| 2010-06-01 |
| ← bibinou left | 00:00 |
| → bibinou joined | 00:00 |
| → Eaven joined | 00:00 |
| ← bibinou left | 00:01 |
| → mostly_harmless joined | 00:01 |
| ← meanburrito920 left | 00:02 |
| ← ajpi left | 00:03 |
| ← Nickeeh left | 00:03 |
| → Transformer joined | 00:04 |
| ← brettgoulder left | 00:04 |
| → hasu joined | 00:04 |
| ← simNIX left | 00:05 |
| ← Titosemi left | 00:05 |
| ← Transformer left | 00:05 |
| → RobertLaptop joined | 00:06 |
| ← AAABeef left | 00:06 |
| ← magn3ts left | 00:06 |
| → darshu joined | 00:08 |
| ← darshu left | 00:09 |
|
mugwump
| steven_t: there was an interesting article posted recently about that | 00:11 |
| ← mostly_harmless left | 00:11 |
|
mugwump
| http://blog.extracheese.org/2010/05/why-i-switched-to-git-from-mercurial.html | 00:11 |
| → benjo2 joined | 00:12 |
|
mugwump
| it's far easier to convert from hg to git - hg fast-export | git fast-import | 00:13 |
|
steven_t
| oh goodie | 00:13 |
| ← mbroeker left | 00:13 |
|
steven_t
| i really just want to learn one i can use to pretty much do everything ill ever need to, and learn it in depth | 00:13 |
|
| because of this: http://blog.degutis.org/post/651422590/i-think-im-a-little-crazy | 00:13 |
| → whalesalad joined | 00:13 |
| ← tedoc2000 left | 00:14 |
|
whalesalad
| Hey guys, I have a branch that I haven't touched in a few days, and so my master is a lot further ahead than it. I'd like to start working in that other branch again, but want the changes to the master as well. Would doing a "git rebase master" from inside the branch achieve this? | 00:14 |
| → mostly_harmless joined | 00:15 |
|
mugwump
| steven_t: git has a lot more depth than hg imho | 00:15 |
|
| more people have extended it | 00:15 |
|
| it is a much more revolutionary approach | 00:15 |
|
vrillusions
| Personally i haven't found git's interface to be all that "klunky" per-se (only past SCM was subversion). The basics are surprisingly simple. It's when you get into the detailed stuff that things can get complicated | 00:16 |
|
mugwump
| sure, the interface has evolved organically | 00:16 |
|
steven_t
| well im completely new to version control | 00:16 |
|
| ive been using git happily for a few months to just commit, and nothing else. | 00:16 |
|
mugwump
| but the simple fact is it has so many commands because you can do more with it, in more different ways | 00:16 |
|
steven_t
| and only locally, to. rarely pushed, and when i did, it was to github and i didnt know what was going on :D | 00:17 |
|
mugwump
| heh, well all you really need to do is read the user manual and you will be much the wiser | 00:17 |
|
steven_t
| how long does that take in its entirety? | 00:17 |
|
vrillusions
| yeah I push to my hosted server downtown over ssh (essentially how github does it) | 00:18 |
| → brettgoulder joined | 00:18 |
|
mugwump
| it explains what happens underneath the hood, and is very useful. I don't know how much time it will take, but if you even read the first few chapters you should find them quite enlightening | 00:18 |
| ← corni left | 00:19 |
|
mugwump
| you don't need to know how all the nuts and bolts fit together, but it is important to understand the conceptual model | 00:19 |
|
vrillusions
| Wish I kept the link, there was a good "git for beginners" that even explained the things that general confuse about git like the staging area | 00:19 |
|
mugwump
| there's a good index of many of them on the home page | 00:19 |
|
| a lot of people write about git :) | 00:20 |
|
steven_t
| every tutorial ive read about git or the index/staging area or anything git related has assumed i know how to use svn or at least some vcs | 00:20 |
|
mugwump
| mmm. well, the good news is that people who start with zero vcs knowledge tend to learn git quicker than those who bring their baggage with them | 00:20 |
| ← whalesalad left | 00:21 |
|
mugwump
| assuming, of course, they can find the right information/guide :) | 00:21 |
| → magn3ts joined | 00:22 |
|
steven_t
| wihch i cant | 00:22 |
|
mugwump
| http://www.kernel.org/pub/software/scm/git/docs/user-manual.html # user manual | 00:23 |
|
| chapters 1 and 7 of that I particularly recommend | 00:24 |
| → a9b joined | 00:24 |
|
mugwump
| http://eagain.net/articles/git-for-computer-scientists/ is frequently recommended | 00:24 |
|
| There is also Scott Chacon's book - freely available online at http://progit.org/book/ | 00:25 |
|
vrillusions
| I learned a lot of stuff by creating a repository and playing with it. Commit files, delete files, rename files, see what has changed between now and 3 commits back, reverting changes. Creating two branches, modify the same file in different areas, merge them back together. do the same and modify the same line in both branches, etc | 00:27 |
| ← DrNick left | 00:27 |
| ← dj_tjerk left | 00:28 |
| ← justin-george left | 00:28 |
| → bman joined | 00:29 |
|
bman
| can someone help i keep getting fatal: The remote end hung up unexpectedly | 00:29 |
| → emmanueloga joined | 00:29 |
| ← robinbowes left | 00:29 |
| → robinbowes joined | 00:29 |
| ← mostly_harmless left | 00:30 |
| → ajpiano joined | 00:32 |
| → mostly_harmless joined | 00:33 |
| ← mostly_harmless left | 00:37 |
| ← engla left | 00:39 |
| → mostly_harmless joined | 00:42 |
| ← nchaimov left | 00:43 |
|
steven_t
| would you guys say that to understand hwo git works, some college-level math/science is required? | 00:45 |
|
| because i havent the slightest clue what diacrylic artic graph means. | 00:45 |
| → madeofcode joined | 00:47 |
|
madeofcode
| what's the best way to make a new repo out of a single branch? | 00:47 |
|
mugwump
| madeofcode: 'git init' a new repo, then use 'git remote add origin -t thatbranch -f URL' | 00:49 |
|
| URL in this case could be something like ../otherrepo | 00:49 |
|
madeofcode
| then remove origin and push to another separate origin? | 00:50 |
|
| thanks | 00:50 |
|
mugwump
| heh, you don't have to call it 'origin' | 00:50 |
|
| make it 'fred' or whatever, then make the one you push it to 'origin' perhaps | 00:50 |
| ← eto left | 00:50 |
|
madeofcode
| sure, i just meant i want to detach it -- but thanks that makes sense | 00:51 |
| → awx joined | 00:52 |
|
mugwump
| sure, you can use git remote for that | 00:52 |
| → icwiener_ joined | 00:53 |
| → Theravadan joined | 00:54 |
| ← madeofcode left | 00:55 |
| ← icwiener left | 00:55 |
| → pheaver joined | 00:55 |
| → mann3qu1n joined | 00:59 |
| → alisdair joined | 00:59 |
| ← sshc left | 01:00 |
| ← mostly_harmless left | 01:01 |
| ← Joeconyers left | 01:02 |
| ← icwiener_ left | 01:04 |
| → mostly_harmless joined | 01:05 |
| ← xenoterracide left | 01:05 |
| ← hyperair left | 01:06 |
| → simplechat joined | 01:06 |
| ← alisdair left | 01:07 |
| ← aresnick left | 01:08 |
| ← loincloth left | 01:11 |
| → loincloth joined | 01:12 |
| ← mostly_harmless left | 01:12 |
| → bcardarella joined | 01:13 |
| ← unreal left | 01:15 |
| → meanburrito920 joined | 01:16 |
| → mostly_harmless joined | 01:17 |
| → DrNick joined | 01:18 |
| ← mostly_harmless left | 01:24 |
| → VVSiz_ joined | 01:24 |
| → unreal joined | 01:25 |
| ← iruediger left | 01:27 |
| ← jrmuizel left | 01:28 |
| → mostly_harmless joined | 01:28 |
| ← VVSiz left | 01:28 |
| → hobodave joined | 01:31 |
| ← aless left | 01:31 |
| ← bcardarella left | 01:32 |
| ← Azeroth left | 01:32 |
| ← mostly_harmless left | 01:33 |
| ← meanburrito920 left | 01:33 |
| → meanburrito920 joined | 01:33 |
| → jrmuizel joined | 01:35 |
| → mostly_harmless joined | 01:36 |
| ← Vampire0_ left | 01:39 |
| → hw1979 joined | 01:40 |
| ← hw1979 left | 01:40 |
| → prgmatic joined | 01:40 |
| ← mostly_harmless left | 01:41 |
| → volk_ joined | 01:43 |
| ← parasti left | 01:43 |
|
volk_
| I "git mv" 'd some files, I added contents to some files. I typed "git add ." and then "git push origin master", and it says "Everything up-to-date" I am using github and I already made an alias for the repository on github. Any idea why it keeps saying eveyrhing is up to date? | 01:44 |
|
| is my git on strike? | 01:45 |
| → mostly_harmless joined | 01:45 |
|
coppro
| did you commit? | 01:45 |
|
volk_
| >< | 01:45 |
|
| stupid me | 01:45 |
|
| I forgot haha | 01:45 |
|
| sorry im new to the whole version control | 01:45 |
|
coppro
| git's a bit weird, too, because of the index | 01:46 |
| ← pheaver left | 01:48 |
| → loinclot_ joined | 01:48 |
| ← loincloth left | 01:48 |
| ← volk_ left | 01:49 |
| → Vampire0_ joined | 01:52 |
| ← mostly_harmless left | 01:55 |
| → ProperNoun joined | 01:56 |
| → mostly_harmless joined | 01:58 |
| → Textmode joined | 02:02 |
| ← mostly_harmless left | 02:03 |
| ← benjo2 left | 02:04 |
| → bcardarella joined | 02:05 |
| → mostly_harmless joined | 02:07 |
| ← mostly_harmless left | 02:12 |
|
frogonwheels
| coppro: nah - it's not git that's weird, it's the other SCMs that are weird for not having it ;) | 02:13 |
| → justin-george joined | 02:13 |
| ← jensn left | 02:14 |
| → mostly_harmless joined | 02:15 |
| ← d1b left | 02:17 |
| → candybar joined | 02:18 |
| ← mostly_harmless left | 02:19 |
| ← unreal left | 02:21 |
| → unreal joined | 02:21 |
| → nchaimov joined | 02:24 |
| ← cytrinox left | 02:24 |
| → lresende joined | 02:24 |
| → cytrinox joined | 02:26 |
| ← zimbres left | 02:26 |
| ← loinclot_ left | 02:32 |
| → loincloth joined | 02:32 |
| → LeLutin_ joined | 02:34 |
| ← LeLutin left | 02:37 |
| ← kukks left | 02:38 |
| ← bcardarella left | 02:39 |
| → cloudhead joined | 02:40 |
|
vrillusions
| How can I change the path a submodule points to? if I just change .gitmodules and try to update it complains it can't find a commit (probably assuming it's still the previous) | 02:47 |
|
| all I can think of is remove the submodule, commit, then add the new submodule | 02:47 |
| → sshc joined | 02:49 |
| ← phantomcircuit left | 02:49 |
|
frogonwheels
| vrillusions: if it can't find the commit, then it sounds like it's a different repo? | 02:50 |
|
| vrillusions: look down at sync in man git-submodule-sync possibly that would help? | 02:51 |
|
mugwump
| vrillusions: did you try 'git mv submodule/path new/submodule/path' ? | 02:51 |
|
| as a last resort, you can poke at the index directly using git update-index | 02:51 |
|
frogonwheels
| vrillusions: I think the sync thing might be the key | 02:51 |
|
vrillusions
| it is different. I want to use a different repo at the same path | 02:52 |
| → timj__ joined | 02:52 |
|
frogonwheels
| vrillusions: does the new repo have the old commits? | 02:52 |
| ← cedricv left | 02:52 |
|
vrillusions
| they do at some point, but the new one was branched and he added some more features that weren't in the original | 02:53 |
| → Aaaarg_ joined | 02:53 |
| ← Aaaarg left | 02:53 |
| Aaaarg_ → Aaaarg | 02:53 |
| ← prgmatic left | 02:54 |
|
frogonwheels
| vrillusions: as long as the current commit you're on exists there, it should work. | 02:54 |
|
| vrillusions: did you try git submodule sync ?? | 02:54 |
| → jmcantrell joined | 02:55 |
| ← timj_ left | 02:56 |
|
vrillusions
| I did, and it said it was syncronizing submodule url but it still fails submodule update | 02:56 |
| → benjo2 joined | 02:56 |
|
frogonwheels
| vrillusions: did you look at git submodule status and see if the SHA1 exists in that other repo? | 02:58 |
| ← schlortoo left | 02:58 |
|
vrillusions
| I haven't checked, I'm guessing it isn't | 02:58 |
|
| oh, it is | 02:59 |
|
frogonwheels
| try to check it out in the submodule directory? | 03:00 |
| ← toxygen left | 03:00 |
| → volk_ joined | 03:00 |
| → toxygen joined | 03:00 |
| → munichlinux joined | 03:00 |
| ← munichlinux left | 03:00 |
|
volk_
| if h made changes to a file, do I have to write "git add changed_files" every time before I do a commit? Or does a commit automagically determine which files have changed? | 03:01 |
| → rchavik joined | 03:02 |
|
frogonwheels
| volk_: I think git add -i or git commit -a is what you're after. | 03:02 |
| ← MattDiPasquale left | 03:02 |
|
frogonwheels
| volk_: git status should tell you what state it's in. (commit -a won't add new files though) | 03:02 |
|
| I like to use git gui to stage changes when it's complex so I can review (not that you can't with CLI interface) | 03:03 |
| → whalesalad joined | 03:06 |
|
volk_
| frogonwheels, what do you mean by "wont add new files" , new is meant by changes or brand new files? | 03:06 |
|
frogonwheels
| volk_: brand new. | 03:07 |
|
volk_
| ah | 03:07 |
|
vrillusions
| I ended up removing the path, removing lines from .gitignore and .git/config. Commit. Then re-add the submodule and commit again and it works | 03:07 |
| ← sagsousuke left | 03:08 |
| → cedricv joined | 03:09 |
| → jony joined | 03:10 |
| ← jony left | 03:11 |
| → pheaver joined | 03:12 |
| → d1b joined | 03:14 |
| → MattDiPasquale joined | 03:15 |
| → jvraoltc joined | 03:18 |
| ← volk_ left | 03:18 |
| ← benjo2 left | 03:21 |
| ← kpreid_ left | 03:22 |
| → kpreid__ joined | 03:22 |
| ← jvraoltc left | 03:22 |
| → hohoho joined | 03:25 |
| ← kpreid__ left | 03:25 |
| → kpreid_ joined | 03:26 |
| → bcardarella joined | 03:29 |
| ← ddunbar left | 03:30 |
| → ddunbar joined | 03:33 |
| ← kpreid_ left | 03:34 |
| ← urkud_ left | 03:34 |
| → Belna_ joined | 03:35 |
| ← whalesalad left | 03:36 |
| ← madewokherd left | 03:38 |
| ← toxygen left | 03:39 |
| → toxygen joined | 03:40 |
| ← gbacon left | 03:40 |
| → alisdair joined | 03:41 |
| → sh1mmer joined | 03:43 |
|
alisdair
| i'm trying to figure out the best way to create a new branch of a project with a truncated history (the full history has bits I can't release) while maintaining the full history privately. | 03:43 |
|
| any guidance? | 03:43 |
|
mugwump
| grafts | 03:43 |
|
| graft the private history onto the public one in your repo | 03:43 |
| ← ilteris_ left | 03:44 |
| ← DrNick left | 03:46 |
| → benjo2 joined | 03:46 |
| ← noyb left | 03:48 |
| → jasonn1234 joined | 03:48 |
| → hyperair joined | 03:49 |
| → codeshepherd joined | 03:50 |
| → eli joined | 03:50 |
| → lut4rp joined | 03:52 |
| → ilteris_ joined | 03:53 |
| ← ajpiano left | 03:54 |
| ← altrux left | 03:54 |
| → DrNick joined | 03:55 |
| ← emmanueloga left | 03:55 |
| ← merlin83 left | 03:56 |
| ← necromancer left | 03:56 |
| → Nickeeh joined | 03:59 |
| → alireza_ joined | 04:00 |
| → robinr joined | 04:01 |
| ← darwin left | 04:01 |
| ← Nickeeh left | 04:02 |
| ← ceej left | 04:03 |
| ← simplechat left | 04:03 |
| → jvraoltc joined | 04:05 |
| ← cedricv left | 04:06 |
| → Joeconyers joined | 04:11 |
| ← LeLutin_ left | 04:12 |
| ← Bass10 left | 04:12 |
| ← bcardarella left | 04:13 |
|
sitaram
| Rhonda: ping | 04:13 |
| → LeLutin joined | 04:14 |
| → Jonah joined | 04:16 |
| ← hohoho left | 04:17 |
| → merlin83 joined | 04:18 |
| ← merlin83 left | 04:18 |
| → merlin83 joined | 04:18 |
| ← jasonn1234 left | 04:22 |
| → cedricv joined | 04:23 |
| → CarlFK joined | 04:23 |
| → jasonn1234 joined | 04:24 |
| ← jasonn1234 left | 04:24 |
| ← alireza_ left | 04:25 |
| → cbreak joined | 04:26 |
| → ajpiano joined | 04:27 |
|
Leemp
| How do you tell git to stop tracking a file, without deleting it from the system? | 04:31 |
|
sitaram
| git rm --cached, and then add it to .gitignore or eqvt | 04:31 |
|
Leemp
| Ah, k | 04:32 |
|
| I must have misread that. Thanks | 04:32 |
| → lanthan__ joined | 04:33 |
| ← lanthan_ left | 04:36 |
| ← benjo2 left | 04:36 |
| ← Belna_ left | 04:40 |
| → gaveen joined | 04:42 |
| → ExtraSpice joined | 04:42 |
| ← meanburrito920 left | 04:43 |
| → mithro joined | 04:43 |
| ← JackWinter2 left | 04:46 |
| → fivetwentysix joined | 04:46 |
| → gnufied joined | 04:49 |
| ← nanotube left | 04:50 |
| → radioman-lt joined | 04:51 |
| ← Eaven left | 04:53 |
| ← gnufied left | 04:53 |
| → gnufied joined | 04:54 |
| → tedoc2000 joined | 04:57 |
| → jony joined | 04:57 |
| ← fivetwentysix left | 04:57 |
| → lhz joined | 04:57 |
| → segher joined | 05:00 |
| ← merlin83 left | 05:00 |
| ← Twisted_Mentat left | 05:02 |
| → slonopotamus joined | 05:02 |
| ← jonmasters left | 05:04 |
| ← tedoc2000 left | 05:05 |
| ← jmcantrell left | 05:05 |
| ← codeshepherd left | 05:06 |
| → fivetwentysix joined | 05:07 |
| → punkmexic joined | 05:09 |
| ← gnufied left | 05:09 |
| ← cloudhead left | 05:09 |
| ← segher left | 05:11 |
| ← sshc left | 05:13 |
| ← hasu left | 05:15 |
| ← luke-jr left | 05:16 |
| → luke-jr joined | 05:16 |
| → jonmasters joined | 05:18 |
|
Rhonda
| sitaram: contentless pong to contentless ping, but don't depend on me sticking around for long | 05:18 |
| → merlin83 joined | 05:20 |
| ← ilteris_ left | 05:20 |
| → aheinecke joined | 05:22 |
| ← magn3ts left | 05:22 |
| → psoo joined | 05:24 |
| ← punkmexic left | 05:25 |
| → radarek joined | 05:29 |
| → Nickeeh joined | 05:30 |
| → freimatz joined | 05:30 |
| ← radarek left | 05:30 |
| ← CarlFK left | 05:32 |
| ← psoo left | 05:33 |
| → carrus85 joined | 05:34 |
| → maxter joined | 05:38 |
|
sitaram
| Rhonda: no worries; ping me when you have some time. Wanted to ask if you managed to test with the current "pu" and if so I'll slap a "v1.5.1" on it and promote it to master | 05:38 |
| → opalka joined | 05:39 |
| ← Jonah left | 05:39 |
| → adiabatic joined | 05:40 |
| ← eli left | 05:40 |
| ← disappearedng left | 05:41 |
| ← stringoO left | 05:42 |
| → stringoO joined | 05:42 |
| ← stringoO left | 05:42 |
| → stringoO joined | 05:43 |
| → benjo2 joined | 05:43 |
| ← stringoO left | 05:43 |
| → segher joined | 05:43 |
| ← pheaver left | 05:44 |
| → disappearedng joined | 05:44 |
| ← lresende left | 05:46 |
| ← Yuffster left | 05:54 |
| ← hyperair left | 05:54 |
| → Yuffster joined | 05:54 |
| → Eaven joined | 05:56 |
| → roop joined | 05:57 |
| ← robinr left | 05:58 |
| ← Yuffster left | 05:58 |
| ← jrmuizel left | 05:58 |
| ← slonopotamus left | 06:00 |
| → cloudhead joined | 06:00 |
| ← LongBeach left | 06:00 |
| ← coppro left | 06:03 |
| ← jvraoltc left | 06:04 |
| → jrmuizel joined | 06:05 |
| → vu3rdd joined | 06:06 |
| → girishr joined | 06:07 |
| ← segher left | 06:07 |
|
freimatz
| hi | 06:10 |
| → hukl joined | 06:11 |
| → segher joined | 06:12 |
| → bennyw joined | 06:13 |
| → alireza_ joined | 06:13 |
| ← adiabatic left | 06:13 |
| → adiabatic joined | 06:14 |
| ← benjo2 left | 06:15 |
| bennyw → benjo2 | 06:15 |
| → yaotti joined | 06:15 |
| → HG` joined | 06:16 |
|
Ilari_antrcomp
| freimatz: Hi... | 06:17 |
| → sgh joined | 06:20 |
| → necromancer joined | 06:21 |
| ← jrmuizel left | 06:22 |
| → cbreak_work joined | 06:22 |
| ← fahadsadah left | 06:25 |
| → mtkd joined | 06:27 |
| → galderz joined | 06:28 |
| ← carrus85 left | 06:29 |
| ← project2501b left | 06:29 |
| → devanjan joined | 06:31 |
| ← maxter left | 06:32 |
| → fahadsadah joined | 06:33 |
| → CarlFK joined | 06:35 |
| ← Belna left | 06:36 |
| ← Nickeeh left | 06:36 |
| → codetroll joined | 06:36 |
| → thiago_home joined | 06:37 |
| ← kristian42 left | 06:37 |
|
Rhonda
| sitaram: Unfortunately I haven't got around to test it yet, sorry. :/ | 06:37 |
|
sitaram
| Rhonda: no problem; be sure to tell me when you do | 06:37 |
| → sshc joined | 06:37 |
| → carl- joined | 06:37 |
| → kristian42 joined | 06:38 |
| → hyperair joined | 06:38 |
| ← NET||abuse left | 06:40 |
| → Titosemi joined | 06:41 |
| → radarek joined | 06:42 |
| ← hyperair left | 06:42 |
| → olaf_ joined | 06:45 |
| → ph^ joined | 06:45 |
| → priidu joined | 06:46 |
| → Lgb joined | 06:48 |
| ← freimatz left | 06:50 |
| → chittoor joined | 06:51 |
| ← Theravadan left | 06:51 |
| → esc joined | 06:52 |
| → hyperair joined | 06:53 |
| ← gwoo left | 06:53 |
| ← Joeconyers left | 06:53 |
| → Joeconyers joined | 06:54 |
| → airborn joined | 06:55 |
| → Nickeeh joined | 07:01 |
| ← Eaven left | 07:03 |
| → raichoo joined | 07:04 |
| → LongBeach joined | 07:04 |
| → gwoo joined | 07:05 |
| → rseifert joined | 07:07 |
| ← ph^ left | 07:08 |
| → Titosemi_ joined | 07:10 |
| ← Titosemi left | 07:11 |
| Titosemi_ → Titosemi | 07:11 |
| → lanthan_ joined | 07:12 |
| → Dawgmatix joined | 07:12 |
| → freimatz joined | 07:12 |
| ← lanthan__ left | 07:13 |
| ← Digitalos left | 07:13 |
| ← loincloth left | 07:13 |
| ← brettgoulder left | 07:17 |
| → bushwakko joined | 07:19 |
| ← bushwakko left | 07:19 |
| → loincloth joined | 07:20 |
| → kar8nga joined | 07:21 |
| ← thiago_home left | 07:23 |
| → [Po]lentino joined | 07:24 |
| ← Nickeeh left | 07:25 |
| → Nickeeh joined | 07:25 |
| → nevyn^ joined | 07:25 |
| → trivol joined | 07:27 |
| → psoo joined | 07:27 |
| ← psoo left | 07:27 |
| → pantsman joined | 07:28 |
| ← Joeconyers left | 07:28 |
| → urkud_ joined | 07:29 |
| → ph^ joined | 07:29 |
| → macno joined | 07:30 |
| ← macno left | 07:33 |
| → thierryp joined | 07:35 |
| → d0ugal joined | 07:35 |
| ← doener left | 07:36 |
| → doener joined | 07:38 |
| → felixge joined | 07:39 |
| ← felixge left | 07:39 |
| → felixge joined | 07:39 |
| → lucsky joined | 07:40 |
| ← cedricv left | 07:41 |
| ← urkud_ left | 07:42 |
| → mastro joined | 07:42 |
| ← bandu left | 07:42 |
| → tobiassjosten joined | 07:44 |
| ← devanjan left | 07:45 |
| → DavidKlein joined | 07:46 |
| ← felixge left | 07:47 |
| → _iron joined | 07:47 |
| ← _iron left | 07:48 |
| → _iron joined | 07:48 |
| ← _iron left | 07:48 |
| → _iron joined | 07:48 |
| ← Adaptee left | 07:48 |
| ← Dawgmatix left | 07:49 |
| → Adaptee joined | 07:52 |
| ← rchavik left | 07:52 |
| ← cloudhead left | 07:52 |
| → AlexC_ joined | 07:52 |
|
AlexC_
| morning Earthlings | 07:52 |
|
| what is the best/correct way to merge in selected commits from a branch into my 'master' branch? | 07:53 |
| ← gaveen left | 07:53 |
|
AlexC_
| there are around 20-30 commits I need | 07:53 |
|
ciaranm
| AlexC_: cherry-pick | 07:53 |
|
AlexC_
| ciaranm: is it possilble to pick multiple with that, or will I have to do it 1 by 1? | 07:53 |
|
ciaranm
| AlexC_: last time i looked it wasn't | 07:54 |
| → drizzd joined | 07:54 |
|
ciaranm
| AlexC_: your other option is rebase | 07:54 |
|
AlexC_
| yeah I have tried: git rebase -i --onto master de7d8013456a476d1be647fca7c6dc72d5ec1e33 upstream-tcm-master however it apperas the merge ends up in the branch 'upstream-tcm-master' | 07:54 |
| ← hukl left | 07:54 |
| → thex00 joined | 07:55 |
| ← Lgb left | 07:55 |
|
wereHamster
| yes, that's what the command does. git rebase branch1 branch2; checks out branch2 before doing anything | 07:55 |
| → ntoll joined | 07:56 |
|
thex00
| Hi, I've been reading through the manual and have been working quite effectively with git. I stumbled upon http://www.kernel.org/pub/software/scm/git/docs/gitignore.html, I couldn't really find how to ignore everything except certain directories recursively. Any idea where I should look? | 07:56 |
|
wereHamster
| you may try to use upstream-tcm-master^{} to work on a detached head, and then attach the head wherever you want | 07:56 |
| ← freshtonic left | 07:56 |
| → dpino joined | 07:57 |
|
AlexC_
| wereHamster: I'm not sure how I would attach the head to where I want. I did try swapping 'master' and 'upstream-tcm-master' around, however that showed me a list of commits from 'master' to pick from | 07:57 |
|
wereHamster
| thex00: add '*' to .gitignore and then explicitly add the files you want to track | 07:57 |
|
| AlexC_: branch -f or checkout && reset --hard | 07:57 |
| → Lgb joined | 07:57 |
| → froschi joined | 07:57 |
|
AlexC_
| wereHamster: to attach head where I want? | 07:57 |
|
thex00
| wereHamster: and the directories ? | 07:57 |
|
wereHamster
| thex00: git only tracks files | 07:58 |
|
| AlexC_: yes | 07:58 |
|
| AlexC_: or use checkout + merge to merge the result into whatever you want | 07:58 |
| → cedricv joined | 07:58 |
|
thex00
| wereHamster: yes, but if I add *, everything gets ignored right? But the rule of not ignoring a directory in the gitignore? | 07:58 |
|
AlexC_
| wereHamster: ok, cool - I shall try this, many thanks | 07:58 |
|
wereHamster
| thex00: git doesn't track directories! | 07:59 |
|
thex00
| wereHamster: it does the files that are within it :S | 07:59 |
|
wereHamster
| then add the files that are in that directory | 07:59 |
| → Belna joined | 07:59 |
|
thex00
| wereHamster: There are a LOT of files inside those directories. | 08:00 |
|
wereHamster
| then add them all | 08:00 |
|
| you can use wildcards, you know? | 08:00 |
|
thex00
| wereHamster: ehm, no, I do not. I discovered gitignore 'yesterday'. | 08:00 |
|
wereHamster
| your shell also supports wildcards, in case you didn't know that | 08:00 |
| ← NetHawk left | 08:01 |
|
thex00
| wereHamster: yes, yet the manual states that the usage of the .gitignore file is to prevent to render the git add . useless. | 08:01 |
|
wereHamster
| and git does as well (and many git commands work recursively, for example 'git add dir/' will add all the files in dir/ recursively) | 08:01 |
|
thex00
| wereHamster: ah. | 08:01 |
|
AlexC_
| wereHamster: what does upstream-tcm-master^{} actually do, btw? | 08:01 |
|
wereHamster
| AlexC_: it detaches the head at that commit | 08:01 |
| → Swistaczek joined | 08:02 |
| → NET||abuse joined | 08:02 |
| → fiatpandas joined | 08:02 |
|
AlexC_
| ok, and from what branch am I merging from once I have finished this rebase? You said checkout + merge, I guess I checkout master, and then merge from .... ? | 08:02 |
| ← benjo2 left | 08:02 |
|
thex00
| wereHamster: well, I saw this example, and wonder how it would work with a directory inside .gitignore: # except foo.html which is maintained by hand | 08:03 |
|
| !foo.html | 08:03 |
| → sondoar joined | 08:04 |
| → gaveen joined | 08:05 |
| → tedoc2000 joined | 08:05 |
|
thex00
| wereHamster: or am I reading it wrong, and should I add a gitignore to each directory that must be ignored? | 08:05 |
|
adiabatic
| thex00: no | 08:05 |
|
thex00
| :S | 08:06 |
|
| I am confused now. | 08:06 |
|
wereHamster
| thex00: gitignore also works recursively. man gitignore | 08:06 |
|
Gitbot
| thex00: the gitignore manpage can be found at http://git.or.cz/man/gitignore | 08:06 |
| → felixge joined | 08:06 |
| ← felixge left | 08:06 |
| → felixge joined | 08:06 |
|
thex00
| wereHamster: I am asking the question because I was already at the manual. | 08:07 |
|
| wereHamster: thank you for pointing it out though. | 08:07 |
|
wereHamster
| it's simple. If you want to ignore a file, you add it to .gitignore (read the rules in the man page to see how the entries are parsed). Files already tracked by git are not affected by the gitignore mechanism | 08:09 |
|
| the entries in .gitignore apply recursively to the directory the .gitignore file is in | 08:09 |
|
thex00
| I do get it. I get that the exception is !, I just want to add a directory with a wild card. | 08:09 |
|
wereHamster
| 'directory with a wildcard'? | 08:10 |
|
thex00
| I want to know if that is the right way. | 08:10 |
|
| Yes, let me examplify | 08:10 |
|
| * | 08:10 |
|
| mydir/* | 08:10 |
|
| !mydir2/* | 08:10 |
|
| sorry, the first mydir was a mistake. | 08:10 |
|
| so | 08:10 |
|
| * | 08:11 |
|
| !mydir/* | 08:11 |
|
| i would read that as: | 08:11 |
|
| 1. ignore everything | 08:11 |
|
| 2. except all the files in that directory. | 08:11 |
|
wereHamster
| add '*' to .gitignore and then explicitly add mydir/ | 08:11 |
|
| no need for the second line | 08:11 |
|
thex00
| wereHamster: why do I have to do that "explicitly" ? Can't I do this in the gitignore? | 08:12 |
|
wereHamster
| you can try, but I'm not sure if that will work. | 08:12 |
|
thex00
| wereHamster: so, that means a no. | 08:13 |
|
| wereHamster: thank you, thats all I wanted to know. | 08:13 |
|
wereHamster
| that means "I don't know" | 08:13 |
|
AlexC_
| wereHamster: sorry to poke you again, however once the rebase is done and I do 'git checkout master' you said to then 'git merge'. From what am I merging? | 08:14 |
| → ppawel joined | 08:14 |
|
wereHamster
| the rebased commits (HEAD@{1}) | 08:15 |
|
AlexC_
| ah so just 'git merge HEAD@{1}'? I just wasn't sure how to reference those commits/branch | 08:15 |
|
wereHamster
| yes | 08:15 |
|
AlexC_
| excellent, many thanks :) | 08:16 |
| → radarek_ joined | 08:16 |
| ← gaveen left | 08:16 |
| ← froschi left | 08:18 |
| ← girishr left | 08:18 |
| ← radarek left | 08:18 |
| → radarek joined | 08:18 |
| ← krawek left | 08:19 |
| ← Belna left | 08:19 |
| ← radarek_ left | 08:21 |
| ← hyperair left | 08:21 |
| ← pantsman left | 08:22 |
| → froschi joined | 08:23 |
| ← fiatpandas left | 08:23 |
| → aspotashev|eeepc joined | 08:28 |
| → giskard joined | 08:28 |
| → tatsuya joined | 08:32 |
| ← freimatz left | 08:33 |
| → maxter joined | 08:33 |
| ← adiabatic left | 08:35 |
| ← loincloth left | 08:37 |
| → loincloth joined | 08:38 |
| ← Nickeeh left | 08:38 |
| → devanjan joined | 08:38 |
| ← aspotashev|eeepc left | 08:39 |
| → forvan joined | 08:39 |
| ← tedoc2000 left | 08:40 |
| → Swistaczek_ joined | 08:41 |
| → tedoc2000 joined | 08:41 |
| ← tedoc2000 left | 08:41 |
| ← Swistaczek left | 08:43 |
| Swistaczek_ → Swistaczek | 08:43 |
| ← olaf_ left | 08:45 |
| → hasu joined | 08:48 |
| → girishr joined | 08:50 |
| ← alisdair left | 08:55 |
| → dajero joined | 08:58 |
| ← necromancer left | 08:58 |
| → alisdair joined | 08:58 |
| ← Mage left | 08:59 |
| → struberg joined | 08:59 |
| ← kar8nga left | 09:03 |
| ← yaotti left | 09:04 |
| ← froschi left | 09:05 |
| ← felixge left | 09:07 |
| → engla joined | 09:09 |
| ← engla left | 09:09 |
| → engla joined | 09:09 |
| → m0 joined | 09:09 |
| ← giskard left | 09:10 |
| → cilly joined | 09:11 |
| → hukl joined | 09:13 |
| → giskard joined | 09:16 |
| ← ppawel left | 09:18 |
| ← jony left | 09:19 |
|
AlexC_
| wereHamster: just finished the rebase + merge, everything went perfectly, many thanks for helping with that | 09:19 |
| → SunilThaha joined | 09:20 |
| → artagnon joined | 09:20 |
| ← artagnon left | 09:21 |
|
bman
| git is the best thing ever | 09:22 |
|
| btw | 09:22 |
|
| fyi | 09:22 |
| → freimatz joined | 09:22 |
| → mattih joined | 09:23 |
| dwmw2_gone → dwmw2 | 09:25 |
| → dj_tjerk joined | 09:25 |
| → mbroeker joined | 09:28 |
| → jbirdman joined | 09:30 |
| ← jbirdman left | 09:30 |
| → congerro joined | 09:31 |
| ← GarethAdams|Work left | 09:33 |
|
congerro
| hi, i am working on a project at the university (different computer) and i also want to work on it at home. for noe im always copying .git/ between the two computer and then checking out | 09:34 |
| ← Heimidal left | 09:34 |
|
congerro
| but if i do a git checkout master, it doesnt overwrite the files | 09:34 |
|
AlexC_
| congerro: would it not be easier to setup a remote repo that you can access? | 09:34 |
|
congerro
| i have to git checkout <commit number> | 09:34 |
|
AlexC_
| or even a free service like GitHub, if you're allowed to make it publically available | 09:35 |
| → Heimidal joined | 09:35 |
|
congerro
| AlexC_: pulically available is impossible, and i have no ssh-acces to a computer which can be accesssed at home and at work | 09:36 |
|
wereHamster
| congerro: then use an usb stick | 09:36 |
|
| make a bare repo on the stick, and push/fetch to it | 09:37 |
| → jony joined | 09:38 |
|
congerro
| thx, i ll try that. | 09:38 |
| → sh1m joined | 09:39 |
|
congerro
| but if i forget my usb-stick at home it ll be a pain :( | 09:40 |
|
AlexC_
| don't forget it :P | 09:40 |
|
congerro
| why doesn t "git checkout master" overwrite old files? | 09:40 |
| ← Swistaczek left | 09:41 |
| ← sh1mmer left | 09:41 |
| sh1m → sh1mmer | 09:41 |
|
wereHamster
| congerro: git status | 09:41 |
| ← fivetwentysix left | 09:42 |
|
congerro
| i already checked out the last commit | 09:42 |
|
| why does git status now say "Not currently on any branch." | 09:42 |
|
wereHamster
| because you checked out a commit | 09:43 |
|
| congerro: faq detached | 09:43 |
|
Gitbot
| congerro: You are on a detached HEAD and might lose commits.. See https://git.wiki.kernel.org/index.php/GitFaq#detached | 09:43 |
| ← lanthan_ left | 09:43 |
| ← AlexC_ left | 09:44 |
|
congerro
| thx | 09:44 |
|
rane_
| you can't *lose* commits ever, or can you? | 09:44 |
| → Paraselene_ joined | 09:45 |
|
wereHamster
| not immediately | 09:45 |
|
| but eventually you can | 09:45 |
| ← mattih left | 09:45 |
|
rane_
| probably | 09:46 |
| → Nickeeh joined | 09:46 |
|
rane_
| but in this case you could cherry-pick the commits you made while detached, I think | 09:46 |
| ← freimatz left | 09:46 |
|
congerro
| ups, i did nearly all my commits on a detached head >,< | 09:47 |
| → benjo2 joined | 09:47 |
|
wereHamster
| the problem is if the person doesn't know that he/she is on detached head, then switches away to another branch and forgets about the commits made on detached head | 09:47 |
| → gaveen joined | 09:47 |
|
wereHamster
| then after 30/60 days the commits will be gone | 09:47 |
| → froschi joined | 09:48 |
| → hugli joined | 09:50 |
| → intripoon joined | 09:51 |
| → jensn joined | 09:52 |
| → Yuuhi joined | 09:52 |
| ← giskard left | 09:52 |
| → xiong joined | 09:52 |
| → giskard_ joined | 09:52 |
| ← curtana left | 09:53 |
| → mattih joined | 09:54 |
| → curtana joined | 09:55 |
| ← Nickeeh left | 09:55 |
|
hugli
| How should I add feature to git? In my case it's "git-issues", I've found it on github I just don't know how to make it work. I've read the READMEs and searched git documentation, but the answer is hiding from me. Thanks for help | 09:58 |
|
engla
| hugli: install git-issues, use it as "git issues". Is that it? | 09:59 |
| → aziz joined | 09:59 |
|
engla
| wereHamster: if you don't notice in 30 days, then, was the change useful at all? | 09:59 |
| → tty1 joined | 09:59 |
|
tty1
| i think im doing something wrong here.. i just did a fresh clone on a repo, and of course im in master (where i want to be)... but i want to be able to edit it and commit it so i need to track it.. i know how to track branches but how do i track the master? | 10:00 |
| ← aziz left | 10:00 |
|
hugli
| engla: Yes that's it. I dont know how to "install" it | 10:02 |
| → Nickeeh joined | 10:02 |
| ← alisdair left | 10:04 |
| ← mbroeker left | 10:04 |
|
tty1
| anyone? | 10:04 |
| → mbroeker joined | 10:05 |
| ← alireza_ left | 10:05 |
|
thiago
| tty1: you're already tracking it | 10:06 |
| → snappy joined | 10:07 |
|
tty1
| thiago: thats what i thought, but i get an error when i try to edit, commit, and push | 10:07 |
|
thiago
| tty1: what error do you get when you try to edit? | 10:07 |
|
| which editor did you use? | 10:07 |
|
tty1
| this something about fast-forward, want me to past it for ya? | 10:08 |
| → aziz joined | 10:08 |
|
tty1
| thiago: i didnt use an editor i used the -m option | 10:08 |
|
engla
| hugli: they don't include install instructions, shame on them. I guess you take the program git-issues and copy it into a directory inside your $PATH and that's it. hope for the best. | 10:08 |
|
thiago
| git can't be used to edit files | 10:08 |
|
| you edit files with any editor | 10:08 |
|
tty1
| thiago: ohh the files themselves, they were edited with a program called umlet, why? | 10:09 |
|
| thiago: http://pastebin.com/VDCemFaw thats the error | 10:09 |
|
thiago
| tty1: did you have an error editing the files? | 10:09 |
|
tty1
| no, why what does the not-fast-forward error mean? | 10:09 |
|
thiago
| it means you're trying to push a commit that is not a fast-forward from where the remote currently is at | 10:10 |
|
snappy
| Could use some assistance here. I git rm'd a bunch of files but haven't committed the changes. How do I rollback/revert? git revert seems to only apply for previously committed changes. | 10:10 |
|
thiago
| fast-forward means going the normal way: forward | 10:10 |
|
tty1
| thiago: how can it not be fast-forward? | 10:10 |
|
thiago
| in other words, you're trying to go back in history and remove one or more commits | 10:10 |
|
tty1
| ohh | 10:10 |
|
thiago
| more than likely, someone has pushed a new commit to upstream between your cloning and your pushing | 10:10 |
|
tty1
| thiago: could that be that i just need to pull first? | 10:10 |
|
| yea that is likely it | 10:10 |
|
| ill pull | 10:10 |
| → gebi joined | 10:11 |
|
tty1
| ahh pulling then pushing worked | 10:11 |
|
| thanks | 10:11 |
|
bman
| push it gud | 10:12 |
| ← ph^ left | 10:13 |
| → NetHawk joined | 10:13 |
| ← justin-george left | 10:15 |
| → kar8nga joined | 10:15 |
| → j0rd joined | 10:16 |
|
j0rd
| what's a good web front end that i can host myself and is open source. Willing to pay under $100 if it's better than anything available that's free. | 10:17 |
| [Po]lentino → [Po]lentino|away | 10:17 |
|
FauxFaux
| gitweb | 10:17 |
|
j0rd
| FauxFaux: ill take a look. any other suggestions? | 10:17 |
| ← Nickeeh left | 10:18 |
| ← hugli left | 10:18 |
|
engla
| j0rd: cgit | 10:19 |
| → Nickeeh joined | 10:19 |
|
j0rd
| anything that's pretty and provides good "client facing" options | 10:20 |
|
engla
| gnome & freedesktop use cgit. kernel uses gitweb | 10:20 |
|
j0rd
| i like the idea of integrated bug tracker and stuff | 10:20 |
|
bman
| j0rd, i like indefero | 10:20 |
|
FauxFaux
| trac must do git by now. | 10:20 |
|
j0rd
| trac was what i have in mind, but not sure if that supports git | 10:20 |
|
| i'm sure it would | 10:20 |
|
bman
| trac does support git | 10:20 |
|
| i saw mention of a addon | 10:20 |
|
j0rd
| thanks for all the suggestions by the way. i'm looking this stuff up | 10:21 |
|
bman
| ko | 10:21 |
|
j0rd
| i wish github wasn't so expensive for hosted =( | 10:21 |
|
_ikke_
| redmine is also good | 10:21 |
|
| but you'd have to use redmine in stead of python | 10:21 |
|
bman
| i wish github was opensource | 10:22 |
|
j0rd
| well. right now my server only have PHP...so I might have to install something else anyways | 10:22 |
| → ppawel joined | 10:22 |
|
bman
| redmine looked really nice but i had fits with it and debian | 10:22 |
|
engla
| j0rd: the mentioned frontends are pretty basic, you probably saw that. but cgit does it's task very well | 10:22 |
|
bman
| j0rd, indefero is php | 10:22 |
|
| looks like google code | 10:22 |
| → ribasushi joined | 10:23 |
| ← ribasushi left | 10:23 |
| → pheaver joined | 10:25 |
| ← robinbowes left | 10:25 |
| → jtauber joined | 10:27 |
|
j0rd
| github is saying it doesn't have storage limits. each of my web projects is around 350mb+ . I've got couple gigs easy to store. Anyone know when they cut you off? | 10:31 |
|
rane_
| try #github | 10:32 |
|
koollman
| 'web' projects of 350MB ? what do you put in there ? :) | 10:32 |
| → ilteris_ joined | 10:32 |
|
j0rd
| koollman: drupal contrib modules | 10:32 |
|
| koollman: i like to keep a steady base of them in my projects, even if I don't use them | 10:32 |
|
rane_
| sounds awkward | 10:33 |
| → elyob joined | 10:33 |
|
koollman
| it probably is. you could at least separate them from your projects and reference them in a different way. | 10:33 |
|
| having one of your project being 'the drupal contrib modules', perhaps | 10:34 |
|
| and the others being way smaller | 10:34 |
|
j0rd
| ya, i did that in svn with svn:externals | 10:34 |
|
steven_t
| its a little unsettling that why_ could be anyone in any channel, and none of us would know it was him | 10:34 |
|
j0rd
| ubercart module is 18M, Location module is 27M, jquery_ui is 27M, ckeditor is 21M. i use all those in all projects i work on. | 10:35 |
|
| other ones are smaller, with everything it adds up | 10:36 |
|
| all my clients are different, so they all require their own trees incase i need specific patches... stuff like that | 10:36 |
| → robinbowes joined | 10:36 |
| → LXS joined | 10:37 |
| ← felipec left | 10:38 |
|
j0rd
| bman: you used indefero? any experiences i should know about. seems 1/2 decent and looks decent | 10:38 |
|
bman
| dont use git-daemon-run no matter what you choose | 10:39 |
|
| aside from that no | 10:40 |
|
| indefero was the easy part | 10:40 |
|
j0rd
| i've been using gitosis, i would assume that would work with indefero | 10:40 |
|
bman
| dont need gitosis | 10:40 |
|
j0rd
| i'm still fairly new to git, but im swtching over fully during this server migration | 10:40 |
|
bman
| im doing the same | 10:40 |
|
| im new as well | 10:40 |
|
j0rd
| gotcha | 10:40 |
|
bman
| you can do all the things you want in the management of indefero | 10:41 |
|
| and it seems easy to build from | 10:41 |
|
j0rd
| i wanna use gitosis so i can allow git accounts with out user accounts and seperate privs | 10:41 |
| ← engla left | 10:41 |
|
j0rd
| alright, not usually a big fan of guis, but i'll install and take a gander | 10:41 |
| → Philwelch joined | 10:42 |
|
j0rd
| bman: it seems to have nginx support as well, which is good because i use that | 10:43 |
|
| :) | 10:43 |
| → ph^ joined | 10:45 |
| → parasti joined | 10:48 |
| → Digitalos joined | 10:49 |
| → Titosemi_ joined | 10:49 |
| ← xiong left | 10:50 |
| ← Titosemi left | 10:50 |
| Titosemi_ → Titosemi | 10:50 |
|
wereHamster
| snappy: was your question answered? | 10:51 |
|
thex00
| Is there an 'override' parameter available to clone a repository into a directory? `git clone git@myhost:myproject.git mydir` is what I am using, but if the directory exists, there is a problem. | 10:53 |
|
wereHamster
| thex00: cd mydir; git remote add newremote git@myhost:myproject.git | 10:54 |
|
| (assuming mydir is an existing git repository) | 10:54 |
| → brothers joined | 10:57 |
|
thex00
| wereHamster: no, mydir is not an existing repository. | 10:58 |
|
wereHamster
| then run git init just after cd mydir; | 10:58 |
| ← curtana left | 10:58 |
|
thex00
| wereHamster: I still get destination directory 'Site' already exists. | 10:59 |
| → harinath joined | 10:59 |
|
wereHamster
| when running what command? | 11:00 |
|
thex00
| wereHamster: I cd'ed to the dir, did an git init. It initialized an empty repository. Then I went a .. up and did a `git clone git@myhost:myproject.git Site` | 11:01 |
|
wereHamster
| did I ever say you should run git clone? | 11:01 |
|
thex00
| wereHamster: ehm, I assume my repository does not magically appear. | 11:01 |
| [Po]lentino|away → [Po]lentino | 11:01 |
|
wereHamster
| cd mydir; git init; git remote add origin git@myhost:myproject.git; git remote update; | 11:02 |
| ← MattDiPasquale left | 11:03 |
|
wereHamster
| if the directory mydir already contains files (which I assume it does, since otherwise you'd simply run rmdir mydir; git clone ..), you have the choice of creating an initial import into git and then merge with the remote branch, or doing reset --hard, or whatever else you want | 11:03 |
|
thex00
| I get usage string after. | 11:03 |
|
wereHamster
| after what? | 11:04 |
|
thex00
| remote add | 11:04 |
|
| oh, wait. | 11:04 |
|
| I missed origin | 11:05 |
| ← mattih left | 11:06 |
| → gbacon joined | 11:06 |
| ← NET||abuse left | 11:06 |
| → hal joined | 11:08 |
| ← loincloth left | 11:09 |
| → loincloth joined | 11:10 |
|
hal
| I have a github repo that I am using with a friend. We been working on the master branch so far, but he has now created a new branch on github with lots of changes | 11:10 |
| → mcdebugger joined | 11:10 |
|
hal
| I have also got lots of changes | 11:10 |
|
| how do I pull his remote branch without disturbing my own local version of the master? | 11:10 |
|
| also, I don't want to go through the merge process just yet | 11:10 |
|
| so really if it is possible, I just want to have the remote branch as a new local branch and use it independently, until one of us is ready to merge it | 11:11 |
|
| if I checkout -b newbranch locally, then it creates a branch of my local copy, meaning that if I pull changes from the new remote branch then I have to merge | 11:12 |
|
| what is the best way to go about this, please? | 11:12 |
|
thex00
| wereHamster: so, instead of git pull, i should do remote update to keep the target dir up to date? | 11:12 |
|
| wereHamster: sorry for being a nubster :) | 11:12 |
| → curtana joined | 11:13 |
|
wereHamster
| thex00: no, remote update only updates the remote tracking branches, it won't touch your working tree | 11:14 |
|
snappy
| wereHamster: it's all good, I created a new branch from an old version | 11:14 |
|
wereHamster
| snappy: btw, the answer to your question would be: git checkout HEAD -- <file> | 11:15 |
|
thex00
| wereHamster: so, what you say is I should use pull? Because that gives me another output message. | 11:15 |
|
wereHamster
| thex00: Well, I guess what I'm saying is: go read the git tutorial or the progit book | 11:15 |
| → darwin joined | 11:15 |
|
thex00
| wereHamster: I thank you for your help. | 11:16 |
| → aspotashev|eeepc joined | 11:17 |
| ← jensn left | 11:17 |
| Digitalos → Digitalos_AFK | 11:18 |
| → ao2 joined | 11:20 |
| → olaf_ joined | 11:20 |
| ← aspotashev|eeepc left | 11:21 |
| → urkud_ joined | 11:24 |
| ← LongBeach left | 11:25 |
| → consolers joined | 11:25 |
| ← devanjan left | 11:26 |
|
consolers
| i wonder if the erstwhile git maintenaer was a fan of wdired in emacs | 11:27 |
| ← frakturfreak left | 11:29 |
| ← urkud_ left | 11:29 |
| → _VVSiz_ joined | 11:30 |
| → [Po]lentino_ joined | 11:30 |
|
hal
| can anyone help me with my question, please? | 11:31 |
| ← kar8nga left | 11:31 |
| ← [Po]lentino left | 11:31 |
|
wereHamster
| hal: git stash; git pull ...; git stash pop | 11:32 |
|
| er, git stash; git checkout -t hisremote/hisbranch; | 11:33 |
|
hal
| wereHamster: do I really need to stash? I have committed all my local changes to my local (master) repo | 11:33 |
|
wereHamster
| then simply checkout his branch ..? | 11:33 |
| ← h0st1le left | 11:33 |
|
hal
| wereHamster: I am sorry, I must be missing something - how do I checkout a remote branch? My local repo doesn't know anything about it yet | 11:34 |
| ← VVSiz_ left | 11:34 |
| ← EricInBNE left | 11:35 |
|
wereHamster
| git remote add yourfriend <url of your friend's repo>; git fetch yourfriend; git checkout -t yourfriend/<the branch you are interested in> | 11:35 |
|
hal
| wereHamster: maybe I am not explaining it properly. My friend's branch is in the remote repo of my origin | 11:36 |
|
wereHamster
| and what's the name of that branch? | 11:36 |
|
hal
| I don't know how to make my local repo aware of it | 11:36 |
| → jensn joined | 11:36 |
|
hal
| let's just call it branchname1 | 11:37 |
|
wereHamster
| git fetch origin; git checkout -t origin/branchname1 | 11:37 |
|
hal
| so on the remote there is master and branchname1 | 11:37 |
| ← jensn left | 11:37 |
|
wereHamster
| or, if you have git >1.7: git fetch origin; git checkout branchname1; | 11:38 |
|
hal
| wereHamster: another thing - I don't want to pull changes from the remote master to my local master yet | 11:38 |
| Digitalos_AFK → Digitalos | 11:39 |
| → domcat joined | 11:39 |
|
thex00
| would git add files even if they aren't changed | 11:39 |
| ← ivan left | 11:40 |
| → ivan joined | 11:40 |
|
_ikke_
| thex00: no | 11:40 |
| → Yardie joined | 11:43 |
| → Bass10 joined | 11:43 |
| → brettgoulder joined | 11:46 |
| ← tty1 left | 11:46 |
|
jefferai
| sitaram: Hey, got another question for you from our testing | 11:46 |
|
sitaram
| sure | 11:47 |
|
jefferai
| We've tried out gitorious and one thing we like is that if you deny force pushes on the repo, it also denies making tags and new branches | 11:47 |
|
sitaram
| but I have a meeting to go to in about a minute so... :( | 11:47 |
|
hal
| thanks wereHamster - checkout -b newbranch origin/branchname1 did it :) | 11:47 |
|
sitaram
| ok | 11:47 |
|
jefferai
| in general we will probably want to disallow new branches to be created other than by a project admin | 11:47 |
|
| is this possible? | 11:47 |
| → eto joined | 11:47 |
|
jefferai
| sitaram: no rush, answer when you get back if you need :-) | 11:47 |
|
eto
| hello si there a way to check out only latest status of svn repo? | 11:48 |
|
spb
| svn checkout | 11:48 |
|
jefferai
| eto: you're in the wrong channel... | 11:48 |
|
eto
| it seems to me like git-svn tries to recreate whole history of the project | 11:48 |
|
jefferai
| ah | 11:48 |
|
eto
| ah i don't have svn | 11:48 |
|
sitaram
| jefferai: it ought to be possible using regexes, but that would mean you have to list out all valid branches. if you need something more flexible (ie, literally what you said) I'll have to code it. Let me get back to you... | 11:49 |
|
| later... | 11:49 |
|
jefferai
| sitaram: sure, thanks | 11:49 |
|
eto
| it dowloaded thousant of file but i stil see only .git dir | 11:49 |
|
| maybe i should stop that and install svn? | 11:49 |
|
charon
| eto: if you only want the latest snapshot you should really be using svn. however you can replace git svn clone <args> with git svn init <args> && git svn fetch -r <revision range> | 11:50 |
| ← ntoll left | 11:50 |
|
eto
| charon well i want to avoid having n repo clients installed what do you think is best? | 11:51 |
|
| go separate tool for each repo type, or just import everyhting to git? | 11:51 |
|
charon
| eto: i personally import everything into git because it's the tool i know. but if you only go for the last snapshot, you've already lost most of the reason to use *any* VCS in the first place. | 11:52 |
|
eto
| i am learning to use git for my projects and so far i like it, but some parts i import from svn | 11:53 |
|
wereHamster
| eto: strange that you have the svn perl bindings but not svn... | 11:54 |
| → masterkorp joined | 11:54 |
|
eto
| wereHamster I am on windows and I installed tortoiseGit + msysgit, maybe there is svn integrated in tortoise package? | 11:55 |
| → munichlinux joined | 11:55 |
| ← posciak left | 11:56 |
| dwmw2 → dwmw2_gone | 11:57 |
| ← mcdebugger left | 11:57 |
|
thex00
| so, even if the file is changed by creation date, and its content is the same, git would ignore the file? | 11:57 |
|
eto
| C:\Progqs>dir /s /b svn* | 11:57 |
|
| C:\Progqs\Git\lib\perl5\site_perl\5.8.8\msys\SVN | 11:57 |
|
| C:\Progqs\Git\lib\perl5\site_perl\5.8.8\msys\auto\SVN | 11:57 |
|
wereHamster
| thex00: because git tracks content, and the content didn't change, git sees the file as unchanged | 11:58 |
|
thex00
| wereHamster: are you sure about that? | 11:58 |
|
eto
| seems like "some" parts of perl are integrated into msysgit but i don't see there svn runtime | 11:58 |
|
wereHamster
| thex00: sure about what? | 11:58 |
| ← roop left | 11:58 |
| → roop_ joined | 11:59 |
|
thex00
| wereHamster: about that git looks at the content of the file and not other file characteristics? | 11:59 |
| ← girishr left | 11:59 |
|
charon
| thex00: which git version? some versions didn't refresh the index if you ran 'git status' | 11:59 |
|
| thex00: if in doubt, 'git update-index --refresh' and then run 'git status' again | 11:59 |
|
thex00
| 1.6.4.2 | 11:59 |
|
wereHamster
| thex00: git only cares aobut file contents, the filename and the executable bit | 11:59 |
|
eto
| C:\Progqs\Git\lib\perl5\site_perl\5.8.8\msys\ | 12:00 |
|
thex00
| wereHamster: so file permissions are ignored by git as well? | 12:00 |
|
eto
| oh sorry | 12:00 |
|
thex00
| charon: thanks. | 12:00 |
|
wereHamster
| apart of the executable bit, yes | 12:00 |
| ← mithro left | 12:00 |
|
thex00
| okay, thanks. | 12:00 |
|
charon
| i thought 1.6.4 was fine, but i'd have to check | 12:00 |
| → posciak joined | 12:01 |
|
eto
| http://pastebin.org/297565 | 12:01 |
| ← Lgb left | 12:02 |
|
eto
| is git svn-importer implemented totally in perl? because i don't see the runtime there | 12:02 |
|
FauxFaux
| [repost] I have a situation like http://pastie.org/986074 where repo B has been made by copying the contents of repo A and `init'ing it (think git-svn). How can I lie to git and tell it that the parent of the first non-init commit in B ("More noise in B") is the copied revision ("Revision two in A")? | 12:02 |
|
eto
| nevermind ,guess I will need to download yet another package | 12:03 |
|
wereHamster
| FauxFaux: fetch all commits from repo A to B, then set up grafts and run filter-branch | 12:03 |
| → khaije|selen joined | 12:05 |
|
FauxFaux
| wereHamster: Mmm, I hadn't looked at grafts. I'll go read-up. | 12:05 |
| → Lgb joined | 12:05 |
|
FauxFaux
| Oh heh at the description. | 12:05 |
|
khaije|selen
| What's the quickest/most straight-forward way to co a remote branch into a local branch | 12:06 |
|
wereHamster
| khaije|selen: install git >=1.7, the git checkout <branch> | 12:06 |
|
khaije|selen
| We | 12:06 |
|
| Err sorry, so I may have messed that up from screwing around with stuff | 12:07 |
|
| I created some local branches w/ the same names as remote branches, when I actually want the remote branches. | 12:08 |
|
parasti
| eto: git svn works out of the box with msysgit, what are you trying to do? | 12:08 |
| ← SunilThaha left | 12:08 |
|
khaije|selen
| Would I just need to start over? | 12:08 |
|
wereHamster
| then checkout the local branch and then reset --hard <remotebranch> | 12:08 |
| → marc_madeira joined | 12:09 |
|
khaije|selen
| ahhh! Very interesting... cheers wereHamster | 12:09 |
| ← khaije|selen left | 12:10 |
|
eto
| parasti I just want fetch latest tree from a certain branch, now I am waiting like hour and and git svn seems to recreating whole history. I admit that foolishly used torotisegit's gui. I jsut want katest rev od that branch, but i don't know it's number | 12:11 |
|
parasti
| git svn clone -r HEAD $URL | 12:12 |
| ← gbacon left | 12:13 |
|
FauxFaux
| I'm still unsure how git svn can take so long to do an initial clone. It doesn't complete in 5 days over file:// on our ~30k rev repo. | 12:13 |
| ← jonmasters left | 12:13 |
|
eto
| parasti thank you! | 12:13 |
|
wereHamster
| FauxFaux: if it's an one-time conversion, there are better tools for that than git-svn | 12:14 |
|
FauxFaux
| Unfortunately not. | 12:14 |
|
| FauxFaux goes to run svn2git just to see. | 12:15 |
| → Weaselweb joined | 12:16 |
| → paja joined | 12:16 |
|
ao2
| hi, I also have a question about git-svn and tags importing, the svn repo I am working on has an unusual layout: trunk/src/project1 and tags/project1-0.1.0 and I can't seem to make git-svn to import tags | 12:16 |
|
eto
| FauxFaux I am in remote location, usind radio link -> flarion, it is able pull here around 22 KBs | 12:16 |
|
FauxFaux
| Heh. Not so great. | 12:17 |
|
ao2
| I tried: git svn clone http://svn.example.com/trunk/src/project1 --trunk=/ --tags=../../../tags | 12:18 |
|
| but it disn't work | 12:18 |
| → dkastner joined | 12:18 |
|
Weaselweb
| if sendemail.to is unset "git send-email HEAD~..HEAD --annotate" asks me the recipient (to) and the reply-id (in-reply-to), but if sendemail.to is set it doesn't ask me neither (not asking to is expected though) | 12:18 |
|
| is this a bug? | 12:18 |
|
| git version 1.6.4.4 | 12:18 |
| ← marc_madeira left | 12:21 |
|
eto
| thank you once more parasti "checkout" was sucessfull | 12:22 |
| → kar8nga joined | 12:23 |
| ← hobodave left | 12:27 |
| → smuf joined | 12:32 |
| ← elyob left | 12:32 |
| → necromancer joined | 12:33 |
|
masterkorp
| hello | 12:33 |
| ← brothers left | 12:33 |
|
masterkorp
| how do i remove an origin ? | 12:34 |
|
_ikke_
| you mean a remote? | 12:34 |
|
masterkorp
| yes | 12:34 |
|
_ikke_
| git remote rm <name> | 12:34 |
|
| man git-remote | 12:34 |
|
Gitbot
| _ikke_: the git-remote manpage can be found at http://git.or.cz/man/git-remote | 12:34 |
|
masterkorp
| how do i list the names? | 12:34 |
| → nanotube joined | 12:34 |
|
_ikke_
| just git remote | 12:35 |
| → icwiener joined | 12:35 |
|
masterkorp
| thanks | 12:35 |
| → petrux joined | 12:35 |
|
masterkorp
| i am with a problem uploading file | 12:36 |
|
| http://pastebin.com/SKHzyJNn | 12:37 |
|
_ikke_
| you have to specify the branch you want to push | 12:37 |
| → ramusara joined | 12:38 |
|
masterkorp
| i sprecified master | 12:39 |
|
| and then | 12:39 |
|
| fatal: 'master' does not appear to be a git repository | 12:39 |
|
| fatal: The remote end hung up unexpectedly | 12:39 |
|
consolers
| git-push --help ? Usage: git-push <REPO> master:master | 12:40 |
| ← epic left | 12:40 |
| ← domcat left | 12:42 |
| → mooosh joined | 12:42 |
|
masterkorp
| i think there is an error that the origins isnt associeted with the brancg master | 12:43 |
|
| when i hit "git branch -a" | 12:43 |
|
mooosh
| Hello. I'm trying to ignore a config file so that if I change it it will not be pushed to the newest version. I added the file in a .gitignore file, but it still get pushed. | 12:44 |
| ← Lgb left | 12:44 |
|
masterkorp
| it only shows master | 12:45 |
|
_ikke_
| What command do you execute? | 12:46 |
| ← Yardie left | 12:46 |
| → JenniferB joined | 12:47 |
|
mooosh
| If you are talking to me, I run git push web | 12:47 |
|
_ikke_
| it was foor masterkorp | 12:47 |
| ← consolers left | 12:47 |
|
JenniferB
| Hi folks, I have installed git and git-gui in ubuntu... i have checked out a project... but my friend commited some on his computer.. how do I do an "svn update" equivalent command ? | 12:47 |
|
_ikke_
| mooosh: A file already added to git doesn't get ignored | 12:48 |
|
| so you would have do delete it first with git rm --cached path/to/file | 12:48 |
|
| and then commit | 12:48 |
|
mooosh
| Oh, okay. Let me try. | 12:48 |
|
zomg
| JenniferB: assuming you have the remote repository set correctly, you can use "git pull origin master"... However, I would recommend reading a beginner's git guide | 12:48 |
|
JenniferB
| zomg: will that do an update ? | 12:49 |
|
| and fetch files that have been changed ? | 12:49 |
| → spb_ joined | 12:50 |
|
_ikke_
| JenniferB: pull only fetches from the remote repository | 12:50 |
|
zomg
| JenniferB: essentially it will "git fetch" (fetch data) and "git merge" (merges fetched data to your master branch) | 12:50 |
| ← mann3qu1n left | 12:50 |
|
zomg
| if it doesn't work you've probably made a mistake at some point or your repository is not set up properly, in which case I'd again fall back to my earlier recommendation =) | 12:51 |
|
odin_
| can I convert a detached head, into a new branch ? well I'm not sure if I at a detached head, I have "* (no branch)) | 12:51 |
|
masterkorp
| _ikke_ git branch -a | 12:51 |
| spb_ → spb | 12:51 |
|
_ikke_
| masterkorp: No when you push to the server | 12:52 |
| → Lgb joined | 12:52 |
| ← Nickeeh left | 12:53 |
|
masterkorp
| "gp" an alias for "git push" | 12:53 |
|
_ikke_
| try gp origin master | 12:53 |
| ← JenniferB left | 12:53 |
| ← necromancer left | 12:54 |
| → cannonball joined | 12:54 |
| ← benjo2 left | 12:54 |
|
masterkorp
| _ikke : it worked! :D | 12:55 |
| ← coulix_greg__ left | 12:55 |
|
masterkorp
| i gona read the manual about that | 12:55 |
|
| i didnt need to do this before | 12:56 |
|
_ikke_
| try git config --get-regexp remote | 12:56 |
| ← sondoar left | 12:56 |
| ← froschi left | 12:57 |
|
masterkorp
| remote.origin.url ssh://masterkorp@killerbot.git.sourceforge.net/gitroot/killerbot/killerbot | 12:57 |
|
| remote.origin.fetch +refs/heads/*:refs/remotes/origin/* | 12:57 |
|
| is this correcting the problem? | 12:57 |
|
_ikke_
| No, this is about diagnosing the problem | 12:57 |
| → Paraselene__ joined | 12:58 |
| ← dj_tjerk left | 12:58 |
|
masterkorp
| it seems ok to you? | 12:58 |
| → tstclair joined | 12:59 |
| → codeshepherd joined | 12:59 |
| → IslandUsurper joined | 13:01 |
| ← Paraselene_ left | 13:01 |
| Paraselene__ → Paraselene_ | 13:01 |
| → krh joined | 13:02 |
|
_ikke_
| try git config branch.master.remote origin | 13:02 |
| ← aeiou_ left | 13:02 |
|
masterkorp
| there is no output | 13:04 |
|
_ikke_
| nope | 13:04 |
|
masterkorp
| this is mean is okay? | 13:04 |
|
_ikke_
| it justs adds a setting | 13:04 |
|
| just* | 13:04 |
| ← MetaCosm left | 13:04 |
| → benjo2 joined | 13:04 |
| → hugoxrosa joined | 13:05 |
|
_ikke_
| It tells git which branches to push when you ommit any branches | 13:05 |
| → mann3qu1n joined | 13:06 |
| ← mann3qu1n left | 13:07 |
|
masterkorp
| _ikke_ :thank you very much, but this config it isnt global right? | 13:07 |
|
_ikke_
| nope, these are local settings | 13:08 |
|
masterkorp
| ok thank u again | 13:08 |
| → oriba joined | 13:09 |
| ← roop_ left | 13:11 |
| → dutchie joined | 13:11 |
| → GarethAdams|Work joined | 13:12 |
| → emmanueloga joined | 13:12 |
| ← ao2 left | 13:12 |
| → project2501b joined | 13:12 |
| → warlock_mza joined | 13:13 |
| → flazz joined | 13:13 |
|
dutchie
| i'm running a live site sat in a git repo, and i need to re-jig it all (preferably without bringing the site down or losing history). it's all a bit of a mess, and I'm trying to sort it out and make it more sane | 13:13 |
| → Nickeeh joined | 13:13 |
| → MattDiPasquale joined | 13:14 |
| ← dpino left | 13:14 |
|
jeremiah
| My fancy https set keeps defaulting to web_dav, is there a good way to debug git-http-backend? | 13:15 |
|
| I have downloaded the source code and am starting there. | 13:15 |
|
_ikke_
| dutchie: You don't really make sense to me | 13:15 |
|
dutchie
| i don't think i explained it very well | 13:15 |
| → brett_h joined | 13:15 |
| → domcat joined | 13:16 |
| → scarabx joined | 13:17 |
|
dutchie
| basically, I have a django site which is a directory containing a load of site-specific configuration files and also subdirs with "apps" in. Currently, that's all controlled by git. What I want is the individual apps under VCS | 13:17 |
|
_ikke_
| dutchie: Git has submodules, but some discourage using them | 13:18 |
|
| But they do work | 13:18 |
|
dutchie
| i was just thinking of submodules | 13:18 |
|
| but I'm interested in how to do the transitino | 13:18 |
|
| er, transition | 13:19 |
|
odin_
| can I ask a remote repository to "format-patch" between 2 tags ? | 13:19 |
|
_ikke_
| Basicly, you put the 'aps' in a new git repository | 13:19 |
|
| you would have to remove the aps from the repo | 13:19 |
| ← benjo2 left | 13:19 |
|
dutchie
| so "git rm --cached <app_dir>", commit that, then "git init" in the subdir? | 13:19 |
|
_ikke_
| dutchie: No, you would have to completely remove them | 13:20 |
|
| the repo needs to exists outside of the current repo | 13:20 |
|
dutchie
| delete the actual dirs? | 13:20 |
|
_ikke_
| (move them elsewhere) | 13:20 |
| → chrowe joined | 13:21 |
| → sveajobb joined | 13:21 |
|
dutchie
| that will stuff up the config though. why would "git rm --cached -r <app_dir>" not work? | 13:21 |
|
_ikke_
| because git submodule demands that the directory is empty or does not exists when adding it to the repository | 13:22 |
| → Swistaczek joined | 13:22 |
|
dutchie
| ah | 13:22 |
|
sveajobb
| Hi, let's say I have 3 topic branches apart from master. the three topic branches are depending on eachoter like this master---A-----B----C , some branches might ofcourse get a few commits breaking the 'nice line'. Is there a way to do an automatic rebase of them in case I get more commits on master? normally I would do like git rebase master A; git rebase --onto A old_A B ; git rebase --onto B old_B C .a bit tedious | 13:24 |
|
_ikke_
| dutchie: Eventualy they will be put back there | 13:24 |
|
| another option is without using git submodule | 13:25 |
| → frakturfreak joined | 13:25 |
| ← frakturfreak left | 13:25 |
|
frogonwheels
| sveajobb: sounds like you should just rebase C onto master and then reset A and B to the appropriate commits | 13:25 |
| → frakturfreak joined | 13:25 |
| → Jferro joined | 13:26 |
| → rayners joined | 13:26 |
| → kukks joined | 13:27 |
| → aspotashev|eeepc joined | 13:28 |
|
sveajobb
| frogonwheels, yeah, that's crazy enough to work :) do you know of some automated way of doing that? I mean, finding the new commit ids and resetting the branches there? | 13:29 |
| → evil-knievel joined | 13:29 |
| ← scarabx left | 13:29 |
| → DanMatthews joined | 13:29 |
|
odin_
| is there an easy way to "git am" to a folder of files ? they are in number requence (from format-patch) | 13:29 |
|
evil-knievel
| hey guys. short question: i made changes in the wrong branch. can i commit them to a different branch? | 13:30 |
| ← petrux left | 13:30 |
| → corni joined | 13:30 |
|
zomg
| evil-knievel: if you haven't commited your changes yet, you can simply checkout the correct branch and then commit | 13:30 |
|
sveajobb
| evil-knievel, if you have done the commits already you can always just checkout the other branch and do git cherry-pick | 13:31 |
| → mazenharake joined | 13:31 |
|
evil-knievel
| zomg: i haven't commited yet, but if i try to checkout the right branch it says: you have local changes to ... cannot sitch | 13:31 |
|
| +w | 13:32 |
|
mazenharake
| Hi, does anyone know if there is any reference on how the internals of the .git directory is structured? Maybe some reference material or a blog or something? | 13:32 |
|
sveajobb
| evil-knievel, this is probably not the best method but I would do a commit and then cherry-pick it into the correct position, jump back to the "wrong" branch and remove the commit | 13:33 |
|
evil-knievel
| sveajobb: good idea, thanks. i'll try this out | 13:34 |
|
sveajobb
| evil-knievel, hope it works ;) | 13:34 |
|
dutchie
| maybe evil-knievel could use git stash? | 13:34 |
| → tvw joined | 13:35 |
|
odin_
| ok silly me, I just "cat * >> BIGFILE.mbox" and that works | 13:35 |
|
_ikke_
| yeah, git stash is much more appropiate | 13:35 |
|
sveajobb
| git stash can probably work if all modified files are to be commited on separate branch, I've had bad experiences with git stash :) | 13:35 |
|
evil-knievel
| dutchie: too late ;-) but thanks, i'll take a look | 13:36 |
| → snuxoll joined | 13:36 |
| ← radioman-lt left | 13:36 |
| → Joeconyers joined | 13:41 |
| → gbacon joined | 13:42 |
| → tomsdale joined | 13:43 |
| → yaotti joined | 13:44 |
| ← harinath left | 13:44 |
| ← pheaver left | 13:44 |
| ← DanMatthews left | 13:44 |
| ← munichlinux left | 13:45 |
| → hobodave joined | 13:46 |
| ← loincloth left | 13:46 |
| → LiamH joined | 13:47 |
| ← emmanueloga left | 13:48 |
|
Weaselweb
| is there a git bug tracker or similar? | 13:49 |
| ← masterkorp left | 13:49 |
| → hobert joined | 13:49 |
|
Rhonda
| Weaselweb: There are some distributed bug trackers that work with git in their background. simple defects (sd) comes to my mind. | 13:50 |
|
Weaselweb
| Rhonda: i mean a bug track _for_ git, not using git | 13:50 |
|
Rhonda
| oh | 13:50 |
|
_ikke_
| Weaselweb: You mean for the git project itself? | 13:51 |
|
Weaselweb
| _ikke_: yes. i think i found a bug (written here at 14:18, but no response yet). but i currently testing this with 1.7.1 | 13:53 |
| → TheNewAndy joined | 13:53 |
|
_ikke_
| they use the mailinglist | 13:53 |
|
Weaselweb
| ok | 13:54 |
| → tizbac joined | 13:54 |
| → ehabkost joined | 13:55 |
| ← ReinH left | 13:56 |
| ← hobert left | 13:56 |
|
ciaranm
| Weaselweb: you mail the mailing list, and if you don't send a patch that's perfect then it gets ignored and isn't fixed until someone else hits it and sends a patch that is | 13:57 |
| → ReinH joined | 13:57 |
| ← posciak left | 13:57 |
| → posciak joined | 13:57 |
| ← gaveen left | 13:58 |
| [Po]lentino_ → [Po]lentino | 13:58 |
| ← BrianHV left | 13:59 |
| → danmatthews joined | 13:59 |
|
Weaselweb
| ciaranm: well, as far as I can see, git send-email is written in perl which i dont know. there is little possibility I can fix this | 13:59 |
| → BrianHV joined | 13:59 |
| ← rseifert left | 13:59 |
| ← Philwelch left | 14:00 |
| → harinath joined | 14:00 |
| → altrux joined | 14:03 |
| ← Nickeeh left | 14:03 |
| ← ReinH left | 14:03 |
| → irc2samus joined | 14:03 |
| → ReinH joined | 14:03 |
|
fr0sty
| ciaranm: a little bitter, are we? | 14:04 |
| ← alezandro left | 14:04 |
| → MetaCosm joined | 14:04 |
|
ciaranm
| fr0sty: i don't think it's any worse than any of the other methods out there, really | 14:04 |
| → Nickeeh joined | 14:05 |
| ← sgh left | 14:05 |
| ← snuxoll left | 14:05 |
|
fr0sty
| i know. just giving you a hard time. | 14:06 |
| ← ivan left | 14:06 |
| ← d1b left | 14:07 |
| ← TheNewAndy left | 14:07 |
| → jasonn1234 joined | 14:07 |
| ← disappearedng left | 14:08 |
| ← project2501b left | 14:08 |
|
fr0sty
| Weaselweb: were you using --compose for any invocations of git-send-email? | 14:08 |
|
resno
| i am having a weird problem, my code changes arent showing up.. | 14:08 |
| ← BrianHV left | 14:08 |
|
_ikke_
| Is the file ignored? | 14:08 |
|
resno
| on my development machine, this use to work fine | 14:08 |
| ← ReinH left | 14:09 |
| → necromancer joined | 14:09 |
|
resno
| like i make code changes, then i test them out and no matter what i do, i dont see any changes on my local server, like i use to | 14:09 |
|
fr0sty
| Weaselweb: also is sendemail.thread set? | 14:09 |
| → jrmuizel joined | 14:10 |
|
Weaselweb
| fr0sty: git send-email HEAD~..HEAD --annotate is my command line which causes the problem | 14:10 |
|
fr0sty
| resno: are you pushing any of your changes? | 14:10 |
| ← dutchie left | 14:10 |
|
Weaselweb
| fr0sty: is didn't set sendemail.thread myself | 14:11 |
| ← Digitalos left | 14:11 |
| ← jasonn1234 left | 14:11 |
| → engla joined | 14:12 |
| ← engla left | 14:12 |
|
Weaselweb
| fr0sty: i tracked the problem down to git-send-email.perl:706 "if ($thread && !defined $initial_reply_to && $prompting) {" | 14:12 |
|
resno
| fr0sty: i tried pushing them. but my test work is done all on my machine, and the updates arent appearing there. i changed a file and no matter what i do, the changes dont appear on my localhost server | 14:12 |
| → jds joined | 14:12 |
|
Weaselweb
| with defined $to and $sender this perl script doesn't ask for a in-reply-to | 14:12 |
|
fr0sty
| resno: clear your cache? | 14:13 |
|
Weaselweb
| because $prompting is still 0 | 14:13 |
|
resno
| fr0sty: many times. restarted computer, memcache, apache, and still nothing | 14:13 |
|
| tried seperate browsers | 14:13 |
|
fr0sty
| and the git working directory is also your webserver directory? | 14:14 |
|
resno
| yes. | 14:14 |
|
_ikke_
| Does someone here has problems with github with commits not showing up? | 14:14 |
| → kusma joined | 14:15 |
|
fr0sty
| Weaselweb: then it comes down to why prompting is off. Might be an undocumented 'feature' of --annotate which is similar to --compose (which doesn't prompt for 'reply-to', according to the manpage) | 14:15 |
|
| resno: have you committed your changes? | 14:15 |
|
resno
| fr0sty: added, committed, pushed. | 14:16 |
|
fr0sty
| (is your working directory clean? | 14:16 |
|
| then blow away the file in the git directory and see if you still get it in your browser. | 14:16 |
|
| if that works then git reset --hard to get everything back. | 14:16 |
| → d0k joined | 14:17 |
|
Weaselweb
| fr0sty: this is unrelated to --annotate, just tested currently. but read my other messages. it's a "feature" git doesn't prompt for reply-id if sender and to is already set | 14:17 |
| ← opalka left | 14:17 |
|
jds
| I just did something really stupid. 'find . -delete "*.bak"' doesn't do what I thought it did | 14:17 |
| → project2501a joined | 14:17 |
|
jds
| It obliterated half of my .git/objects/ directory before I realised what I was doing & hit ctrl-C :( | 14:18 |
|
_ikke_
| What did it do? | 14:18 |
|
| oops | 14:18 |
|
resno
| fr0sty: erased the file, and it still keeps going :( | 14:18 |
|
_ikke_
| jds: that't not an easy task to repair | 14:18 |
|
fr0sty
| then your webserver is either posessed or it is not serving files out of the directory you think it is. | 14:19 |
| → ShooterMG joined | 14:19 |
| ← sh1mmer left | 14:19 |
|
fr0sty
| jds: have you pushed or cloned this repository lately? | 14:19 |
|
resno
| fr0sty: so, are you thinking this is not a git issue? i figured the branching could have caused this | 14:19 |
|
| im reaching big time | 14:19 |
|
jds
| fr0sty: a few days ago. Just looking at merging my local & remote .git directories to see if anything's recoverable | 14:20 |
|
| At least it didn't get around to trashing my working copy | 14:20 |
|
parasti
| hmm, which find does not error out on that syntax? | 14:20 |
|
fr0sty
| Weaseweb: have you seen the same behvior if you do 'git send-email HEAD~..HEAD' (without --annotate, with sendemail.to set and not set? | 14:20 |
|
| resno: if your webserver is serving files that don't exist you can't blame git for that. | 14:21 |
| ← NetHawk left | 14:21 |
|
Weaselweb
| fr0sty: yes, same behavior | 14:21 |
|
resno
| fr0sty: i mean, is there a chance, its using serving another branch. i am on a beta branch currently. | 14:22 |
| ← Nickeeh left | 14:22 |
|
fr0sty
| resno: unless you have a bizarre git-aware webserver (unlikely), it can only serve up what is in the working directory (whichever branch that may be). | 14:23 |
| ← project2501a left | 14:23 |
|
resno
| fr0sty: ive created a monster. :-) thanks for you help. ill play with it a bit more. | 14:23 |
| → fmardini joined | 14:24 |
|
fr0sty
| resno: I'll bet a nickel that the problem is both unrelated to git and something dump that we are both not thinking of. | 14:24 |
|
| s/dump/dumb/ | 14:24 |
| ← jony left | 14:24 |
|
fr0sty
| Weaselweb: that might warrent a question to the list. show the differing behavior with sendemail.to set and unset and see what they say. I am wholly unfamiliar with this facility so I don't know what importance there might be to being able to change those values. | 14:26 |
|
resno
| fr0sty: im hoping so. | 14:26 |
| → spearce joined | 14:27 |
|
Weaselweb
| fr0sty: i checked the perl code and in-reply is only asked, if to and sendemail.to and sendemail.from is already set by config or argument | 14:27 |
|
resno
| fr0sty: ill be happy when i can find something that wil break it :0 | 14:27 |
|
Weaselweb
| in my opinion git should always ask for it | 14:27 |
| → Titosemi_ joined | 14:28 |
| → tedoc2000 joined | 14:28 |
|
fr0sty
| I'd write that up and mail [email@hidden.address] | 14:29 |
| ← Titosemi left | 14:30 |
| Titosemi_ → Titosemi | 14:30 |
| → bin1010 joined | 14:31 |
|
masa-
| how can i reset a branch other than master in a bare repository? | 14:31 |
| ← CarlFK left | 14:31 |
|
masa-
| or am i just missing something when i fail to force a push after commit --amend:ing | 14:32 |
|
| and this is just my own repo so nobody will get pissed when i fuxor it :p | 14:32 |
| → bibinou joined | 14:34 |
| ← necromancer left | 14:34 |
| ← dwmw2_gone left | 14:34 |
| ← spearce left | 14:35 |
| → spearce joined | 14:35 |
| → dwmw2_gone joined | 14:35 |
| ← jrmuizel left | 14:36 |
| → bin10101 joined | 14:36 |
| ← bin1010 left | 14:38 |
| → CarlFK joined | 14:38 |
| → necromancer joined | 14:40 |
| → Nickeeh joined | 14:43 |
| ← vu3rdd left | 14:43 |
|
fr0sty
| what are you trying to accomplish? | 14:43 |
| → Yuffster joined | 14:44 |
| → snuxoll joined | 14:45 |
| → d1b joined | 14:45 |
| → ivan`` joined | 14:46 |
| → ikrabbe1 joined | 14:46 |
| → herdingcat joined | 14:46 |
| → BrianHV joined | 14:47 |
| ← ikrabbe left | 14:47 |
| → ReinH joined | 14:47 |
| → raichoo1 joined | 14:49 |
|
masa-
| i'd like to reset the latest commit from a branch so i can push the amended new commit to it | 14:49 |
| → rolfb joined | 14:50 |
|
masa-
| it just says "remote rejected" when i try to push --force it | 14:50 |
| ← raichoo left | 14:50 |
| ← ajpiano left | 14:50 |
| → aresnick joined | 14:52 |
| → patmaddox joined | 14:52 |
| → jvraoltc joined | 14:53 |
| → jensn joined | 14:54 |
| ← domcat left | 14:56 |
| ← giskard_ left | 14:56 |
| ← fmardini left | 14:56 |
| → fmardini joined | 14:57 |
| ← fmardini left | 14:57 |
| ← kusma left | 14:58 |
| ← lemonchicken left | 14:58 |
| → sagsousuke joined | 14:58 |
| → jasonn1234 joined | 14:59 |
| → NET||abuse joined | 15:00 |
| ← hasu left | 15:00 |
| → pklingem joined | 15:00 |
| ← NET||abuse left | 15:00 |
| → lemonchicken joined | 15:01 |
| → galderz_ joined | 15:02 |
| ← galderz_ left | 15:02 |
| → galderz_ joined | 15:02 |
| ← carl- left | 15:02 |
| ← galderz_ left | 15:02 |
| → alezandro joined | 15:03 |
| ← galderz left | 15:04 |
| → alester joined | 15:05 |
|
fr0sty
| seems like your remote has some hook running which disallows forced pushes. | 15:05 |
| → froschi joined | 15:07 |
|
fr0sty
| this config value may be the culprit: receive.denyNonFastForwards | 15:07 |
| ← HG` left | 15:07 |
| → NetHawk joined | 15:07 |
|
fr0sty
| you have to change that at then you can push --force | 15:07 |
| → disappearedng joined | 15:08 |
| → domcat joined | 15:09 |
| ← radarek left | 15:09 |
| ← domcat left | 15:10 |
| ← evil-knievel left | 15:11 |
| → malumalu joined | 15:13 |
| → rchavik joined | 15:13 |
| → stringoO joined | 15:14 |
|
posciak
| I keep having problems with git doing very cumbersome ('unintelligent') diffs, e.g. it adds new C functions by overlapping already existing functions, overlapping comments, etc. is there any way to have a more intelligent diff? | 15:15 |
| ← cbreak_work left | 15:16 |
| → schulty joined | 15:16 |
| → jrmuizel joined | 15:16 |
| → hyperair joined | 15:17 |
| ← stringoO left | 15:19 |
| ← jasonn1234 left | 15:19 |
|
fr0sty
| you can try --patience | 15:21 |
| dwmw2_gone → dwmw2 | 15:22 |
|
posciak
| fr0sty: oh, thank you. Can I use it for git gui as well? | 15:23 |
|
fr0sty
| never used git gui, but probably yes. | 15:23 |
| ← codeshepherd left | 15:29 |
| ← patmaddox left | 15:29 |
| → seanmccann joined | 15:29 |
| → patmaddox joined | 15:30 |
|
posciak
| well, for any git command other than diff for that matter... for example for git-add | 15:30 |
|
me22
| git doesn't store diffs, so you don't need to worry about that | 15:31 |
| ← CarlFK left | 15:33 |
| ← hobodave left | 15:33 |
| → dj_tjerk joined | 15:33 |
| ← patmaddox left | 15:34 |
| → Nemurenai joined | 15:35 |
| ← brez- left | 15:36 |
| → dexcs joined | 15:37 |
| → Theravadan joined | 15:37 |
|
dexcs
| hi all! i have a newbie question: I've used git only to put stuff on heroku with "git push heroku master", my problem is that i've deleted files local. and after a push they are still present online. How can i push with delete ? | 15:38 |
|
jensn
| How did you remove them? | 15:39 |
| → brez- joined | 15:39 |
|
| jensn thinks you didn't use git rm. | 15:39 |
|
jensn
| and/or forgot to commit. | 15:40 |
|
me22
| posciak: to clarify, git only stores full files, not diffs. the diffs are generated when you ask for them, so only those commands need the --patience option | 15:40 |
|
dexcs
| no, i've done always this 3 steps: git add . && git commit -m "comment" && git push heroku master ;-) | 15:40 |
|
jensn
| dexcs: Yes, but how did you remove the files? | 15:40 |
|
dexcs
| no i thnik not ;-) | 15:40 |
|
| how can i remove them? | 15:41 |
|
| is it better to add a secons "step" -> git add . + git rm . ? | 15:41 |
|
jensn
| No, that would remove . | 15:41 |
|
| Which is likely not what you want. | 15:41 |
|
| "man git-rm" | 15:42 |
|
Gitbot
| jensn: the git-rm manpage can be found at http://git.or.cz/man/git-rm | 15:42 |
|
dexcs
| hmm no i thought git commit will add new files and delete old files. but it does only add new, right? | 15:43 |
|
| i'm a little bit confused now... | 15:43 |
|
jensn
| No, git-add adds files. | 15:43 |
|
| git-rm removes files. | 15:43 |
| → emmanueloga joined | 15:43 |
|
jensn
| I think http://git-scm.com/documentation might be a good start. | 15:44 |
| → kipras joined | 15:44 |
| → patmaddox joined | 15:45 |
| ← yaotti left | 15:45 |
| → radioman-lt joined | 15:46 |
| → steveire joined | 15:46 |
| → Beer_MX joined | 15:46 |
|
steveire
| When I try to git svn dcommit a commit which contains images I get a eol violation. How to I resolve that? | 15:46 |
|
Beer_MX
| git best :P | 15:46 |
|
dexcs
| ok, but i cant do a git rm ., because it would rm all files, right? | 15:46 |
|
steveire
| http://dpaste.com/201893/ | 15:47 |
| ← rolfb left | 15:47 |
|
Beer_MX
| may be you need git reset --hard HEAD^ ? | 15:47 |
|
| del last commit changes | 15:47 |
|
ToxicFrog
| dexcs: 'commit -a' will automatically 'git rm' all files that you've removed on disk | 15:47 |
| → bin1010 joined | 15:48 |
|
ToxicFrog
| (that it previously knew about) | 15:48 |
|
Beer_MX
| Когда уже гит на русский переведут? | 15:48 |
|
| :P | 15:48 |
|
steveire
| Anyone? Google throws up nothing, surprisingly | 15:50 |
|
Beer_MX
| get commit -a -m "descript" | 15:50 |
| ← bin10101 left | 15:50 |
| → Turias joined | 15:50 |
| ← thex00 left | 15:50 |
| ← aziz left | 15:51 |
| ← mazenharake left | 15:51 |
| ← harinath left | 15:52 |
| ← seanmccann left | 15:52 |
| → slonopotamus joined | 15:53 |
|
gcl
| any stgit experts around? I need some help recovering a stgit stack. | 15:53 |
| ← Theravadan left | 15:54 |
| ← patmaddox left | 15:55 |
| ← tildeequals left | 15:55 |
|
Turias
| i have a local branch which is tracking a remote branch. how do i tell which remote branch it is tracking? | 15:56 |
| ← Beer_MX left | 15:56 |
| → urkud_ joined | 15:56 |
| → prgmatic joined | 15:56 |
|
Turias
| (this is git-svn if it matters) | 15:57 |
| → bcardarella joined | 15:57 |
| ← [Po]lentino left | 15:58 |
| → aziz joined | 15:58 |
|
jefferai
| sitaram: the ability to control who can push new branches or tags would be great to have in the next two weeks if you think it's a nice idea, as we're making a report (due in two weeks) comparing gitolite and some other options and that's one thing that we find useful that it doesn't have :-) | 15:58 |
| ← olaf_ left | 16:00 |
|
sitaram
| jefferai: tell me something quickly: will the existing branches follow a known, finite, set of patterns? if so, it's quite easy right now | 16:00 |
| ivan`` → ivan | 16:01 |
|
jefferai
| not necessarily | 16:01 |
| ← priidu left | 16:01 |
|
jefferai
| :-| | 16:01 |
|
| it's possible they *could* | 16:01 |
|
| tags probably would, in general | 16:02 |
|
| in general also our policy is not to have feature branches in the main repo | 16:02 |
| ← mtkd left | 16:02 |
|
jefferai
| we'd have people clone (wildcard repo) for that | 16:02 |
|
| but we'd like to be able to enforce that | 16:02 |
| → mtkd joined | 16:02 |
|
jefferai
| and also to make sure nobody pushes :master | 16:02 |
|
| although deleting a branch would already require + right? | 16:02 |
|
sitaram
| jefferai: nobody pushed master is easy enough | 16:02 |
| ← sagsousuke left | 16:03 |
|
sitaram
| jefferai: yes deleting requires +, although there is a way to say "+" means stricly rewind, not delete | 16:03 |
| ← trivol left | 16:04 |
|
jefferai
| yeah -- we'd probably prefer it to mean both | 16:04 |
|
| (saw that in the faq) | 16:04 |
|
sitaram
| thats the default | 16:04 |
|
jefferai
| yeah | 16:04 |
| → bin10101 joined | 16:04 |
| → domcat joined | 16:04 |
| ← aziz left | 16:04 |
|
jefferai
| so, pushing branches -- those are not *huge* concerns since we can clean them out, but it'd be nice to disallow it | 16:04 |
| ← sveajobb left | 16:04 |
| ← smuf left | 16:04 |
| → aziz joined | 16:05 |
|
sitaram
| creating new branches you mean? | 16:05 |
|
jefferai
| pushing tags -- I'm not too familiar with tags so I don't know what it takes to add/delete them | 16:05 |
| ← JEEB left | 16:05 |
|
jefferai
| sitaram: yes, sorry | 16:05 |
|
| pushing branches not existent on that repo up to it :-) | 16:05 |
|
sitaram
| jefferai: a branch is in the refs/heads/ namespace, a tag is in refs/tags/ -- no real diff as far as gitolite is concerned except that a bare "foo" is treated as "refs/heads/foo", so tags have to be specified fully qualified like refs/tags/bar | 16:05 |
|
| (another diff is that overwriting a tag is considered a rewind; because tags are not supposed to move. Requires "+") | 16:06 |
| ← raichoo1 left | 16:06 |
| ← Nickeeh left | 16:06 |
|
jefferai
| sitaram: ok -- so if somebody creates a tag and pushes it up | 16:06 |
|
| and this should not have been done/was mistakenly done | 16:07 |
| ← bin1010 left | 16:07 |
|
jefferai
| then anyone with + can change/delete that tag | 16:07 |
|
| but it's a rewind | 16:07 |
|
| will that screw up peoples' clones, if they've cloned in the meantime? | 16:07 |
| ← Mage_Dude left | 16:07 |
|
jefferai
| (or pulled in the meantime) | 16:07 |
| → harinath joined | 16:08 |
| ← slonopotamus left | 16:09 |
|
sitaram
| depends on your definition of "screw up". IIRC git does not re-fetch tags so if a tag I already fetched has since changed, my copy is still pointing to the old SHA | 16:09 |
|
| jefferai: meanwhile, http://pastebin.com/P2uDVypC | 16:09 |
| ← Weaselweb left | 16:10 |
| cworth` → cworth | 16:10 |
| ← prgmatic left | 16:11 |
| ← necromancer left | 16:11 |
| → galderz joined | 16:11 |
| ← galderz left | 16:11 |
| → galderz joined | 16:11 |
|
jefferai
| sitaram: ah! I didn't realize you could have per-branch ACLs like that | 16:11 |
|
| missed that somehow | 16:11 |
|
| so that does take care of the branch issue | 16:11 |
| ikrabbe1 → ikrabbe | 16:13 |
| ← ikrabbe left | 16:13 |
| → ikrabbe joined | 16:13 |
| → JEEB joined | 16:13 |
|
sitaram
| jefferai: ouch... that's the main reason I created gitolite (that and the stupid python-setuptools not installing on bloody solaris 9 ;-) | 16:14 |
| → Mage_Dude joined | 16:14 |
| ← urkud_ left | 16:14 |
|
bman
| anyone verify if this is correct for putting in a post-commit | 16:15 |
|
jefferai
| sitaram: heh :-) | 16:15 |
|
bman
| git log -1 --format="[git] %an, %ar. %s ${url}" | 16:15 |
|
jefferai
| sitaram: would I be right in thinking that if you don't allow RW access to the entire repo (instead relying on ACLs for particular branches) that you can't push up tags anyways? | 16:15 |
|
bman
| with url being set to my url to the commit | 16:15 |
|
sitaram
| jefferai: that paste I showed you prevents pushing any tags by any devs; only admin can do that now | 16:16 |
|
jefferai
| Great | 16:16 |
|
| that sounds good | 16:16 |
|
| that's what I thought | 16:16 |
| → AkumaStreak joined | 16:17 |
| → hobodave joined | 16:18 |
|
sitaram
| jefferai: http://pastebin.com/S8g45F4V | 16:18 |
| ← warlock_mza left | 16:18 |
| → sh1mmer joined | 16:18 |
| → radhermit joined | 16:18 |
|
jefferai
| sitaram: lovely :-D | 16:18 |
| → CarlFK joined | 16:18 |
|
sitaram
| jefferai: that's why I asked if the valid branches are finite and known; if they are, you can already do all that you want. | 16:18 |
|
| jefferai: only if the valid branches are themselves unknown, but you want to prevent the users from *creating* them (while allowing them to *push* them) we need new code | 16:19 |
| → Zephyrus joined | 16:20 |
| → rubydiamond joined | 16:20 |
| → kenichi joined | 16:20 |
| → manyoso joined | 16:20 |
| ← radhermit left | 16:20 |
|
jefferai
| sitaram: the valid branches are not known now -- but they could be made known to a sysadmin, who could then set up appropriate rights | 16:21 |
|
| so I think we're fine with the current capabilities | 16:21 |
|
sitaram
| jefferai: also http://pastebin.com/S8g45F4V for another scenario | 16:23 |
| → sassyn joined | 16:23 |
|
sassyn
| hi | 16:23 |
| → sylr joined | 16:23 |
|
sassyn
| just of curiosity what is the diff between remotes/origin/master and master ? | 16:23 |
|
sitaram
| oops http://pastebin.com/JdfNZUzk | 16:23 |
|
sassyn
| when I pull git repo? | 16:24 |
|
sitaram
| sassyn: the former is your copy of the master on the remote called origin | 16:24 |
|
sassyn
| I see | 16:24 |
|
| sitaram, 10x | 16:24 |
|
sitaram
| you're welcome! | 16:25 |
| → Theravadan joined | 16:25 |
| → raichoo joined | 16:25 |
| → Ryback_ joined | 16:26 |
| → felipec joined | 16:26 |
| ← CarlFK left | 16:27 |
| ← oriba left | 16:29 |
| ← compnerd left | 16:29 |
| → AAABeef joined | 16:30 |
| → compnerd joined | 16:30 |
| ← jermilio left | 16:30 |
| → radhermit joined | 16:30 |
| → Jonah joined | 16:32 |
| → ohmy joined | 16:32 |
|
ohmy
| hello :) | 16:32 |
|
| is it posible to filt er git diff to show only diffs on ".cpp .h .pro" for example ? | 16:32 |
| → radarek joined | 16:34 |
| → villemv joined | 16:35 |
| → lsk joined | 16:36 |
|
ThunderChicken
| find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.pro' \) -exec git diff + | 16:36 |
|
| ? | 16:36 |
|
lsk
| hello to everyone | 16:36 |
| → priidu joined | 16:37 |
| ← radhermit left | 16:37 |
| ← ppawel left | 16:37 |
| ← sh1mmer left | 16:37 |
| → naeu joined | 16:39 |
| → davidc_ joined | 16:40 |
|
davidc_
| Hello git-gods :) | 16:40 |
|
| I'm a bit screwed and I can't figure out how to merge a fork back into the master. | 16:40 |
|
| I've tried some hard reset | 16:40 |
| ← hukl left | 16:40 |
| → ft joined | 16:41 |
| → hukl joined | 16:41 |
| → dreiss joined | 16:41 |
| ← Theravadan left | 16:42 |
|
drubies
| er #github is very quiet right now... anyone notice github lagging? I can get to a new branch I just pushed by looking at the network graph but that's it. pushed it like 1/2 hour ago. I can't track it from another repo either | 16:42 |
|
wereHamster
| davidc_: hard reset is definitely not the same as a merge | 16:43 |
|
davidc_
| wereHamster, merging and pushing says the branch is ahead of master | 16:43 |
|
| http://github.com/frapi/frapi/network <-- | 16:43 |
|
| I'm not exactly sure where I fscked up | 16:44 |
|
wereHamster
| davidc_: that graph doesn't tell me what you did | 16:44 |
|
| nor what you are trying to do | 16:44 |
| → Belna joined | 16:44 |
| ← kar8nga left | 16:44 |
| → domcat_ joined | 16:44 |
|
davidc_
| The Jeremy branch can't commit anymore. | 16:45 |
|
wereHamster
| a branch is a non-human object. Only humans should commit. | 16:45 |
|
bman
| how can i apply a post-commit script to everything i submit from my client? | 16:45 |
|
wereHamster
| (as a rule anyway) | 16:45 |
|
bman
| instead of in each .git/hooks? | 16:45 |
| → justin-george joined | 16:46 |
|
davidc_
| Ok sorry wereHamster oneself can't commit to the Jeremy branch anymore | 16:46 |
|
wereHamster
| davidc_: .. any error essages you are getting? | 16:46 |
| → urkud_ joined | 16:46 |
|
davidc_
| Let me try again | 16:46 |
| ← domcat left | 16:46 |
| domcat_ → domcat | 16:46 |
|
bman
| anyone know | 16:47 |
|
wereHamster
| bman: I don't understand your questino | 16:47 |
|
bman
| how can i apply a post-commit script to everything i submit from my client? with a seperate script in each .git/hooks/ | 16:47 |
|
| without | 16:47 |
|
wereHamster
| 'submit from my client'? What does taht mean? | 16:47 |
|
bman
| i want to make a git hook to run from everything on my machine | 16:48 |
| → psoo joined | 16:48 |
|
bman
| client - my machine | 16:48 |
|
| server - git server | 16:48 |
|
PerlJam
| bman: you want a post-receive hook sounds like | 16:48 |
|
wereHamster
| davidc_: create a pastebin and put into it: what you did, what the outcome was (including error and non-error messages), and what you expected to happen | 16:48 |
| → dev2 joined | 16:48 |
|
bman
| i want a post-commit i just want one script to apply to all my source trees | 16:48 |
|
| that i use from my machine | 16:49 |
|
| not on the server | 16:49 |
|
davidc_
| wereHamster, I did so much in the past 30 mins (rebase, merge, reset) that I'm trying to find out what's worked and what hasn't now :D | 16:49 |
|
| We just managed to push again to the master on Jeremy but look at that: http://github.com/frapi/frapi/network | 16:49 |
|
| haha | 16:49 |
|
PerlJam
| bman: you have multiple repos that you want a post-commit hook to apply to? | 16:50 |
|
bman
| yes | 16:50 |
|
| exactly | 16:50 |
|
wereHamster
| ah, so the question was 'how do I share a post-commit hook between multiple repos'? | 16:50 |
|
bman
| indeed | 16:50 |
| ← cilly left | 16:50 |
| ← unixtippse left | 16:50 |
|
wereHamster
| make the hook somewhere (~/ or /usr/share/..) and then create a symlink from each repo to that file | 16:51 |
| → Theravadan joined | 16:52 |
|
PerlJam
| bman: also, you can create your own template directory so that when you "git init", your hook(s) are automatically installed instead of the defaults. | 16:52 |
|
bman
| can you point me to a guide for that PerlJam | 16:53 |
|
PerlJam
| bman: git help init | 16:53 |
| → unixtippse joined | 16:54 |
|
wereHamster
| bman: or edit /usr/share/git-core/templates/hooks/post-commit | 16:54 |
|
bman
| very good | 16:55 |
| ← timj__ left | 16:55 |
|
bman
| thanks much | 16:55 |
|
odin_
| is there a way to delete the last commit ? undo ? is there a way to undo all the way down the history of the branch to a commit-id ? | 16:56 |
| → tildeequals joined | 16:57 |
| → jasonn1234 joined | 16:57 |
| ← jasonn1234 left | 16:57 |
|
PerlJam
| odin_: git revert will commit a patch that undoes the effect of a specific commit. | 16:57 |
|
odin_
| "git reset --hard <cimmit-id>" ? | 16:57 |
| → Adman65|mbp joined | 16:58 |
|
odin_
| I don't want the patch in the history, its also only a local repo (it is not like anyone gained visibility of it) | 16:58 |
|
davidc_
| ah ok so wereHamster now when I push I get | 16:58 |
|
| Your branch is ahead of 'origin/master' by 3 commits | 16:58 |
|
PerlJam
| odin_: then your reset command will work. | 16:58 |
|
Adman65|mbp
| I have a branch with commit A, B, C, D, I want to reset the branch back to point A and completely loose commit B, C, D. How can I do this ? | 16:58 |
|
odin_
| os that is what reset does, it unwinds the commit-id all the way back ? are they always discarded ? or are they made uncommitted ? | 16:59 |
| → cilly joined | 16:59 |
| → orange_tomek joined | 17:00 |
|
odin_
| if I were to "format-patch" the last 5 commits, then reset --hard the last 5, then modify the tree (to fix that patch) patch, the commit the top 4 commits, that would fix a patch 5 away from head ? HEAD~5 ? | 17:00 |
|
orange_tomek
| hi all, I was wondering what is the proper way to push changes to a remote server without doing a pull first. I want to push the latest revision, but the changes are so drastic, it might complicate things quite a bit to do a pull first, fix the merge and push back. Is there a way i can just push what I have in my repo to the server without doing the merge? | 17:01 |
| ← domcat left | 17:01 |
|
odin_
| "then commit the top 4 commits" = "git am ..." on the top 5 commits I saved | 17:01 |
| → pantsman joined | 17:02 |
|
resno
| fr0sty: i decided to erase the dir and re-clone it... that worked | 17:03 |
| → domcat joined | 17:03 |
|
PerlJam
| orange_tomek: you can try "git fetch" then "git push" (git pull is just fetch + merge, so if you just fetch, you're not doing the merge) | 17:04 |
|
| orange_tomek: though, I have no idea if that will work for you. | 17:04 |
| ← maxter left | 17:04 |
|
wereHamster
| odin_: instaed of forma-tpatch; reset --hard; edit; am;, it's easier to do an interactive rebase | 17:05 |
| ← aziz left | 17:05 |
| → kar8nga joined | 17:05 |
|
dev2
| can I have my own private git server installed on my box? | 17:06 |
|
_ikke_
| there is no git server | 17:06 |
|
dev2
| so I have to use github.com? | 17:06 |
|
_ikke_
| dev2: nope | 17:06 |
|
dev2
| sorry, Im trying to get the hang of it. | 17:07 |
|
_ikke_
| just need ssh + git installed | 17:07 |
| ← rchavik left | 17:07 |
|
PerlJam
| dev2: just "git init" in a directory will get you a repo. Why do you want a "server"? | 17:07 |
| → timj__ joined | 17:07 |
|
dev2
| I've only used git as part of the web hosting service so I think I've got some things confused | 17:07 |
| → LongBeach joined | 17:07 |
|
_ikke_
| dev2: What exactly do you want | 17:07 |
|
| dev2: Git does not need a central server | 17:08 |
|
dev2
| _ikke_: ok that answers part of my question... maybe even all of it :) | 17:08 |
|
odin_
| wereHamster, does that also rewrite history ? so no one know or your error ? I thought the commit-id would change, if you changes a patch 5 back from HEAD | 17:08 |
|
_ikke_
| dev2: That's what means it's distributed | 17:08 |
| → frikinz joined | 17:08 |
|
wereHamster
| odin_: sure, rebase rewites history, as does your approach | 17:08 |
|
dev2
| right. | 17:09 |
|
_ikke_
| You've got the whole repository on your machine | 17:09 |
| ← radarek left | 17:09 |
|
PerlJam
| dev2: and every time you clone, you get a copy of the whole repo. | 17:09 |
| → radarek joined | 17:09 |
| ← d0ugal left | 17:09 |
| ← fahadsadah left | 17:10 |
| ← mtkd left | 17:10 |
|
dev2
| PerlJam: when would one of our team want to clone? | 17:10 |
|
Adman65|mbp
| i have a branch that i want to add 3 commits from to my branch. What's the best way to do that ? | 17:10 |
|
PerlJam
| dev2: whenever they want their own copy to hack on. | 17:10 |
|
Adman65|mbp
| err how can I choose 3 commits from another branch to add to my branch ? | 17:10 |
|
wereHamster
| Adman65|mbp: checkout your branch, then use cherry-pick three times | 17:10 |
|
Adman65|mbp
| k | 17:10 |
|
PerlJam
| Adman65|mbp: git cherry-pick perhaps? | 17:10 |
| → fahadsadah joined | 17:11 |
|
dev2
| PerlJam: and then they can commit the copy they've worked on? | 17:11 |
| → topi joined | 17:11 |
|
PerlJam
| dev2: the can commit to their local copy of the repo and then push/pull between repos. | 17:11 |
|
| dev2: if you want some "official" copy of the code, you may very well want a repo that everyone pushes to (in a centralish manner) | 17:12 |
| → Nickeeh joined | 17:12 |
|
frikinz
| Hi! Does anyone know if gitorious supports git-http-push? This is the wireshark follow tcp stream : http://gist.github.com/421185 | 17:12 |
|
| git pull/fetch works | 17:13 |
|
| and only http(s) is allowed from where I am, through a proxy | 17:14 |
| ← forvan left | 17:14 |
| → cloudhead joined | 17:14 |
| ← gebi left | 17:14 |
| → necromancer joined | 17:14 |
| → aziz joined | 17:17 |
| ← disappearedng left | 17:17 |
| ← SRabbelier left | 17:18 |
| → jmcantrell joined | 17:18 |
| → disappearedng joined | 17:18 |
|
odin_
| when a patch comes back from mainline (but it got modified on the way), is there a way to tell git to compute the differences ? | 17:18 |
|
| i.e. I create a commit, then email it off, it goes around and 4 weeks later gets committed to mainline, but my tree is 4 weeks older now (using my original path) | 17:19 |
| → luckiestmonkey joined | 17:19 |
| → rolfb joined | 17:19 |
| → mw joined | 17:19 |
|
odin_
| how do I reconcile the differences ? since it is not exactly my commit that ended up being final (in mainline). is that where "git am --skip" comes in, during conflict resolution ? | 17:20 |
| → darkskiez_ joined | 17:20 |
| → kpreid_ joined | 17:20 |
| → ppawel joined | 17:21 |
| darkskiez_ → darkskiez | 17:22 |
| ← chittoor left | 17:22 |
| ← curtana left | 17:22 |
| → LucasWilcox joined | 17:23 |
| → chittoor joined | 17:24 |
| ← darkskiez left | 17:24 |
| → SRabbelier joined | 17:24 |
| → darkskiez joined | 17:25 |
| → Chillance joined | 17:25 |
| ← kar8nga left | 17:25 |
| ← Jferro left | 17:27 |
| ← nevyn^ left | 17:28 |
| ← Nickeeh left | 17:28 |
| → WebDragon joined | 17:28 |
| → mattih joined | 17:29 |
| ← herdingcat left | 17:29 |
| → herdingcat joined | 17:29 |
| ← thierryp left | 17:30 |
| ← alester left | 17:32 |
| ← tatsuya left | 17:32 |
| ← darkskiez left | 17:33 |
| ← Theravadan left | 17:34 |
| ← radarek left | 17:34 |
| ← MattDiPasquale left | 17:35 |
| → Nickeeh joined | 17:36 |
| ← vinse left | 17:38 |
| ← tstclair left | 17:38 |
| → Taren joined | 17:38 |
| ← frikinz left | 17:40 |
| ← aziz left | 17:42 |
| → aziz joined | 17:42 |
| ← chittoor left | 17:42 |
| → Theravadan joined | 17:42 |
| ← justin-george left | 17:42 |
| ← Theravadan left | 17:44 |
|
Taren
| I am (still) having problems getting git to work correctly. Whenever I try pulling an archive (and I've tried three different sites), I get a "gitfm: fatal error: `chdir' failed: permission denied." error. I have read/write permission to the directory I'm in, and am certain that the site I'm trying to pull from is valid. | 17:45 |
| → Theravadan joined | 17:45 |
|
avar
| strace it and see where the permission error occurs | 17:46 |
|
Taren
| git isn't designed to work with Solaris is it? strace shows that it can't open /dev/log. | 17:48 |
| → radhermit joined | 17:49 |
| → jasonn1234 joined | 17:49 |
| → nothingmuch joined | 17:49 |
| ← jasonn1234 left | 17:49 |
|
Taren
| avar: I changed the permissions on /dev/log, and strace, now, shows nothing. | 17:50 |
|
| ...but git still gives the same error. | 17:51 |
| ← PerlJam left | 17:51 |
| → PerlJam joined | 17:51 |
|
avar
| strace shows *nothing* ? | 17:51 |
|
Taren
| Absolutely nothing. It just returns with no results. | 17:52 |
|
avar
| what command are you running? | 17:52 |
|
Taren
| strace git clone git://github.com/git/hello-world.git | 17:52 |
| → xiong joined | 17:53 |
| ← Nemurenai left | 17:54 |
|
topi
| truss might work better | 17:54 |
| ← _iron left | 17:54 |
| ← mastro left | 17:55 |
| ← dj_tjerk left | 17:57 |
| → robinr joined | 17:58 |
| → evantravers joined | 17:59 |
| ← multigrain left | 17:59 |
|
bman
| hey is there a way to report repository name in git-log format definition? | 18:00 |
| → Akkarin joined | 18:00 |
|
Akkarin
| Hi, ain't there a GIT plugin to access mercurial repositories? | 18:00 |
|
bman
| umm | 18:01 |
|
Taren
| All truss shows is that git can't open 'clone' | 18:01 |
|
bman
| git > mercurial | 18:01 |
|
Taren
| ...but I thought 'clone' was a command passed to git. | 18:01 |
| → HG` joined | 18:02 |
|
Akkarin
| bman: ye great that was the answear i expected... i'm going to tell everyone only exposing a mercurial repo... | 18:02 |
| ← lsk left | 18:02 |
|
ToxicFrog
| Akkarin: https://git.wiki.kernel.org/index.php/InterfacesFrontendsAndTools#Mercurial | 18:02 |
| → Jferro joined | 18:02 |
|
drizzd
| bman: git repositories do not have a name | 18:02 |
|
ToxicFrog
| There's also hg-git [http://hg-git.github.com/] for going the other way and accessing git from hg. | 18:02 |
|
bman
| drizzd, the origin link then maybe? | 18:03 |
|
Akkarin
| ToxicFrog: ye hg-git i already found but it's hard to find anything if you enter mercurial and git in google you only find great comparing websites. Thanks anyway gonna check it out! :-) | 18:03 |
|
drizzd
| bman: that is not part of history, but you can get it from the configuration | 18:03 |
|
| git config remote.origin.url | 18:04 |
|
bman
| hrmm | 18:04 |
|
| guess ill just have to go by the directory name and parse it out | 18:04 |
| ← disappearedng left | 18:05 |
| ← HG` left | 18:05 |
| ← doener left | 18:06 |
| → Titosemi_ joined | 18:07 |
| → _iron joined | 18:07 |
| → justin-george joined | 18:07 |
| ← Titosemi left | 18:09 |
| Titosemi_ → Titosemi | 18:09 |
| → khmarbaise joined | 18:09 |
| → MattDiPasquale joined | 18:09 |
| ← urkud_ left | 18:10 |
| → sudiptamondal joined | 18:12 |
| → thiago_home joined | 18:13 |
|
coldboot
| I have git 1.6.1.2 in cygwin, and `git stash` is doing nothing. Here is a paste to show the behaviour: http://pastie.org/987780 | 18:15 |
| ← hal left | 18:16 |
| ← WebDragon left | 18:16 |
| → bcardarella_ joined | 18:17 |
| ← bcardarella left | 18:17 |
| bcardarella_ → bcardarella | 18:17 |
| ← sudiptamondal left | 18:17 |
|
Turias
| i have a local branch which is tracking a remote branch. how do i tell which remote branch it is tracking? (this is git-svn) | 18:18 |
| → sudiptamondal joined | 18:18 |
| → radarek joined | 18:18 |
| → stringoO joined | 18:20 |
| → rutski joined | 18:22 |
| ← dexcs left | 18:22 |
|
rutski
| why is it that "git push origin master" bitches about me being 2 commits ahead of the remote branch | 18:23 |
|
| but then I do a "git push" (sans the "origin master") and it pushes just fine | 18:23 |
|
| rutski doesn't get it | 18:23 |
| → schulty_ joined | 18:23 |
|
cbreak
| being ahead is not a problem | 18:23 |
|
| are you on master? | 18:23 |
| ← sudiptamondal left | 18:24 |
|
cbreak
| is the branch you are on tracking origin's master? | 18:24 |
| → snucko joined | 18:25 |
| → ironfroggy__ joined | 18:25 |
| ← schulty left | 18:25 |
| → sword` joined | 18:25 |
| → dna_ joined | 18:25 |
| → dsop_ joined | 18:25 |
| → thiago_h1me joined | 18:25 |
| → osfamero1 joined | 18:25 |
| ironfroggy__ → ironfroggy | 18:25 |
| ← schulty_ left | 18:25 |
| ← radhermit left | 18:25 |
| → Cesario_ joined | 18:26 |
| ← xiong left | 18:26 |
| → steven_t_ joined | 18:26 |
| → ArjenL_ joined | 18:26 |
| → logankoe1ter joined | 18:26 |
| → johnjay_ joined | 18:26 |
| → schulty joined | 18:26 |
| ← thiago_home left | 18:26 |
| ← Mage_Dude left | 18:26 |
| ← aresnick left | 18:26 |
| ← corni left | 18:26 |
| ← chrowe left | 18:26 |
| ← LXS left | 18:26 |
| ← eno left | 18:26 |
| ← staale left | 18:26 |
| ← __ed left | 18:26 |
| ← ben_h left | 18:26 |
| ← reuss left | 18:26 |
| ← ndim left | 18:26 |
| ← dsop left | 18:26 |
| ← steven_t left | 18:26 |
| ← tonyj left | 18:26 |
| ← redondos left | 18:26 |
| ← ironfroggy_ left | 18:26 |
| ← logankoester left | 18:26 |
| ← resno left | 18:26 |
| → aresnick_ joined | 18:26 |
| → sejo joined | 18:27 |
| → infid joined | 18:27 |
| → jantje joined | 18:27 |
| → resno joined | 18:28 |
| → huslu joined | 18:28 |
| → TTilus joined | 18:28 |
| → tonyj joined | 18:28 |
| → reuss joined | 18:28 |
| → mutex joined | 18:28 |
| → staale joined | 18:28 |
| → WebDragon joined | 18:28 |
| ← steven_t_ left | 18:29 |
| → steven_t_ joined | 18:29 |
| dna_ → dna | 18:29 |
| → eplots joined | 18:29 |
| → ndim joined | 18:30 |
|
bcardarella
| How do I set the head to a particular SHA1 on a remote? | 18:32 |
|
cbreak
| with git push | 18:32 |
| → __ed joined | 18:33 |
|
cbreak
| bcardarella: man git-push, search for -f or + | 18:33 |
|
Gitbot
| bcardarella: the git-push manpage can be found at http://git.or.cz/man/git-push | 18:33 |
|
bcardarella
| cbreak: k, thanks | 18:33 |
| → chrowe joined | 18:33 |
| → Mage_Dude joined | 18:34 |
| ← herdingcat left | 18:34 |
| → corni joined | 18:34 |
|
eto
| hey guys can git handle also binary data with ease? | 18:35 |
| → ice799 joined | 18:35 |
|
wereHamster
| it can, but not with 'ease' | 18:35 |
| → eno joined | 18:36 |
|
eto
| wereHamster what does that mean? | 18:36 |
| thiago_h1me → thiago_home | 18:36 |
| ← thiago_home left | 18:36 |
| → thiago_home joined | 18:36 |
|
eto
| it is bad for repo size or there is bad workflow? | 18:36 |
|
cbreak
| do you change the binaries? | 18:36 |
|
_ikke_
| bad for size/merge purposes | 18:37 |
|
cbreak
| every single change will require the full binary to be stored in git | 18:37 |
|
_ikke_
| s/purposes/reasons | 18:37 |
| → ben_h joined | 18:37 |
| → redondos joined | 18:37 |
|
cbreak
| obviously, git can't merge them, so you'll get to resolve merge conflicts. | 18:37 |
| ← Turias left | 18:37 |
| → SamothUK joined | 18:37 |
|
SamothUK
| Evening all | 18:38 |
| → tstclair joined | 18:38 |
|
eto
| cbreak things like icons and buttons and such the frequency of change might be very slow | 18:38 |
| → alisdair joined | 18:38 |
|
cbreak
| should not be much of a problem then | 18:39 |
| ← Mage_Dude left | 18:39 |
|
SamothUK
| I have a possibly stupid question regarding rebasing in git and a kinda semi-published branch that I'm trying to get my head round. | 18:39 |
|
cbreak
| icons are only 512x512 pixel, that should be rather small | 18:39 |
|
| don't rebase public things unless everyone knows about it | 18:39 |
|
SamothUK
| I know that in principle, you never want to rebase on branches that have been published (pushed) as it forces everyone else to rebase | 18:39 |
|
cbreak
| and no one bases work on it | 18:39 |
|
SamothUK
| cbreak: yup | 18:39 |
| → dropandhop joined | 18:39 |
| → multigrain joined | 18:40 |
|
dropandhop
| hey all...I have a question about upgrading the server side git | 18:40 |
| → Mage_Dude joined | 18:40 |
| ← Theravadan left | 18:40 |
| → jasonn1234 joined | 18:40 |
|
SamothUK
| cbreak: the situation I have is that I'm working on local branches at home, and I have a central repo on the 'staging' server that I test the app on | 18:40 |
| ← jasonn1234 left | 18:40 |
|
dropandhop
| I'm running 1.4.4.4-4+etch4 and would like to upgrade to the newest version | 18:40 |
|
| I'm worried that all of my repos will break in the upgrade | 18:41 |
|
cbreak
| if you control it, it's not public | 18:41 |
| → urkud_ joined | 18:41 |
|
SamothUK
| cbreak: so my workflow is to branch, work on stuff in that branch, push up to my staging repo, and check out a copy of that working branch on the staging server for testing - so no work ever gets committed on the branch on the staging server | 18:41 |
|
dropandhop
| do I have anything to worry about? | 18:41 |
|
SamothUK
| cbreak: yeah, this is what I'm trying to make sure i have right | 18:41 |
|
cbreak
| dropandhop: make backups. then you don't. | 18:41 |
|
SamothUK
| cbreak: so if I rebase my local copy of the staging branch against master, push to the my central staging server, I shouldn't have issues because no work is ever done on the staging copy of that branch, yes? | 18:42 |
|
| (if that all makes sense) | 18:42 |
|
cbreak
| is the "central" bare? | 18:43 |
|
SamothUK
| cbreak: yes | 18:43 |
|
cbreak
| then you can force push | 18:43 |
|
dropandhop
| cbreak- thanks for the feedback...i'll make a copy of all of the repos | 18:43 |
|
SamothUK
| cbreak: I check a working copy out for testing by cloning the bare repo on the staging box | 18:43 |
|
dropandhop
| cbreak- any idea if this usually goes smoothly? | 18:43 |
| → Cryp71c joined | 18:43 |
|
Cryp71c
| How can I order git blame by date? by default it appears to be ordered by commit hash? | 18:44 |
| ← Mage_Dude left | 18:44 |
| → Mage_Dude joined | 18:45 |
|
SamothUK
| I just wanted make sure that I was right that the 'don't rebase public branches' really applied to branches that other people had based work on, and since my repo is private and the staging copy is read only, I should be ok. In case I was just being dimwitted while reading the docs :) | 18:45 |
|
cbreak
| dropandhop: I don't use git that long. but I never had problems upgrading from the 1.5 series | 18:45 |
| → theoros joined | 18:45 |
|
SamothUK
| cbreak: your explanation fits with my understanding too, which at least gives me a sanity check :) | 18:46 |
| → radhermit joined | 18:47 |
|
cbreak
| rebasing forces other people to rebase as well | 18:47 |
|
| if they don't know about it, it will probably cause chaos | 18:47 |
|
SamothUK
| cbreak: yup, and the 'other people' in this case is 'me, sat on my staging server' | 18:47 |
| ← corni left | 18:48 |
| → sagsousuke joined | 18:48 |
|
SamothUK
| cbreak: given that the branch on the staging server is effectively read-only, then I could rebase it, or I could just reset back to the head of the origin branch in the repo, since there are no local changes no? | 18:49 |
| → mjf joined | 18:49 |
| ← Mage_Dude left | 18:50 |
|
cbreak
| or reset | 18:50 |
| ← radarek left | 18:50 |
|
SamothUK
| yeah | 18:50 |
|
| Hmm, this all *sounds* like it should work nicely. Guess I need to go try it and see what pain I cause myself :) | 18:51 |
| → adamv joined | 18:51 |
| ← stringoO left | 18:51 |
| → Mage_Dude joined | 18:51 |
| ← Textmode left | 18:52 |
| ← rayners left | 18:52 |
| → thierryp joined | 18:53 |
|
SamothUK
| cbreak: thanks very much for the sanity check :) | 18:53 |
|
cbreak
| np :) | 18:54 |
| → airborn_ joined | 18:55 |
| ← airborn left | 18:55 |
| airborn_ → airborn | 18:55 |
| ← radhermit left | 18:57 |
| → m104 joined | 18:58 |
| → ChUrP joined | 18:58 |
| → seryl joined | 18:59 |
|
seryl
| Anyone have ideas why whenever I init a gitweb repo, it works fine on that local machine | 18:59 |
|
| but when I pull remotely I get the following: warning: remote HEAD refers to nonexistent ref, unable to checkout. | 18:59 |
| ← schulty left | 18:59 |
|
wereHamster
| you mean when you clone the repo.. ? | 19:00 |
|
seryl
| yea. | 19:00 |
|
ChUrP
| hey everyone, I have done some mess with my project code and would like to go back to how it was when I did my last commit. what's best why to get there | 19:00 |
|
cbreak
| does it contain a commit? | 19:00 |
|
seryl
| sure does. | 19:00 |
|
ciaranm
| ChUrP: git reset --hard | 19:00 |
| → sjokkis joined | 19:00 |
|
cbreak
| does it contain HEAD? | 19:00 |
|
seryl
| sure does | 19:00 |
|
| works locally | 19:00 |
|
| just not when I pull it from another computer | 19:00 |
| → theoros_ joined | 19:01 |
| ← rubydiamond left | 19:01 |
|
seryl
| the repo that gitweb's serving up is definitely legitamate, works fine. has a touched foo as the initial commit | 19:01 |
|
sjokkis
| hi. i have a commit that includes a new function which i'd like to split off into a new commit. when i use git add --patch it won't treat the function as one hunk. can i open the commit as a file, and cut/paste the section i want to split off? | 19:01 |
|
ChUrP
| ciaranm: I still have the untracked files | 19:01 |
|
wereHamster
| seryl: is the head detached in the repo you are trying to clone? | 19:01 |
|
ciaranm
| ChUrP: git clean | 19:01 |
| → radarek joined | 19:01 |
|
seryl
| wereHamster: No? this was literally a bare repo, touched foo, added foo, committed. | 19:01 |
| ← Zephyrus left | 19:01 |
|
cbreak
| sjohnson: do git add -p | 19:01 |
|
| and then chose edit | 19:01 |
|
| you can manually select the hunk in your editor | 19:02 |
|
| it is VERY powerful | 19:02 |
|
wereHamster
| seryl: bare repos don't have a working tree. How exactly did you add that file? | 19:02 |
| → gaveen joined | 19:02 |
|
sjokkis
| cbreak: i did try that, but it doesn't treat the whole section i need as one hunk | 19:02 |
|
| so how can i select it all at once? | 19:02 |
|
cbreak
| did you read the help? | 19:03 |
|
| I think there's an interactive help | 19:03 |
|
| if you add -i | 19:03 |
|
| or add -p | 19:03 |
| → atheistfundy joined | 19:03 |
|
seryl
| seryl: touch foo; git add foo; git commit -m "init commit"; git push origin master; | 19:03 |
| ← evantravers left | 19:03 |
|
seryl
| wereHamster: *** above | 19:03 |
| ← theoros left | 19:03 |
|
ChUrP
| ciaranm: so I do git reset --hard to move back to my last tracked version und git clean to remove untracked files? | 19:03 |
| ← thierryp left | 19:03 |
|
ciaranm
| ChUrP: yup | 19:04 |
|
ChUrP
| thanks | 19:04 |
|
cbreak
| ChUrP: man git-clean. Careful. It is one of the few commands that are not reversible | 19:04 |
|
Gitbot
| ChUrP: the git-clean manpage can be found at http://git.or.cz/man/git-clean | 19:04 |
|
wereHamster
| seryl: how did you create the repo you pushed to? git init --bare? | 19:04 |
|
seryl
| wereHamster: pulling the repo locally works fine, I feel as if it's something to do with the gitweb setup | 19:04 |
|
| wereHamster: yes, git init --bare | 19:04 |
|
wereHamster
| seryl: are you cloning through http? | 19:04 |
|
seryl
| wereHamster: correct | 19:04 |
| → stringoO joined | 19:04 |
|
cbreak
| gitweb should have nothing to do with serving the repo | 19:04 |
|
wereHamster
| seryl: did you run git update-server-info after pushing (in the server repo)? | 19:05 |
|
seryl
| no, just did now, same status. | 19:05 |
|
wereHamster
| seryl: are you using smart or dumb http? | 19:05 |
|
seryl
| wereHamster: that's a good question? I don't know how to give you the correct answer. just calling http://username:password@git.domain.com/test.git | 19:06 |
|
wereHamster
| seryl: how did you set up the server? Like that: http://progit.org/2010/03/04/smart-http.html ? | 19:07 |
| → dkobia joined | 19:08 |
|
seryl
| wereHamster: I wasn't the original person to set it up :P I'll find out. | 19:08 |
| ← Cryp71c left | 19:08 |
| → Mage joined | 19:09 |
| theoros_ → theoros | 19:10 |
| → magcius_ joined | 19:14 |
| → sanitz1 joined | 19:15 |
| ← sanitz1 left | 19:16 |
| → Zephyrus joined | 19:17 |
|
sjohnson
| cbreak: will try it thanks | 19:19 |
| → radhermit joined | 19:20 |
|
rutski
| cbreak: yup, the branch I'm tracking is indeed origin's master; it's a pretty vanilla situation here | 19:21 |
| → olaf_ joined | 19:21 |
|
rutski
| cbreak: I'm still confused as to why "git push origin master" errors out with "you're too far ahead", while "git push" works fine | 19:21 |
|
cbreak
| too far ahead is not an error | 19:21 |
|
| that you are ahead is normal if pushing is possible | 19:22 |
|
rutski
| cbreak: seems like an error to me, because the push doesn't happen :-p | 19:22 |
| ← m104 left | 19:22 |
|
rutski
| I _have_ to do "git push" (sans the "origin master") if I want the push to actually go through | 19:22 |
|
sjohnson
| cbreak: do you know much about "Pro Git"? | 19:23 |
| → m104 joined | 19:23 |
| ← ikrabbe left | 19:23 |
| ← raichoo left | 19:23 |
| ← Adman65|mbp left | 19:23 |
|
dropandhop
| do any of you know much about git-http backend? | 19:24 |
| → hal1 joined | 19:25 |
|
hal1
| I have found a problem line in my source code, and what to bring it to the attention of the other dev. Is there any functions avialable in git to do this? | 19:25 |
|
drizzd
| hal1: no | 19:26 |
|
hal1
| drizzd: you can't make comments on lines, or on a commit ? | 19:26 |
|
ciaranm
| hal1: not using git itself | 19:26 |
|
| hal1: github has something that lets you do that. you may or may not like it. | 19:26 |
|
hal1
| ciaranm: yes, I am struggling with that functionality in github, which is why I asked | 19:27 |
|
| thank you ciaranm and drizzd | 19:27 |
|
dennda
| hal1: sometimes when you add the button to the left of a line it takes a moment for the form to open | 19:28 |
|
| but it opens right below the line | 19:28 |
|
ciaranm
| github also hates you if you're using noscript | 19:28 |
| ← necromancer left | 19:29 |
|
dennda
| who would use that piece of !@#$ anyways... | 19:30 |
| ← jvraoltc left | 19:30 |
|
| dennda runs and hides | 19:30 |
|
hal1
| hehe | 19:30 |
|
cbreak
| hal1: man git-notes | 19:31 |
|
Gitbot
| hal1: the git-notes manpage can be found at http://git.or.cz/man/git-notes | 19:31 |
|
cbreak
| might not be what you want. | 19:31 |
|
| I have no idea how it works | 19:31 |
| hal1 → hal | 19:33 |
| ← felipec left | 19:33 |
| ← froschi left | 19:33 |
| ← Nickeeh left | 19:33 |
| ← tobiassjosten left | 19:33 |
| ← gaveen left | 19:34 |
| → jack___ joined | 19:34 |
| ← dkobia left | 19:35 |
| ← radarek left | 19:35 |
| → giskard joined | 19:36 |
| ← aheinecke left | 19:36 |
| jack___ → batjack | 19:36 |
| → aheinecke joined | 19:36 |
| → khaije|selen joined | 19:40 |
|
khaije|selen
| Is there a way to view the tracking setting for a branch... I _think_ mine are correct, but id like to know how to verify | 19:41 |
|
_ikke_
| git config --get-regexp remote? | 19:41 |
| → project2501a joined | 19:42 |
|
khaije|selen
| _ikke_: idk ill check that out! | 19:42 |
| ← jmcantrell left | 19:42 |
|
cbreak
| less .git/config for the raw :) | 19:43 |
|
wereHamster
| khaije|selen: git branch -vv, git remote show origin | 19:43 |
| ← mattih left | 19:43 |
| ← Taren left | 19:44 |
| ← sshc left | 19:44 |
| → Taren joined | 19:47 |
| ← Taren left | 19:48 |
| → rndstr joined | 19:48 |
|
khaije|selen
| wereHamster: fantastic, thx again! | 19:49 |
| → augustl joined | 19:52 |
|
theoros
| holy shit -vv | 19:53 |
| ← Zephyrus left | 19:53 |
|
augustl
| in git diff, the diff is split into sections with i.e. "@@ -165,8 +165,11 @@". Is there a way to git add one such section and not the entire file? | 19:53 |
|
wereHamster
| augustl: git add -p | 19:53 |
|
theoros
| git add -p | 19:53 |
|
crab
| august: git add -p | 19:53 |
| → Taren joined | 19:53 |
|
augustl
| nice, tnx | 19:54 |
|
cbreak
| there are other ways | 19:54 |
| ← domcat left | 19:56 |
|
augustl
| I noticed that some git guis lets you choose what lines to add by hand, so I guess git add is pretty flexible that way? :) | 19:56 |
|
_ikke_
| augustl: Yeah, you can specify line by line what to add | 19:57 |
|
cbreak
| you can enter edit mode and edit the hunks yourself | 19:57 |
| → chrispitzer joined | 19:57 |
|
chrispitzer
| dumb question: I added more files than I should have... how do I un-add files to a commit? (before actually commiting) | 19:58 |
|
crab
| git status will tell you | 19:58 |
|
chrispitzer
| thanks | 19:58 |
| → Wez joined | 19:58 |
| ← orange_tomek left | 19:59 |
|
Wez
| using fast-import, is there a right way to model the deletion and re-creation of a branch? I end up with error: there are still refs under 'refs/heads/2.2' | 20:00 |
| ← augustl left | 20:01 |
| → sylr_ joined | 20:02 |
| ← congerro left | 20:02 |
| ← cilly left | 20:03 |
| ← bman left | 20:04 |
| → Fissure joined | 20:05 |
| ← rutski left | 20:05 |
| ← bibinou left | 20:06 |
|
crab
| git doesn't have any way to represent that at all | 20:07 |
|
Wez
| crab: any suggestions on how to map that? | 20:10 |
| ← villemv left | 20:10 |
| → jvraoltc joined | 20:10 |
| → domcat joined | 20:13 |
| → kumbayo joined | 20:13 |
|
mmattice
| I need a reminder. I did an interactive rebase to fixup a commit. I now need to rebase a branch that was past the original commit | 20:14 |
| → mtkd joined | 20:14 |
| ← d0k left | 20:14 |
| → felipec joined | 20:15 |
| → WebDragon|away joined | 20:15 |
| → bibinou joined | 20:15 |
| ← drubies left | 20:16 |
| ← bibinou left | 20:16 |
| ← sagsousuke left | 20:16 |
| ← reuss left | 20:17 |
| → teukka joined | 20:18 |
| ← radioman-lt left | 20:18 |
| ← shd left | 20:18 |
| → shd joined | 20:18 |
| → dropandhop1 joined | 20:18 |
| → reuss joined | 20:18 |
| ← WebDragon left | 20:19 |
| ← dropandhop left | 20:19 |
| ← steven_t_ left | 20:22 |
| → radioman-lt joined | 20:23 |
| → zchydem joined | 20:23 |
|
_ikke_
| is it possible with git commit --amend to remove a file which has been commited? | 20:23 |
|
rane_
| yes | 20:24 |
| ← alisdair left | 20:24 |
| → ph^_ joined | 20:24 |
|
rane_
| if you want to change the last commit | 20:24 |
| ← dajero left | 20:25 |
|
_ikke_
| I know i can add it by first doing git add and then git commit --amend, but how should i remove changes? | 20:25 |
|
| (still keep the changes, but save them for another commit) | 20:25 |
| WebDragon|away → WebDragon | 20:26 |
| → jmcantrell joined | 20:28 |
| dwmw2 → dwmw2_gone | 20:29 |
|
rane_
| _ikke_: you want to remove a file addition from the latest commit? | 20:29 |
|
_ikke_
| rane_: Yeah | 20:30 |
|
| just the parts that were added to the last commit | 20:30 |
|
rane_
| err | 20:31 |
| ← Taren left | 20:31 |
|
rane_
| so it's not a new file? | 20:31 |
|
_ikke_
| rane_: Nup | 20:31 |
|
| like the opposite of git add -p | 20:32 |
|
rane_
| try umm | 20:33 |
|
| git reset HEAD^ -- path/to/file | 20:33 |
|
| and then commit --amend | 20:33 |
|
_ikke_
| i'll try that | 20:33 |
| ← cloudhead left | 20:35 |
|
_ikke_
| rane_: It looks like it works | 20:36 |
| ← cannonball left | 20:37 |
| ← ph^_ left | 20:37 |
| → xperience joined | 20:37 |
| → ph^_ joined | 20:37 |
| ← mtkd left | 20:38 |
| ← Bass10 left | 20:38 |
| → alester joined | 20:39 |
| ← Jferro left | 20:39 |
|
_ikke_
| how can I push all new tags to the server | 20:40 |
| ← toxygen left | 20:40 |
| → Jferro joined | 20:40 |
|
_ikke_
| git push doesn't seem to push new tags | 20:40 |
|
rane_
| git push --tags | 20:40 |
| → mtkd joined | 20:41 |
|
_ikke_
| ok, thanks | 20:41 |
| ← DavidKlein left | 20:42 |
| → toxygen joined | 20:42 |
| → Superlokkus joined | 20:44 |
| → Dawgmatix joined | 20:44 |
| ← Superlokkus left | 20:44 |
| → rayners joined | 20:47 |
| → yacoob joined | 20:47 |
| ← urkud_ left | 20:48 |
|
yacoob
| Hello there. Should I expect git-svn to be part of git distribution, or is it somethign extra? | 20:48 |
|
jast
| depends. on debian, ubuntu etc. it's in the "git-svn" package | 20:49 |
|
| it's part of the official git releases, anyway | 20:49 |
|
yacoob
| ...and I just realized that they put that as separate variant | 20:50 |
|
| in macports, I mean. | 20:50 |
| ← drizzd left | 20:51 |
| ← ph^_ left | 20:51 |
| → kabus joined | 20:51 |
| ← kabus left | 20:51 |
| → ph^_ joined | 20:51 |
| → Twisted_Mentat joined | 20:52 |
| ← Belna left | 20:53 |
| → masterkorp joined | 20:55 |
| → alisdair joined | 20:56 |
| → drizzd joined | 20:56 |
| → johnw joined | 20:57 |
| johnjay_ → johnjay | 20:57 |
| ← khmarbaise left | 20:58 |
| → dj_tjerk joined | 21:00 |
| ← chrispitzer left | 21:00 |
| → ereslibre joined | 21:02 |
| → benjo2 joined | 21:03 |
| ← benjo2 left | 21:05 |
| ← masterkorp left | 21:06 |
| ← xperience left | 21:08 |
| ← khaije|selen left | 21:08 |
| ← robinr left | 21:08 |
| ← dropandhop1 left | 21:08 |
| dsop_ → dsop | 21:08 |
| ← yacoob left | 21:10 |
| → dkobia joined | 21:10 |
| ← hyperair left | 21:10 |
| ← radioman-lt left | 21:11 |
| ← topi left | 21:12 |
| → gebi joined | 21:13 |
| ← hugoxrosa left | 21:13 |
| → topi joined | 21:13 |
| ← _iron left | 21:13 |
| ← malumalu left | 21:14 |
| → altogether joined | 21:15 |
| → hugoxrosa joined | 21:17 |
| ← lucsky left | 21:20 |
| ← WebDragon left | 21:27 |
| ← codetroll left | 21:28 |
| → necromancer joined | 21:28 |
| ← IslandUsurper left | 21:28 |
| ← tstclair left | 21:29 |
| ← gbacon left | 21:31 |
| ← pklingem left | 21:35 |
| ← jeremiah left | 21:35 |
| ← kumbayo left | 21:35 |
| ← priidu left | 21:37 |
| ← aresnick_ left | 21:37 |
|
eto
| do you think that base64 encoding file would help git handle big binary files? | 21:38 |
| ← paja left | 21:38 |
| → benjo2 joined | 21:38 |
|
selckin
| no | 21:38 |
|
David-T
| how would making them bigger help? | 21:39 |
| → WebDragon joined | 21:39 |
| ← WebDragon left | 21:39 |
| → thierryp joined | 21:40 |
| ← thierryp left | 21:41 |
| → froschi joined | 21:41 |
| → urkud_ joined | 21:41 |
| ← hukl left | 21:42 |
| ← multigrain left | 21:42 |
| ← gebi left | 21:42 |
| ← redondos left | 21:43 |
| → redondos joined | 21:43 |
| ← floppyears left | 21:43 |
| → aresnick joined | 21:43 |
| → Titosemi_ joined | 21:45 |
| → hyperair joined | 21:46 |
| ← kipras left | 21:46 |
| ← ExtraSpice left | 21:46 |
| ← Titosemi left | 21:47 |
| Titosemi_ → Titosemi | 21:47 |
| ← irc2samus left | 21:47 |
|
eto
| they would become text based | 21:48 |
|
| yeah maybe that was stupid diea | 21:48 |
|
| *idea | 21:48 |
| ← radhermit left | 21:48 |
| ← tvw left | 21:49 |
| ← TDJACR left | 21:50 |
| → BenHoltz joined | 21:50 |
| ← harinath left | 21:53 |
|
mmattice
| how can you recover a deleted branch? | 21:53 |
| ← alisdair left | 21:53 |
|
cbreak
| mmattice: do you know it's last SHA? | 21:53 |
|
| then you can just git branch sha | 21:53 |
|
mugwump
| er | 21:53 |
|
| itym git checkout -b branchname sha | 21:54 |
| ← seryl left | 21:54 |
|
theoros
| r-r-r-reflog | 21:54 |
|
mugwump
| indeed | 21:54 |
|
| or if that fails, git fsck --lost-found | 21:54 |
| ← brettgoulder left | 21:54 |
|
cbreak
| or look on the remotes | 21:55 |
|
| maybe one of them has the branch | 21:55 |
|
mmattice
| it's only local | 21:55 |
| → dydx joined | 21:55 |
|
cbreak
| is, was or is again? | 21:56 |
| ← Tommy[D] left | 21:56 |
| ← locklace left | 21:56 |
|
mmattice
| is and was | 21:56 |
|
cbreak
| good, good :) | 21:56 |
| → andrewa2 joined | 21:56 |
| → Tommy[D] joined | 21:57 |
|
dydx
| Can anyone save me some time, is there a way to push the current local branch I am on, call it branchX, to branchA without doing: git push upstream branchX:branchA? | 21:57 |
| → TDJACR joined | 21:57 |
| ← Jferro left | 21:57 |
| ← andrewa2 left | 21:57 |
| → engla joined | 21:58 |
| → pklingem joined | 21:58 |
| → __skyl__ joined | 21:58 |
|
cbreak
| dydx: configure your tracking | 21:59 |
|
| in .git/config | 21:59 |
| → primorsky joined | 21:59 |
| ← zchydem left | 21:59 |
|
__skyl__
| bah, I just did ``git add .`` #with a bunch of .svn files/directories not .gitignore'd | 21:59 |
|
mugwump
| __skyl__: git reset | 22:00 |
| ← mtkd left | 22:00 |
|
mugwump
| and try again :) | 22:00 |
| ← spearce left | 22:00 |
|
cbreak
| rm --cached might work too | 22:00 |
| ← olaf_ left | 22:01 |
|
__skyl__
| hmm, I actually got the .svn files from a past commit somewhere | 22:01 |
|
mugwump
| sounds like a job for... filter-branch! | 22:01 |
| → zchydem joined | 22:01 |
|
FauxFaux
| Dun dun derrrr! | 22:02 |
|
mugwump
| well actually perhaps you might not care, it's not like they take up extra space in the history, those extra copies have the same content as the checkout | 22:02 |
|
cbreak
| it's ugly | 22:02 |
|
| it's ... tainted. | 22:02 |
| → rubysolo joined | 22:02 |
| ← TDJACR left | 22:03 |
|
mugwump
| depends if anyone cares if you rewrite history really | 22:03 |
|
| mugwump is more of a revisionist than a socialist | 22:03 |
| → spearce joined | 22:04 |
|
jast
| you're making it sound like the two are polar opposites | 22:04 |
|
mugwump
| perhaps socialist was the wrong choice of word :) | 22:04 |
|
jast
| even a project where everyone contributes can benefit from revising :) | 22:04 |
| ← makubi left | 22:05 |
|
rubysolo
| if I have commits A -> B -> C -> D which are already pushed to shared repo, what's the best way to move B and C to a new branch? I want master to have A and D. B and C need to stick around so they can be applied later, but I don't want them on master now. | 22:05 |
|
jast
| yeah, it was. you lose, I win. and stuff. do you feel depressed yet? | 22:05 |
|
theoros
| rubysolo: you could cherry-pick B and C in the right order then use rebase -i or --onto to delete B and C | 22:06 |
| ← psoo left | 22:06 |
| ← dkastner left | 22:07 |
| ← galderz left | 22:07 |
|
rubysolo
| theoros: is that going to cause problems in the shared repo? | 22:07 |
| → jermilio joined | 22:07 |
| → flaguy48 joined | 22:07 |
|
__skyl__
| so I just removed the dirs and updated | 22:07 |
|
theoros
| rubysolo: if other people have pulled changes, do not rewrite published history | 22:08 |
| → harinath joined | 22:08 |
|
theoros
| you will reap so much chaos that i don't even know what the chaos exactly is because there are so many warnings i've never witnessed it happen | 22:08 |
|
rubysolo
| :) | 22:08 |
| ← lhz left | 22:08 |
| ← Wez left | 22:09 |
|
rubysolo
| yeah, in this case I created A and D. another dev created B and D on master, but they aren't really deploy ready -- should be on their own topic branch. :( | 22:09 |
| → floppyears joined | 22:10 |
| ← giskard left | 22:10 |
|
rubysolo
| I think I'm going to have to revert each one individually then revert the reverts later. | 22:10 |
| → TDJACR joined | 22:11 |
| ← pantsman left | 22:12 |
| ← froschi left | 22:13 |
| → drako joined | 22:14 |
| → khaije|selen joined | 22:15 |
| ← rolfb left | 22:15 |
| → Nightsorrow joined | 22:15 |
|
mmattice
| between deleting and recovering my branch (with only one extra commit on it), I did a fixup on an intermediate (between master and HEAD of branch1) commit. rebasing the restored branch is failing because of this. | 22:15 |
| ← jermilio left | 22:16 |
|
khaije|selen
| How do I specify a nonstandard ssh port for the git clone command? | 22:16 |
| ← benjo2 left | 22:16 |
| ← bcardarella left | 22:17 |
|
mmattice
| easiest is to stick it in your ssh_config | 22:17 |
| ← ppawel left | 22:18 |
| ← altrux left | 22:18 |
| ← naeu left | 22:18 |
| ← m104 left | 22:18 |
|
khaije|selen
| Mkay, too bad git doesn't handle that option itself | 22:18 |
|
cbreak
| khaije|selen: you can put it into the path... | 22:18 |
|
| it's not called URI for nothing | 22:19 |
|
khaije|selen
| cbreak: what would that look like? | 22:19 |
|
cbreak
| khaije|selen: like specified in man git-clone | 22:19 |
|
Gitbot
| cbreak: the git-clone manpage can be found at http://git.or.cz/man/git-clone | 22:19 |
|
cbreak
| I just changed it in /etc/services | 22:19 |
|
| that had the nice side effect that my sshd listens on the new port as well :) | 22:20 |
| ← intripoon left | 22:23 |
| → diegoviola joined | 22:23 |
|
diegoviola
| hi, how do i create a diff patch? | 22:23 |
|
| if i haven't committed yet | 22:23 |
|
wereHamster
| git diff > your.patch | 22:23 |
|
johnw
| git format-patch | 22:23 |
|
| either is accepted by "patch" | 22:23 |
|
jast
| first answer is correct :) | 22:23 |
|
cbreak
| what would you need a diff patch for? | 22:23 |
|
diegoviola
| ty | 22:24 |
| → corni joined | 22:24 |
|
khaije|selen
| cbreak: ok cool I see now... if I add the ssh:// prefix I get exactly what I want, thanks | 22:24 |
| → locklace joined | 22:24 |
| → Theravadan joined | 22:25 |
|
johnw
| i missed "if I haven't committed yet" :) | 22:25 |
|
khaije|selen
| I'm trying to setup gitosis and its giving me a hard time | 22:25 |
| ← atheistfundy left | 22:26 |
| ← a9b left | 22:26 |
|
jast
| khaije|selen: you might want to check out gitolite instead. it's much more maintained and everything. | 22:26 |
|
| and it allows for more flexible setups, too | 22:26 |
|
khaije|selen
| jast: I've read about it, it supports auth against branches right? | 22:26 |
| ← cedricv left | 22:27 |
|
jast
| I think so | 22:27 |
|
| I haven't really used gitolite myself but I read the testimonials here and I believe the author is one of the good guys | 22:27 |
|
khaije|selen
| jast: there was something I didn't like about it at the time... can remember now so I'll give it a second look | 22:27 |
| ← LiamH left | 22:27 |
|
jast
| at any rate, the author tends to be here fairly often to complain at or ask questions | 22:28 |
|
johnw
| i like gitolite much | 22:28 |
|
jast
| s/n t/n for people t/ | 22:29 |
| → noyb joined | 22:30 |
| ← hugoxrosa left | 22:30 |
| ← drizzd left | 22:31 |
| ← aheinecke left | 22:31 |
| → basie joined | 22:32 |
| → MattDiPa_ joined | 22:33 |
| ← stringoO left | 22:33 |
| ← MattDiPasquale left | 22:34 |
| ← johnw left | 22:34 |
| → kokx- joined | 22:35 |
| kokx- → kokx | 22:35 |
| ← domcat left | 22:35 |
| → a9b joined | 22:36 |
| ← pklingem left | 22:37 |
| → brettgoulder joined | 22:37 |
| → sshc joined | 22:38 |
| ← tizbac left | 22:40 |
|
basie
| G'day all. If 'A' is an existing git repository, and 'B' has almost identical contents to 'A' but is not a git repository, is it possible to turn 'B' into a clone of 'A' without deleting all the files and starting over? | 22:40 |
|
KeeperOfTheSoul
| basie: why? you're going to have to copy the whole repository when cloning anyway | 22:41 |
|
wereHamster
| git init; git remote add origin <url of A>; git fetch origin; | 22:41 |
|
| then try git reset --soft origin/master; git add .; git commit | 22:41 |
|
basie
| thanks wereHamster. KeeperOfTheSoul: because I don't have permissions to completely empty the target directory. | 22:41 |
|
KeeperOfTheSoul
| I prefer to clone with no checkout, then copy the content in and add it | 22:42 |
|
wereHamster
| or, if that doesn't work, git update-ref refs/heads/master origin/master; git add .; git commit | 22:42 |
| → jermilio joined | 22:42 |
|
KeeperOfTheSoul
| basie: why not, that could annoy git anyway, since git wouldn't be able to delete files as it likes | 22:42 |
| ← ramusara left | 22:42 |
| → benjo2 joined | 22:42 |
| ← dreiss left | 22:43 |
| → hugoxrosa joined | 22:43 |
|
basie
| KeeperOfTheSoul: because some files were written by another process which I do not have permission to delete. Those directories are in .gitignore, but I still can't empty the main directory which seems to be preventing git from cloning. | 22:43 |
| ← apalyan left | 22:43 |
| → jackdempsey joined | 22:43 |
| ← jrmuizel left | 22:44 |
| ← mbroeker left | 22:45 |
| → yaotti joined | 22:45 |
| → enherit joined | 22:46 |
| ← rubysolo left | 22:47 |
| → radhermit joined | 22:47 |
| → mbroeker joined | 22:49 |
| ← brett_h left | 22:50 |
| → multigrain joined | 22:50 |
| ← benjo2 left | 22:54 |
| → sh1mmer joined | 22:58 |
| → freshtonic joined | 23:00 |
| ← sylr_ left | 23:00 |
| ← danmatthews left | 23:01 |
| ← struberg left | 23:02 |
| → eletuchy_ joined | 23:03 |
| → mar77i joined | 23:03 |
| ← eletuchy left | 23:03 |
| ← orafu left | 23:04 |
| → orafu joined | 23:06 |
| ← brez- left | 23:07 |
| ← sshc left | 23:08 |
| ← aresnick left | 23:08 |
| ← Akkarin left | 23:08 |
| ← hugoxrosa left | 23:09 |
| ← ehabkost left | 23:10 |
| ← primorsky left | 23:10 |
| ← theoros left | 23:11 |
| → Wez joined | 23:11 |
| ← Wez left | 23:11 |
| → Wez joined | 23:11 |
| ← MattDiPa_ left | 23:11 |
| ← jackdempsey left | 23:12 |
| ← alezandro left | 23:12 |
| → prgmatic joined | 23:12 |
| ← Wez left | 23:12 |
| → pklingem joined | 23:14 |
| → masterkorp joined | 23:15 |
| → fxn joined | 23:18 |
| → loincloth joined | 23:19 |
| → coppro joined | 23:19 |
|
fxn
| I have a commit in my local repo, not pushed anywhere, and I want to get rid of it, I want my local repo to be like origin/master | 23:19 |
|
kokx
| fxn: git reset origin/master --hard | 23:20 |
|
fxn
| kokx: cool | 23:21 |
|
kokx
| though you are really losing all data ;) | 23:21 |
|
fxn
| kokx: yeah that's fine | 23:21 |
| ← hal left | 23:22 |
| → vinse joined | 23:22 |
|
jmcantrell
| how do i get the root directory of a repo? | 23:23 |
|
kokx
| jmcantrell: how do you mean, 'get the root directory' ? | 23:23 |
| ← ChUrP left | 23:23 |
| → seryl joined | 23:24 |
|
jmcantrell
| kokx: the root of a working tree. the directory that contains the .git directory. i remember there being a fairly simple way to do this, but i can't remember what it was | 23:24 |
| ← justin-george left | 23:25 |
|
charon
| git rev-parse --show-toplevel | 23:27 |
|
| jmcantrell: ^... and --show-cdup for relative | 23:27 |
|
jmcantrell
| charon: yes! thank you | 23:28 |
|
nanotube
| also try git rev-parse --git-dir | 23:29 |
| ← Swistaczek left | 23:30 |
| → aresnick joined | 23:30 |
| → shennyg joined | 23:30 |
| ← Titosemi left | 23:32 |
| ← radhermit left | 23:32 |
| → Determinist joined | 23:33 |
| ← yaotti left | 23:33 |
| ← AkumaStreak left | 23:34 |
| ← basie left | 23:34 |
|
sjohnson
| Q: what is git potty? | 23:34 |
|
| it sounds cute. | 23:34 |
|
seryl
| Anyone have an idea why git's throwing a Cannot access URL http://git.bitbane.com/test.git/, return code 22? | 23:35 |
|
| using git-http-backend with apache | 23:35 |
|
| followed: http://progit.org/2010/03/04/smart-http.html | 23:36 |
| ← loincloth left | 23:36 |
|
sjohnson
| because you didn't go to church last sunday | 23:36 |
|
DrNick
| No route matches "/test.git" with {:method=>:get} | 23:37 |
|
sjohnson
| just kidding. i don't know. | 23:37 |
|
seryl
| DrNick: that's not true either. it's definitely there when I browse there, getting works fine | 23:37 |
|
| posting is failing though | 23:37 |
|
| and I can grab the repo fine | 23:37 |
| → stringoO joined | 23:38 |
| → dev2_ joined | 23:40 |
| ← mjf left | 23:42 |
| → loincloth joined | 23:42 |
| → madewokherd joined | 23:42 |
| ← dev2 left | 23:42 |
| dev2_ → dev2 | 23:42 |
| ← BenHoltz left | 23:43 |
| → glebd joined | 23:44 |
| ← fxn left | 23:46 |
| ← Paraselene_ left | 23:46 |
| → fxn joined | 23:47 |
| ← fxn left | 23:47 |
| → radhermit joined | 23:47 |
| ← eletuchy_ left | 23:48 |
| → brett_h joined | 23:49 |
| ← dj_tjerk left | 23:51 |
| → hasu joined | 23:51 |
| ← ph^ left | 23:52 |
| ← LRN left | 23:54 |
| ← dydx left | 23:57 |