IRCloggy #git 2012-05-02

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.

2012-05-02

→ yizumi joined00:00
← iddt left00:03
→ ISF_ joined00:05
→ pheaver joined00:05
→ yizumi_ joined00:06
→ njection joined00:06
→ gavin_huang joined00:08
← yizumi left00:09
← yizumi_ left00:09
→ nrichards joined00:10
← Infiltrator left00:11
→ davidbanham joined00:11
→ Infiltrator joined00:11
→ yizumi joined00:13
← stepnem left00:14
→ Fandekasp joined00:16
→ kadoban joined00:18
← dreiss_ left00:19
offby1 you may now change your nick00:19
Nickeeh I need to find if a file was ever in our repository, how can I do this?00:21
kevlarman /nick whywouldichangemynick?00:21
Nickeeh Oh, ermm.. I don't know where the file would've been. Just the filename.00:21
→ ymasory joined00:22
→ thwest joined00:22
kevlarman Nickeeh: how many commits in your repository roughly?00:22
Nickeeh kevlarman, 370000:22
cespare Nickeeh: not trivially i don't think. Will probably require some brute-forcery00:23
kevlarman Nickeeh: something along the lines of git rev-list master|xargs git ls-files|grep filename00:23
Nickeeh git log -p, let less search for it, did get me a bit.00:23
→ hagabaka joined00:23
kevlarman Nickeeh: generating a list of files is cheaper than generating a patch00:24
→ stepnem joined00:25
Nickeeh yeah I'm browsing the manpage but iddn't find that quickish. kevlarman, how would I do that?00:25
← yizumi left00:25
cespare Nickeeh: something like git log --name-only?00:27
Nickeeh cespare, cheers mate.00:27
← acl_ left00:27
kevlarman Nickeeh: um i gave you a command00:29
Nickeeh kevlarman, d'oh, mist that. xD00:30
→ lottadot joined00:30
Nickeeh Nicks-MacBook-Pro:src nick$ git rev-list master | xargs git ls-files00:32
herp. ;D00:32
kevlarman, ^ that's empty somehow.00:32
git rev-list master works..00:32
git ls-files as well.00:32
offby1 fills a plant mister and starts pumping00:32
Nickeeh kevlarman, git ls-files doesn't work with a commit tho..00:33
ah, it shows differences.00:33
Hmm, then it just doesn't show up.00:33
funny thing is, nothing shows up.00:34
that can't be right, right?00:34
kevlarman Nickeeh: git ls-tree -r then00:34
i thought git ls-files worked with commits00:34
→ fyolnish joined00:35
Nickeeh hmpf, git ls-tree -r also doesn't show anything with xargs, but if I pass it a commit-name it works..00:35
how can this not print something >_>00:36
aren't we looking for a for-each instead of xargs tho?00:36
kevlarman, but, tbh, git log --name-only was okay: I could search with a regexp through all the changed files..00:36
→ duncanm joined00:37
duncanm is ther00:37
hola00:37
→ yizumi joined00:37
→ BryanRuiz joined00:37
duncanm are there well known bugs against the version of git that's shipped by apple? (1.7.5.4)00:37
i have a repo where i'm at commit XYZ, and if i run 'git reset --hard XYZ', i get an error00:37
https://gist.github.com/257264800:38
Nickeeh duncanm, and erm.. why not just git reset --hard? not sure if that's suppose to break but..00:38
duncanm Nickeeh: because i want to make sure i land on a specific commit00:38
Nickeeh duncanm, check the permissions.00:38
← Infiltrator left00:38
Nickeeh of the .git thing.00:38
→ Infiltrator joined00:39
duncanm Nickeeh: it's all owned by the same user00:39
Nickeeh duncanm, hmpf. Could you clone again and see if that repository also has the same issue?00:40
it sounds like you somehow broke your index.00:40
well maybe not you.00:40
Maybe it was the earths magnetic field.00:41
But I'm curious to see if a fresh index has the same problem.00:41
→ alberto56 joined00:41
→ limoges joined00:41
duncanm hey offby100:41
offby1 la la la00:42
→ alester joined00:42
offby1 I was about to kick rudybot for not greeting you but I see he's not here with us.00:42
duncanm heh00:45
→ jalama joined00:45
offby1 it's nice to have a respite from the kids once in a while.00:46
→ project2501a joined00:47
→ aristidesfl joined00:47
→ chihjen_ joined00:48
← nrichards left00:50
→ redrocket joined00:50
→ thursday joined00:52
→ hvgotcodes joined00:53
← thursday left00:53
hvgotcodes so i started a project, pushed it to github -- then i created a new dir and copied everything into that new dir -- how do i get dir to the same git spot as github, but keep the changes i made since then...00:54
→ thursday joined00:54
← ISF_ left00:54
← thursday left00:54
→ brngardner joined00:54
→ thursday joined00:55
→ thearthur joined00:55
→ milki joined00:55
→ ISF__ joined00:55
Vinnie_win hvgotcodes: clone the remote into a new directory, then copy your changed files back in, then add and commit.00:55
→ w09x joined00:55
hvgotcodes Vinnie_win: the old dir is still there. once i saw someone init a repo based on another directory00:56
does that sound possible?00:56
→ siloxid joined00:56
Vinnie_win that doesn't really make much sense to me00:56
you can clone a local repository, maybe thats what you saw00:56
it sounds to me like you have a set of changed files, and you want to commit it to the remote, is that right?00:56
hvgotcodes do i lose the changes i have made since then00:57
correct sir00:57
Vinnie_win well like I said, clone the remote into a new directory - this wont affect your files since the directory is new00:57
then, copy your changed files over into this new directory and use git status to see what changed, then git add, followed by git commit00:57
← hagabaka left00:57
→ gensymv joined00:57
hvgotcodes ok00:57
← Infiltrator left00:58
→ amigojapan joined00:58
→ Infiltrator joined00:59
gensymv hello, i am trying to back my code i push to git on a machine that doesn't use git. how can i set a post-receive hook that copies the files that have been pulled to another machine?00:59
*back up00:59
→ kickandr1w joined01:00
→ dfr|mac joined01:00
→ xiangfu joined01:00
→ TeckniX_ joined01:00
← TeckniX left01:01
TeckniX_ → TeckniX01:01
→ cholin joined01:02
→ Goplat joined01:03
→ awx joined01:04
← ISF__ left01:05
→ ISF__ joined01:06
nevyn ummm01:08
gensymv: huh?01:08
gensymv: explain the data flow you want again for me01:08
you push to git on a machine that doesn't use git?01:08
offby1 gensymv: why not just rsync your repository every once in a while?01:09
gensymv no01:09
← BryanRuiz left01:10
nevyn 10:57 < gensymv> hello, i am trying to back my code i push to git on a machine that doesn't use git. how can i set a post-receive hook that copies the files that have been pulled to another machine?01:10
gensymv <nevyn> i am pushing my code from my computer to the git repository.01:10
nevyn well git pushes from a repository to a repository01:10
ok.01:10
but ok01:10
gensymv but the code should also be copied to another computer01:10
nevyn ok.01:11
gensymv one of the labs at uni01:11
nevyn ok.01:11
gensymv the computer has no git installed01:11
→ bsb joined01:11
nevyn do you want to do this from your workstation?01:11
→ fuzzybunny69y joined01:11
gensymv no01:11
nevyn or from the remote01:11
gensymv remote, yes01:11
post-receive hook i guess, is what should it be done as01:12
what i want to achieve is, having my code copied to that machine after every push01:12
nevyn ok.01:12
→ dv310p3r joined01:12
nevyn can you ssh from the remote to the lab machine?01:13
with a ssh-key?01:13
gensymv but i can't find where git stores the code... i have read that it stores code as blobs, but that is not enough to get me started01:13
yes01:13
nevyn gensymv: so there are a couple of ways to do this.01:13
→ satyanash joined01:13
nevyn gensymv: the rightway is install git on the lab machine.01:14
but given that.01:14
isn't going to happen by the sound of it.01:14
→ darren joined01:14
gensymv nevyn: the admin wrote an angry email, on why that shouldn't be installed, after i compiled that by my own, so that's a no go...01:14
nevyn oh what was the reasoning?01:14
I'm curious as an admin ;)01:15
gensymv "curious" ssh activity01:15
nevyn oh lols01:15
ok.01:15
← ISF__ left01:16
→ booginga joined01:16
gensymv what's the wrong-way to do it?01:17
:D01:17
nevyn so you have a post recieve hook that runs git archive --format tgz HEAD | ssh labmachine rm "stuff" && tar xvf -01:17
I think that'll work01:18
gensymv ah archive is what i have been missing01:18
lemme give that a try01:18
nevyn so are you allowed to use rsync?01:18
cause that could be nicer.01:18
← darren left01:18
nevyn just create another clone on the remote. reset that remote and rsync it to the lab machine01:19
gensymv yes01:19
← jalama left01:19
gensymv that is smarter01:19
nevyn gensymv: you may have a valid use case for pushing to a non-bare repo01:21
← siloxid left01:22
→ Lgb joined01:23
→ zli joined01:23
gensymv nevyn: thanks that worked01:23
→ igotnolegs joined01:23
nevyn in that rather than have another clone. you could just use the repo on the remote ...01:23
← kadoban left01:24
→ neurodrone joined01:25
← alester left01:29
← bsb left01:29
→ Vampire0_ joined01:30
→ ISF__ joined01:30
→ mritz joined01:31
→ Stellar joined01:31
← limoges left01:32
→ bsb joined01:33
bsb Is "git checkout-index -a" the way to safely partially checkout into a dirty/conflicting directory?01:33
→ noDLL joined01:35
→ alester joined01:36
noDLL Hello, I'm having this message everytime gitosis try to sync a repository "Bad owner or permissions on /home/gitosis/.ssh/config "01:36
could anybody help me?01:36
→ weiyang joined01:36
gitinfo set mode: +v01:37
→ glennpratt joined01:37
→ frogonwheels_ joined01:38
noDLL Could anyone help me to find out why gitosis is failing to sync a repository?01:38
bob2 who owns that file01:38
^ obvious thing you should include in your question01:38
→ lunchdump-away joined01:38
noDLL this file is owned by git01:38
git, group git and gitosis is ran by git01:39
gitinfo set mode: +v01:39
frogonwheels_ noDLL: I what are the permissions for it noDLL ?01:39
bob2 why is the homedir called gitosis then01:39
→ batmanian joined01:39
← ipalaus_ left01:39
noDLL -rw-rw-r-- 1 git git 53 2011-12-07 18:26 /home/gitosis/.ssh/config01:39
frogonwheels_ noDLL: well there you are.01:39
offby1 noDLL: this won't help you right now, but: gitosis is deprecated.01:40
!gitosis01:40
gitinfo gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite01:40
← yizumi left01:40
noDLL well the user was going to be called gitosis but the hook is ran by the git user01:40
frogonwheels_ noDLL: you need to clamp down the permissions to user only01:40
noDLL 600?01:40
frogonwheels_ noDLL: Probably better01:40
→ magcius joined01:40
frogonwheels_ and really, forget gitosis. it's less configurable and not supported,01:41
← booginga left01:41
→ nrichards joined01:41
frogonwheels_ noDLL: oh, and it's messier to configure01:41
→ yizumi joined01:41
noDLL frogonwheels_ : I really believe you, I'll migrate to gitolite then in a few days :)01:42
600 fixed the problem01:42
:D01:42
frogonwheels_ noDLL: btw, that has nothing to do with git - it's a ssh thing01:42
noDLL I see, that's bad :S01:43
frogonwheels_ noDLL: nah, it's safe.01:43
noDLL you have given to me more work than expected hehe; this file have not been touched by me01:43
may be someone have been playing with the server in the last days01:44
→ theCole joined01:44
← pheaver left01:45
frogonwheels_ noDLL: ooh, your'e right, that's bad.01:47
→ ISF_ec09 joined01:47
noDLL frogonwheels_ : thanks a lot for your help mr.01:48
→ aboudreault joined01:48
frogonwheels_ np01:48
← ISF__ left01:50
aboudreault Hi, trying to do a git cvsimport , and I would like to map user X = Y. (for github)01:50
→ mapreduce joined01:50
mapreduce Hi. Is there any way of listing all the commits across all branches from, say, the past 7 days?01:50
← brngardner left01:52
← thearthur left01:52
→ camdenx joined01:52
bob2 then what?01:53
→ raek joined01:54
mapreduce To me? Then emailing them to the doofus who wants a weekly progress report.01:54
→ Agro joined01:55
Agro On github, I changed the name of a repository I made. How do I change it on my local git?01:55
← w09x left01:55
← kaen left01:55
← ISF_ec09 left01:56
← camdenx left01:57
→ txomon|nqas joined01:57
bob2 Agro, edit .git/config01:57
→ subbyyy joined01:58
← subbyyy left01:58
Agro thanks01:58
→ w09x joined02:01
→ ISF_ec09_ joined02:02
→ Nibato joined02:02
→ harish joined02:02
→ subbyyy joined02:03
← thwest left02:03
→ heidar joined02:04
← weiyang left02:05
bsb anyone used git checkout-index?02:05
← Infiltrator left02:06
→ ChaoWang joined02:07
→ Infiltrator joined02:07
← gensymv left02:07
← subbyyy left02:08
→ kaen joined02:09
← kaen left02:09
→ kaen joined02:09
→ Sahua joined02:10
← txomon|nqas left02:10
→ txomon|nqas joined02:12
← txomon|nqas left02:12
→ txomon|nqas joined02:12
← alester left02:12
→ stkrzysiak joined02:13
→ Zenith77 joined02:14
bob2 as always best to ask your question02:14
→ asedeno_work joined02:15
→ leo2007 joined02:16
← alberto56 left02:16
leo2007 folks, good morning02:16
→ kenperkins joined02:17
→ alberto56 joined02:18
← stkrzysiak left02:18
leo2007 is there a decent way to continue using git with hg repos?02:18
← asedeno_work left02:18
friskd so if you do git push origin master --tags is that how it should be done every time.02:18
Seems weird that tags are just not always pushed...02:19
or does it have to be done in to operations02:19
git push origin master02:19
git push --tags02:19
← amigojapan left02:20
→ mtytel joined02:20
→ mgpcoe1 joined02:21
→ subbyyy joined02:22
→ timoxley joined02:23
→ HyperNerdV2_ joined02:24
leo2007 friskd: yep, or you can push tag one by one: git push origin tag TAGNAME02:24
friskd is there a way to configure tags to be pushed by default02:24
so any git push origin branch would do it?02:25
i'm using the output of the git describe command to generate an App version02:25
leo2007 not sure, check git config02:25
friskd and thus tags need to be preserved02:25
→ luxurymode joined02:25
friskd i don't see anything here: http://man.he.net/man1/git-config02:27
→ edude03 joined02:28
→ irqq_ joined02:29
← HyperNerdV2_ left02:29
→ thearthur joined02:29
→ stkrzysiak joined02:30
← ISF_ec09_ left02:32
← kenperkins left02:32
→ dstorrs joined02:32
→ ISF_ec09__ joined02:32
→ weiyang joined02:33
→ asedeno_work joined02:33
→ dreiss_ joined02:34
← mgpcoe1 left02:35
← subbyyy left02:35
→ cybersphinx joined02:36
← alberto56 left02:36
→ subbyyy joined02:39
→ ixti joined02:42
→ thwest joined02:44
→ davidban_ joined02:46
→ DofLeFou joined02:46
→ Chib joined02:46
← thwest left02:47
→ vs joined02:47
vs → Guest2498702:47
→ orafu joined02:47
← stkrzysiak left02:48
← davidbanham left02:49
← leo2007 left02:49
→ ben225 joined02:51
← redrocket left02:51
→ redrocket joined02:52
← timoxley left02:54
← w09x left02:55
← theCole left02:55
→ timoxley joined02:57
→ Yuuhi` joined02:57
← ymasory left02:58
→ w09x joined02:59
← asedeno_work left02:59
→ archdori joined02:59
→ asedeno_work joined02:59
→ oogatta joined03:00
→ tardo joined03:00
← tardo left03:00
← Agro left03:01
← Fandekasp left03:02
→ jkyle joined03:02
← dv310p3r left03:03
→ Cam joined03:04
← txomon|nqas left03:06
→ txomon|nqas joined03:08
← txomon|nqas left03:08
→ txomon|nqas joined03:08
→ Textmode joined03:08
→ thwest joined03:10
thwest huh. `git pull` in master project... "fetching submodule" x N. whence this sourcery? I have always had to `git submodule update --init --recursive` afterwards.03:12
← aboudreault left03:14
← ben225 left03:17
→ dv310p3r joined03:18
→ randomuser joined03:19
→ Dave^| joined03:19
→ SegFaultAX joined03:19
← asedeno_work left03:19
→ az joined03:20
← mritz left03:22
randomuser I'm piecing together a script to grab a user's name and email from their git config. I found references to GIT_COMMITTER_NAME and GIT_AUTHOR_NAME environment variables. Are these commonly used and worth checking for? If so, what's the difference between AUTHOR and COMMITTER ?03:23
→ boombatower joined03:23
← TeckniX left03:24
fayimora Hey guys, I just cloned a repo from github.. What do i do to be able to push changes to my own repo but pull from the cloned repo ?03:26
→ ajpiano joined03:27
→ mritz joined03:28
← dv310p3r left03:28
bsb bob2: Is "git read-tree -v HEAD && git checkout-index -a" the way to safely partially checkout into a dirty/conflicting directory?03:28
→ asedeno_work joined03:29
RandalSchwartz bsb - why do you need a safe way to do a reckless thing?03:29
bsb I have existing $HOME dirs with copied and edited dotfiles it'd like to consolidate and manage with git03:30
RandalSchwartz egad. please don't manage $HOME with git03:30
git is for branching and merging *trees* of files03:31
bsb it can be toggled with env manipulations03:31
RandalSchwartz when will you ever be branching a tree of your $HOME?03:31
or reverting anything except a single file or two03:31
it's like hammering nails in with a screwdriver. WRONG TOOL03:32
bsb anything wacky (like managing gh-pages) could just be done in another ordinary clone03:32
RandalSchwartz if you want file history (not tree history) use something like RCS03:32
you don't need *tree* history on $HOME03:32
→ dv310p3r joined03:33
bsb I also like the idea of keeping all my dotfile tweaks in sync03:33
at the moment that doesn't happen03:33
RandalSchwartz wanders off, letting fools fend for themselves03:33
SerajewelKS RandalSchwartz: it's more like using a swiss army knife to screw in a screw03:34
← txomon|nqas left03:34
SerajewelKS RandalSchwartz: sure, you could also use it to cut a lemon. or carve something. but whatever, you're not using those other bits right now.03:34
git does just as well at linear history as branched history03:35
offby1 don't tell RandalSchwartz but I keep my $HOME in git03:35
he's right; it's overkill. But it works fine.03:35
And I use git all the time anyway, so why not?03:35
SerajewelKS i keep some files like my vimrc and screenrc in a git repo, ~/config-files -- then i symlink them into $HOME03:36
that's "the right way" to do it03:36
→ markq joined03:36
bsb I was trying to avoid the symlinks03:36
→ txomon|nqas joined03:36
fayimora Hey guys, I just cloned a repo from github.. What do i do to be able to push changes to my own repo but pull from the cloned repo ?03:36
SerajewelKS bsb: eh, it's not too much work to set up03:36
← redrocket left03:37
SerajewelKS fayimora: ... what?03:37
bsb SerajewelKS: no kidding, it throws up all kinds of interesting wrinkles (where I'm at: https://github.com/bowman/.dotfiles/blob/master/.dotfiles/setup.sh)03:37
SerajewelKS bsb: you could even store a script in the repo to do it for you03:37
→ redrocket joined03:38
← redrocket left03:38
bsb SerajewelKS: yeah, ideally something that bootstraps nicely (like cpanminus does: curl $URL | interp )03:38
SerajewelKS bsb: i also keep e.g. my email signature in there03:38
fayimora SerajewelKS: I just cloned a repo.. I want to make changes and push to my own equivalent repo on github.. however, i still want to be able to run 'git pull' to fetch updates from where i cloned it from03:38
SerajewelKS all kinds of little config-y things03:39
fayimora So pulling from original and pushing to mine03:39
SerajewelKS bsb: i also use git to synchronize my terraria worlds and oblivion save games. shh, don't tell RandalSchwartz.03:39
fayimora: did you "fork" on github, or are you doing a manual fork (clone upstream and push to your copy)03:39
bsb I keep a research journal in git & yaml :)03:39
SerajewelKS bsb: it actually came in handy... i wanted to experiment with vampire vs non-vampire gameplay in oblivion03:40
fayimora SerajewelKS: I didn't fork, I just cloned03:40
SerajewelKS bsb: guess what i did? i created a "vampire" branch.03:40
fayimora: ok. so you have the remote "origin" which is upstream. so "git remote add mine [email@hidden.address]03:40
bsb that might help with trying out alternate WMs say...03:40
→ redrocket joined03:41
SerajewelKS fayimora: then push whatever branches you want with "git push mine branch1 branch2 ..."03:41
fayimora: if you want your local branches to track the branches in mine, then "git push -u ..."03:41
fayimora: otherwise they will continue to track origin's branches03:41
→ ilteris__ joined03:41
→ pheaver joined03:41
SerajewelKS bsb: directed acyclic graphs <303:42
so many applications03:42
bsb So, given that aim is a bit odd at first glance, the question: is "git read-tree -v HEAD && git checkout-index -a" the way to safely partially checkout into a dirty/conflicting directory?03:42
fayimora SerajewelKS: thanks..would try that03:42
→ SmilingDevil joined03:43
fayimora Is a submodule a repo in a repo?03:43
SmilingDevil Hello03:43
gitinfo SmilingDevil: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.03:43
← Chib left03:43
SerajewelKS fayimora: sort of03:43
SmilingDevil How would I create a repo on my webserver and have a repo on my local server, and have the local webserver push to the upstream server?03:44
What would I do to set that up?03:44
Like: [Computer] <--> [Local Server] ---> [Web server]03:45
SerajewelKS SmilingDevil: is the local server's repo bare?03:45
SmilingDevil The webserver's is03:45
SerajewelKS SmilingDevil: pushing to a non-bare repo has caveats03:45
SmilingDevil: namely, you cannot push to the branch checked out in the remote03:45
SmilingDevil SerajewelKS, what would I do to set this up correctly?03:46
← ISF_ec09__ left03:46
→ ISF joined03:47
SerajewelKS SmilingDevil: well, generally you should only pull from a non-bare remote, never push to it (as a rule, there are exceptions)03:47
→ jameswarren joined03:47
SerajewelKS SmilingDevil: so from the local server you would pull from your computer03:47
SmilingDevil SerajewelKS, as of right now, I have nothing set up03:47
SerajewelKS SmilingDevil: then you can push to the web server from there03:47
SmilingDevil I would like to read/write files on my computer to the server over SCP03:48
Then commit, and push upstream to the webserver03:48
SerajewelKS SmilingDevil: hmm, well having a central-ish bare repo is probably not a bad idea, then just have everything use that as their origin03:48
SmilingDevil What commands would I need to do that?03:48
→ marke joined03:48
← ISF left03:48
SmilingDevil The computer wouldn't have a git repo03:48
SerajewelKS oh03:48
so you are editing via ssh or something?03:49
SmilingDevil Over SSH though a editor (Coda), yes.03:49
SCP*03:49
SerajewelKS ok, then your computer has no part in the graph really03:49
SmilingDevil SFTP**03:49
SerajewelKS you are editing "on" the server, just via a transport03:49
SmilingDevil Yes03:49
→ duckxx joined03:49
SerajewelKS so ssh into the server in order to execute git commands03:49
SmilingDevil SerajewelKS, I have a constant ssh connection, so yes03:50
bsb randomuser: git config user.name ; git config user.email # does this help?03:50
→ jeremyb joined03:50
bsb that respects the env03:50
← teotwaki_ left03:50
← markq left03:50
SerajewelKS SmilingDevil: ok, so does that answer your question?03:51
← Sahua left03:51
→ ISF__ joined03:51
SmilingDevil SerajewelKS, no, I'd like to know the commands on how to set this up03:51
I've used git very little.03:51
SerajewelKS SmilingDevil: ok, if you want a bare repo on the web server, then go there and do something like: mkdir ~/something.git && cd ~/something.git && git init --bare03:52
SmilingDevil As of right now, I have two, empty git repos which I just init'd03:52
SerajewelKS SmilingDevil: ok. the one on the web server is bare, right?03:52
SmilingDevil no03:52
Let me do that real quick03:52
SerajewelKS you might want to read "man git-init" to see what a bare repo is03:53
gitinfo the git-init manpage is available at http://jk.gs/git-init.html03:53
SerajewelKS basically, it has no working directory03:53
SmilingDevil I see03:53
So no .git?03:54
SerajewelKS well, the contents of what would be .git are stored in . instead03:54
← dv310p3r left03:54
→ WillMarshall joined03:54
SerajewelKS normally, the repository data is stored in a .git subdirectory; in a bare repo, the data is stored directly in that directory03:54
SmilingDevil I understand03:55
Now say I have files in that directory already03:55
SerajewelKS then you would not want to make a bare repo03:55
SmilingDevil How would I confgure my local server to push to that, but fetch those files first03:55
SerajewelKS try this03:55
inside that directory, "git init" and then create the initial commit03:55
on the local server, add the remote (git remote add origin user@host:path && git fetch origin)03:56
then "git checkout -t origin/master"03:56
make sure you have the files locally03:56
SmilingDevil SerajewelKS, would I remove the HEAD/config/desc. files?03:56
→ OOPMan joined03:57
SerajewelKS did you already run "git init --bare"?03:57
SmilingDevil yes03:57
SerajewelKS then yeah, you probably would want to remove whatever git created03:57
i was under the assumption that you had no data in either directory03:57
SmilingDevil ok03:57
OK, I ran git init on the webserver03:58
on my local server03:58
SerajewelKS ok03:58
create the commit with the files you need on the web server. you know how to do that, yes?03:58
SmilingDevil yes03:58
SerajewelKS ok03:59
SmilingDevil 'git init' on local server?03:59
→ xsbeats joined03:59
SerajewelKS probably easier just to clone03:59
git clone user@host:path directory-to-create03:59
→ s_segawa joined03:59
SmilingDevil would a valid directory to create be .?04:00
← njection left04:00
SerajewelKS if it's empty, that should work, yes04:00
SmilingDevil ok04:00
→ njection joined04:00
SmilingDevil ok, downloading.04:00
and after this?04:01
SerajewelKS verify that . has the files you want in the repo04:01
SmilingDevil It does04:01
SerajewelKS ok, go to the web server and delete the whole directory04:01
then create it again, and "git init --bare" inside it04:01
SmilingDevil the directory itself, or the files inside it?04:01
including .git?04:02
SerajewelKS well, everything04:02
right04:02
ls -a should give . and .. :)04:02
SmilingDevil Done04:02
SerajewelKS now git init --bare04:02
SmilingDevil Done04:02
SerajewelKS then go back to your local box04:02
git push -u origin master04:02
if that completes, you're done with the set up04:02
SmilingDevil Then how would I push after commiting?04:03
Can I just 'git push'?04:03
SerajewelKS yup, if you're committing to a branch that is set to track a remote branch04:03
(which master is)04:03
SmilingDevil ok then04:03
SerajewelKS if you create any new branches you want to push, you will have to "git push -u origin branchname"04:03
SmilingDevil When this finishes let's see if it works04:03
SerajewelKS that will push the branch to the remote repo and set up your local branch to track the remote branch04:03
→ zdk joined04:03
SerajewelKS "git push" will push the currently checked-out branch to whatever remote the local branch is tracking, unless you have modified push's default behavior in your git config04:04
SmilingDevil SerajewelKS, eventually I'm going to write a web app to do this all for me04:04
← njection left04:04
SmilingDevil :)04:04
Well thank you Sera04:05
SerajewelKS i have already done a very simple web interface for my wife, i use git to back up and sync our checkbook data across a few computers04:05
np04:05
SmilingDevil Well I'm off now!04:05
SerajewelKS it can pull and push, and if the local and remote branches ever diverge, it will refuse to do anything at all, so i can look and see how to merge04:05
SerajewelKS waves04:05
SmilingDevil And away I go!04:06
← SmilingDevil left04:06
→ fayaz joined04:07
← marke left04:08
→ SmilingDevil joined04:08
SmilingDevil SerajewelKS, problem04:08
It pushed correctly, but the files don't show up in the directory04:09
SerajewelKS on the web server?04:09
SmilingDevil [smilingdevil@gummi sites]$ ls04:10
HEAD branches config description hooks info objects refs04:10
SerajewelKS that's the point of a bare repository04:10
SmilingDevil :>04:10
It's a webserver04:10
SerajewelKS remember, it has no working directory, therefore it never has any branch checked out which means you can push to any branch at any time04:10
then i would move the bare repo somewhere else (out of the web root for example)04:10
then create a clone of that repo locally04:10
(if the repo is ~/webapp.git then "git clone ~/webapp.git ~/webapp")04:11
then symlink the webroot directory into your real webroot, or map it with an apache alias04:11
the files you want in your webroot should not be at the root of the repository, since then your .git will be in the web root and that's a bad thing.04:11
but the "right way" to do this would be to clone the bare repo on the server, then you will be pulling from that local repo04:12
SmilingDevil there we go!04:12
SerajewelKS you can "sort of" do this with a single repo by having the web server repo check out a branch that you will never ever touch from your local server04:12
SmilingDevil SerajewelKS, so if I were to push on my local server upstream, I would have to pull on the webserve in my other directory?04:12
SerajewelKS SmilingDevil: yes04:12
SmilingDevil Fair enough04:13
SerajewelKS SmilingDevil: whichever way you go, you will have to do something on the web server04:13
→ skylamer` joined04:13
SerajewelKS SmilingDevil: if you use one repo on the web server (a single non-bare one) then you have to merge with the branch you pushed, which will fast-forward04:13
SmilingDevil: if you use two, you have to pull the bare from the non-bare04:13
SmilingDevil SerajewelKS, how can I reconfigure my origin directory on the local server?04:13
← duckxx left04:13
SerajewelKS SmilingDevil: git remote rm origin && git remote add origin user@server:path04:13
SmilingDevil: then git fetch04:14
(of course)04:14
SmilingDevil: i gotta get to bed now. hope it all works out for you. :) if not, i'll be at work in about 9-10 hours and i'll be available there.04:14
or maybe someone else in here can help you04:14
SmilingDevil SerajewelKS, I just committed yet it says up to date?04:15
:(04:15
SerajewelKS SmilingDevil: you committed on the local server?04:16
SmilingDevil committed and pushed04:16
webserver doesn't find anything, and nothing was uploaded04:16
SerajewelKS SmilingDevil: did the push succeed?04:16
SmilingDevil ba36e97..4fa7a75 master -> master04:16
Looks like it04:16
SerajewelKS and "git pull" from the clone on the web server says what?04:17
SmilingDevil Already up-to-date.04:17
SerajewelKS what's "git rev-parse master" say there04:17
→ e_dub joined04:17
SmilingDevil ba36e9738f64aca99d61fa2cd3b3f7690b7f220504:17
SerajewelKS and "git rev-parse origin/master"04:17
SmilingDevil same04:17
SerajewelKS what does "git fetch" do04:18
SmilingDevil Nothing04:18
[root@gummi sites]# git fetch04:18
[root@gummi sites]#04:18
SerajewelKS then something is wrong, one or both of the repositories are not pulling from the same place04:18
try "git remote show -n origin" on both repos and compare the paths04:18
is the clone on the web server fetching from itself maybe?04:19
(if you changed the paths but did not recreate the remote)04:19
SmilingDevil SerajewelKS, I just did that04:19
I re-cloned it04:20
SerajewelKS on the web server clone too?04:20
oh04:20
→ Chibby_ joined04:20
SerajewelKS go into the bare repo and "git rev-parse master"04:20
gitinfo set mode: +v04:20
SmilingDevil 4fa7a750a63962e8242bb48f8bb1f6a1a1fdf46204:20
SerajewelKS ok04:20
SmilingDevil wait04:20
SerajewelKS and in the clone, you are positive that "git remote show -n origin" displays the path of the bare repo?04:20
SmilingDevil no that's right04:20
SerajewelKS, which clone, the one with the webfiles in it?04:21
e_dub hello, I have a quick question: if I have already merged changes into my master, then pushed those masters to github, and now need to roll changes back to match the original fork to re-do something , is there an easier way than just deleting my fork and local clone, then re-forking and cloning again?04:21
SerajewelKS SmilingDevil: the non-bare clone on the web server04:21
e_dub: you can checkout the branches locally, "git reset --hard 123456" which will point the checked-out branch to commit 123456, and then "git push --force"04:22
e_dub: this will revert the branch to an earlier commit locally and on github04:22
→ EyesIsMine joined04:22
SmilingDevil SerajewelKS, http://pastebin.com/ywm93CpW04:22
→ duckxx joined04:22
e_dub thank you SerajewelKS04:22
SerajewelKS e_dub: nu04:22
← zli left04:22
SerajewelKS np*04:22
→ mcluskydodallas joined04:23
SerajewelKS SmilingDevil: paste me this: cd /var/sites && git fetch origin && git rev-parse master && git rev-parse origin/master && cd /var/git && git rev-parse master04:23
SmilingDevil 4fa7a750a63962e8242bb48f8bb1f6a1a1fdf46204:23
4fa7a750a63962e8242bb48f8bb1f6a1a1fdf46204:23
4fa7a750a63962e8242bb48f8bb1f6a1a1fdf46204:23
:>04:23
SerajewelKS looks like somewhere in there you got the pull to work :)04:24
SmilingDevil and on local server: 4fa7a750a63962e8242bb48f8bb1f6a1a1fdf46204:24
→ fayimora joined04:24
SmilingDevil let me try and push a blank file04:24
→ hotspants joined04:24
SmilingDevil it works!04:25
Thanks again SerajewelKS04:25
You've done it again!04:25
SerajewelKS SmilingDevil: no problem :) good luck with the project04:25
SmilingDevil Thanks04:25
← SmilingDevil left04:25
→ mister_m joined04:26
← mcluskydodallas left04:26
→ teotwaki_ joined04:28
← jkyle left04:29
e_dub cool that worked perfectly SerajewelKS , thanks again04:31
later04:31
← e_dub left04:31
→ hagabaka joined04:32
← hagabaka left04:32
→ hagabaka joined04:32
→ jkyle joined04:32
← pheaver left04:32
← ferdna left04:33
→ defaultro joined04:33
→ Gentlecat joined04:33
→ kenperkins joined04:33
← neurodrone left04:36
→ jimubao joined04:37
← luxurymode left04:37
scientes !lol04:38
gitinfo git config --global alias.lol "log --oneline --graph --decorate"04:38
← kenperkins left04:38
→ ferdna joined04:39
→ rafasc joined04:40
rafasc i deleted a remote branch by typing "git push repository :branch"04:41
but on redmine, the private repo i am using, it still shows revisions that were related with those branches.04:41
← xsbeats left04:42
rafasc is there a way to delete them permanently?04:42
→ slakmagik joined04:43
gitinfo set mode: +v04:43
→ xsbeats joined04:46
← xsbeats left04:46
→ beautifulmind joined04:48
→ macmartine joined04:49
→ xsbeats joined04:53
→ pheaver joined04:53
← jimubao left04:54
← thearthur left04:56
→ maleknet joined04:56
→ ymasory joined05:01
← Zenith77 left05:01
→ nibalizer joined05:02
nibalizer waves to r0csteady05:02
← beautifulmind left05:03
→ beautifulmind joined05:03
← mritz left05:05
→ glcrazy joined05:05
→ crhan joined05:05
← duckxx left05:08
← yizumi left05:11
← ISF__ left05:11
← satyanash left05:12
← pheaver left05:17
→ yizumi joined05:18
← xsbeats left05:21
→ angelsl joined05:24
← jkyle left05:25
← irqq_ left05:28
→ Lulzon joined05:29
rafasc sorry guys. It is a bug on redmine05:30
→ akiress joined05:33
→ joaoh82 joined05:34
randomuser bsb, just scrolled up - a git config --global username,email isn't the same as the environment variables, but I'm checking that too05:35
randomuser just scrolled way up05:35
← dfr|mac left05:36
→ satyanash joined05:38
← ymasory left05:40
→ Araxia joined05:41
→ LongBeach joined05:41
→ ymasory joined05:42
→ khmarbaise joined05:44
→ krz joined05:46
← rafasc left05:46
← mister_m left05:52
→ shruggar joined05:53
→ camdenx joined05:54
← timoxley left05:56
← khmarbaise left05:56
→ arvind_khadri joined05:56
→ tabakhase_ joined05:57
tabakhase_ → tabakhase05:57
→ Araxia_ joined05:59
→ minigonna joined05:59
← camdenx left05:59
← joaoh82 left05:59
→ Fandekasp joined05:59
← thwest left06:00
← macmartine left06:01
← thursday left06:02
← kevlarman left06:02
← archdori left06:03
→ kevlarman joined06:04
← aristidesfl left06:04
→ mishok13 joined06:05
maleknet → alirezameskin06:07
alirezameskin → AlirezaMeskin06:07
← gavin_huang left06:09
← minigonna left06:11
→ cbreak-work joined06:11
→ igli joined06:12
→ dc5ala joined06:13
← AlirezaMeskin left06:14
→ michaelmartinez joined06:14
← fayaz left06:14
igli hi, i have some changes in a single commit in an unpushed branch. i'd like to split the commit up, same as: git add -p. is that possible?06:14
→ AlirezaMeskin joined06:15
→ JohnBat26 joined06:15
→ gavin_huang joined06:16
→ j0ran joined06:16
→ ThomasLocke joined06:17
bob2 sure, reset, cherry-pick -n, add-p, enjoy06:17
_ikke_ bob2: why the cherry-pick?06:18
cbreak-work no need for cherry-pick06:18
igli ah ty06:18
cbreak-work reset is enough, and a rebase -i if the commit you wish to split is not the newest06:18
bob2 don't you need to 'reset --hard' the branch to the previous commit?06:19
← michaelmartinez left06:19
→ freimatz joined06:19
_ikke_ no06:20
igli that'll lose working tree?06:20
_ikke_ just reset06:20
git reset HEAD^; git add -p; git commit; git add -p; git commit06:20
← kevlarman left06:20
→ kevlarman joined06:20
igli lovely :)06:20
→ solofight joined06:21
→ Vert joined06:21
← shruggar left06:22
← solofight left06:22
→ kadoban joined06:23
→ fayaz joined06:23
← mishok13 left06:23
igli yeah "splitting commits" in man git-rebase is great too. thanks all :)06:24
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html06:24
igli hehe06:24
bob2 hm, given it's already commit, isn't throwing the working tree away fine?06:24
→ vadi2 joined06:24
vadi2 How would I handle the need of integrating code of one branch as a sub-component in another branch most properly?06:25
igli bob2: not sure what the workflow would be there.06:26
i wouldn't have the files to git add -p06:26
bob2 what's a subcomponent06:26
→ marthinal joined06:27
→ senny joined06:27
_ikke_ bob2: No, because he does want the changes, but he only wants to create new commits06:28
bob2 hm, I'm confused: I would have that that given you want to split up the current HEAD commit of a branch, a working (but long winded) way to do this would be: git reset --hard previouscommit ; git cherry-pick -n whattheoldHEADwas ; git add -p ; git commit ?06:29
← weiyang left06:29
← satyanash left06:30
_ikke_ yes, that would work, but is not the shortest06:30
Because it's basically the same as just git reset HEAD^06:31
You are basically throwing the changes away, and the applying them again06:31
→ Cyp_ joined06:31
bob2 ah, ok06:31
thanks :)06:31
← dstorrs left06:33
← jameswarren left06:33
← randomuser left06:34
→ borkman joined06:35
_ikke_ git reset (--mixed) HEAD^ first resets the current branch to the previous commit, and then updates the index, but it doesn't touch the working tree, allowing you to restage and commit06:35
!reset_demistified06:36
gitinfo http://progit.org/2011/07/11/reset.html06:36
← fayaz left06:36
→ mcluskydodallas joined06:37
← skylamer` left06:37
← Lulzon left06:39
← mcluskydodallas left06:40
← subbyyy left06:42
→ fayaz joined06:43
→ satyanash joined06:44
→ aries joined06:45
→ aristidesfl joined06:45
→ Sigma joined06:45
→ robbyoconnor joined06:45
→ solofight joined06:46
← solofight left06:46
→ brokenshakles joined06:47
→ giallu joined06:47
→ tatsuya_o joined06:47
→ mishok13 joined06:48
← mishok13 left06:52
→ Gitzilla joined06:52
→ rtuin joined06:52
← OOPMan left06:53
← Infiltrator left06:53
→ Infiltrator joined06:54
→ dpino joined06:56
← tatsuya_o left06:57
→ o-_-o joined06:58
o-_-o Hello06:58
gitinfo o-_-o: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.06:58
o-_-o So I created a branch experimental06:58
git branch experimental06:58
and did stuff on it06:58
now I want to push it to remote branch experimental06:59
how do I do this ?06:59
→ stodan joined06:59
← teotwaki_ left06:59
o-_-o There is no remote branch experimental06:59
cbreak-work you can just push new branches:07:00
git push remotename branchname07:00
→ maletor joined07:00
_ikke_ o-_-o: git branch does not checkout that branch07:00
← igotnolegs left07:00
o-_-o Oh...man I pushed and the remote head is not experimental07:00
cbreak-work and?07:01
o-_-o How do I undo this ?07:01
cbreak-work remotes have many heads07:01
git ls-remote remotename07:01
← boombatower left07:01
← project2501a left07:01
→ Sitethief joined07:01
→ project2501a joined07:01
o-_-o I cloned a new repository and I got what is in experimental07:01
My real head is now gone07:02
cbreak-work what are you talking about?07:02
you're not making sense07:02
← Infiltrator left07:02
cbreak-work git branch -a07:02
what do you see?07:02
→ timoxley joined07:02
vadi2 How would I handle the need of integrating code of one branch as a sub-component in another branch most properly?07:02
→ Infiltrator joined07:02
o-_-o * master07:02
remotes/origin/HEAD -> origin/master07:02
remotes/origin/master07:02
cbreak-work looks ok07:02
o-_-o I think I pushed experimental to master07:02
I wanted to push experimental to experimental07:03
cbreak-work you probably committed in master too07:03
o-_-o Yeah...is there a way to go back ?07:03
cbreak-work just branch it off07:03
and then reset master back07:03
o-_-o Ah...ok07:03
cbreak-work you probably never ever committed to master07:04
I mean experimental07:04
_ikke_ vadi2: What do you mean with as a subcomponent?07:04
← WillMarshall left07:04
← igli left07:05
→ psoo joined07:07
← aries left07:07
← Infiltrator left07:09
← Sitethief left07:10
→ Infiltrator joined07:10
→ Sitethief joined07:10
vadi2 _ikke_: as in within a folder07:11
so I have project a and project b, I'd like project b in project a /project b07:11
→ jceb joined07:11
vadi2 but still have project b be a separate branch and etc?07:11
→ jameslord joined07:12
→ borwar joined07:12
_ikke_ Not sure, but I guess you are looking at !subtree merge07:12
gitinfo The git subtree merge method is ideal to incorporate a subsidiary git repositories directly in to single git repository with "unified" git history, where you only need to pull changes in from external sources not contribute your own changes back (which if technically possible is at least difficult). See http://progit.org/book/ch6-7.html Type "!subtree_alt" for more options07:12
vadi2 ok07:13
→ ph^ joined07:17
→ airborn joined07:19
← beautifulmind left07:19
→ mak1 joined07:19
← Lgb left07:20
→ Bartzy joined07:20
← Infiltrator left07:22
→ Lgb joined07:23
→ Infiltrator joined07:23
← giallu left07:24
← Vert left07:25
← borwar left07:26
← mak1 left07:27
← txomon|nqas left07:27
→ txomon|nqas joined07:28
← txomon|nqas left07:28
→ txomon|nqas joined07:28
→ dvgsvc joined07:30
→ Guest55285 joined07:34
Guest55285 → UukGoblin07:34
→ Shusshu joined07:34
→ lb joined07:34
← batmanian left07:35
← ymasory left07:36
← ilteris__ left07:37
→ TheHaven joined07:37
→ Radium joined07:37
→ cagatay joined07:37
→ Kulrak joined07:37
← Kulrak left07:37
→ Kulrak joined07:37
← txomon|nqas left07:39
← Goplat left07:40
→ txomon|nqas joined07:40
← txomon|nqas left07:40
→ txomon|nqas joined07:40
gitinfo set mode: +v07:44
→ fukushima joined07:44
cagatay hey07:44
← Infiltrator left07:45
cagatay guys hope you're all fine07:45
i'm getting Attempt to free unreferenced scalar: SV 0x271af20, Perl interpreter: 0x19ba010 during global destruction. while using git svn branch07:45
→ whitman joined07:46
→ Infiltrator joined07:46
→ adhawkins joined07:46
→ eijk joined07:46
→ mak1 joined07:47
← vadi2 left07:48
← cagatay left07:48
charon cagedwisdom: sounds like a broken svn library installation. was it compiled for the perl you are using?07:52
← Radium left07:52
charon bah, wrong tab completion, sorr<y07:52
_ikke_ charon: he's gone already07:52
cagedwisdom thats ok, I was wondering the exact same thing07:52
_ikke_ lol07:53
→ Milossh joined07:53
→ silntbob joined07:54
→ camdenx joined07:54
→ _Qman joined07:55
→ sy3h joined07:56
→ giallu joined07:56
→ theCole joined07:56
osse What is the default format of 'git stash list'? Trial and error gives me '%gd: %gs' but it would be nice with an "official" answer. I see no difference between %gs and %s.07:56
← dvgsvc left07:57
← aristidesfl left07:57
→ dvgsvc joined07:57
← Infiltrator left07:57
→ Infiltrator joined07:58
← camdenx left07:58
→ Desproges joined08:01
→ Salash joined08:02
gitinfo set mode: +v08:03
→ flijten joined08:03
sy3h my .gitignore says ".settings/" but i can't seem to ignore this folder. Is the dot messing with it? damn you eclipse. Ideas?08:03
← silntbob left08:04
← glcrazy left08:04
← marthinal left08:04
→ francisfish joined08:04
FauxFaux sy3h: Sounds fine, sure you haven't made a mistake?08:05
_ikke_ sy3h: Git doesn't ignore directories already added to the repository08:05
→ QaDeS joined08:06
FauxFaux Does git "cope" with .gitignores with Windows line endings yet?08:06
_ikke_ no clue08:08
→ twisted` joined08:08
gitinfo set mode: +v08:09
mak1 Can anyone tell me how to download specific versions from a git repository? I did a git clone and got the latest stable release. I want to download the newer/unstable ones, can i? how?08:09
FauxFaux mak1: You already have them. git branch -r08:10
sy3h _ikke_: Thanks that was it :)08:10
← dvgsvc left08:11
→ dvgsvc joined08:11
→ wbednarski joined08:11
← Araxia left08:12
Araxia_ → Araxia08:12
→ andreagelati joined08:14
← andreagelati left08:14
→ marthinal joined08:14
← txomon|nqas left08:15
← brokenshakles left08:15
→ tsdh joined08:16
→ txomon|nqas joined08:16
← txomon|nqas left08:16
→ txomon|nqas joined08:16
→ brokenshakles joined08:17
→ pmatthews joined08:18
← sy3h left08:18
→ Vert joined08:20
← marthinal left08:21
← Chibby_ left08:21
→ sdeboey joined08:22
→ Yuuhi`` joined08:24
→ fairuz joined08:25
→ BenL joined08:25
→ arietis joined08:26
← Yuuhi` left08:26
← dvgsvc left08:26
→ PigeonFriend joined08:27
dzan I have forked a repo and created a few branches with changes after which I forked the same repo ( not my fork ) as an organization, what's the easiest way to get my branches of my initial fork in the organization's fork? ( they are not yet pulled into the original project )08:27
→ marthinal joined08:28
→ tvw joined08:28
→ m1sc joined08:29
← o-_-o left08:29
→ Stava joined08:30
→ shruggar joined08:30
Stava how do i checkout a file from 2 commits ago?08:30
FauxFaux git checkout HEAD~2 -- file08:30
_ikke_ FauxFaux: you beat me08:30
mak1 i did "git branch -r", it gave me a list but is does not show any version numbers. how do i get v1.1-rc in a folder?08:30
FauxFaux _ikke_: You don't look like a woman to me... oh. I see. Never mind.08:30
Stava FauxFaux: thanks08:30
FauxFaux mak1: "git tag" will show versions, if it's been tagged. Normally people don't tag development work.08:31
← kadoban left08:31
← Infiltrator left08:31
→ fayaz_ joined08:32
→ hachque joined08:32
→ thiago joined08:32
← dc5ala left08:32
← fayaz left08:32
hachque Is there a way to get a sanitized list of files that are currently staged, suitable for feeding into bash?08:33
Basically I'd like to run indent / expand over staged files before they're committed (in the pre-commit hook)08:33
thiago try git ls-files08:34
FauxFaux ls-files --something; git status -u | cut -d' ' -f208:34
hachque I tried git ls-files --stage, but that shows untracked changes as well08:34
thiago note that "staged" includes all files that aren't modified08:34
hachque ah08:34
thiago maybe you can do git diff --cached --name-only08:34
hachque ah thanks08:35
that works :D08:35
→ mishok13 joined08:35
_ikke_ How do you go on when a rebase results in an empty commit?08:35
Just git rebase --continue?08:35
thiago git rebase --skip08:35
_ikke_ ok08:35
hachque just checking, are hooks always run with the working directory set to the root of the git repository?08:37
dzan I have forked a repo and created a few branches with changes after which I forked the same repo ( not my fork ) as an organization, what's the easiest way to get my branches of my initial fork in the organization's fork? ( they are not yet pulled into the original project )08:37
should I just change the origin localy from my fork to the org's fork and then push each branch again?08:38
→ Infiltrator joined08:38
adhawkins You can add another remote and push direct I'd have thought08:38
→ bolt joined08:40
→ barrbrain joined08:42
→ LimeBlast joined08:42
dzan adhawkins, ok i'll try that08:42
→ tatsuya_o joined08:43
← shruggar left08:44
→ jameslor1 joined08:44
→ marcogmonteiro joined08:45
→ siloxid joined08:45
← jameslord left08:45
→ Eridius joined08:45
→ flavius joined08:46
mak1 FauxFaux: i did "git tag" it showed me http://pastebin.com/diMuTpDz , i am looking for 1.1-rc. can it be in Latest_CVS08:46
FauxFaux 1) "git fetch origin --tags" and try again. 2) git ls-remote origin. 3) If not, what makes you think that this tag exists?08:47
osse I stashed something when I was on a commit which is a merge commit of two branches (from blah into master). Later on, when I list my stashes that particular stash shows up as "WIP on (no branch)". Is that right? Or have I done something stupid I can't remember?08:48
→ achadwick joined08:48
FauxFaux osse: Sounds like you were in a !detach 'd head state.08:49
gitinfo osse: [!detached] A detached HEAD occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach08:49
→ shruggar joined08:50
thiago osse: the stash message is right08:50
← ixti left08:51
→ fug joined08:52
→ d0k joined08:52
→ TomyLobo joined08:52
→ dc5ala joined08:53
osse FauxFaux, thiago. ahh, I remember now. I was indeed in a detached state08:53
gitinfo set mode: +v08:53
→ marhaban joined08:53
fug hi. I'm having problems with git svn dcommit. It just hangs (i.e nothing happens after the first text "commiting" is up)08:53
I'm having trouble with tracking down the problem08:54
how can I figure out where dcommit fails?08:54
mak1 FauxFaux: didnt find.08:55
← tsdh left08:55
→ noisebleed joined08:55
→ tsdh joined08:57
mak1 FauxFaux: developer told me that "I just pushed an updated version of the client. It work once again with the latest daemon (v1.1-rc)"08:58
FauxFaux If it's not in ls-remote, he's lying.08:58
(Or your origin isn't where you think it is.)08:58
mak1 where should the origin be?09:00
← Infiltrator left09:00
mak1 do you mean that i am running git from a wrong dir?09:00
→ archdori joined09:00
FauxFaux No, no, he's pushed it to some server, and you're looking at a different server.09:00
→ Infiltrator joined09:00
mak1 ok09:01
→ WillMarshall joined09:01
cbreak-work it's in the cloud!09:01
somewhere09:01
← WillMarshall left09:01
mak1 how do i get the version out of these tags copied to a directory?09:02
_ikke_ git archive09:02
hachque is there a way I can retrieve the state of a file from the index except store it in a different filename?09:03
← Fandekasp left09:03
_ikke_ hachque: git cat-file afaik09:03
FauxFaux git show HEAD:file > file209:04
hachque hmm09:04
no I don't want the HEAD, I need what's in the index09:05
osse Ahh. I just inspected git-stash. It was a shell script so it was easy to find that the "official" output format of 'git stash list' is indeed '%gd: %gs'. Now all that remains is the difference between %gs and %s09:05
hachque I need to see whether the remaining differences is because the user intentionally didn't commit certain lines09:05
because obviously in that case, the formatter shouldn't abort the commit09:05
_ikke_ osse: %gs is reflog subject09:05
→ satyanash_ joined09:06
hachque actually it would be even more awesome if I could pull the file out of the index, and then store it back in the index after formatting it09:06
without actually having to move the original file09:06
somehow tricking git add into using a different filename to what the file is actually called09:06
osse _ikke_, indeed. But for the stash list %s and %gs are the same. Perhaps to make it easier to write general format strings? For regular commits %gs is empty.09:07
← Eridius left09:07
hachque ooh09:07
found out how to get a file out of the index with cat-file09:07
it's just git cat-file :path/to/file09:07
_ikke_ right, I always forget about the : to refert to the index09:09
← Infiltrator left09:10
→ amcsi_work joined09:10
amcsi_work hello09:10
gitinfo amcsi_work: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.09:10
amcsi_work can I use git apply to fix whitespace errors in my modifications without indexing anything?09:10
→ Infiltrator joined09:11
→ TrahDivad joined09:12
→ dekroning joined09:12
← thiago left09:13
← TrahDivad left09:13
→ TrahDivad joined09:13
hachque does anyone know a way of adding a file as another file to the git index09:13
without actually moving files temporarily09:13
i.e. something like09:13
git add /tmp/tmp.9d7fj --as path/to/file09:14
FauxFaux git hash-object -w and git update-index? Really, really hard, though, as there's no tools to manipulate trees.09:14
→ berserkr joined09:15
→ SkAzZ joined09:15
→ n1x joined09:16
← txomon|nqas left09:16
dekroning I would like to overwrite my master branch with a specific development branch... what is the easiest way todo this? reason is I dont' want to use any of the current master branch code anymore09:16
→ SkAzZ1 joined09:16
FauxFaux git checkout the target branch, git branch -f master, git checkout master.09:17
_ikke_ git checkout -B master09:17
git checkout -B target09:18
→ txomon|nqas joined09:18
← txomon|nqas left09:18
→ txomon|nqas joined09:18
← marhaban left09:18
→ FreeArtMan joined09:18
hachque when git hash-object mentions "-w Actually write the object into the object database."09:18
by object database does it mean the index?09:18
FauxFaux No.09:19
← borkman left09:19
hachque hmm, I assume the git index is however a type of object database?09:19
FauxFaux Nope. ¬_¬09:19
hachque v_v09:19
← SkAzZ left09:19
→ papegaaij joined09:20
← ferdna left09:21
← francisfish left09:22
→ francisfish joined09:22
→ DoniRS joined09:22
→ Chibby_ joined09:23
charon hachque: the object database is just a huge sha1->contents mapping. the index, for example, is a name->(stat() data, sha1) mapping, so to look up the contents of a file as "stored" in the index, git looks up the name in the index, and then the sha1 in the object db09:24
→ ipalaus_ joined09:25
hachque right, so I should use -w and then use update-index to change the SHA1 for a given file?09:25
FauxFaux Seriously, not worth the effort.09:25
→ fjfish joined09:27
← fyolnish left09:27
← fjfish left09:27
← Shusshu left09:27
→ fjfish joined09:28
← FreeArtMan left09:29
← txomon|nqas left09:30
→ marhaban joined09:30
→ txomon|nqas joined09:30
→ mklappstuhl joined09:30
← Infiltrator left09:31
← francisfish left09:31
→ Infiltrator joined09:31
→ FreeArtMan joined09:32
→ morgoth_ joined09:36
← morgoth_ left09:36
→ Chibby__ joined09:37
→ harshpb joined09:37
→ weiyang joined09:38
← chihjen_ left09:38
← Chibby_ left09:39
→ urobor joined09:39
hachque okay, so this is what I got it down to:09:40
git hash-object --path=libdcpu-vm/hw.c /tmp/tmp.Mrpp5FH3gm09:40
git update-index --cacheinfo 100644 4bd53a2a60fbeecbfeee240be2884670f466ec72 /tmp/tmp.Mrpp5FH3gm09:40
now update-index doesn't want to accept /tmp/tmp... and says it's an invalid path09:40
← mklappstuhl left09:40
hachque is that because it's expected libdcpu-vm/hw.c?09:40
*expecting09:40
FauxFaux Yes?09:40
hachque okay, but in this case I want to feed the content of /tmp/tmp.... into the index09:41
and not the original file09:41
the SHA is from git hash-object, so it should be the new hash of the data, but I still don't know how to get the actual data into the index (if update-index doesn't accept the new content as a path)09:42
← BenL left09:42
← urobor left09:42
FauxFaux Isn't that what -w fixes?09:42
→ BenL joined09:42
hachque aha!09:43
yes thank you :D09:43
awesome09:43
now the format sanitization only effects the lines that have been added to the index by the user in the first place :D09:44
← krz left09:44
→ BenL1 joined09:44
← harish left09:45
→ dvgsvc joined09:46
← Infiltrator left09:46
hachque https://gist.github.com/2575594 if anyone wants the final script09:46
→ Infiltrator joined09:47
← BenL left09:47
← BenL1 left09:49
lb is there a git command available to push a branch to all remote tracking branches?09:51
← archdori left09:51
→ mischat joined09:52
dekroning _ikke_, FauxFaux: sorry late response, but will this also remove files that are in "master" branch but no longer used in new "development" branch?09:53
→ solofight joined09:54
← weiyang left09:54
→ camdenx joined09:55
← camdenx left09:55
→ camdenx joined09:55
→ thiago joined09:56
_ikke_ yes09:56
dekroning _ikke_: great thanks09:56
← jameslor1 left09:57
→ jameslord joined09:57
dekroning _ikke_: your "target" in my case is "master" right? for example I have branch called "develop" which my new release is... which I want to use as my "master" branch so I do: git checkout -B develop; git checkout -B master09:58
_ikke_ dekroning: git checkout -B master develop09:59
That's what you want09:59
dekroning _ikke_: thanks a lot, going to try it out right away10:00
→ cortana2 joined10:01
→ Lisimba2 joined10:01
dekroning _ikke_: is it also not the same as: git checkout develop; git checkout -B master btw ?10:02
→ fyolnish joined10:02
→ wbednarski_ joined10:03
→ Anubisss_ joined10:05
→ tharkun joined10:05
→ dr0id joined10:05
← wbednarski left10:07
← ChaoWang left10:10
→ niro joined10:11
← s_segawa left10:13
← wbednarski_ left10:14
← mak1 left10:14
→ fisted joined10:15
← Infiltrator left10:16
→ Infiltrator joined10:16
_ikke_ yes, it is10:18
→ mak1 joined10:19
→ ronniy joined10:19
→ dvide joined10:23
→ harish joined10:23
← mak1 left10:23
→ hsb joined10:24
→ Element9 joined10:24
→ jpjacobs joined10:25
→ cyphase joined10:25
← theCole left10:27
jpjacobs Hi! I've got a repo which has a submodule. I want to have a clone on my laptop and a clone on my PC at work, both pushing/pulling from a certain server at work. But due to some portforwarding magic to get to the server repo on my laptop, the url to that submodule is not the same in the 2 repos (laptop and workpc). How should I cope with this situation?10:27
← project2501a left10:32
→ ivan12345 joined10:32
→ ivan12348 joined10:32
← DofLeFou left10:32
← dpino left10:33
→ babilen joined10:34
→ beautifulmind joined10:35
→ pfFredd joined10:36
→ Fullmoon joined10:37
← Fullmoon left10:37
← davidban_ left10:40
→ OOPMan joined10:42
← fjfish left10:45
→ alberto56 joined10:45
→ francisfish joined10:45
→ hyperair joined10:48
→ wbednarski joined10:48
← francisfish left10:50
← alberto56 left10:50
dekroning _ikke_: another question, the older "master" is really gone at this point now right ?10:50
_ikke_ dekroning: No10:51
dekroning _ikke_: you can still go back to this version afterwards ?10:51
_ikke_ dekroning: Yes, for about a week or two10:51
dekroning _ikke_: ah right Garbage Collection10:51
vandemar what's the best way to use git locally to interact with a cvs upstream? is there an extension or a guide somewhere? most of the stuff I found from google is talking about converting cvs repos or exposing a cvsserver interface for a native git repo10:52
← mischat left10:52
dekroning _ikke_: so say that I want to be able to always go back to this older version, I make a copy of my old masterbranch? or tag it ?10:52
← Infiltrator left10:52
_ikke_ tag or branch, both are possible10:53
→ Infiltrator joined10:53
→ andref_dias joined10:54
dekroning _ikke_: right so before the "overwriting" i just tag my old master branch... and this "tag" will be my hook back into the history10:54
vandemar or more specifically, there is no better way than git cvsimport and then git cvsexportcommit? There's no native way to map cvs upstream rev to local git node and commit all current branch commits beyond that node back to cvs?10:56
→ qwertz_ joined10:59
_ikke_ dekroning: yup10:59
→ Davey joined11:00
→ ToBeFree joined11:01
→ FernandoBasso joined11:01
← FernandoBasso left11:01
← oogatta left11:02
→ gxk joined11:02
dekroning _ikke_: thanks once more :-)11:02
→ FernandoBasso joined11:02
← ipalaus_ left11:04
→ mklappstuhl joined11:09
← solofight left11:09
→ Lord_DeathMatch joined11:10
← fuzzybunny69y left11:13
→ ipalaus_ joined11:13
← Infiltrator left11:15
→ aries joined11:15
→ shuaib joined11:15
→ Infiltrator joined11:16
→ Lulzon joined11:17
← FernandoBasso left11:18
← dreiss_ left11:19
← aries left11:19
← freimatz left11:20
→ tim joined11:20
→ FernandoBasso joined11:20
← satyanash left11:20
→ vedang joined11:20
→ teotwaki joined11:21
← zdk left11:22
← tatsuya_o left11:24
→ Peste_Bubonica joined11:25
vedang → h0bbit11:25
← pmatthews left11:28
← Infiltrator left11:29
← dekroning left11:30
→ Infiltrator joined11:30
→ dv310p3r joined11:30
← adhawkins left11:31
← fyolnish left11:32
← Bartzy left11:33
→ adhawkins joined11:34
← dv310p3r left11:38
Lord_DeathMatch → Lord_DM-eating11:40
← Lulzon left11:42
← shuaib left11:45
← harshpb left11:45
→ Vazzi joined11:46
→ Shusshu joined11:46
→ harshpb joined11:49
← FernandoBasso left11:50
→ erichynds joined11:52
→ eightyeight joined11:53
← glennpratt left11:55
hvgotcodes i had hundreds of files staged11:56
they were all in a build dir11:56
so i added build to .gitignore11:56
they no longer show up if i do git-status, but Im wondering if i need to upstage them11:56
barrbrain hvgotcodes: you haven't accidentally committed them?11:57
hvgotcodes correct11:58
they still show up as staged in gitx11:58
and when i try to upstage them gitx crashes cause there is like 1000 of them11:58
cmn they should still show up as staged11:58
_ikke_ git reset should fix it11:58
hvgotcodes i have other changes too11:58
that i want to keep -- will that work with git reset?11:59
_ikke_ staged?11:59
They'll only be unstaged11:59
hvgotcodes negative11:59
the other files are not staged yet11:59
_ikke_ Nothing is removed11:59
cmn unless you tell reset to clobber files, it wont11:59
_ikke_ (ie, --hard)11:59
hvgotcodes ok, so I'm going to do a git reset11:59
_ikke_ without --hard11:59
hvgotcodes yep that worked12:00
i have 'build' in my .gitignore, and i still se things like modified: build/iphone/build/Debug-iphonesimulator/Hacker Scorecard.app/Hacker Scorecard12:00
# modified: build/iphone/build/Hacker Scorecard.build/Debug-iphonesimulator/Hacker Scorecard.build/Hacker Scorecard.dep12:00
# modified: build/iphone/build/Hacker Scorecard.build/Debug-iphonesimulator/Hacker Scorecard.build/build-state.dat12:00
in my git status12:00
do i need build/?12:00
_ikke_ That shouldn't be in git12:00
→ amigojapan joined12:01
hvgotcodes git rm then?12:01
et if they are tracked, gitignore has no effect i think - so yes, you'd need to git rm12:01
→ Archen joined12:01
→ alberto56 joined12:01
hvgotcodes can i just git rm build/* to do them all?12:02
← Infiltrator left12:02
hvgotcodes git rm -rf build did it12:03
→ Infiltrator joined12:03
hvgotcodes sorry for the barrage, but when i do git status now, i see all the build files12:04
how do i just not have to deal with them?12:04
Rhonda you need to commit your git rm12:05
→ localhost joined12:05
Rhonda only then they are really removed and you won't be bothered by them anymore (because of your .gitignore)12:05
hvgotcodes Rhonda: thank you12:05
→ flaguy48 joined12:06
Lord_DM-eating → Lord_DeathMatch12:08
← flaguy48 left12:08
→ davidbanham joined12:09
→ edude03_ joined12:11
← edude03 left12:11
← cyphase left12:11
← Vazzi left12:12
→ fuzzybunny69y joined12:12
← Infiltrator left12:14
→ Infiltrator joined12:14
→ Vazzi joined12:15
→ neurodrone joined12:15
→ theCole joined12:15
→ shuaib joined12:15
← Textmode left12:16
→ rurufufuss joined12:16
← niro left12:17
→ jalama joined12:20
→ BSaboia joined12:21
← harish left12:21
← yizumi left12:24
→ pandeiro joined12:25
← Infiltrator left12:26
← Vazzi left12:28
→ cyphase joined12:28
shruggar I don't know why this thread with "Rich Pixly" showed up in my inbox, but I feel he has a fundamental misunderstanding of what a branch is12:28
← theCole left12:28
FauxFaux Probably a mercuriual user.12:28
_ikke_ He is12:28
He wants git to work as mercurial does12:28
What I guess is he wants master to update when he fetches12:29
→ t4nkd joined12:29
cmn isn't that called a pull?12:29
_ikke_ or something like that12:29
FauxFaux What actually happens if you make the fetchspec symetric? >.>12:29
shruggar I want to reply "git doesn't track branches, that's where you're confused", but that seems like an oversimplification12:29
_ikke_ I have a reply waiting too, but I'm still holding it12:29
cbreak-work FauxFaux: imagine a reset --soft after a fetch12:29
FauxFaux: imagine a git push to a non-bare12:29
cmn i.e. the reason git won't let you push to the active branch12:30
FauxFaux Awesome.12:30
cbreak-work if mercurial does that, then it's even more worthless than I thought12:30
cmn for mercurial, a "branch" is more of a "branch set"12:30
the second branch is what git understands as a branch12:30
cbreak-work like... a repository? :)12:30
cmn sure...12:30
_ikke_ If I understand it right, in mercurial they are stored somewhere, and automatically merged in at the next merge or something12:31
→ martin_tsc joined12:31
→ number_number joined12:31
cmn except that you have a tighter coupling between these branch heads than just being the same repo12:31
shruggar it sounds like he's saying that mercurial allows one to push conflicting commits to a branch, and when you do that, mercurial says "okay, this branch now points to both of these commits. I'll wait for someone else to do the merge and cause it to be one commit again"12:31
→ bartek joined12:31
shruggar but I have no idea what it does until that merge happens, if you try to check out the branch12:31
_ikke_ "Sure. You can fetch other branches, (unless you happen to be checked out from them). But you can't fetch to master if you're checked out from master."12:32
cmn and that's not what you want to do anywy12:32
_ikke_ Nope12:32
number_number so.. I can do.. $ git diff remotes/work_box/master which shows all the changes on my work box.. which I'd like to 'pull' into my current repository.. but git pull remotes/work_box/master gives an error saying it isn't a git repository12:33
← nrichards left12:33
martin_tsc i just set up a git repository and my local site says offline(drupal). I'm assuming i need to get my DB imported as well12:33
_ikke_ "The illusion that we're all working on the same branch, (mercurial, monotone, etc), defaults to more frequent merges, and a much smaller change tree when it comes to visualization."12:33
→ Infiltrator joined12:33
→ pyhead joined12:33
cbreak-work martin_tsc: git doesn't need databases12:33
→ Craig joined12:33
cbreak-work or what ever that drupal thing is12:34
martin_tsc drupal is awesome :). prob just a config error on my end then thanks12:34
→ project2501a joined12:34
← harshpb left12:35
shruggar the "everyone else supports this (even subversion)" is very telling: he wants git to assume that "can merge the lines programmatically" means "there is no conflict"12:35
← xiangfu left12:35
cbreak-work number_number: you're confusing merge and pull12:35
number_number: pull is fetch and merge. you need fetch to make remotes/work_box/master be up-to-date12:35
and after that you can merge it12:35
→ joaoh82 joined12:36
cbreak-work remotes/work_box/master is a remote tracking branch, a branch12:36
not a repository12:36
_ikke_ shruggar: He wants git to automatically merge trivial merges or something like that12:36
number_number cbreak-work: cool, git merge seems to have done what I was imagining :) I'll straighten it out in my head at some stage! :D12:37
← neurodrone left12:37
→ harish joined12:38
→ flexd joined12:38
flexd I think I've broken git in a horrible way 0_012:39
I am trying to rebase a branch since I made a typo in the latest commit12:40
martin_tsc flexd, i think that all the time with half the stuff i do12:40
flexd But when I do git rebase --interactive HEAD~112:40
It suddenly brings up the 3 latest commits of another branch12:40
A branch I even have deleted12:40
I just merged that branch into this one :/12:40
and if I :q or :wq out of vim then it says it fails and I end up not being on a branch at all12:41
:s12:41
_ikke_ !situation12:42
gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if you problem is more complex than 20 commits long)12:42
→ friturillor joined12:42
← friturillor left12:42
_ikke_ use gist.github.com or something12:42
→ FernandoBasso joined12:42
flexd https://gist.github.com/cef13e17ad4b3fd4cefd12:44
and yes, it's pretty horrible12:44
← AlirezaMeskin left12:44
flexd I'm quite new at git, and the two others on the project have no clue so it gets a bit messy :p12:44
← Stava left12:44
← shuaib left12:45
→ flaguy48 joined12:45
_ikke_ And what are you trying to rebase?12:46
flexd I'm trying to rebase the branch 'development'12:46
Because of the typo in the latest commit12:46
_ikke_ flexd: The problem is that it's a merge commit12:47
flexd: use git commit --amend12:47
flexd So that is why it's failing? I thought I broke it12:47
Hmm.. hoo12:47
good*12:47
_ikke_ git rebase doesn't play nice with merge commits12:47
← fuzzybunny69y left12:48
flexd What if I want to (again) fix a typo in the commit before that again?12:48
_ikke_ That's not really easy12:48
← fayaz_ left12:48
flexd Because I can't rebase with the merge commit in there?12:48
hm12:48
Nevermind then, doesn't really matter anyway12:48
Just wrote wiht instead of with.12:49
_ikke_ Easiest way is to loose the merge, fix it, and then merge again12:49
flexd Yeah.. I deleted the branch the merge came from :p12:49
_ikke_ flexd: You can as easily create it again12:49
flexd Oh?12:49
← number_number left12:49
→ what_if joined12:50
et flexd: branches are just "flexible names" for commits12:50
flexd Okay, so how do I do this?12:50
what_if I am having problems setting the author in git... I followed the instructions found by google :) but still git uses my login name @none.com... ideas?12:51
_ikke_ git checkout -b temp_branch 4be453c12:51
← Infiltrator left12:51
_ikke_ what_if: !repro12:51
gitinfo what_if: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.12:51
SethRobertson specifically, the commands you used to set the author12:51
martin_tsc what_if your .git/gitconfig file in your home folder12:51
→ Infiltrator joined12:51
what_if martin_tsc: ty... did not know that file even existed (new laptop...)12:52
SethRobertson That's because he made it up12:52
What command did you use to set your name?12:52
flexd _ikke_: right, so I've fixed the typo, how do I undo the merge before remerging?12:52
_ikke_ git checkout develop; git reset --keep HEAD^12:53
← amigojapan left12:53
→ bglusman joined12:53
what_if git config --global user.name "Your Name Comes Here"12:54
same for email, but user.email12:54
:)12:54
SethRobertson and please pastebin ~/.gitconfig12:54
what_if this seems to only have set the committer, not the author12:55
SethRobertson and !repro12:55
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.12:55
flexd _ikke_: excellent, thank you so much :)12:56
Loving git more and more12:56
← barrbrain left12:56
flexd Now I just need to get the others up to speed on using this properly :)12:56
→ JohnyBaby joined12:56
← Vert left12:56
what_if My git config https://gist.github.com/257635312:57
→ macabre joined12:57
← FernandoBasso left12:58
→ rgsteele joined12:58
SethRobertson Please pastebin an example commit which doesn't contain that. Meaning: echo A>A; git add A; git commit -m A; git show --pretty=raw HEAD12:58
→ fyolnish joined12:59
→ jackh joined12:59
← OOPMan left13:00
→ `Assassin joined13:00
→ pppaul joined13:00
→ Vazzi joined13:00
→ cafaro joined13:01
← joaoh82 left13:02
→ Vert joined13:02
cafaro Is there a quick way to supply files to a git command without having the type the complete path all the time? e.g., foo.c is a unique file located in: repo/a/b/c/d/foo.c. Is there a quick way to refer to foo.c without changing dir?13:03
what_if SethRobertson: that worked... I am both author and committer... hmm...13:03
cmn cafaro: that's something that your shell would or wouldn't do13:03
**/foo.c works on some shells13:03
→ selckin joined13:03
FauxFaux cafaro: '**/foo.c' will work in many cases, but not all. If you use a proper shell (like zsh), **/foo.c (without quotes) will work in all cases.13:03
← Infiltrator left13:04
SethRobertson Um, what?13:04
**/foo.c does not work in bash13:05
→ Infiltrator joined13:05
← kaen left13:05
cbreak-work the second * seems redundant13:05
SethRobertson for bash yes, for zsh no13:06
→ harshpb joined13:06
cafaro FauxFaux: ok thanks13:06
FauxFaux SethRobertson: With quotes it'll work, because it's interpreted by git.13:06
→ LmAt joined13:06
SethRobertson Yes, but you said "without quotes"13:06
→ amigojapan joined13:06
FauxFaux Yes. But I qualified it with "if you use a proper shell". i.e. not bash.13:07
et he also said 'proper shell'13:07
SethRobertson I parsed the "all cases" to mean "non-zsh cases"13:07
→ pmatthews joined13:07
cafaro I'm using zsh, so it all good :)13:08
LmAt kloeri; yo13:08
→ Psycho_gr joined13:08
selckin can you "push remotes" or some other way so extra remotes can be available if your repo is cloned?13:08
LmAt kloeri; Sorry for poking you. My client said that you sent me a message or something.13:08
→ Jackneill joined13:08
← Jackneill left13:08
→ Jackneill joined13:08
LmAt kloeri; I can't find it in my logs.13:08
_ikke_ selckin: No13:09
selckin: git doesn't have a way to distribute remotes13:09
selckin _ikke_: sucks :(, ok thanks13:09
→ kerrick joined13:09
Psycho_gr Even though I added "Smarty/templates_c/" to my .gitignore, I still see files from this directory when I execute git status. What am I doing wrong?13:09
_ikke_ Psycho_gr: Git doesn't ignore tracked files13:09
← Vazzi left13:09
kerrick Why can't I partially commit a new file?13:10
what_if SethRobertson: ahh... I see now... git commit --amend is only fixinf the submitter, not the author13:10
cmn you can13:10
_ikke_ cmn: A new file?13:10
what_if SethRobertson: how do I --amend the author?13:10
cmn sure, no problem13:10
Psycho_gr _ikke_: So what should I do?13:10
cmn git add -I newfile13:10
git add -p newfile13:10
kerrick cmn, git-gui doesn't want to let me do that13:10
→ dv310p3r joined13:10
cmn then use git13:10
_ikke_ Psycho_gr: Remove them from git if you don't want to have them tracked13:10
SethRobertson what_if: Use --author et al as well13:10
kerrick It's either stage the whole thing or nothing at all13:10
cmn hm, the -I flag might be wrong13:10
kerrick cmn, I think you mean -i13:11
SethRobertson what_if: Or use `git filter-branch`13:11
kerrick but that's irritating13:11
Psycho_gr git remove <filename> ?13:11
cmn kerrick: no, I meant -N13:11
← harshpb left13:11
_ikke_ Ah13:11
cmn assuming -p on a new file doesn't work, because otherwise you wouldn't have asked13:11
_ikke_ cmn: It doesn't13:11
But I didn't know -N could be used for this13:12
cmn well, then, -N is your friend13:12
kerrick cmn, also, with add, it's -i13:12
Psycho_gr How is it possible that the same file appears in "Changes to be committed" and also in "Changes to staged for commit"?13:12
kerrick not -p13:12
AFAIK13:12
cmn kerrick: what is?13:12
→ harshpb joined13:12
_ikke_ Psycho_gr: Because you added only part of the file13:12
kerrick cmn, nvm13:12
cmn it's -i or -p13:12
→ hatchetjack joined13:12
kerrick yeah13:12
Psycho_gr How is _that_ possible?13:12
cmn -p is a special form of -i13:12
_ikke_ Psycho_gr: with git add -p13:12
hatchetjack what's the git svn equivalent of svn update?13:12
_ikke_ hatchetjack: git svn rebase13:12
cmn Psycho_gr: or you've staged a file and then continued to change it13:13
_ikke_ or that indeed13:13
→ Chib joined13:13
hatchetjack so I've checked out an svn repository and now I just want to update it to get any new revisions and git svn rebase is what I would do to do that?13:13
Psycho_gr I see.13:13
kerrick hatchetjack, you also have to run git svn fetch first13:13
_ikke_ hatchetjack: yes13:14
hatchetjack hhmmm13:14
okay13:14
← pppaul left13:14
_ikke_ kerrick: no13:14
cmn hatchetjack: yeah, rebase13:14
kerrick _ikke_, hmm?13:14
_ikke_ kerrick: git svn rebase does git svn fetch13:14
hatchetjack I'll look at rebase13:14
kerrick oh13:14
→ pppaul joined13:14
kerrick I've always done them separately. My bad.13:14
cmn that just means you'll have to wait even longer13:14
→ sdaone joined13:15
→ njection joined13:15
→ Vazzi joined13:17
→ codewrangler joined13:18
→ francisfish joined13:18
→ juanfer joined13:18
← Lgb left13:20
what_if here was the magic I needed:: git commit --amend --author="Author Name [email@hidden.address]13:20
thanks SethRobertson :)13:20
→ AaronMT joined13:21
→ SoulOfTheInterne joined13:21
← ToBeFree left13:22
→ dfr|mac joined13:22
→ ToBeFree joined13:22
← Infiltrator left13:23
→ kermit joined13:23
← kermit left13:23
→ kermit joined13:23
→ galaris_ joined13:23
→ Lgb joined13:23
→ cannonball joined13:23
→ bartman joined13:23
→ Infiltrator joined13:23
← Vazzi left13:25
← pppaul left13:25
→ pppaul joined13:26
→ xiangfu joined13:27
rgsteele Does git not play well with special files (devices, pipes, etc.)?13:28
→ ehsan_ joined13:28
cmn I've be surprised if they didn't confuse git13:28
are you trying to version-control your /dev?13:28
← ToBeFree left13:29
→ ToBeFree joined13:29
← ToBeFree left13:29
SoulOfTheInterne → ToBeFree13:29
→ Tinti joined13:29
rgsteele No. They're files in an application's on-disk heirarchy, one of which is a FIFO pipe.13:29
→ SoulOfTheInterne joined13:30
SethRobertson No, you cannot check in anything except files and symbolic links13:30
mattp_ .git/config gets copied in clone right?13:30
cmn mattp_: no, as it's not tracked13:30
→ glennpratt joined13:30
→ tatsuya_o joined13:30
SethRobertson Have the application create the file automatically, or use a local domain named pipe, or have the post-checkout hook create it13:30
cmn isn't a FIFO pipe something you create on startup?13:30
mattp_ true. hrm13:30
← Gentlecat left13:30
← pppaul left13:30
cmn and they're repo-specific config; cloning creates a different repo13:31
← ToBeFree left13:31
mattp_ cmn: im aiming to allow a default committer user/email13:31
SethRobertson mkfifo are persistent named piped. local domain sockets are dynamic13:31
rgsteele SethRobertson: Yeah, I'm going to just have my config mgmt app create it post-install (it's not a packaged - e.g., deb/rpm/etc - resource, so there's no post-install script with it)13:31
cmn default committer?13:31
← SoulOfTheInterne left13:31
→ pppaul joined13:31
← dfr|mac left13:32
→ ToBeFree joined13:32
cmn that doesn't make sense13:32
→ chrisgeorge joined13:32
cmn the committer should be the person who commits13:32
← Infiltrator left13:32
mattp_ cmn: i know. im dealing with automated commits from a build process right now13:33
→ Infiltrator joined13:33
→ digiv joined13:33
cmn that sounds like it's going to end in a lot of pain13:33
but there's no reason you can't export some env vars13:33
→ Laibsch joined13:33
mattp_ cmn: hopefully not :) just tracking build artifacts that should be in the repo13:33
→ prudnikov joined13:33
cmn build artifacts shouldn't be in the repo13:33
mattp_ cmn: which manpage explains the env vars controlling email/name?13:34
cmn man git probably13:34
if not, man git var13:34
gitinfo the git-var manpage is available at http://jk.gs/git-var.html13:34
→ tbird72 joined13:34
mattp_ cmn: think gemfile.lock13:34
→ dfr|mac joined13:34
cmn if you want to track that, it's not a build artifact13:35
it's how you fix dependency versions13:35
mattp_ ok, build artifact may have been a poor choice of words13:35
→ chronos joined13:35
→ intripoon joined13:35
mattp_ thank you for the help though13:35
cmn but why is your build script deciding the exact version?13:36
why don't the developers do it?13:36
← pppaul left13:36
→ TeckniX joined13:36
→ pppaul joined13:36
← Psycho_gr left13:36
→ revagomes joined13:37
→ kevwil joined13:37
mattp_ cmn: because i'm automating the step where IT needs to bundle the packages, not something the devs can do automatically13:38
→ nrichards joined13:38
← edude03_ left13:38
→ juvenal joined13:40
hatchetjack how can I use git svn to delete something from the repository?13:40
_ikke_ just delete it in git and then svn dcommit it?13:41
← txomon|nqas left13:41
hatchetjack yeah you're probably right13:42
thinking about it all wrong I reckon13:42
:)13:42
need coffee13:42
→ txomon|nqas joined13:42
← txomon|nqas left13:42
→ txomon|nqas joined13:42
← pppaul left13:43
→ pppaul joined13:43
← Desproges left13:44
_ikke_ Good ida13:44
→ dfr|mac_ joined13:44
→ Desproges joined13:45
→ edude03 joined13:46
→ SkAzZ joined13:46
← Archen left13:46
→ Archen joined13:46
← lunchdump-away left13:46
← pyhead left13:47
← SkAzZ1 left13:47
← dfr|mac left13:48
→ summer-more-more joined13:48
→ Sahua joined13:48
→ resmo joined13:48
_ikke_ idea*13:48
← sdeboey left13:49
← JohnyBaby left13:51
← LittleFo- left13:51
← pppaul left13:51
← Infiltrator left13:51
→ LittleFool joined13:51
← harshpb left13:52
← Davey left13:52
→ andrewvos joined13:52
→ Infiltrator joined13:52
→ pppaul joined13:52
piotr hi13:52
gitinfo piotr: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.13:52
piotr why git clone https://github.com/discoproject/disco.git13:52
Cloning into disco...13:52
warning: remote HEAD refers to nonexistent ref, unable to checkout.13:52
I get this error in one machine, but not in other13:52
any ideas?13:52
→ qiushuang joined13:52
andrewvos Someone here managed to name a branch "origin/share", and there's a remote branch called "share". How can i rename this branch? (It hasn't been pushed anywhere)13:53
← francisfish left13:54
→ francisfish joined13:54
← ThomasLocke left13:55
← qiushuang left13:55
← tsdh left13:55
← Shusshu left13:56
andrewvos Ok disregard that, solved.13:56
← amigojapan left13:56
→ JohnyBaby joined13:56
→ xsbeats joined13:56
→ Ryback_ joined13:58
mattp_ is GIT_AUTHOR_IDENT the equivalent of user.name and user.email?13:58
→ yizumi joined13:59
← francisfish left13:59
← fug left13:59
← tbird72 left14:00
← gavin_huang left14:00
→ g0bl1n joined14:01
← g0bl1n left14:01
→ g0bl1n joined14:01
← pfFredd left14:01
→ pfFredd joined14:01
← ph^ left14:02
→ ology joined14:03
→ bitkiller joined14:03
→ Davey joined14:04
SethRobertson mattp_: man git-var and man git-commit-tree14:04
gitinfo mattp_: the git-var manpage is available at http://jk.gs/git-var.html14:04
mattp_: the git-commit-tree manpage is available at http://jk.gs/git-commit-tree.html14:04
→ qiushuang joined14:05
← qiushuang left14:06
→ qiushuang joined14:06
→ mritz joined14:07
→ Superlokkus joined14:08
→ Vazzi joined14:08
← Infiltrator left14:08
→ nots joined14:09
→ Infiltrator joined14:10
← summer-more-more left14:10
→ bartek_ joined14:10
→ munichlinux joined14:11
→ mister_m joined14:12
← twisted` left14:13
← bartek left14:13
← nots left14:14
→ cgrage joined14:14
→ lacrymology joined14:15
lacrymology my diff.external script seems to have stopped working14:15
→ tewecske joined14:15
← Vazzi left14:15
→ mikepack joined14:16
lacrymology has there been any upgrades that might have broken it?14:16
→ francisfish joined14:16
→ Vazzi joined14:16
→ dpino joined14:16
→ Flavius1924 joined14:16
← Superlokkus left14:19
← Infiltrator left14:19
→ jkyle joined14:19
charon "it doesn't work" is hardly a bug report14:19
← marhaban left14:19
→ Infiltrator joined14:20
← resmo left14:20
← mikepack left14:20
→ Parhs joined14:20
← w09x left14:21
← Vazzi left14:21
cmn but !doesnt is always a cheerful trigger14:21
gitinfo [!doesntwork] Sorry to hear it doesn't work. What happened? Did it fall asleep on your couch, with your sister? Eat your homework? What did you want it to do? What happened instead? Please be specific!14:21
gitinfo set mode: +v14:21
talexb Does anyone use https://studio.plugins.atlassian.com/wiki/display/JGIT/JIRA+Git+Plugin for JIRA/git work? I'm trying to understand whether it works with multiple repos.14:21
← Tinti left14:21
→ nots joined14:22
→ amigojapan joined14:22
cbreak-work hmm. I was thinking of writing my own jira hook14:22
→ hydrozen joined14:22
Flavius1924 after i tapped git init,what's the next step for creating my repository and be able to commit changes ?14:22
talexb cbreak-work, There's the JIRA CLI which works fine, but it requires each user download and install some code. :/14:23
lacrymology charon: well, I've got it set up to a script that runs meld, and git diff just gives me the old command line diff tool output14:23
cbreak-work hmm. Looks like it wouldn't work14:23
talexb I've been directed to look into a solution that's simpler than that.14:23
cbreak-work only for self hosted jiras14:23
lacrymology running the script opens meld allright14:23
cmn Flavius1924: make changes you can commit14:23
→ Tinti joined14:24
Flavius1924 but i have a new project,i have a lots of files that i want to upload on github14:24
cmn that way of thinking is going to make you very confused14:24
!book14:24
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://progit.org/book/ but also look at !bottomup !cs !designers !gitt !vcbe and !parable14:24
→ Zenith77 joined14:24
cmn if you're at a loss for what to do after 'git init', it's time to read the book14:24
← Lord_DeathMatch left14:24
talexb cbreak-work, I've asked on the Atlassian channel, but with only 35 attendees, it's kinda quiet.14:25
Flavius1924 oh,no,my bad14:25
→ Mkaysi joined14:25
lacrymology Flavius1924: github has a nice "how to get started" help page, if that's what you want to use it with14:25
talexb Flavius1924, If I may suggest, IRC isn't the place to ask "How do I get started", rather, it's a place where you say something like "I've read the docs, tried a), b), c) and d), and now I'm stuck."14:27
Flavius1924 i got it,ok,commited and push :)14:27
→ brngardner joined14:27
Flavius1924 now,if i want to give somebody the permission to commit,push and pull to my project what do i have to do ?14:27
cmn ask github14:28
→ axl_ joined14:28
cmn git doesn't deal with any of that14:28
← andrewvos left14:28
talexb Flavius1924, RTFM.14:28
Flavius1924 RTFM ?14:28
j github14:28
← nots left14:29
talexb Flavius1924, https://github.com/features/projects READ THE FINE MANUAL14:29
→ nots joined14:29
← alberto56 left14:29
cbreak-work no need to yell14:30
talexb sighs.14:30
→ pyhead joined14:30
← Infiltrator left14:32
→ Infiltrator joined14:33
charon lacrymology: well, how do you invoke it? what is the state of the index? which attributes apply from which gitattributes files? have you checked with git check-attr -a <path> ? does diff consider the file binary? what if you use GIT_TRACE=1 with it?14:35
→ Bartzy joined14:35
← kickandr1w left14:35
← Laibsch left14:35
← beautifulmind left14:36
← txomon|nqas left14:38
← psoo left14:38
← flijten left14:38
← nots left14:39
→ Y_Ichiro joined14:39
← Y_Ichiro left14:39
→ Y_Ichiro joined14:39
← lb left14:40
← davidbanham left14:40
→ parsifal_ joined14:41
parsifal_ I changed a github repo's name/URI. How do I update my local checkout?14:41
cmn man git remote set-url14:41
gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html14:41
cmn and it's not a checkout, it's a repo14:41
→ sporous joined14:42
parsifal_ thanks14:42
okay, still learning14:42
← edude03 left14:42
Vinnie_win anyone really good at git-subtree?14:42
→ txomon|nqas joined14:42
parsifal_ is it 'rename' or just 'set-url'?14:42
cmn do you want to rename it?14:43
← txomon|nqas left14:43
→ txomon|nqas joined14:43
→ duckxx joined14:43
parsifal_ I went on github and renamed it, and now the uri is different — which is what I wanted. I wanted to move it out of the way to create a new repo with the same name14:43
→ Grummle joined14:44
← hyperair left14:44
→ mattp_ joined14:44
gitinfo set mode: +v14:44
→ edude03 joined14:44
cmn that doesn't answer the question of whether you want to rename the remote14:44
and I'm guessing the answer is no14:44
→ nots joined14:45
parsifal_ oh I think I know what you mean14:45
→ e-ndy joined14:45
parsifal_ I don't think I want to do that14:45
cmn then don't14:45
→ ludde joined14:45
parsifal_ I have 'origin' and 'heroku'14:45
← yizumi left14:46
→ dekroning joined14:46
→ HyperNerdV2 joined14:46
parsifal_ got it.. thanks14:47
← Infiltrator left14:47
← Sitethief left14:47
→ _mpu joined14:48
← galaris_ left14:48
→ galaris joined14:49
← shruggar left14:50
→ beatak joined14:50
← parsifal_ left14:50
← txomon|nqas left14:51
_mpu Hi, how can I see what changes have been done since last merge in another branch?14:51
← nots left14:51
cmn with log or diff, depending on how you want to see the changes14:51
→ ph^ joined14:52
cmn what's the relationship with this other branch?14:52
_mpu Well I merged from master a few weeks ago and changes were done in master since, I want to see the logs/diffs.14:52
cmn between which points? just in master?14:53
→ lausi joined14:53
→ txomon|nqas joined14:53
← txomon|nqas left14:53
→ txomon|nqas joined14:53
→ gusnan joined14:53
_mpu yes, master after changes / master at merge time14:53
cmn git log master ^HEAD14:54
assuming you're in that other branch14:54
→ Infiltrator joined14:54
_mpu Thanks, that works, what does ^HEAD mean?14:54
cmn no in HEAD14:54
not*14:55
← galaris left14:55
cmn it's the same as HEAD...master14:55
it's the same as HEAD..master sorry14:55
← prudnikov left14:55
→ neurodrone joined14:55
→ shruggar joined14:55
← JohnyBaby left14:56
← arvind_khadri left14:56
→ arvind_khadri joined14:57
← Mkaysi left14:57
→ JohnyBaby joined14:57
→ j416 joined14:58
→ yizumi joined14:58
→ Mkaysi joined14:58
← edude03 left14:59
_mpu Thank you.14:59
→ elijah joined14:59
→ nots joined14:59
elijah I amended my last commit, now when I push it is saying that non-ff updates were rejected. Is this normal?14:59
← yizumi left14:59
FauxFaux elijah: Yes, amending is !rewrit15:00
gitinfo elijah: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)15:00
→ legnaleurc joined15:00
elijah FauxFaux: Thank you very much15:00
← satyanash_ left15:01
← legnaleurc left15:01
→ legnaleurc joined15:02
← nots left15:03
→ tbird72 joined15:03
→ alberto56 joined15:04
← JohnBat26 left15:05
← xiangfu left15:05
← Flavius1924 left15:07
← dc5ala left15:08
→ xiangfu joined15:08
→ JameshC joined15:09
→ matthiaskrgr joined15:09
← Infiltrator left15:10
→ Infiltrator joined15:10
← tharkun left15:11
→ tharkun joined15:11
→ mikepack joined15:12
→ ISF joined15:12
← wbednarski left15:13
← babilen left15:15
→ wbednarski joined15:15
← cbreak-work left15:15
→ shoerain joined15:16
→ hyperair joined15:17
→ v0n joined15:17
→ satyanash joined15:17
← HyperNerdV2 left15:18
→ nots joined15:20
→ glcrazy joined15:21
← what_if left15:21
→ kenperkins joined15:21
→ pheaver joined15:21
← pheaver left15:22
← alberto56 left15:22
← njection left15:23
← dpino left15:23
→ drue joined15:24
← jackh left15:25
→ jackh joined15:25
→ luxurymode joined15:27
← jceb left15:27
← _Qman left15:29
← qiushuang left15:29
← t4nkd left15:30
→ stkrzysiak joined15:30
→ t4nkd joined15:31
← dr0id left15:31
→ an0maly joined15:32
← Infiltrator left15:32
→ Infiltrator joined15:33
← amcsi_work left15:33
→ alberto56 joined15:35
→ martinjlowm joined15:35
← nots left15:36
← pandeiro left15:36
→ bondar joined15:37
← bondar left15:37
→ bondar joined15:37
← bondar left15:38
→ bondar joined15:38
← bondar left15:38
→ bondar joined15:38
← mritz left15:38
← bondar left15:38
→ idoru joined15:39
→ bondar joined15:39
← bondar left15:39
→ chrisshattuck joined15:39
← arvind_khadri left15:39
→ Shanachan joined15:39
← xiangfu left15:39
→ alexukf joined15:40
← _mpu left15:41
→ babilen joined15:41
← rtuin left15:42
← papegaaij left15:43
← hachque left15:43
→ nots joined15:44
→ pheaver joined15:45
← pheaver left15:45
→ HyperNerdV2 joined15:45
→ guampa joined15:47
→ sq-one joined15:48
← thiago left15:48
← t4nkd left15:49
→ aristidesfl joined15:49
← matthiaskrgr left15:50
← bartek_ left15:50
← angelsl left15:50
→ kadoban joined15:51
← martinjlowm left15:52
← Infiltrator left15:53
← amigojapan left15:53
→ Bass10 joined15:53
→ Infiltrator joined15:53
→ mritz joined15:54
→ martinjlowm joined15:54
← Bass10 left15:54
→ Tohuw_ joined15:54
→ joaoh82 joined15:54
← j416 left15:55
→ Bass10 joined15:55
← FreeArtMan left15:56
← elijah left15:56
← jackh left15:57
← mister_m left15:57
→ OOPMan joined15:59
→ umc joined16:00
→ sjhill joined16:00
→ j416 joined16:00
→ BSaboia__ joined16:01
→ thm joined16:02
← Sigma left16:02
sjhill I've searched and not found anything. I have a random list of commit ids and I want to get them displayed in the order they were committed into the tree. Any ideas?16:02
→ Sigma joined16:02
thm git commit gives a nice overview of which files changed, renamed, etc. is there a way to get the same overview with diff or log?16:03
← Tohuw_ left16:03
→ mister_m joined16:03
→ Tohuw joined16:03
rue Sure, did you take a look at the options?16:03
Tohuw Hello, gitolite 2.2-1 (Debian) running on git 1.7.9.5. Client end is Windows with msysgit 1.7.10 using CLI. I can ssh fine as the user my key is for (does not ask for password, uses key), and I can ssh as gitolite and receive the permissions message. However, any git action (including fetching repos that were working fine on here yesterday) fails with "remote end hung up unexpectedly". git clone -v provides no additional output. Any ideas?16:03
et thm: git status?16:03
thm et: no, I mean afterwards, for some earlier commit.16:04
← BSaboia left16:04
thm et: nvm, found it. git diff --summary16:05
PerlJam Tohuw: there's a way to make the ssh connection details more verbose but I don't remember it right off.16:06
cmn Tohuw: GIT_TRACE=1 git whatever; and try to log in with plain ssh16:06
→ Superlokkus joined16:07
← Chib left16:07
← Superlokkus left16:08
← whitman left16:08
← JohnyBaby left16:09
variable after an initial git svn clone is there anything that could be done to compress the repository ?16:09
or is the repo already minimal ?16:09
→ matthiaskrgr joined16:10
cmn repack it16:10
or just run gc, like any other time you want to try to optimize a repo16:10
→ tyatpi joined16:11
→ SegFaultAX|work joined16:11
→ kerrick_ joined16:11
← ajpiano left16:11
→ MarcWeber joined16:13
variable cmn: I'm really asking, will that help after an initial git svn clone16:13
cmn most likely16:13
with size, that is16:13
it probably won't make it noticeable faster16:13
→ popcorn joined16:14
→ ajpiano joined16:14
variable cmn: yes, I'm curious about size atm. 7.1 GB is a bit much16:15
cmn that number without any context doesn't mean anything16:15
variable cmn: 150000 revisions so far16:15
There is a total of 290k revs16:16
← Infiltrator left16:16
variable I'd like to reduce the amount of diskspace16:16
→ Infiltrator joined16:16
→ macmartine joined16:16
cmn the number of revisions isn't that big a factor16:16
← mishok13 left16:16
variable cmn: what is a factor then?16:17
← TrahDivad left16:17
cmn the size of the files in the tree and the changes in them between each one16:17
← francisfish left16:17
→ hellopat joined16:18
→ francisfish joined16:18
← senny left16:18
→ fjfish joined16:19
← francisfish left16:19
← pyhead left16:19
← martin_tsc left16:20
← LimeBlast left16:20
→ Vinnie_win joined16:21
→ linusoleander joined16:23
← fjfish left16:23
← stkrzysiak left16:23
→ ben225 joined16:24
← tyatpi left16:24
→ felgru joined16:25
sjhill given two random commit ids, is there a way to see which one was committed first and which was committed second?16:25
→ francisfish joined16:25
← francisfish left16:25
→ stkrzysiak joined16:25
→ francisfish joined16:26
→ Vincenzinho joined16:26
SethRobertson There are many ways to skin that cat. One way would be to `git log --oneline SHA1 SHA2` and see which comes first.16:27
← Vincenzinho left16:27
milki but each way gives you tanned cat leather16:27
SethRobertson Note the method I suggest will produce inconsistent results if the two commits are not on the same branch at the time of the later of the two commits16:28
→ sery joined16:29
← h0bbit left16:29
← TheHaven left16:30
→ SamDiablo joined16:30
← francisfish left16:30
← andref_dias left16:31
mmattice_ → mmattice16:31
← popcorn left16:31
← SamDiablo left16:31
sjhill SethRobertson: that's no problem16:32
in reality, i'm trying to take a list of random commit ids and get them in the order they were committed16:32
→ gloryfish joined16:32
sjhill i just haven't found a way to do it easily without doing a whole bunch of individual 'git log' calls16:33
charon git log --no-walk --format="%at" A B | { read a;read b; }; test $a -gt $b16:33
or some such.16:33
SethRobertson You can generate the entire commit history for a branch in one log call16:33
charon oh wait, %ct16:33
→ bkeating joined16:34
SethRobertson Only if commit-time is consistent, which is not a requirement for an arbitrary git repo16:34
bkeating nobody laugh… but how do you remove a file called ``--auto``? i can't escape it with quotes or back slashes16:34
← dvgsvc left16:34
SethRobertson rm -- --auto16:34
sjhill bkeating: rm -- --auto16:34
SethRobertson or ./auto16:35
./--auto16:35
charon SethRobertson: well ok, but then "first" is not defined to begin with, unless you declare it to be w.r.t history, which again fails if history is not linear16:35
← stkrzysiak left16:35
← frogonwheels_ left16:35
→ stkrzysiak joined16:35
→ frogonwheels_ joined16:35
← ToBeFree left16:35
← alberto56 left16:36
→ sdeboey joined16:36
bkeating hey, thanks SethRobertson , sjhill ``./--auto`` worked.16:37
→ nioncode joined16:38
→ marhaban joined16:38
← giallu left16:38
← pppaul left16:38
→ krainboltgreene joined16:38
→ pheaver joined16:38
→ yhager joined16:39
← marhaban left16:39
→ t4nkd joined16:39
← gloryfish left16:39
← Infiltrator left16:40
← nots left16:40
← noisebleed left16:40
← stodan left16:40
→ pppaul joined16:40
← krainboltgreene left16:40
→ Infiltrator joined16:40
→ krainboltgreene joined16:41
krainboltgreene Test.16:41
Alright, I have two branches A and B. B originates from A, and has changes. I want to bring B into A, but selectively about certain lines. B has multiple commits over A. Is there way to turn multiple commits into a single commit, that I can edit before applying to A?16:41
← hydrozen left16:41
milki squash?16:41
→ nots joined16:41
← dekroning left16:42
← t4nkd left16:42
← Vert left16:42
milki i suggest making another branch from A, cherry-pick from B, squash, then apply back to A16:42
krainboltgreene Cherry pick would work, but some commits have bad code, was hoping for an interactive line-by-line merge.16:43
I may have to do that second bit though. Looking up squash first.16:43
→ diegoviola joined16:44
milki you can edit the squashed commit later16:44
→ trochala joined16:44
milki before applying to !16:44
krainboltgreene Gotcha.16:44
milki A that is16:44
Tohuw PerlJam: You're likely thinking of ssh -vvv, but that doesn't help me, as ssh is working, git actions aren't. cmn: As I said, ssh is fine. git_trace=1 on a git clone revealed it is trying to run plink to get the key. How can I get msysgit to use my openssh key, as ssh is doing?16:44
→ CannedCorn joined16:45
cmn undo whatever you did to get it to use plink16:45
krainboltgreene Can you squash the difference between two branches, milki ?16:45
cmn you probably have GIT_SSH set16:45
← lacrymology left16:45
← jalama left16:45
→ spaceonline joined16:46
Tohuw cmn: How can I check this?16:46
milki o.O no, squash is for commits16:46
→ sauoq joined16:46
→ scientes joined16:46
cmn Tohuw: echo $GIT_SSH16:46
or more genrally, see what 'env' and 'git config --list' say16:47
krainboltgreene The difference between these two branches is a series of commits, I want to smash those into a single commit, then edit that commit, then apply that commit.16:47
← fyolnish left16:47
cmn or check a guide for using plink and see if you've done any of those things16:47
Tohuw cmn: indeed, it is set to plink. How can I change this?16:47
cmn unset it16:47
← Desproges left16:48
← Infiltrator left16:49
→ Infiltrator joined16:50
→ Araxia_ joined16:50
← chrisshattuck left16:50
→ popcorn joined16:50
← popcorn left16:50
→ Flavius1924 joined16:51
Flavius1924 how can i ignore some files in my repository ?16:51
cmn man gitignore, or read the appropriate part of progit16:52
gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html16:52
← scientes left16:52
→ dstorrs joined16:53
→ scientes joined16:53
→ mishok13 joined16:53
→ raatiniemi joined16:53
← scientes left16:53
→ scientes joined16:53
PerlJam Flavius1924: make sure git isn't already tracking them. otherwise .gitignore will be useless.16:53
← matthiaskrgr left16:53
Flavius1924 yes,it is already tracking them16:55
PerlJam Flavius1924: oh, you said "in my repository" ... why do you want git to ignore these files?16:55
et then git rm them first16:55
← j0ran left16:55
→ tizzo joined16:55
Flavius1924 some compiled files16:55
← sq-one left16:57
→ t4nkd joined16:58
→ nobitanobi joined16:58
← t4nkd left16:58
← camdenx left16:58
→ hunterp joined16:58
hunterp I have about 1G of commits that are stopping me from syncing. How can I simply delete all these commits, and take the files as they are now ?16:58
nobitanobi I commited and pushed a .swp file into a repo. Even though I just added *.swp into mt .gitignore, how do I delete that file from the remote repository?16:58
et you git rm, commit and push again?16:59
nobitanobi et, if I git rm, it will be removed from my local repo, and I don't want that... I just don't want it to be commited.16:59
right?16:59
cmn --cached17:00
← Infiltrator left17:00
cmn and what you presumably don't want is to delete it from the worktree17:00
→ Infiltrator joined17:00
nobitanobi cmn: correct.17:00
cmn you'll then have to ammend or squash into the commit that introduced it17:00
and keep in mind !rewriting17:01
gitinfo [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)17:01
nobitanobi ok, I might just git rm17:01
and push17:01
and create it back in my local17:01
Flavius1924 so,can you tell me again ?17:01
→ kukks joined17:01
→ apok joined17:01
Flavius1924 i want to untrack some files and after that ignore them17:01
SerajewelKS Flavius1924: git rm --cached ...17:01
Flavius1924: then add entries in .gitignore as appropriate17:02
← Peste_Bubonica left17:02
→ pyhead joined17:03
→ Peste_Bubonica joined17:03
← adhawkins left17:04
→ melee joined17:05
← pmatthews left17:05
→ JohnyBaby joined17:05
← Tohuw left17:06
← pppaul left17:06
← erichynds left17:06
→ francisfish joined17:06
→ axl___ joined17:06
→ dreiss_ joined17:07
→ pppaul joined17:07
Flavius1924 and if i rm some files that i want to be tracked again ?17:07
→ mdhopkins joined17:08
→ michaelmartinez joined17:09
krainboltgreene Hey milki, you just saved me a ton of time and energy. Thanks! Let me know if I can do anything for you :) http://github.com/krainboltgreene17:09
← tharkun left17:09
← hunterp left17:10
→ d0k_ joined17:10
← d0k left17:10
d0k_ → d0k17:10
→ galaris joined17:10
← axl_ left17:10
axl___ → axl_17:10
→ tharkun joined17:10
→ bartek joined17:11
→ Spedge joined17:12
← tharkun left17:13
→ tharkun joined17:13
← cgrage left17:14
← mister_m left17:14
← alexukf left17:14
← Infiltrator left17:15
→ ToBeFree joined17:15
← flavius left17:16
→ Infiltrator joined17:16
← Flavius1924 left17:16
→ gjoseph joined17:17
→ alvaro_o joined17:17
→ qt-x joined17:19
gjoseph hi there - it seems to me that git, when cloning, does not do preemptive authentication, unless credentials are passed via url. or perhaps that's specific to the osxkeychain helper ? Either way, is that a correct observation, and is that controllable (options?) - and is there a reason for it to be this way ? Right now all i see is my http logs cluttered with failed authentication (where somehow the correct username is passed though)17:19
cmn if you give git a url, it can't know whether you need to auth or not17:19
so first it does what you tell it to, try to grab that url17:20
← aristidesfl left17:20
cmn and when the server says you need auth, it asks17:20
→ matthiaskrgr joined17:21
→ aristidesfl joined17:21
→ aselder joined17:21
gjoseph cmn: makes sense, but it could perhaps check with the auth help if credentials are known for said url beforehand ? Also i'm curious to know how in the http server actually knows the username if not creds are sent17:22
cmn if no creds are sent, it doesn't know17:23
→ macabre^ joined17:23
→ mcluskydodallas joined17:24
→ dcarper joined17:24
cmn if you set them up in .netrc you can probably make it preemtive as well17:24
→ keller joined17:24
← bkeating left17:25
gjoseph cmn: i think i know what happens, thanks to your note about netrc17:25
→ calimocho joined17:25
← akiress left17:25
cmn you set .netrc wrong?17:25
→ lacrymology joined17:26
→ Flavius1924 joined17:26
Flavius1924 is there a way to untrack a lot of files at once,not one by one ?17:26
cmn shell globs17:26
← PigeonFriend left17:27
lacrymology say I've got a remote repo set up pointing somewhere else on my filesystem, as in `git remote add local /path/to/repo`, is there an easy way of doing `cd path-to-local`?17:27
Flavius1924 what is that ?:)17:27
lacrymology I hope that makes sense17:27
← siloxid left17:27
gjoseph cmn ok bingo that was it. with another user on my laptop, http logs were fine. got a 401 on git-upload-pack. with my user, http said "failed to authenticate gjoseph". and indeed, before i even discovered the auth helper stuff could work with the osxkeychain, i tried the .netrc route … which doesn't work with my password, presumably because it contains spaces or quotes or something17:27
cmn what is what?17:27
← macabre left17:27
Flavius1924 shell globs :)17:27
et Flavius1924: git rm --cached -- *.swp17:27
PerlJam Flavius1924: git rm --cached *.txt # untrack all txt files17:27
et for example17:27
lacrymology Flavius1924: globs are 'not quite like regexps'17:27
← tvw left17:28
gjoseph cmn: thanks !17:28
lacrymology take * as a wildcard, and the such17:28
← shruggar left17:28
cmn gjoseph: glad to help17:28
shell globs are * ? and []17:28
lacrymology cmn: what does [] do?17:28
PerlJam cmn: and {}17:28
et depends on the shell actually17:28
cmn fine, so there are more17:28
et {} is usually not globbing though17:29
← tim left17:29
→ flavius joined17:29
cmn the [] use one of each, like you'd say *.[ch] to get your source code17:29
Flavius1924 and to ignore some untracked files,lot of files,what can i do ?17:30
PerlJam Flavius1924: add the glob to .gitignore17:30
Flavius1924: (or add each filename)17:30
← n1x left17:30
Flavius1924 and how is that possible ?17:30
← francisfish left17:31
et how is what possible?17:31
→ francisfish joined17:31
Flavius1924 to ignore a globe at once17:32
bremner use a shell17:32
Flavius1924 git ignore *.txt , for example ?17:32
cmn put that in the ignore file17:32
man gitignore again17:32
gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html17:32
← gusnan left17:33
← bitkiller left17:33
→ t4nkd joined17:34
← sjhill left17:34
← Infiltrator left17:34
→ Infiltrator joined17:34
→ logart joined17:35
→ siloxid joined17:35
gitinfo set mode: +v17:35
→ tvw joined17:35
← francisfish left17:36
← nots left17:36
→ vs_ joined17:37
← Guest24987 left17:37
← dcarper left17:38
→ traatiniemi joined17:38
← OOPMan left17:38
→ ymasory joined17:38
→ cbreak joined17:39
→ OOPMan joined17:40
← gjoseph left17:40
← codewrangler left17:41
← marcogmonteiro left17:41
→ codewrangler joined17:42
← alvaro_o left17:42
→ bondar joined17:44
→ stkrzysiak_ joined17:44
← bondar left17:46
← cortana2 left17:46
← stkrzysiak left17:47
stkrzysiak_ → stkrzysiak17:47
← logart left17:49
← Infiltrator left17:50
→ dcarper joined17:50
→ Chillance joined17:50
→ Infiltrator joined17:51
← thm left17:53
→ njection joined17:53
← OOPMan left17:54
→ arvind_khadri joined17:54
← njection left17:55
→ BryanRuiz joined17:55
← project2501a left17:56
→ OOPMan joined17:57
← spaceonline left17:57
→ pandeiro joined17:57
← Flavius1924 left17:59
→ cespare joined17:59
← tvw left17:59
← ph^ left18:02
→ ph^ joined18:03
→ andref_dias joined18:03
→ dropdrive joined18:03
→ Destos joined18:03
← achadwick left18:04
→ causasui joined18:04
→ rtuin joined18:06
→ nots joined18:06
← siloxid left18:07
← ph^ left18:08
→ frnkkpp joined18:08
→ vs joined18:08
← vs_ left18:08
vs → Guest2179418:09
→ logart joined18:09
← mishok13 left18:09
gitinfo set mode: +v18:09
→ enmand joined18:10
→ nots_ joined18:10
→ veyres joined18:10
→ ph^ joined18:10
logart Hello, I am trying to add an empty "templates_c" folder to my git repo that will be used by my Smarty templating engine for the cached tpl files. But git doesn't allow me to add an empty folder. I tried adding a .gitignore file into that folder but git is still not picking up the new folder. Any suggestions?18:10
← nots left18:11
← OOPMan left18:11
← tatsuya_o left18:12
axl_ hey, i have a question. In github, can i not compare difference between two commits within the same branch?18:12
cmn axl_: that should be #github18:12
→ williambr joined18:12
SethRobertson logart: You can absolutely add a .gitignore in that folder. !repro18:12
gitinfo logart: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.18:12
cmn logart: how is it not picking it up? how did you try?18:12
→ OOPMan joined18:13
axl_ cmn: got it18:13
← veyres left18:13
← luxurymode left18:13
→ alberto56 joined18:13
→ FernandoBasso joined18:13
← bolt left18:13
→ veyres joined18:14
← dcarper left18:15
→ hanneso_ joined18:15
logart I will do a gist real quick18:15
← galaris left18:16
→ galaris joined18:17
→ francisfish joined18:17
logart https://gist.github.com/257889118:18
← nots_ left18:18
logart that is a summary of my commands18:18
→ darren joined18:18
→ jstout24 joined18:18
logart SethRobertson: that is a link to the gist of my commands18:20
→ alexukf joined18:20
← ipalaus_ left18:20
cmn of course git won't let you; you told it to ignore every single file18:20
SethRobertson YOu need to add templates_c/.gitignore18:20
`git add -f templates_c/.gitignore`18:20
et logart: and don't use commit with a path18:21
← digiv left18:21
← OOPMan left18:22
← williambr left18:22
logart SethRobertson: Thanks, the -f was the key there.18:23
I hate the word "force" lol18:23
← Infiltrator left18:24
→ OOPMan joined18:24
→ Targen joined18:24
→ gjoseph joined18:24
→ Infiltrator joined18:24
← ronniy left18:25
← kermit left18:26
→ gusnan joined18:26
→ bolt joined18:26
→ jfelchner joined18:27
← Spedge left18:28
← OOPMan left18:29
← berserkr left18:29
→ OOPMan joined18:30
→ berserkr joined18:30
← traatiniemi left18:31
← satyanash left18:31
→ kermit joined18:31
→ satyanash joined18:31
← Craig left18:31
← cbreak left18:31
→ Tekhne joined18:31
→ adhawkins joined18:32
← trochala left18:32
Tekhne i have a git repo with submodules. is there a way to ignore "dirty" summaries for the submodules when running "git commit"?18:33
← OOPMan left18:34
← alexukf left18:35
→ cbreak joined18:35
← stkrzysiak left18:36
← ymasory left18:36
→ OOPMan joined18:37
← logart left18:37
← marthinal left18:37
→ alexukf joined18:38
→ ymasory joined18:38
← gjoseph left18:38
→ teweWORK joined18:38
veyres Tekhne: What do you call "dirty summaries" ??18:38
← chronos left18:39
→ mishok13 joined18:39
Tekhne veyres: for example, when i run "git commit" i'll see a line like "modified: <submodule> (untracked content)"18:40
← fahadsadah_ left18:40
Tekhne veyres: i can ignore the any changes in submodules via flags to "git diff" and "git status", but i don't see what can be done for "git commit"18:41
cbreak look the other way...18:42
← pandeiro left18:42
veyres Tekhne: git commit -m "my-customized-message"18:43
... that way, you can choose your own message.18:43
cbreak you should not use -m18:43
Tekhne veyres: well, but i'll still get the dirty summaries18:43
cbreak it makes people write worthless oneliner18:43
← Infiltrator left18:43
→ Infiltrator joined18:44
→ shruggar joined18:45
→ fxn joined18:45
← bsb left18:46
fxn hi, I have a rebased branch I want to collapse to a single commit before pushing to a public repo, what's the command to say "let me rewrite the history of the commands not in <original branch>"?18:47
← OOPMan left18:47
fxn I want to make sure no sha1 in the original branch is touched18:47
← Guest21794 left18:48
→ OOPMan joined18:48
cbreak fxn: git rebase -i originalbranchhere18:48
← mishok13 left18:48
cbreak while on the branch you want to change18:48
fxn cbreak: awesome, that was the one, thanks!18:49
← ISF left18:49
shruggar possibly: git rebase -i $(git merge-base <originalbranch> HEAD)18:49
depending on the state of <originalbranch> now vs when you started18:49
(usually doesn't matter, but technically correct)18:50
→ tvw joined18:50
→ bsb joined18:50
fxn the original branch is updated, and the feature branch is rebased18:50
cbreak the only difference is that my command will put the result on top of originalbranch and yours won't :)18:50
← ben225 left18:51
shruggar that's soometimes an important difference. If you want to "edit history", not "rebase the current branch, editing history along the way", then my command does that and nothing else18:51
→ alester joined18:51
→ tyatpi joined18:52
→ Mowsh joined18:52
← nobitanobi left18:52
← OOPMan left18:52
→ nobitanobi joined18:52
→ n1x joined18:52
fxn "use commit, but meld into previous commit", previous means older? (hence down the file), or previous line?18:53
→ stkrzysiak joined18:53
→ OOPMan joined18:53
cbreak the one before in topological order18:54
→ fahadsadah joined18:54
cbreak (the parent commit)18:54
fxn cbreak: I can't put a "f" on the first presented commit18:54
cmn there is no previous commit to fixup18:55
→ ben225 joined18:55
← t4nkd left18:55
cbreak fxn: you'd have to change the parent of the first commit for that18:55
and you said before you didn't want that18:56
fxn ahhhh, they are presented in reverse order as git log, gotcah18:56
← alberto56 left18:56
fxn gotcha18:56
← Infiltrator left18:56
cmn they're instructions; presented in the way people read18:56
← Targen left18:57
→ Sigma[Mtp] joined18:57
→ Infiltrator joined18:57
← Sigma left18:58
→ camdenx joined18:58
← n1x left18:58
shruggar "git log" presents commits in the most natural order for reading a log: you care about more-recent entries most. "git rebase -i" presents commits in the most natural order for "doing things": the order in which the commits exist18:59
→ n1x joined18:59
→ dekroning joined18:59
← alester left18:59
← raatiniemi left18:59
→ khmarbaise joined18:59
fxn shruggar: understand the rationale, I think you could equally defend the other ordering though, no big deal it's the way it is19:00
→ t4nkd joined19:01
shruggar too much rebase -i makes me want to ignore parents completely, and just work with changesets. But pretending that changesets can be freely moved around leads to madness, so instead I stop using rebase -i so much :)19:01
→ k0rnel joined19:02
← rgsteele left19:02
← k0rnel left19:02
kevlarman shruggar: they *can* be moved around freely as long as you haven't published them19:03
← n1x left19:03
→ k0rnel joined19:03
← OOPMan left19:03
← camdenx left19:03
cmn more importantly is probably having a sane way to describe those movements19:03
shruggar kevlarman: they *can* be moved around freely in utterly trivial cases. The first time you deal with a merge conflict that wasn't automatically detected is the last time you'll put yourself in that situation19:04
← shruggar left19:05
→ n1x joined19:05
→ OOPMan joined19:05
← fxn left19:06
→ thiago joined19:06
→ btx94 joined19:06
→ dcarper joined19:06
← krainboltgreene left19:07
← HyperNerdV2 left19:08
→ HyperNerdV2 joined19:09
← gusnan left19:09
← munichlinux left19:09
← OOPMan left19:10
← ToBeFree left19:11
→ OOPMan joined19:12
← pfFredd left19:12
→ whitman joined19:12
← joaoh82 left19:13
← Bass10 left19:14
→ Fretta joined19:14
→ mishok13 joined19:14
← mcluskydodallas left19:14
← lacrymology left19:15
← rtuin left19:15
→ thearthur joined19:15
← OOPMan left19:16
→ OOPMan joined19:18
→ nots joined19:19
← stkrzysiak left19:19
← Lgb left19:20
→ stkrzysiak joined19:20
→ h0bbit joined19:22
→ duckx joined19:22
← OOPMan left19:23
→ Lgb joined19:23
→ MistuhKurtz joined19:23
→ williamcotton joined19:24
→ twisted` joined19:24
→ OOPMan joined19:25
← duckxx left19:25
← Infiltrator left19:28
→ gjoseph joined19:29
→ anildigital joined19:29
→ Infiltrator joined19:30
→ TTSDA_ joined19:30
TTSDA_ → TTSDA19:30
← OOPMan left19:31
← Tekhne left19:31
← francisfish left19:31
← nobitanobi left19:31
→ nobitanobi1 joined19:31
← alexukf left19:32
→ singingwolfboy joined19:32
→ francisfish joined19:32
→ OOPMan joined19:32
singingwolfboy I want to amend a commit that is not the tip of my branch (I committed other things after it), but neither that commit nor the commits that came after have been pushed to a public repository yet. Is this possible?19:32
_ikke_ singingwolfboy: yes19:32
with rebase -i\19:32
rebase -i19:32
cespare singingwolfboy: sure, do an interactive rebase back to that commit19:32
_ikke_ singingwolfboy: git rebase -i <commit>^19:33
singingwolfboy ok, and what do I do when rebasing?19:33
(I'm not very familiar with rebasing)19:33
cespare singingwolfboy: do you need to change the commit itself, or just the message?19:33
_ikke_ You get an editor right?19:33
singingwolfboy cespare: adding a line to the commit itself19:33
_ikke_ you see a list of hashes with a description, and the text pick in front of each19:33
→ john_anderson joined19:34
→ islam joined19:34
← islam left19:35
→ ibash joined19:35
→ LycoLoco joined19:35
← LycoLoco left19:35
← Jackneill left19:35
cespare singingwolfboy: like _ikke_ says, you see 'pick' in front of the commits. Change 'pick' to 'edit' (or 'e') in front of the commit you want to amend19:35
ibash gi19:35
hi19:36
_ikke_ !hi19:36
gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.19:36
ibash I used this script to remove merged in branches: and it removed remote and local branches, how can I undo removing remote branches? http://snippets.freerobby.com/post/491644841/remove-merged-branches-in-git19:36
cespare singingwolfboy: save and quit, then you'll get a chance to change your commit (so make the change and then git commit --amend, or whatever you'd like to do) and then git rebase --continue19:36
ibash Or is there way to undo removing remote branches?19:37
← OOPMan left19:37
← francisfish left19:37
← mklappstuhl left19:39
→ OOPMan joined19:39
→ cehteh joined19:40
→ svdv joined19:40
cmn fetch, that'll update the remote-tracking branches19:41
ibash cmn, I think it pushed the remote tracking branches19:43
push the deletion of19:43
cmn what did?19:43
→ Fangorn_ joined19:43
cmn well, if you deleted the branches also in the remote, there isn't much you can do19:43
← OOPMan left19:44
ibash I have another clone that has most of those branches on my local machine19:45
→ glaudiston joined19:45
→ oriba joined19:45
ibash is there a way I can recover most from that clone?19:45
← glaudiston left19:45
→ OOPMan joined19:46
cmn push the remote-trackig branches19:46
→ Vazzi joined19:46
cmn but if it's an old clone, they'll probably be out of date19:46
ibash these things are merged in, it's just to look back at past history19:46
← fayimora left19:47
→ mcluskydodallas joined19:47
ibash if I do git branch -a there I get a bunch of remotes/origin/branchname19:47
does that mean that they're not local?19:47
← j416 left19:47
→ _pr0t0type_ joined19:48
← sdaone left19:48
_pr0t0type_ Hey guys. Is there anyway to force git to allow me to modify the list of commit messages in a git rebase —interative?19:48
cmn they're not "local branches"19:48
they're remote-tracking branches19:49
they exist in your repository19:49
_pr0t0type_ like, right now it only allwos me to squash or pick or whatever, but I want to modify the commit messages already in the log19:49
cmn _pr0t0type_: and what part of the instructions at the bottom isn't telling you the exact command to do that?19:49
← Infiltrator left19:49
_ikke_ _pr0t0type_: what do you mean with commit message already in the log?19:49
← dcarper left19:49
_ikke_ _pr0t0type_: With reword, you can modify the messages19:50
cespare _pr0t0type_: you should be able to use 'edit' or 'reword' (although reword is newer, i think?)19:50
ibash cmn: are remote tracking branches stored locally though, can I recover from them?19:50
cmn yes19:50
← OOPMan left19:50
→ Infiltrator joined19:50
← FernandoBasso left19:51
→ ferdna joined19:51
_pr0t0type_ hmm, thanks guys I'll look into reword19:51
← nots left19:52
→ mklappstuhl joined19:52
→ OOPMan joined19:53
← Nibato left19:53
→ giallu joined19:53
→ jfisk1987 joined19:54
jfisk1987 hey guys, in a bit of a pickle19:54
→ Eridius joined19:54
jfisk1987 how can i go back to an older commit?19:54
trash all my changes, go back 2 commits in time?19:54
ibash cmn: do you know how I would do that? I saw this:http://stackoverflow.com/questions/1992364/git-recover-deleted-remote-branch but am not sure what's going on19:54
→ tatsuya_o joined19:54
cmn you do what you always do with a push19:55
git push <remote> <refspec>19:55
← matthiaskrgr left19:55
cmn in this case there refspec is refs/remotes/origin/*:refs/heads/*19:55
cespare jfisk1987: git reset --hard HEAD~2 (but be sure this is what you want, read the man page about git-reset, etc)19:56
jfisk1987 cespare what if i have the commt "code"?19:56
i.e i want commit with SHA ff452c6f4add65db5f3ea50df3debf199d82b25619:56
→ matthiaskrgr joined19:56
cespare jfisk1987: you want to blow away all changes after that commit?19:57
jfisk1987 yeah19:57
cespare git reset --hard ff452...19:57
jfisk1987 i mistakenly commited19:57
cespare sorry don't include those dots (i forget that it's actually git syntax)19:57
_ikke_ use --keep unless you want to loose uncomitted changes too19:57
← OOPMan left19:57
ibash cmn: thank you so much! (can I buy you a beer?)19:58
milki what19:58
cmn gets free beer?19:58
→ rtuin joined19:58
cmn it'd probably be warm by the time it gets here19:58
→ OOPMan joined19:59
→ Nibato joined19:59
← twisted` left20:00
← aristidesfl left20:00
cmn don't be jealous milki :(20:00
→ quentusrex_ joined20:00
quentusrex_ is it possible to squash commits into a later commit?20:01
or do you just have to swap the commit messages, and squash into the earlier one?20:01
cmn that's how you do it20:01
or squash the later one into the earlier one20:01
← drue left20:01
cmn you can choose the final message20:01
jfisk1987 thanks guys20:02
← jfisk1987 left20:02
→ aristidesfl joined20:02
→ Bass10 joined20:02
→ nax joined20:02
→ drue joined20:02
nax → Guest8933820:03
← heidar left20:03
← milki left20:03
→ bitslip joined20:04
→ Radium joined20:04
← OOPMan left20:04
← enmand left20:04
← mklappstuhl left20:04
→ milki joined20:05
→ twisted` joined20:05
→ OOPMan joined20:05
← Infiltrator left20:05
→ heidar joined20:06
→ Infiltrator joined20:06
← LongBeach left20:06
← t4nkd left20:06
→ joaoh82 joined20:06
→ joren joined20:07
← OOPMan left20:10
→ brianV joined20:10
→ OOPMan joined20:11
→ boombatower joined20:12
← matthiaskrgr left20:12
→ fayimora joined20:13
← EyesIsMine left20:13
← BryanRuiz left20:13
→ Superlokkus joined20:13
← Radium left20:14
→ stkrzysiak_ joined20:14
→ shruggar joined20:15
← Superlokkus left20:15
joren Hey, so I recently removed a bunch of files from history from a git repo I had, but one of the devs undid most of what I did. Does anyone know of a good hook to use to prevent this from happening in the future?20:15
The size is drastically different, so maybe some sort of size limit?20:16
→ alberto56 joined20:17
← stkrzysiak left20:17
stkrzysiak_ → stkrzysiak20:17
cmn what you need is to figure out why it keeps happening20:17
→ Radium joined20:17
SethRobertson As a specific hook? No. In general you would do it in post-receive. What you might do as more easy would be to disable force pushes and ref deletes which might cause a road-bump20:17
→ EyesIsMine joined20:18
← darren left20:18
→ akiress joined20:18
joren SethRobertson, that could make sense, thanks20:20
← OOPMan left20:20
← singingwolfboy left20:21
← Vazzi left20:21
← john_anderson left20:22
← Infiltrator left20:23
→ OOPMan joined20:23
→ Infiltrator joined20:23
→ alex__c2022 joined20:24
← adhawkins left20:27
← Stellar left20:27
← Radium left20:27
← hyperair left20:28
← mishok13 left20:28
→ matthiaskrgr joined20:28
← OOPMan left20:28
joren hmm.. git config --system receive.denyNonFastforwards true perhaps?20:28
→ darren joined20:28
→ OOPMan joined20:30
→ nots joined20:30
← nobitanobi1 left20:31
→ nobitanobi joined20:31
cmn that seems very draconian20:31
you're forbidding every user on that computer to receive non-ff20:31
← darren left20:33
← n1x left20:33
← aselder left20:33
joren cmn, I ended up setting it in the repo's config file20:34
← umc left20:34
← Yuuhi`` left20:34
→ Radium joined20:36
← linusoleander left20:38
← OOPMan left20:39
→ t4nkd joined20:40
← _pr0t0type_ left20:40
→ OOPMan joined20:40
→ iKrzysiek joined20:41
← t4nkd left20:41
→ t4nkd`workin joined20:41
← nots left20:41
joren That config line seems to have solved the particular case I had at least20:42
→ dcarper joined20:42
← QaDeS left20:43
→ jpalmer joined20:43
← h0bbit left20:45
← `Assassin left20:45
→ `Assassin joined20:46
→ makeawish joined20:47
cmn it solved the symptom20:48
→ BryanRuiz joined20:48
← Grummle left20:48
← Chibby__ left20:49
→ tg joined20:50
← alex__c2022 left20:52
← BSaboia__ left20:52
← whitman left20:52
→ Vile joined20:53
joren cmn, it did indeed, and can be removed later on if it causes trouble and or once the devs all have new versions of the repo..20:54
← nrichards left20:54
→ ipalaus_ joined20:54
→ Yuuhi joined20:55
← galaris left20:55
→ dleedev joined20:55
dleedev hey guys, is there a way to make git fail on commit when there's no email address configured?20:56
I forget to set the email address for new repositories, and whenever I commit, it gives the warning "Your name and email address were configured automatically…"20:56
It would be preferable for git to just error and not commit20:57
← chrisgeorge left20:57
← glcrazy left20:57
← hagabaka left20:57
→ nots joined20:57
dleedev that way, I can git config the proper name and email and commit again, without having to git reset HEAD^20:57
← ymasory left20:57
cmn you don't have to do that20:57
configure it and use --amend --reset-author20:57
or just put your e-mail in the global config20:58
dleedev I want to have per project configs for email address, since I have both personal and work email addresses20:58
I used to have a global config, but I ended up either committing as personal email to work repos or committing as work email to personal repos20:59
→ camdenx joined20:59
← Peste_Bubonica left21:00
← dekroning left21:00
→ chrisgeorge joined21:00
← Infiltrator left21:00
→ alexukf joined21:01
→ Infiltrator joined21:01
← rtuin left21:02
→ Targen joined21:03
← camdenx left21:03
→ lindenle joined21:05
gitinfo set mode: +v21:05
← ph^ left21:05
lindenle HIall, can i do a filter branch of a subdirectory for a certain branch?21:05
← nots left21:06
→ cagedwisdom joined21:06
← t4nkd`workin left21:07
PerlJam lindenle: I don't quite understand the question21:07
lindenle PerlJam: it is probably a bad question, I just want to take the history up to the HEAD of one branch in one subdirectory of my repo and push it to a new remote.21:08
← boombatower left21:08
← Tinti left21:08
→ alester joined21:08
cmn lindenle: man git filter-branch has exactly that21:08
gitinfo lindenle: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html21:08
← bartek left21:09
← ben225 left21:09
← g0bl1n left21:09
← Fangorn_ left21:09
→ gtrak joined21:10
→ ben225 joined21:11
← gtrak left21:11
→ pisto joined21:11
gitinfo set mode: +v21:12
CannedCorn hey guys, i think i lost a commit21:12
how do i see all of them in git log21:12
_ikke_ git log --all21:13
← pisto left21:13
→ troulouliou_dev joined21:13
CannedCorn uh oh21:13
i committed to no branch21:13
→ mrpisto joined21:13
CannedCorn and saw it21:13
now that I'm on master, it isn't in there though21:13
mrpisto hello. I need to take out a subfolder from my git repository and turn it into a new git repository. Then, I want to delete the original folder, and reintroduce it but as a submodule, linked to the new repository.21:13
← cbreak left21:13
troulouliou_dev hi is there a palce for tortoisegit discussion ?21:13
mrpisto I believe that for the first part, that is create a new repo, this should be it: http://help.github.com/split-a-subpath-into-a-new-repo/21:13
← arietis left21:14
_ikke_ CannedCorn: use the reflog21:14
!reflog21:14
gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`21:14
← TomyLobo left21:14
mrpisto but how do I create a submodule? how do I switch branches within the submodule?21:15
m1sc troulouliou_dev: afaik no -- just !ask21:15
gitinfo troulouliou_dev: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.21:15
mrpisto and, is there a way to link a certain branch of my main repo to a branch of the submodule repo?21:15
→ enmand joined21:15
→ TomyLobo joined21:15
_ikke_ mrpisto: a submodule is a complete repository on its own21:16
CannedCorn thanks _ikke_21:16
_ikke_ mrpisto: git trackes the currently checked out commit of the submodule. Each branch could have it's own version of what's checked out21:16
CannedCorn _ikke_ how would i get the contents of that reflog21:17
and stash it or some such thing21:17
of that ref, rather21:17
or re-apply to current branch21:17
gitinfo set mode: +v21:18
sauoq CannedCorn: one way is cherry-pick21:18
← tbird72 left21:19
gitinfo set mode: +v21:20
← dstorrs left21:20
→ dstorrs joined21:22
← svdv left21:23
→ cbreak joined21:23
→ krz joined21:23
← fairuz left21:24
← DoniRS left21:24
← flavius left21:27
← Infiltrator left21:27
← k0rnel left21:27
→ Infiltrator joined21:28
← alester left21:30
zivester what's the best way to pull in one specific commit (not the entire branch) into the current branch ?21:31
→ nots joined21:31
_ikke_ zivester: cherry-pick21:32
→ linusoleander joined21:34
← d0k left21:34
← berserkr left21:35
← Sigma[Mtp] left21:35
→ fairuz joined21:37
← mdhopkins left21:38
→ d3c joined21:38
← CannedCorn left21:38
← Sahua left21:39
← pyhead left21:40
← AaronMT left21:40
← nots left21:41
← nioncode left21:42
← brokenshakles left21:42
← alberto56 left21:44
→ misternemo joined21:44
← misternemo left21:45
→ aspotashev joined21:45
→ teotwaki_ joined21:46
→ alex__c2022_ joined21:46
→ statis joined21:47
← alex__c2022_ left21:47
→ brokenshakles joined21:47
→ SyL joined21:48
← statis left21:48
→ francisfish joined21:48
SyL I'm having problems getting gitolite and gitweb to work together. I'm getting the "404 - no projects" error. Is this the right channel to ask for help about this?21:48
→ mklappstuhl joined21:49
← iKrzysiek left21:49
FauxFaux No, you should try #gitolite. *runs*. SyL: su to the webserver user (NO EXCUSES), cat projects.list, and go into one of the repo directories and run "git log".21:50
SyL FauxFaux: I'll try that now, thanks21:50
← Dave^| left21:50
juanfer Look at this: https://bitbucket.org/spooning/21:50
see the video!21:51
FauxFaux Welcome to april fools day, over a month ago. :p21:51
← ipalaus_ left21:51
SyL FauxFaux: all seem to work. projects.list has files in it and hotchicksroom.git had git info in it.21:52
milki hot...chicks...room....?21:53
→ kaen joined21:53
← kaen left21:53
→ kaen joined21:53
SyL milki: the name wasn't taken.21:53
pasky hmm anyone has any trick in store for filtering git history only to file additions in certain directory?21:53
← twisted` left21:53
pasky i.e. commits adding a file21:53
← akiress left21:54
← mklappstuhl left21:54
cmn --filter-diff=A21:54
pasky yes just hit that in search results too, thanks :)21:54
(diff-filter)21:54
← hellopat left21:55
← Destos left21:55
← eijk left21:56
→ kinetic joined21:57
← veyres left21:57
→ williamcotton_ joined21:58
→ nots joined21:59
→ svdv joined21:59
← stkrzysiak left21:59
← williamcotton left22:00
williamcotton_ → williamcotton22:00
→ ipalaus_ joined22:00
→ mklappstuhl joined22:00
→ madewokherd joined22:01
SyL FauxFaux: any ideas on other things I can check?22:02
FauxFaux: damn it. just found it. thanks!22:03
← SyL left22:03
→ w09x joined22:04
FauxFaux wonders what was up.22:06
← martinjlowm left22:06
← nots left22:06
atdt when i cherry-pick a commit from another user's remote and both files were changed, which is the way to indicate that i want the version from the cherry-picked commit, git add or git rm?22:07
→ nots joined22:08
← txomon|home left22:09
← svdv left22:10
← felgru left22:11
→ pfFredd joined22:12
→ felgru joined22:12
SethRobertson `git mergetool` usually, or edit the file22:12
← PerlJam left22:13
← TeckniX left22:13
→ PerlJam joined22:13
→ Industrial joined22:13
→ TeckniX joined22:13
← juanfer left22:13
→ berserkr joined22:14
← Lisimba2 left22:17
← glennpratt left22:18
← teotwaki_ left22:18
← Infiltrator left22:18
→ Infiltrator joined22:19
← francisfish left22:19
→ francisfish joined22:20
← neurodrone left22:20
lindenle HI all, using gitolite and getting a fork error "remote: /home/git/share/gitolite/hooks/common/update: fork: Cannot allocate memory" also notice that it is spawning hundreds of processes, can anyone help?22:20
← axl_ left22:20
cmn what are you using as a hook?22:21
lindenle cmn: the gitolite udate hook in common22:21
cmn something's clearly making the update hook spawn a lot of processes22:21
← mklappstuhl left22:21
cmn and you haven't changed anything at all?22:21
SethRobertson Quite sure you don't have a gitolite-hook to some user process?22:22
← mrpisto left22:22
→ amigojapan joined22:23
lindenle cmn: changed a post-recieve hook but nothing in update22:24
lrwxrwxrwx 1 git git 38 May 2 15:23 update -> /home/git/gitolite/hooks/common/update22:24
cmn and update.secondary?22:25
← francisfish left22:25
← dv310p3r left22:25
cmn what's that process that gets spawned?22:26
→ Chaser joined22:27
← macabre^ left22:27
lindenle cmn: no update.secondary22:27
→ mdhopkins joined22:28
lindenle cmn: /bin/bash /home/git/share/gitolite/hooks/common/update refs/heads/master22:28
→ Gentlecat joined22:28
← revagomes left22:29
→ cbeck_ joined22:29
cmn are you trying to push a huge amount of branches22:30
?22:30
→ proq` joined22:30
← fisted left22:31
← proq left22:31
lindenle cmn: no one branch and only one change22:31
→ akiress joined22:31
cmn hm, that's really odd22:31
← d3c left22:31
→ fisted joined22:31
lindenle cmn: all the spawned processes seem to have the same two rev numbers22:32
← JohnyBaby left22:32
lindenle cmn: and are sleeping22:32
→ fuzzybunny69y joined22:32
← tizzo left22:32
proq` → proq22:34
← berserkr left22:34
← proq left22:35
cmn curioser and curioser22:35
lindenle cmn: how about im an idiot22:35
cmn huh?22:36
← beatak left22:36
lindenle cmn: just realized I had overwritten the common/update hook in gitolites dir22:36
cmn: just fixed it22:36
→ beatak joined22:36
cmn alright then22:36
lindenle cmn: sorry for being a pain in the ass22:37
← yeryry left22:38
← troulouliou_dev left22:38
← neunon left22:38
→ nand` joined22:40
← nartholl1s left22:40
→ libertyprime joined22:40
← mdhopkins left22:40
→ narthollis joined22:40
→ proq joined22:41
← duckx left22:41
← linusoleander left22:42
→ jbub joined22:42
→ zokko joined22:42
← sdeboey left22:42
→ linusoleander joined22:43
← tewecske left22:43
→ lonewulf` joined22:43
→ thebignoise joined22:44
Guest13014 → atomicity22:44
← Ryback_ left22:44
← chrisgeorge left22:44
→ Pupeno_W_ joined22:46
→ variable joined22:47
← teweWORK left22:47
Pupeno_W_ → Pupeno_W22:48
← Infiltrator left22:48
→ Infiltrator joined22:49
← TeckniX left22:49
→ revagomes joined22:50
← beatak left22:51
← revagomes left22:51
→ TeckniX joined22:52
← kevwil left22:52
→ blorbx joined22:52
← felgru left22:53
← Element9 left22:53
← btx94 left22:54
→ neurodrone joined22:54
→ berserkr joined22:55
← shruggar left22:56
→ w09x_ joined22:56
→ bitkiller joined22:58
→ Destos joined22:58
→ camdenx joined22:59
← w09x left23:00
← cbeck_ left23:00
← jfelchner left23:00
→ Lord_DeathMatch joined23:01
→ joshsmith joined23:02
← mikepack left23:02
→ mikepack joined23:03
← Bass10 left23:03
← camdenx left23:04
← airborn left23:04
→ wilmoore joined23:04
← giallu left23:06
milki hmmm pita bread23:06
its apparently cross-post in #gitolite and #git day23:06
→ WillMarshall joined23:07
← mikepack left23:08
← Guest89338 left23:08
→ w09x joined23:08
← Chillance left23:09
→ marhaban joined23:09
← w09x_ left23:11
← fayimora left23:12
← wbednarski left23:13
← fuzzybunny69y left23:14
→ w09x_ joined23:17
→ bartek joined23:19
→ w09x__ joined23:19
← Lord_DeathMatch left23:19
← w09x left23:20
→ JohnyBaby joined23:20
→ fuzzybunny69y joined23:21
→ blorbx` joined23:21
← blorbx left23:21
← w09x_ left23:22
← Infiltrator left23:24
→ Infiltrator joined23:25
→ mister_m joined23:25
→ fayimora joined23:25
→ troulouliou_dev joined23:25
troulouliou_dev hi i noticed a weird bug on tortoisegit, if you try to commit without local modification , it stay open ; and cancel / close button do not do anything23:26
cmn you should probably tell the tortoisegit people23:26
→ chronos joined23:27
→ project2501a joined23:27
troulouliou_dev none of the here ?23:28
→ njection joined23:28
→ btx94_ joined23:29
cmn there may be, but they have a bug tracking system23:30
and I'd expect that to work much better than hoping one of them is here right now23:30
→ Lisimba joined23:33
← gjoseph left23:34
← blorbx` left23:34
→ thursday joined23:35
← andref_dias left23:37
← Infiltrator left23:39
→ Infiltrator joined23:40
← troulouliou_dev left23:45
← dcarper left23:45
→ dv310p3r joined23:46
← redrocket left23:47
← btx94_ left23:47
→ redrocket joined23:48
← tvw left23:49
← aristidesfl left23:50
→ davidbanham joined23:51
← pfFredd left23:51
← cannonball left23:52
→ aristidesfl joined23:54
← amigojapan left23:54
← marhaban left23:55
→ rchavik joined23:55
← rchavik left23:55
→ rchavik joined23:55
→ marhaban joined23:55
← mister_m left23:56
← marhaban left23:56
← proq left23:57
← ehsan_ left23:57
← SkAzZ left23:58
← w09x__ left23:58
→ w09x joined23:58
→ john_anderson joined23:59
← njection left23:59
→ cbeck_ joined23:59
← kinetic left23:59

Logs Search ←Prev date Next date→ Channels Documentation