| 2011-01-16 |
|
spvensko
| is it fair to associate the term "focus" with git checkout? | 00:00 |
| → sshc joined | 00:00 |
|
spvensko
| as in change focus by switching to a commit or branch? | 00:00 |
| ← vi_it_p left | 00:00 |
| ← Morasique left | 00:01 |
| ← TML__ left | 00:01 |
| → TML joined | 00:01 |
|
offby1
| *shrug* | 00:02 |
|
| fair to whom? | 00:02 |
|
spvensko
| to me with respect to my learning | 00:03 |
| ← nikolajsen left | 00:03 |
| ← chrischambers left | 00:03 |
|
womble
| If it works for you, sure. Most people just use the term 'checkout' | 00:04 |
|
| Or 'switch', I guess | 00:04 |
|
spvensko
| womble: i just want to make sure i'm assuming the correct action for the command | 00:04 |
|
| when i think checkout i think of the line at a grocery store :( | 00:04 |
| ← winterweaver left | 00:05 |
|
womble
| Well, learn to think of a git working copy instead. | 00:05 |
|
spvensko
| easier said than done but i'm working on the transition | 00:05 |
| ← wolog left | 00:06 |
| ← artefon left | 00:06 |
| ← sshc left | 00:06 |
| → sshc joined | 00:06 |
| ← pantsman left | 00:07 |
| ← Pula left | 00:09 |
| → stringoO joined | 00:09 |
| → chrischambers joined | 00:09 |
| → wolog joined | 00:09 |
| ← sshc left | 00:12 |
| → sshc joined | 00:12 |
| ← HG` left | 00:13 |
| → nadavoid joined | 00:14 |
| → steph021 joined | 00:16 |
| ← alsuren_ left | 00:16 |
| ← ormaaj left | 00:18 |
| → ormaaj joined | 00:19 |
| → Textmode joined | 00:19 |
| ← sshc left | 00:19 |
| → ereslibre joined | 00:19 |
| → sshc joined | 00:19 |
| → BiggFREE joined | 00:20 |
| ← dreiss left | 00:22 |
| → SirFunk joined | 00:24 |
| → Guest670 joined | 00:24 |
| ← tizbac left | 00:26 |
| ← sshc left | 00:26 |
| → sshc joined | 00:26 |
| ← Guest670 left | 00:26 |
| ← t0rc left | 00:30 |
| ← DiaPo left | 00:31 |
| → DiaPo joined | 00:31 |
| ← ereslibre left | 00:32 |
| ← mdel left | 00:32 |
| ← sshc left | 00:33 |
| → sshc joined | 00:33 |
| → fedesilva_ joined | 00:34 |
| ← tschundeee left | 00:36 |
| → AAA_awright_ joined | 00:37 |
| ← fedesilva left | 00:38 |
| fedesilva_ → fedesilva | 00:38 |
| ← AAA_awright left | 00:38 |
| AAA_awright_ → AAA_awright | 00:38 |
| ← damentz left | 00:40 |
| → wireghost joined | 00:40 |
| ← sshc left | 00:40 |
| → sshc joined | 00:40 |
| ← wireghost left | 00:41 |
| ← mariaharten left | 00:42 |
| ← chrischambers left | 00:42 |
| → normanrichards_ joined | 00:43 |
| ← beatak left | 00:45 |
| ← normanrichards left | 00:47 |
| normanrichards_ → normanrichards | 00:47 |
| ← sshc left | 00:47 |
| → sshc joined | 00:47 |
| ← fedesilva left | 00:47 |
| → valhallasw joined | 00:50 |
| ← SimonP86 left | 00:52 |
| ← sshc left | 00:55 |
| ← shruggar left | 00:55 |
| Caelum_ → Caelum | 00:56 |
| ← gusnan left | 00:57 |
| → bdiu joined | 00:57 |
| → eli joined | 00:58 |
| ← boombatower left | 00:58 |
| → juangiordana_ joined | 00:59 |
| → mariaharten joined | 01:01 |
| ← juangiordana left | 01:01 |
| ← bdiu left | 01:02 |
| → puddy joined | 01:02 |
| → spaceonline joined | 01:03 |
| → slithytove20061 joined | 01:04 |
| ← oracal left | 01:05 |
| → FilipeMaia joined | 01:05 |
| ← Pacman_Home left | 01:07 |
| ← slithytove20061 left | 01:08 |
| → slithytove2006 joined | 01:08 |
|
slithytove2006
| hi | 01:08 |
|
| if i set up a repository on one computer, then clone it to another, i know that i can pull the second clone onto the original, but can i get the changes on the second computer to show up on the first, without getting on that one? | 01:09 |
| ← Tommy[D] left | 01:09 |
|
clever
| slithytove2006: git help remote | 01:09 |
|
| on each system, add the other as origin, then either can pull from the other | 01:10 |
| ← ph^ left | 01:10 |
| → Tommy[D] joined | 01:10 |
| → Pacman_Home joined | 01:11 |
|
slithytove2006
| oh. i know that. i was wondering if i can go the other direction, making the changes on the second computer be reflected on the first, by running a command on the second | 01:11 |
|
womble
| Yes, push from second to first. | 01:11 |
| ← lamefun left | 01:11 |
|
slithytove2006
| that would make sense.. =/ | 01:11 |
|
clever
| so far, i havent had much luck pushing to a working directory | 01:11 |
|
| push seems to work best with a bare .git (from git clone --bare) | 01:12 |
|
wereHamster
| clever: git push <the other repo> HEAD:refs/heads/incoming; and then in the other repo: git merge incoming | 01:12 |
|
slithytove2006
| what exactly does a bare repo mean? | 01:12 |
|
wereHamster
| slithytove2006: man gitglossary | 01:12 |
|
jast
| slithytove2006: the 'gitglossary' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/gitglossary.html [automatic message] | 01:12 |
|
slithytove2006
| ah=] just started looking at git yesterday.. | 01:13 |
|
clever
| wereHamster: that could work, though ive already setup a central repo on an always on box | 01:13 |
|
| push a->c, pull c->b | 01:13 |
|
| a/b arent always on at the same time anyways | 01:13 |
| → amondracorp joined | 01:15 |
|
slithytove2006
| thats my main issue. when developing some web applications, i have the always-on host (dev and live), and several computers on which i develop. the other computers are never on at the same time | 01:15 |
| → bdiu joined | 01:16 |
| ← oriba left | 01:17 |
| → oracal joined | 01:18 |
| → dwmw2_gone joined | 01:18 |
|
womble
| So use the always-on box as your git repo server. | 01:18 |
|
slithytove2006
| thats the plan. just still learning the best way to do it | 01:18 |
|
womble
| git push; git pull; etc etc | 01:19 |
| ← steph021 left | 01:20 |
| → alberto56 joined | 01:23 |
| → dabd joined | 01:24 |
| → leavittx joined | 01:25 |
| → angelsl joined | 01:25 |
| ← valhallasw left | 01:27 |
| → jackdempsey joined | 01:28 |
| ← ericlee left | 01:29 |
| ← bdiu left | 01:29 |
| ← Yuuhi` left | 01:30 |
| → TheMoonMaster joined | 01:32 |
| → bdiu joined | 01:32 |
| ← Buglouse left | 01:32 |
| ← Textmode left | 01:34 |
| → Schmallon joined | 01:35 |
| → bcardarella joined | 01:36 |
| ← Caelum left | 01:39 |
| → Caelum joined | 01:40 |
| ← airborn left | 01:40 |
| ← zombor left | 01:40 |
| ← bdiu left | 01:41 |
| ← slithytove2006 left | 01:41 |
| ← jason237 left | 01:43 |
| ← ormaaj left | 01:43 |
| → jason237 joined | 01:44 |
| → ormaaj joined | 01:44 |
| → Textmode joined | 01:44 |
| → ryanf joined | 01:45 |
| → ericlee joined | 01:45 |
| → sputnick joined | 01:45 |
|
sputnick
| hi there | 01:45 |
| ← nyce_ left | 01:45 |
| → Lewisham joined | 01:46 |
| ← Chillance left | 01:46 |
|
linusoleander
| How do i remove the last commit? | 01:47 |
| ← jackdempsey left | 01:47 |
| ← priidu left | 01:48 |
|
womble
| git reset HEAD^ | 01:48 |
|
| And git reset --hard after that to completely obliterate the changes forevermore | 01:48 |
|
Lewisham
| Hi all. I think I've found a bug in Git, but I'm not sure how to report it or how to find out if it has already been reported. I've been finding that the line counter for diffs can be wrong. For example, the file at http://bit.ly/gpMoDc ends at line 332, but the diff for the patch on the next commit <http://bit.ly/faif5g> has a line counter starting at line 341. What should I do now? :) | 01:49 |
| ← corni left | 01:51 |
| → eean joined | 01:52 |
|
offby1
| send to the dev. list, I think | 01:52 |
| ← spaceonline left | 01:53 |
|
Lewisham
| righto | 01:54 |
|
| thanks :) | 01:54 |
| ← SuperTerp left | 01:54 |
| ← LiamH left | 01:54 |
|
cirwin
| Lewisham: I think you should check more carefully first | 01:54 |
| ← Sajaki left | 01:55 |
|
Lewisham
| cirwin: I've checked to the best of my ability, I understand maybe there is some machinations that could have occurred due to histories being merged and such, but I thought it best maybe to check here than simply write it off as my own incompetence, just in case :) | 01:55 |
|
cirwin
| well, the line numbers on the file you linked to don't start at the beginning, and don't end and the end | 01:56 |
|
| implying that whatever adds the line numbers is wrong | 01:56 |
|
| and I `think` that will be github | 01:56 |
|
Lewisham
| I've verified the same numbers come out when actually getting the diff out from Git itself | 01:56 |
|
cirwin
| ah, sorry I'm wrong | 01:57 |
|
| github's CSS fails for me | 01:57 |
|
| but the line number is right | 01:57 |
| → Buglouse joined | 01:58 |
|
cirwin
| however the versino of the file just before that commit | 01:58 |
|
| does have 351 lines | 01:58 |
|
Lewisham
| oh, which one is that? | 01:59 |
|
cirwin
| https://github.com/voldemort/voldemort/raw/4fc16f475e290d02e507ce74de07c6b949d429a7%5E/src/java/voldemort/server/storage/StorageService.java | 01:59 |
| → frakturfreak_ joined | 02:00 |
| ← angelsl left | 02:01 |
|
Lewisham
| ah, yes | 02:02 |
|
sputnick
| what is the best aproach to have "git instaweb" on port 80 under Linux all the time (not only one shot) ? | 02:02 |
|
bremner
| sputnick: use gitweb? | 02:02 |
|
sputnick
| I don't want my sources to be viewvable by everybody | 02:03 |
|
| (bremner) | 02:03 |
| ← chrisshattuck left | 02:03 |
|
womble
| So stick HTTP auth in front of it. | 02:03 |
|
bremner
| sputnick: gitweb is no different from instaweb in that respect | 02:03 |
| ← stringoO left | 02:03 |
|
sputnick
| bremner: I thought you said "github" | 02:04 |
|
bremner
| sputnick: yeah, I get that a lot. | 02:04 |
|
| good for github, I guess. | 02:04 |
|
Lewisham
| cirwin: lines numbers and such are pretty mind bending when you don't necessarily have a linear history :) I am happy to believe user error, I'd just love to know what I'm missing :) | 02:04 |
|
sputnick
| I have to search for gitweb | 02:04 |
| ← frakturfreak left | 02:05 |
| → bdiu joined | 02:05 |
|
cirwin
| Lewisham: I think you're just looking at the wrong version of the file | 02:05 |
|
| i.e. there's a diff missing somewhere | 02:05 |
|
Lewisham
| yeah, I can believe that | 02:06 |
|
| any idea how that might happen? | 02:06 |
| ← rorist_ left | 02:06 |
|
bremner
| Lewisham: gitk is good for those kind of explorations. | 02:06 |
|
Lewisham
| bremner: good idea | 02:07 |
| → chrisshattuck joined | 02:07 |
| → angelsl joined | 02:10 |
| ← chrisshattuck left | 02:10 |
|
banisterfiend
| how do i know when i've reached the end of a git bisect process? | 02:10 |
| ← wtfness left | 02:11 |
| → NewtonianB joined | 02:12 |
| → dl9pf joined | 02:13 |
| ← dl9pf left | 02:13 |
| → dl9pf joined | 02:13 |
| ← dl9pf_ left | 02:14 |
| ← ricky left | 02:15 |
| → dduncan joined | 02:16 |
| ← dduncan left | 02:16 |
|
rudi_s
| banisterfiend: Git tells you that it found the commit. | 02:16 |
| → ricky joined | 02:17 |
| ← ricky left | 02:20 |
| → ricky joined | 02:22 |
| ← GodEater left | 02:23 |
| → GodEater joined | 02:23 |
| ← walf443 left | 02:23 |
| ← dabd left | 02:25 |
| → jackdempsey joined | 02:27 |
| → MattDiPasquale joined | 02:28 |
| ← Vampire0 left | 02:31 |
| ← bcardarella left | 02:32 |
| → walf443 joined | 02:32 |
| ← engla left | 02:32 |
| ← phantomcircuit left | 02:33 |
| ← walf443 left | 02:33 |
| → phantomcircuit joined | 02:33 |
| → walf443 joined | 02:34 |
| ← jmcantrell__ left | 02:36 |
|
sputnick
| thanks bremner womble | 02:36 |
|
| works like a charm | 02:36 |
| → jmcantrell joined | 02:37 |
| → ScislaC joined | 02:38 |
|
ScislaC
| Does anyone know some short tutorial on Git that shows how to work with multiple branches that come from different repositories? | 02:38 |
|
PerlJam
| ScislaC: no, but if you could explain your confusion, I might be able to clear it up | 02:39 |
| ← Lewisham left | 02:39 |
| → jonanin joined | 02:39 |
|
ScislaC
| PerlJam: well, it's actually not my confusion... that of another developer who is wanting to do work on cairo & pixman... (he's an inkscape developer and since my git experience is very low level I couldn't help him) | 02:41 |
|
| PerlJam: I think I will just recommend that he drop in here himself. | 02:41 |
| → bcardarella joined | 02:42 |
|
sputnick
| see ya | 02:43 |
| ← sputnick left | 02:43 |
| → Vampire0 joined | 02:44 |
| → bhosie joined | 02:47 |
| → silanus_ joined | 02:47 |
| ← Buglouse left | 02:49 |
| ← oracal left | 02:49 |
| ← silanus left | 02:49 |
| → k04n joined | 02:50 |
| ← adamm left | 02:52 |
| ← daemonkeeper left | 02:53 |
| → RobertLaptop joined | 02:55 |
| ← madewokherd left | 02:58 |
| → t0rc joined | 02:58 |
| → dreiss joined | 02:59 |
| → madewokherd joined | 03:00 |
| ← Pewpewarrows left | 03:01 |
| ← tewecske left | 03:02 |
| → bhosie_ joined | 03:06 |
| ← leavittx left | 03:08 |
| ← bhosie_ left | 03:09 |
| ← bhosie left | 03:09 |
| ← eean left | 03:10 |
| → eean joined | 03:11 |
| → gnufied joined | 03:12 |
| ← Elfe left | 03:12 |
| ← dermoth_ left | 03:13 |
| ← BiggFREE left | 03:13 |
| → MattDiPa_ joined | 03:14 |
| → corey joined | 03:17 |
| corey → Guest12077 | 03:17 |
| → k04n_ joined | 03:18 |
| ← ScislaC left | 03:19 |
| ← Guest12077 left | 03:20 |
| ← k04n left | 03:20 |
| ← bdiu left | 03:20 |
| ← gnufied left | 03:22 |
| ← MattDiPa_ left | 03:22 |
| ← Amorphous left | 03:22 |
| → Elfe joined | 03:24 |
| ← eean left | 03:26 |
| → MetaCosm joined | 03:27 |
| → dermoth_ joined | 03:27 |
| → adamm joined | 03:30 |
| → envi joined | 03:32 |
| ← bcardarella left | 03:32 |
| → bdiu joined | 03:33 |
| → intripoon_ joined | 03:34 |
| → Amorphous joined | 03:37 |
| → normanrichards_ joined | 03:37 |
| ← intripoon left | 03:37 |
| ← jackdempsey left | 03:39 |
| → Buglouse joined | 03:39 |
| ← normanrichards left | 03:41 |
| normanrichards_ → normanrichards | 03:41 |
| ← k04n_ left | 03:41 |
| ← MikhX left | 03:42 |
| → MikhX joined | 03:42 |
| → gnufied joined | 03:42 |
| ← verto left | 03:44 |
| → k04n joined | 03:46 |
| ← dreiss left | 03:49 |
| → k04n_ joined | 03:49 |
| → dreiss joined | 03:49 |
| ← k04n left | 03:51 |
| → timj__ joined | 03:51 |
| ← Dave^| left | 03:53 |
| ← alberto56 left | 03:53 |
| ← ormaaj left | 03:55 |
| → ormaaj_ joined | 03:55 |
| ← MetaCosm left | 03:55 |
| ← timj_ left | 03:55 |
| → helv12 joined | 03:56 |
| ← ormaaj_ left | 03:57 |
| → ormaaj joined | 03:57 |
| ← jaeckel left | 03:57 |
| → jaeckel joined | 03:57 |
| ← bdiu left | 03:58 |
| ← beekhof left | 03:58 |
| ← puddy left | 03:59 |
| → k04n joined | 04:00 |
| ← ormaaj left | 04:00 |
| → ormaaj_ joined | 04:00 |
| ← vitor-br left | 04:01 |
| ← k04n_ left | 04:02 |
| → puddy joined | 04:03 |
| → beekhof joined | 04:04 |
| ← beekhof left | 04:04 |
| → beekhof joined | 04:04 |
| → vitor-br joined | 04:04 |
| → mariaharten_ joined | 04:08 |
| ← mariaharten left | 04:08 |
| → zombor joined | 04:11 |
| ← Buglouse left | 04:14 |
| → Buglouse joined | 04:15 |
| ← davidc_ left | 04:18 |
| → sagsousuke joined | 04:19 |
| ← Kudu|afk_ left | 04:20 |
| → a2h joined | 04:20 |
| ← gnufied left | 04:24 |
| → chrisshattuck joined | 04:25 |
| ← ormaaj_ left | 04:27 |
| → ormaaj joined | 04:28 |
| ← ormaaj left | 04:29 |
| → warthog9 joined | 04:30 |
| → davidc_ joined | 04:30 |
| ← kukks left | 04:31 |
| → ormaaj joined | 04:33 |
| ← ricky left | 04:33 |
| ← ormaaj left | 04:34 |
| → ormaaj joined | 04:35 |
| → ricky joined | 04:36 |
| → gnufied joined | 04:36 |
| → jarodluebbert joined | 04:39 |
| ← Theaxiom left | 04:43 |
| → justin-george joined | 04:46 |
| ← zivester__ left | 04:46 |
| ← nadavoid left | 04:49 |
|
davetoo
| 'k, where should I be looking to figure out how to find duplicate files in my workspace? I had a gigantic mess of working directories for the same project (nominally) from different systems, before I became Enlightened :) | 04:51 |
|
| Must be somethign that will show me which checksums match more than one file in the tree? | 04:51 |
|
womble
| find . -type f | xargs md5sum |sort | 04:52 |
|
davetoo
| haha | 04:54 |
|
| but... | 04:54 |
|
| I have this Git-shaped hammer :) | 04:55 |
|
| davetoo is a dumbass sometimes | 04:55 |
|
davetoo
| eh, except that I have to prune the .git directory | 04:56 |
| ← vitor-br left | 04:56 |
|
sitaram
| davetoo: you really need something like fdupes -- dont use "the hammer" for everything | 04:59 |
| ← MattDiPasquale left | 04:59 |
|
davetoo
| never heard of fdupes before now :) | 04:59 |
|
sitaram
| nice little program, decent set of options to make things easier | 05:00 |
| → datruth29 joined | 05:02 |
| ← datruth29 left | 05:03 |
|
sitaram
| davetoo: of course, if this is *source code* (all of it), you should probably use the hammer. Guess which is the oldest one, check it into a brand new repo, then manually copy the others one after the other and commit as if you manually edited them since the last commit | 05:04 |
| ← linusoleander left | 05:04 |
| ← sh4rm4 left | 05:04 |
| → sh4rm4 joined | 05:04 |
|
davetoo
| it is source code, but there are few enough files that using md5sum and vi I've created a list of the dupes. | 05:04 |
| → linusoleander joined | 05:06 |
| ← panRJK left | 05:06 |
| → MattDiPasquale joined | 05:07 |
| ← a2h left | 05:09 |
| → Maletor joined | 05:11 |
| ← puddy left | 05:11 |
| → smolyn_ joined | 05:12 |
| → deeks joined | 05:13 |
| ← smolyn left | 05:15 |
| ← MattDiPasquale left | 05:15 |
| ← _iron left | 05:16 |
| ← amondracorp left | 05:17 |
| ← Fullma_ left | 05:18 |
| ← marc_kdab left | 05:18 |
| → marc_kdab joined | 05:18 |
|
| crab watches fdupes chew through the 500k files in his ~ | 05:21 |
| ← justin-george left | 05:22 |
| → vitor-br joined | 05:22 |
| → mancha joined | 05:23 |
| → alus joined | 05:23 |
|
mancha
| high folks, is there a way to show a git and have it tell you the before and after labels (to get a sense of where in the timeline it was added) ? | 05:23 |
|
alus
| I did a git commit, and now I want to undo that. I ran "git reset "HEAD^", but my changes don't show up in "git diff" anymore | 05:24 |
|
| how do I get them to appear in "git diff" again? | 05:24 |
|
womble
| alus: They should show up in git diff; what does git status tell you? | 05:24 |
|
| mancha: "show a git"? | 05:24 |
|
mancha
| sorry, show a commit | 05:25 |
|
davetoo
| hombre de la mancha | 05:25 |
|
mancha
| i'd like to have it tell me that commit 7e9c6eeb136a.... is between label foo and label bar. any simple way? | 05:25 |
| ← ormaaj left | 05:26 |
|
alus
| womble: oh, "new file" | 05:26 |
|
womble
| mancha: You mean you'd like to find the tag before and after a given commit? And have that shown in the output of git diff? | 05:27 |
|
| alus: Thar she be. | 05:27 |
|
alus
| git does a weird thing. if you add a file "foo" and then make changes, "git diff" shows changes in "foo". but if you run "git commit foo" and then "git reset "HEAD^"" it just says it's added | 05:28 |
|
mancha
| womble yes. though it need not be in the diff's output...it could be a couple of git commands. | 05:29 |
|
womble
| mancha: I don't know of a way to display the tags on either side of a commit. | 05:29 |
|
| That's not to say it can't be done; I'm no git expert. | 05:29 |
| ← jonanin left | 05:30 |
| → _iron joined | 05:30 |
| ← linusoleander left | 05:30 |
|
womble
| alus: That's because git reset takes you right back to before any additions to the index, and a new file not in the index "doesn't exist" in git's worldview. | 05:30 |
|
| You can use git add -N to add the file, but not any of it's contents. | 05:30 |
|
| I suppose a case could be made for git reset to call that for all files that would otherwise be made "totally new", but that's certainly not the current behaviour. | 05:31 |
|
mancha
| womble aha, it is tricky but should be possible | 05:31 |
| → linusoleander joined | 05:32 |
|
alus
| womble: oook. thanks | 05:33 |
| ← linusoleander left | 05:33 |
| ← TheMoonMaster left | 05:35 |
| → ka1ser joined | 05:39 |
| ← sterlo left | 05:39 |
| → maleknet joined | 05:39 |
| → aidan joined | 05:41 |
| → amerine joined | 05:41 |
| → ormaaj joined | 05:42 |
|
mancha
| then obese, then diabetic, then lose a leg, then die | 05:45 |
|
davetoo
| ? | 05:45 |
| ← ryanf left | 05:45 |
|
mancha
| channel mix (in a nutritional convo elsewhere). sorry | 05:46 |
|
davetoo
| heh | 05:46 |
| ← dr_win left | 05:48 |
| ← t0rc left | 05:51 |
| ← dreiss left | 05:53 |
| ← mancha left | 05:54 |
| → thrillERboy joined | 05:56 |
| ← ormaaj left | 06:00 |
| ← chrisshattuck left | 06:00 |
| ← Yuffster_ left | 06:02 |
| → ormaaj joined | 06:02 |
| → Yuffster joined | 06:02 |
| → _pingu joined | 06:03 |
| ← Maletor left | 06:04 |
| ← ormaaj left | 06:05 |
| → ormaaj joined | 06:05 |
| → rgr joined | 06:06 |
| → darkredandyellow joined | 06:07 |
| ← sagsousuke left | 06:09 |
| ← Mage left | 06:10 |
| → yhager joined | 06:12 |
| ← ormaaj left | 06:12 |
| → ormaaj joined | 06:12 |
| ← vitor-br left | 06:12 |
| ← aah left | 06:12 |
| ← rgr left | 06:14 |
| ← darkredandyellow left | 06:15 |
| ← alnewkirk left | 06:17 |
| → lamefun joined | 06:18 |
| ← pr0wler left | 06:18 |
| → saikobee joined | 06:20 |
| Chillaway → Chillax | 06:21 |
| → fizy[laptop] joined | 06:21 |
|
fizy[laptop]
| how do i install git on linux? im somewhat new to linix :p | 06:22 |
|
offby1
| fizy[laptop]: are you using a Linux "distro", like Ubuntu? | 06:23 |
|
fizy[laptop]
| im using ubuntu 10.04 | 06:23 |
|
offby1
| "sudo aptitude install git-core" is all you need | 06:23 |
|
fizy[laptop]
| thx | 06:23 |
| ← thrillERboy left | 06:23 |
|
dstorrs
| Good choice of Linuxes, by the way. (In my opinion, anyway.) | 06:24 |
|
fizy[laptop]
| whats the diff betweet aptitude and apt-get? | 06:24 |
|
| thx | 06:24 |
|
offby1
| very little | 06:24 |
|
fizy[laptop]
| lol | 06:24 |
| ← sivy_ left | 06:24 |
|
offby1
| aptitude has an interactive full-screen mode | 06:24 |
|
fizy[laptop]
| i tried sudo apt-get install git, but that didnt work | 06:24 |
|
offby1
| but if you invoke it with arguments, as I suggested, then it's pretty much the same as apt-get | 06:24 |
|
| "git-core" | 06:24 |
|
fizy[laptop]
| didnt know it was got-core | 06:24 |
|
| git* | 06:25 |
| ← alus left | 06:25 |
|
dstorrs
| yeah, that is the one tricky bit with package managers -- guessing which name the package manager thought was most appropriate for the software you want. | 06:25 |
|
fizy[laptop]
| ikr? | 06:25 |
|
offby1
| likr? | 06:25 |
|
fizy[laptop]
| how do i launch it? command line 'git', menues, or what? | 06:26 |
|
| and can get a gui for ubuntu? | 06:26 |
|
| a git gui, that is | 06:27 |
|
offby1
| I recommend the command line | 06:27 |
|
fizy[laptop]
| ok | 06:27 |
|
offby1
| "git init" will create a new repo; "git clone ..." is how you clone | 06:27 |
|
fizy[laptop]
| im used to mercurial command line and gui | 06:27 |
|
offby1
| "gitk --all" is a crude-but-useful gui | 06:27 |
|
| read one of the many intros; start at git-scm.com | 06:28 |
| ← edude03 left | 06:29 |
| ← adamm left | 06:32 |
| ← zombor left | 06:33 |
| wagle_ → wagle | 06:38 |
| ← saikobee left | 06:42 |
| ← sraue left | 06:44 |
| ← deeks left | 06:53 |
| ← OOPMan left | 06:54 |
| → sraue joined | 06:56 |
| ← jfkw left | 06:57 |
| ← madewokherd left | 07:01 |
|
Arrowmaster
| the package name has changed from git-core to just git in debian so future versions of ubuntu should use that name too | 07:05 |
|
womble
| Awwww, the GNU interactive tools got relegated. | 07:07 |
| ← Yuffster left | 07:07 |
|
Arrowmaster
| yeah | 07:07 |
|
womble
| I'll bet that's why bzr is the FSF's official SCM. | 07:08 |
| ← Bass10 left | 07:09 |
|
dstorrs
| fizy[laptop]: git-scm.com in general, but specifically: http://book.git-scm.com/ | 07:09 |
|
davetoo
| I'm using Tortoise Git where I"m using Windows. Sometimes. | 07:09 |
| ← _Vi left | 07:11 |
| Adys_ → Adys | 07:11 |
| ← scheibo left | 07:14 |
|
offby1
| ProGit is worth a look too | 07:15 |
|
womble
| http://progit.org/ | 07:16 |
| ← egrouse- left | 07:17 |
| ← warthog9 left | 07:17 |
| → egrouse joined | 07:17 |
| ← TML left | 07:21 |
| → TML joined | 07:24 |
| → nimrod10 joined | 07:28 |
| ← davetoo left | 07:28 |
|
banisterfiend
| offby1: i bought that book and did a few things after i bought it | 07:28 |
|
| offby1: i went fishing | 07:28 |
| ← nimrod10` left | 07:31 |
| ← NewtonianB left | 07:33 |
|
tango_
| with the book or in an unrelated note? | 07:35 |
|
banisterfiend
| tango_: both, a note-book | 07:35 |
| ← fizy[laptop] left | 07:35 |
| ← JimmyRcom left | 07:37 |
| ← lamefun left | 07:37 |
| ← smolyn_ left | 07:43 |
| → paleywiener joined | 07:46 |
| → dr_win joined | 07:48 |
|
paleywiener
| guys i'm trying to copy some git files to my local .vim bundle dir via a script. Trouble is i C-c the script sometimes. When i re-run clone borks with dir already exists.. any way to sync interrupted downloads?? | 07:50 |
|
| merge and pull won't work in this case | 07:51 |
| ← cirwin left | 07:54 |
|
womble
| paleywiener: Fix the script to cleanup on C-c | 07:57 |
| ← fr left | 07:59 |
| ← mariaharten_ left | 08:01 |
| → warthog9 joined | 08:01 |
| → mariaharten joined | 08:02 |
| ← jarodluebbert left | 08:03 |
| → OOPMan joined | 08:04 |
|
paleywiener
| hmm.. I did: git clone https://github.com/tpope/vim-pathogen.git now when i do git pull sameURL it says not a git repository?? | 08:05 |
|
| isn't pull the same as svn update | 08:05 |
|
womble
| Yes(ish) | 08:06 |
|
KyleXY[2]
| paleywiener: just 'git pull' will do. | 08:06 |
|
womble
| You don't have to specify the URL you cloned from; it's automatically setup as the remote 'origin' | 08:06 |
| ← spvensko left | 08:06 |
| → Adaptee joined | 08:07 |
|
paleywiener
| ah! yeah worked.. any way to specify a dst/target dir? i'm scripting this so i'd like to avoid a cwd/cd | 08:08 |
| → spvensko joined | 08:08 |
| ← OOPMan left | 08:08 |
|
womble
| Yeah, just give the destdir as the next argument to the clone | 08:11 |
|
| So git clone URL destdir | 08:11 |
| ← Slix` left | 08:11 |
| → cooperbear joined | 08:11 |
| ← spvensko left | 08:13 |
|
cooperbear
| Hello everyone. I'm using the git-repo from assembla.com and am a bit confused at what happened. I have files in some files in my default view, and everything else in a 'seperate' branch called 'master'. Isn't 'master' the default branch always? | 08:16 |
|
womble
| cooperbear: It doesn't have to exist, or be the default, but it's not commonly absent. | 08:18 |
|
cooperbear
| womble: Ah okay. So it should also work withouth any branch? | 08:19 |
|
| ie. no default 'master' branch | 08:19 |
|
womble
| Yes. | 08:19 |
|
cooperbear
| Okay, thanks! | 08:19 |
| → tewecske joined | 08:21 |
|
thiago_home
| it has to have one branch | 08:24 |
|
| doesn't have to be master | 08:24 |
| → OOPMan joined | 08:24 |
| ← amerine left | 08:24 |
| → utu joined | 08:24 |
|
cooperbear
| thiago_home: Okay.. but some environments automatically assume a branch 'master' right? If it is missing. | 08:25 |
|
tango_
| not master, the current checkouted out branch | 08:25 |
|
thiago_home
| no | 08:25 |
|
| if any script or program assumes the existence of master, it's broken | 08:26 |
|
| "master" is just the default name of the branch that is created by "git init" | 08:26 |
|
cooperbear
| ah okay.. I'm not sure what happened last time at assembla's git-hosting then.. I had alot of files inside the master branch and a few files not, they only appeared when not selecting a branch to view.. any idea? | 08:27 |
| → matjas joined | 08:30 |
|
cooperbear
| I'm using git tower on osx to first clone the repo from assembla, then commit and push new files to it. Alway's the first time it complains about the default branch.. I think it by default pushes to '. current' .. but when I do it via commandline the first-time, and after that use git tower, it does work | 08:31 |
| ← MikhX left | 08:31 |
|
thiago_home
| I'm not even understanding what you're saying | 08:35 |
| ← alip left | 08:35 |
| → smolyn joined | 08:36 |
|
thiago_home
| how exactly does git tower complain? | 08:36 |
| → doener joined | 08:36 |
| → chrischambers joined | 08:37 |
|
cooperbear
| thiago_home: I'm sorry :) one sec, I'll see if I can replicate the problem :) | 08:37 |
| Chillax → Chillaway | 08:39 |
| → alip joined | 08:40 |
| → slithytove2006 joined | 08:41 |
| ← slithytove2006 left | 08:41 |
| → slithytove2006 joined | 08:44 |
| ← doener left | 08:44 |
| → doener joined | 08:44 |
|
cooperbear
| thiago_home: I'm getting the same strange thing again. I clone a repo from assembla.com. Then put files inside and commit them. After that I try to push the new changes to assembla. But it doesn't do anything, just tells me it is already up to date.. see this screenshot: http://d.pr/L2wd | 08:44 |
|
| Additional info: This is an empty repository that I just created. | 08:46 |
|
thiago_home
| created on the hosting service? Or locally? | 08:46 |
| ← _pingu left | 08:46 |
|
cooperbear
| thiago_home: On the hosting service. | 08:46 |
|
thiago_home
| was this the first problem you had? No other error messages? | 08:47 |
|
cooperbear
| yes, the first problem. No other errors. | 08:47 |
| ← smolyn left | 08:48 |
|
thiago_home
| then I suggest you stop using git tower | 08:48 |
|
cooperbear
| I'm sorry, I gave you the wrong screenshot :) http://d.pr/M7EL - butt still.. seems to do nothing | 08:49 |
|
thiago_home
| it's pushing to . | 08:50 |
|
| of course it's going to be up to date | 08:50 |
|
| was the remote repository also empty? | 08:50 |
|
cooperbear
| thiago_home: Yes, the remote repository was empty. Then I cloned locally, and now I'm trying to push files to it | 08:51 |
|
womble
| cooperbear: I'll bet that you're pushing a branch that doesn't already exist on the remote, so git push isn't pushing to it. Try git push origin branch:branch | 08:51 |
|
thiago_home
| cooperbear: what happens if you clone a non-empty repository? | 08:51 |
|
womble
| Or, as thiago_home says, dump git tower, it's clearly a bit broken. | 08:51 |
|
thiago_home
| cloning empties is a new feature. Maybe git tower doesn't work properly with it yet. | 08:51 |
| ← comcor- left | 08:54 |
| → comcor- joined | 08:54 |
|
cooperbear
| Ah okay.. but how do I start with a filled repository then? If that should solve the problem? Git Tower is still in beta yes, so it could be a missing feature. Not sure about non-empty repositories from assembla, but from github, they work straight out-of-the-box. | 08:54 |
|
thiago_home
| I suggest git init, put the files in, push | 08:54 |
|
| then clone | 08:54 |
| ← FilipeMaia left | 08:57 |
| → MikhX joined | 08:57 |
| ← mbertens left | 08:57 |
|
cooperbear
| thiago_home, womble: Okay thanks for the help, will try and see if that works | 09:00 |
| ← mariaharten left | 09:01 |
|
womble
| Why would you ever clone an empty repo, anyway? | 09:01 |
|
| It's not like they're hard to come by. | 09:01 |
|
thiago_home
| so you can push to it | 09:02 |
| → napster_123 joined | 09:02 |
|
cooperbear
| womble: I think I misundertood how git repositories should be initiated. My workflow so far was to create a remote repository for my new project, then clone it locally, and put the initial files in there, then commit and push so the remote repository that was first empty is now filled and up-to-date. | 09:03 |
| → mariaharten joined | 09:03 |
|
thiago_home
| you can do that | 09:04 |
|
| but the original workflow, before cloning empties was allowed, is to git init, put the files, create the remote repository and then push there | 09:05 |
|
| no cloning involved | 09:05 |
| banisterfiend → banister`out`bab | 09:05 |
|
womble
| No clones for you! One year! | 09:08 |
|
cooperbear
| Ah alright.. good to know. Thanks guys, I'll try out the original workflow. womble: Hehe, alright :) | 09:09 |
| ← napster_123 left | 09:13 |
| ← robotarmy left | 09:13 |
| ← laj_ left | 09:13 |
| → fedesilva joined | 09:15 |
| → HG` joined | 09:21 |
| → jmd joined | 09:21 |
| ← utu left | 09:24 |
|
jmd
| Whenever I try to push it says I need to pull first. | 09:25 |
|
| Whenever I pull it says 'already up to date'. | 09:25 |
|
| How can I resolve this deadlock? | 09:25 |
|
womble
| Give everyone a second chopstick. | 09:27 |
|
doener
| jmd: are you sure the non-ff error is about the branch head you have checked out? | 09:32 |
| ← matjas left | 09:33 |
|
jmd
| Well I specify the same repo and branch for both the pull and push commands, so presumably it is. | 09:33 |
|
doener
| jmd: do you specify the branch head you have checked out? | 09:34 |
|
| jmd: merging the remote's foo doesn't mean that it is merging to your local foo | 09:35 |
|
| s/merging/merged/2 | 09:35 |
|
jmd
| I say 'git pull repo master' and then 'git push repo master' Shouldn't that do the job? | 09:35 |
|
doener
| jmd: if you have branch foo checked out, no | 09:36 |
| → matjas joined | 09:36 |
|
doener
| jmd: "git pull repo master" would merge repo's master to foo, and then you try to push master | 09:36 |
|
| jmd: but neither command would ever modify your local master | 09:36 |
|
| jmd: so the error would never change either, because you try to push the same thing over and over again | 09:37 |
| ← slithytove2006 left | 09:37 |
|
jmd
| Well when I do 'git diff repo/master HEAD' there are certainly differences. | 09:37 |
|
doener
| You don't like getting help, right? | 09:38 |
|
| I'm still waiting for an answer to: 10:35:21 <doener> jmd: do you specify the branch head you have checked out? | 09:40 |
|
| (strictly, you didn't really answer the first question either...) | 09:40 |
|
jmd
| doener: When people ask for help on a forum, they are probably not experts (otherwise they wouldn't be asking). So if you start talking a lot of very context specific terms, you shouldn't be surprised if the punter misunderstands/fails to understand your question. | 09:44 |
| → napster_123 joined | 09:45 |
|
jmd
| When s/he then provides more information in the hope that it will answer your question, there is a distinct possibility that it might not be strictly relevant. | 09:45 |
|
doener
| jmd: "git branch" -- the line with the * | 09:48 |
| ← loxs left | 09:48 |
|
doener
| jmd: same name that you give to push? | 09:49 |
| ← Textmode left | 09:49 |
| → slithytove2006 joined | 09:49 |
|
jmd
| * (no branch) | 09:49 |
|
doener
| so you're on a detached HEAD (no branch head checked out), so your "git pull" commands won't affect "master" (as it is not checked out), so you're trying to push the same state of "master" all the time, so you get the same error all the time | 09:51 |
| → goshawk joined | 09:51 |
|
slithytove2006
| if i clone a project, then make some changes, and then want to update the project, i would use git rebase right? | 09:51 |
|
doener
| if you want to merge to master, check that out first (git checkout master). You probably want to create a "backup" branch head for the commits you created while on a detached HEAD though (git branch <whatever>) | 09:52 |
|
banister`out`bab
| slithytove2006: lol? | 09:52 |
|
jmd
| doener: Ok Thanks. I'll try that. | 09:53 |
|
doener
| jmd: (and if you get asked a question and don't know how to answer that question, then ask for a way to answer it, instead of providing a heap of random information) | 09:53 |
|
jmd
| Right. And get some pedantic smart alec send you a 'dont ask to ask' bot message. | 09:55 |
| → oracal joined | 09:55 |
| ← HG` left | 09:56 |
| ← jmd left | 09:59 |
| → kumbayo joined | 10:00 |
| ← tyteen4a03 left | 10:01 |
| → HG` joined | 10:02 |
| → ThomasLocke joined | 10:03 |
| ← MikhX left | 10:03 |
| → tyteen4a03 joined | 10:05 |
| ← tyteen4a03 left | 10:06 |
| → TrineLocke joined | 10:07 |
| → pantsman joined | 10:08 |
| → MikhX joined | 10:10 |
| → drizzd joined | 10:13 |
| ← drizzd_ left | 10:16 |
| → Zephyrus joined | 10:17 |
| → jhoepken joined | 10:17 |
| → ph^ joined | 10:18 |
| ← goshawk left | 10:20 |
| ← slithytove2006 left | 10:20 |
| ← mariaharten left | 10:21 |
| ← hashier_ left | 10:27 |
| → slithytove2006 joined | 10:28 |
| → tizbac joined | 10:32 |
| ← koo5 left | 10:35 |
| ← krunkosaurus left | 10:37 |
| ← roger_padactor left | 10:38 |
| ← Buglouse left | 10:40 |
| ← slithytove2006 left | 10:40 |
| → priidu joined | 10:41 |
| → benlangfeld joined | 10:41 |
| → ludde joined | 10:42 |
| ← SvenDowideit left | 10:43 |
| → Sajaki joined | 10:44 |
| → krunkosaurus joined | 10:45 |
|
krunkosaurus
| is there a way I can run gitk or some other visualizer on a remote ssh session? | 10:45 |
|
| just so I can see the branches and merges visually | 10:45 |
| → project2501b joined | 10:46 |
| ← aef left | 10:47 |
| → aef joined | 10:48 |
| → alsuren_ joined | 10:48 |
|
krunkosaurus
| git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short | 10:50 |
| ← nimrod10 left | 10:52 |
| → nimrod10 joined | 10:53 |
| frakturfreak_ → frakturfreak | 10:54 |
| → mariaharten joined | 10:54 |
| → d0k joined | 10:55 |
| ← paleywiener left | 10:57 |
| ← project2501b left | 11:01 |
| → alsuren__ joined | 11:08 |
| ← alsuren_ left | 11:08 |
| ← joshsmith left | 11:11 |
| ← jhoepken left | 11:13 |
| → unon joined | 11:15 |
| ← zorzar left | 11:17 |
| → napster_123_ joined | 11:19 |
| → amund joined | 11:20 |
| ← napster_123 left | 11:21 |
| napster_123_ → napster_123 | 11:21 |
|
doener
| krunkosaurus: http://jonas.nitro.dk/tig/ | 11:21 |
| ← Zinuzoid left | 11:21 |
| → dabd joined | 11:23 |
|
krunkosaurus
| doener: thanks! | 11:23 |
| → MattDiPasquale joined | 11:23 |
|
cooperbear
| Is the first push to an empty remote repository somehow different then any following push? | 11:23 |
| → TheFox21 joined | 11:24 |
| → patrakov joined | 11:24 |
|
patrakov
| hi. I am new to git. I made some changes in my source files and didn't commit them. Now I think that these changes are all wrong. What should I do? | 11:25 |
|
wereHamster
| cooperbear: no | 11:26 |
|
| patrakov: git reset --hard | 11:27 |
|
patrakov
| (i.e., looking for an equivalent of "svn revert") | 11:27 |
| ← MattDiPasquale left | 11:27 |
| ← ThomasLocke left | 11:28 |
|
cooperbear
| wereHamster: It seems like when I first push files to an empty remote repo using 'git push origin master' it does not get recorded under a branch remotely. But after this initial push, I can just use 'git push' and it will always be under the branch 'master'.. does sound familiar or am I seeing strange things? | 11:29 |
| → zorzar joined | 11:30 |
| ← TrineLocke left | 11:31 |
| → engla joined | 11:31 |
| ← napster_123 left | 11:31 |
| ← engla left | 11:31 |
| → engla joined | 11:31 |
| → Octalot joined | 11:31 |
| → jvv joined | 11:31 |
|
wereHamster
| cooperbear: man git-config -> push.default | 11:32 |
|
jast
| cooperbear: the 'git-config' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-config.html [automatic message] | 11:32 |
| ← k04n left | 11:32 |
|
wereHamster
| there's an explanation | 11:32 |
| → Yuuhi joined | 11:33 |
| → nebuchadnezzar joined | 11:33 |
|
krunkosaurus
| tig is amazing | 11:35 |
|
cooperbear
| wereHamster: Am I right that when I set push.default to 'current', it should create the branch I use locally on the remote? Even if the remote is completely empty? | 11:38 |
|
wereHamster
| the man page would suggest so | 11:39 |
| → napster_123 joined | 11:39 |
|
nebuchadnezzar
| hello, I try to use git-log pretty format and I can not produce the output of --pretty=medium, I don't see how to put tab in front of subject and body lines, any hints? | 11:39 |
| → Silanus joined | 11:39 |
|
wereHamster
| nebuchadnezzar: use a custom format, see PRETTY FORMATS in man git-log | 11:40 |
|
jast
| nebuchadnezzar: the 'git-log' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-log.html [automatic message] | 11:40 |
|
nebuchadnezzar
| wereHamster: I do, but I see nothing in the manpage to ident lines by X spaces or tabs | 11:41 |
| → k04n joined | 11:41 |
| → |RicharD| joined | 11:42 |
|
|RicharD|
| hi to all | 11:42 |
|
| i had created a git reposity with webfaction shared account... | 11:42 |
|
| but now i had a local git reposity | 11:42 |
|
| i want upload the commit on remote | 11:42 |
|
| how i can do ? | 11:42 |
| ← k04n left | 11:43 |
|
wereHamster
| |RicharD|: with git push | 11:44 |
|
|RicharD|
| oki | 11:44 |
|
| but how i can specify the url? | 11:44 |
| → airborn joined | 11:45 |
| ← MikhX left | 11:46 |
|
|RicharD|
| i tried but it say: src refspec origin not match any | 11:46 |
| ← Schmallon left | 11:46 |
| → gebi joined | 11:47 |
| ← gebi left | 11:47 |
| → gebi joined | 11:47 |
|
cooperbear
| |RicharD|: Maybe git push origin master ? | 11:47 |
|
|RicharD|
| i had resolved :) | 11:47 |
|
| with only master | 11:47 |
|
cooperbear
| oke :) | 11:47 |
|
|RicharD|
| umh but what is different from origin and master ? | 11:47 |
| ← lanthan_ left | 11:48 |
|
cooperbear
| I'm not sure, am a rookie myself :) I think it references from local to remote | 11:48 |
|
|RicharD|
| umh oki :) | 11:48 |
|
| then why the commit is done by unknown | 11:49 |
|
| and not by my username ? | 11:49 |
|
| how i can change/set author ? | 11:49 |
|
cooperbear
| git config --global user.name "Your name" | 11:50 |
| ← acid left | 11:50 |
| ← unon left | 11:51 |
|
cooperbear
| and git config --global user.email "you@email.com" | 11:51 |
| → koo5 joined | 11:52 |
|
|RicharD|
| oki thanks | 11:52 |
| ← jvv left | 11:52 |
|
cooperbear
| |RicharD|: np :) | 11:52 |
|
|RicharD|
| :) | 11:52 |
|
cbreak
| rich, note that that will not change the author and committer of previous commits | 11:54 |
|
| also, take a look at http://book.git-scm.com/2_setup_and_initialization.html :) | 11:54 |
|
nebuchadnezzar
| the following does not produce the same as --pretty=medium: git log --pretty='format:commit %H%nAuthor: %an <%ae>%nDate: %ad%n%+B' | 11:54 |
|
|RicharD|
| yes don't worry :) | 11:55 |
| ← jmil_ left | 11:55 |
|
|RicharD|
| i had only 2 commits for test :) | 11:55 |
|
cbreak
| don't forget to set your e-mail address | 11:55 |
|
| or ... one of your addresses... | 11:55 |
| → Cro_Crx joined | 11:55 |
|
cbreak
| (I have one specifically for git commits in public repos, just in case some random spam bot finds it...) | 11:56 |
|
|RicharD|
| yes i done it :) | 11:56 |
|
| it's a private reposity | 11:56 |
| → Anubisss joined | 11:56 |
|
cooperbear
| is anyone else here using assembla's git hosting? | 12:00 |
| → unon joined | 12:02 |
| ← HG` left | 12:07 |
| → nikolajsen joined | 12:07 |
| → tvw joined | 12:10 |
| ← tvw left | 12:10 |
| → foocraft joined | 12:11 |
| → tvw joined | 12:11 |
| ← foocraft left | 12:18 |
| ← Silanus left | 12:21 |
| ← mariaharten left | 12:28 |
| ← pantsman left | 12:31 |
|
cooperbear
| Nobody uses Assembla.com for git-hosting? :) | 12:31 |
| → karpar joined | 12:32 |
| → mariaharten joined | 12:33 |
|
bremner
| maybe their customers live in a different timezone | 12:34 |
|
cooperbear
| bremner: yeah, suppose so.. hmm | 12:36 |
|
charon
| man git-reflog | 12:36 |
|
jast
| the 'git-reflog' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-reflog.html [automatic message] | 12:36 |
|
| charon hands jast's script a cookie | 12:36 |
| → gusnan joined | 12:36 |
| → bentob0x joined | 12:37 |
| → SvenDowideit joined | 12:37 |
|
GoGi
| Does it make any sense to keep branches in subdirectories? | 12:40 |
|
wereHamster
| what do you mean by 'subdirectories'? | 12:40 |
|
GoGi
| inside the branch master | 12:40 |
|
cbreak
| GoGi: what are you talking about? | 12:41 |
|
wereHamster
| GoGi: git doesn't work like svn | 12:41 |
|
cbreak
| branches are in .git/refs/heads | 12:41 |
|
GoGi
| yes | 12:41 |
|
cbreak
| you can use branch names with / in them to make subdirectories | 12:41 |
|
wereHamster
| a better term is a namespace | 12:41 |
|
GoGi
| well my real problem is that I have not found a way to easily have a complete mirror of my local git repository | 12:42 |
|
bremner
| use clone? | 12:42 |
|
cbreak
| git clone makes a clone :) | 12:42 |
|
GoGi
| yes | 12:42 |
|
| but now I create a new local branch "xxx" | 12:42 |
|
wereHamster
| GoGi: git branch xxx | 12:42 |
|
GoGi
| then "xxx" will track "master" on the remote | 12:42 |
|
cbreak
| no | 12:42 |
|
GoGi
| ? | 12:42 |
|
cbreak
| it tracks what ever you tell it to track | 12:42 |
|
| by default, nothing | 12:43 |
|
GoGi
| okay, I think I tried to configure it that it tracks something automatically and it ended up tracking master automatically | 12:43 |
| → Dave^| joined | 12:44 |
|
cbreak
| anyway, where's the problem? | 12:44 |
|
| and what does it have to do with branch names? | 12:44 |
|
GoGi
| is it possible to configure it in such a way that git branch on the local repository creates also a new branch on the remote? | 12:44 |
|
cbreak
| no | 12:44 |
|
| just git push the new branch to the remote | 12:45 |
|
| you can use git push -u to set the upstream of the local to the remote | 12:45 |
|
bremner
| well, you can use push --mirror. But the last person that took that advice is still a bit bitter. | 12:45 |
|
cbreak
| so the local will track the one on the remote | 12:45 |
|
| I recommend against --mirror | 12:45 |
|
GoGi
| bremner: what happend to that person? | 12:45 |
|
cbreak
| because it does what it says. | 12:45 |
|
bremner
| GoGi: he lost some remote branches that were not present in the local repo | 12:46 |
| → chrischambers_ joined | 12:46 |
|
GoGi
| I see | 12:46 |
| ← chrischambers left | 12:47 |
| chrischambers_ → chrischambers | 12:47 |
|
GoGi
| and there is no corresponding git pull --mirror | 12:48 |
|
wereHamster
| GoGi: git fetch origin refs/*:refs/* gets you close enough | 12:50 |
|
cbreak
| I recommend against that | 12:51 |
|
GoGi
| cbreak: what will happen? | 12:51 |
|
cbreak
| it will do what it says | 12:51 |
|
wereHamster
| how surprising.. | 12:51 |
|
cbreak
| so attempt to overwrite local branches with remote ones | 12:52 |
|
wereHamster
| it won't do non-ff updates though | 12:52 |
|
cbreak
| a normal fetch spec is like this: +refs/heads/*:refs/remotes/key/* | 12:52 |
|
| so it only fetches branches, and it puts them into a subfolder | 12:52 |
|
| (the + means it will overwrite local refs) | 12:52 |
|
| branches are in refs/heads | 12:53 |
|
GoGi
| I see | 12:53 |
| → LongBeach joined | 12:54 |
|
GoGi
| this seems to be the correct way to do it if you are working with other people | 12:54 |
|
cbreak
| the correct way is to just git fetch mormally :) | 12:55 |
|
GoGi
| but I am one person working on two hosts | 12:55 |
|
| so somehow I thought that I want all branches and all tags exactly the same on both hosts | 12:56 |
|
cbreak
| I use a bare repo for syncing | 12:56 |
|
| and work normally appart from that | 12:56 |
| → roger_padactor joined | 12:59 |
| → v0n joined | 12:59 |
|
GoGi
| but when you create new branches you always manually configure the upstream? | 12:59 |
|
patrakov
| I have made several commits, how to see them as one big patch? | 13:00 |
|
cbreak
| hmm? | 13:00 |
|
| I just push them | 13:00 |
|
| no need to configure anything | 13:00 |
| ← _rane_ left | 13:00 |
| → _rane_ joined | 13:00 |
| ← _rane_ left | 13:00 |
|
GoGi
| yes ok | 13:01 |
| → _rane joined | 13:01 |
| → _Vi joined | 13:01 |
| → Zephyrus__ joined | 13:02 |
|
bremner
| patrakov: git diff | 13:03 |
| ← Zephyrus left | 13:03 |
|
patrakov
| bremner: doesn't work, the previous command was "git commit -a -m 'make function static'" if that matters | 13:04 |
|
bremner
| patrakov: you, ah, have to give some parameters. see man git-diff | 13:04 |
|
jast
| patrakov: the 'git-diff' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-diff.html [automatic message] | 13:04 |
| ← nikolajsen left | 13:06 |
|
patrakov
| bremner: git diff HEAD~3 worked for me | 13:06 |
|
bremner
| excellent. | 13:06 |
| → jhoepken joined | 13:07 |
| ← unon left | 13:10 |
| → unon joined | 13:12 |
| ← ph^ left | 13:13 |
| → DiGitalX joined | 13:14 |
| → MetaCosm joined | 13:14 |
| ← MetaCosm left | 13:14 |
| → MetaCosm joined | 13:14 |
| ← engla left | 13:15 |
| → paradoxx joined | 13:15 |
| → rorist joined | 13:16 |
|
paradoxx
| If there a number of settings such as "set smartindent" that I want to be configured automatically, do I add them to the global gitconfig? | 13:16 |
|
| my bad, wrong channel >.< | 13:17 |
| ← matjas left | 13:18 |
| ← nevyn_ left | 13:20 |
| → nevyn joined | 13:22 |
| ← unon left | 13:23 |
| → khmarbaise_ joined | 13:27 |
| → unon joined | 13:29 |
| ← khmarbaise left | 13:30 |
| khmarbaise_ → khmarbaise | 13:30 |
| ← maleknet left | 13:31 |
| ← Sajaki left | 13:32 |
| → skoop joined | 13:33 |
| → Chillance joined | 13:39 |
| ← unon left | 13:39 |
| → hanche joined | 13:43 |
| → rgr joined | 13:46 |
| ← hanche left | 13:51 |
| → hanche joined | 13:52 |
| ← Mannequin1 left | 13:52 |
| → nicoulaj joined | 13:56 |
| ← karpar left | 13:56 |
| → karpar joined | 13:58 |
| → nikolajsen joined | 13:59 |
| ← skoop left | 14:01 |
| ← Zephyrus__ left | 14:03 |
| → Zephyrus joined | 14:03 |
| ← jkp left | 14:04 |
| → jkp joined | 14:06 |
|
jast
| aww, thanks charon [automatic message] | 14:10 |
| → curtana joined | 14:11 |
| ← napster_123 left | 14:15 |
| → jvv joined | 14:15 |
| ← jkp left | 14:15 |
|
wereHamster
| ~botsnack | 14:15 |
| ← juangiordana_ left | 14:15 |
| → madewokherd joined | 14:15 |
| ← rgr left | 14:16 |
| ← xiong left | 14:19 |
| → Agos joined | 14:19 |
| → BiggFREE joined | 14:19 |
| → juangiordana joined | 14:19 |
| ← Zephyrus left | 14:20 |
| → henrikbjorn joined | 14:22 |
| → goshawk joined | 14:23 |
| → Zephyrus joined | 14:27 |
| → juangiordana_ joined | 14:29 |
| ChanServ set mode: +v | 14:29 |
| ← juangiordana left | 14:30 |
| ← juangiordana_ left | 14:31 |
|
hanche
| Shouldn't git fall back to IPv4 if an IPv6 connection fails? | 14:31 |
| → juangiordana joined | 14:31 |
|
wereHamster
| you mean git:// ? | 14:32 |
|
hanche
| Yes. | 14:32 |
|
wereHamster
| probably | 14:32 |
|
angelsl
| ugh | 14:32 |
|
hanche
| Okay, hang on, I'll paste relevant info ... | 14:32 |
|
angelsl
| now I think compiling and running gitolite on my 500MHz ARM NAS is a baaad idea | 14:32 |
| → project2501b joined | 14:33 |
|
hanche
| ; git pull | 14:33 |
|
| git.boinkor.net[0: 2001:858:745:a0e4:200:1aff:fe19:d355]: errno=No route to host | 14:33 |
|
| Already up-to-date. | 14:33 |
|
| ; git remote -v | 14:33 |
|
| origin git://git.boinkor.net/sbcl.git (fetch) | 14:33 |
|
| origin git://git.boinkor.net/sbcl.git (push) | 14:33 |
|
| DNS entries: | 14:33 |
|
| git.boinkor.net. 84176 IN CNAME baker.boinkor.net. | 14:33 |
|
| baker.boinkor.net. 86372 IN AAAA 2001:858:745:a0e4:200:1aff:fe19:d355 | 14:33 |
|
| baker.boinkor.net. 86369 IN A 86.59.21.99 | 14:33 |
| ← project2501b left | 14:33 |
|
hanche
| Is there an explicit way to ask it to use IPv4? | 14:35 |
|
curtana
| hanche, use the ip address | 14:35 |
|
| if it doesn't fall back then you could have a bad resolver configuration | 14:35 |
|
| welcome to the madness of /etc/gai.conf | 14:36 |
| ← alsuren__ left | 14:36 |
|
hanche
| curtana: no gai.conf (I'm on macosx). How do I use the ip address directly? | 14:37 |
|
wereHamster
| git://<the ip address>/sbcl.git | 14:37 |
|
hanche
| As in git pull git://86.59.21.99/sbcl.git ? | 14:38 |
|
wereHamster
| if 86.59.21.99 is your ip address... | 14:39 |
|
hanche
| Not mine, but of the repository, yes. I'll take that as "yes". | 14:39 |
| → awilkins joined | 14:40 |
|
hanche
| Odd. It says already up-to-date. Maybe the repository has not been updated. | 14:40 |
|
| I'll check with the maintainsers. | 14:40 |
| ← airborn left | 14:41 |
|
sitaram
| angelsl: anything I can do? | 14:41 |
|
angelsl
| sitaram: it's not gitolite per se, it's git | 14:42 |
| ← awilkins left | 14:43 |
|
angelsl
| my NAS runs some crippled version of GNU/Linux | 14:43 |
| → airborn joined | 14:43 |
|
angelsl
| i think i'll just keep my projects on my computer until I find somewhere to put then | 14:43 |
|
| them* | 14:43 |
|
| sitaram: but thanks anyway ;) | 14:43 |
| ← patrakov left | 14:44 |
| ← sraue left | 14:44 |
|
angelsl
| I don't even think it's GNU/Linux now | 14:44 |
|
| Linux 1064HD 2.6.12.6-arm1 #30 Mon Aug 18 14:19:14 CST 2008 armv5tejl unknown | 14:44 |
| → ph^ joined | 14:46 |
| ← karpar left | 14:46 |
| → vitor-br joined | 14:47 |
| → winterweaver joined | 14:48 |
|
sitaram
| hmm ok; I was wondering why you mentioned "gitolite" specifically so I asked | 14:48 |
| → Sajaki joined | 14:49 |
| → shentino joined | 14:51 |
| ← shentino left | 14:51 |
| → shentino joined | 14:51 |
| → MattDiPasquale joined | 14:51 |
| ← Sajaki left | 14:51 |
| ← PerlJam left | 14:51 |
| → sraue joined | 14:52 |
| → kaka86 joined | 14:52 |
| ← bduncan left | 14:53 |
| → PerlJam joined | 14:53 |
| ← PerlJam left | 14:53 |
| → PerlJam joined | 14:54 |
| ← BiggFREE left | 14:54 |
| ← hanche left | 14:56 |
| ← AAA_awright left | 14:57 |
| → spaceonline joined | 14:58 |
| → Sajaki joined | 14:58 |
| → xiong joined | 14:59 |
| → jkp joined | 14:59 |
| → AAA_awright joined | 14:59 |
| ← nikolajsen left | 15:00 |
| → pyther joined | 15:00 |
|
pyther
| Hello | 15:00 |
|
| I have forked a git repo and I'm trying to pull in this change https://github.com/Dieterbe/aif/commit/1c1c2bf461a9887e0dbe487472c161e17fa659f6 but when I do git pull origin it tells me it is already up-todate | 15:01 |
| ← dr_win left | 15:01 |
|
pyther
| but I know isn't since that change isn't applied to my local master branch | 15:01 |
|
wereHamster
| pyther: git pull https://github.com/Dieterbe/aif.git master | 15:01 |
| → tmw joined | 15:01 |
|
pyther
| wereHamster: ok, why wasn't I able to do git pull origin | 15:02 |
|
wereHamster
| does origin point to https://github.com/Dieterbe/aif.git ? | 15:02 |
| ← angelsl left | 15:02 |
| → AAA_awright_ joined | 15:03 |
|
pyther
| wereHamster: no it points to another git repo :P | 15:03 |
|
| the author usually pushes to both, he must have fogetten to push to the other one :-/ | 15:04 |
|
wereHamster
| then why did you expect git to magically fetch from https://github.com/Dieterbe/aif.git when origin points to another repo? | 15:04 |
| ← AAA_awright left | 15:04 |
|
pyther
| wereHamster: I had assumed they were both in sync, they always had been in the past, and I didn't think to look until you aksed where origin pointed to | 15:04 |
| ← Cro_Crx left | 15:05 |
|
pyther
| he uses github and then an offical project git repo | 15:05 |
| → AAA_awright joined | 15:05 |
| ← gusnan left | 15:05 |
| → matjas joined | 15:07 |
| ← AAA_awright_ left | 15:07 |
| → oriba joined | 15:08 |
| → van7hu_ joined | 15:10 |
| → luxurymode joined | 15:10 |
| ← goshawk left | 15:11 |
| ← pyther left | 15:11 |
| → ThomasLocke joined | 15:12 |
| → Bass10 joined | 15:12 |
| ← xiong left | 15:13 |
| ← kaka86 left | 15:13 |
| ← van7hu_ left | 15:13 |
| ← jkp left | 15:15 |
| ← Sajaki left | 15:15 |
| ← normanrichards left | 15:16 |
| → pantsman joined | 15:20 |
| → Cromulent joined | 15:22 |
| → anon33_ joined | 15:22 |
|
anon33_
| I've added a bunch of submodules to a new repo, but even before my first commit they're all in modified (untracked content) | 15:22 |
|
| How can I add them to the stage? 'git add <path>' or 'git add .' doesn't work | 15:23 |
| → NickyP joined | 15:23 |
| → Sajaki joined | 15:23 |
| → jkp joined | 15:23 |
| → posciak joined | 15:24 |
|
anon33_
| Also, trying 'git rm --cached <path to submodule' and then re-adding it doesn't work either - it keeps going back into modified (but untracked content) | 15:27 |
| → FsTluxe joined | 15:30 |
| → Pewpewarrows joined | 15:31 |
| → linusoleander joined | 15:31 |
| ← frogonwheels left | 15:32 |
| → frogonwheels joined | 15:32 |
| → ereslibre joined | 15:35 |
| ← ereslibre left | 15:35 |
| → ereslibre joined | 15:35 |
| → JimmyRcom joined | 15:36 |
| ← luxurymode left | 15:37 |
| ← Elfe left | 15:37 |
| → Elfe_ joined | 15:37 |
|
cbreak
| anon33_: ignore it, not a problem | 15:41 |
| → bdiu joined | 15:42 |
| → Maletor joined | 15:44 |
| → aah joined | 15:44 |
| ← ereslibre left | 15:46 |
| ← OOPMan left | 15:47 |
|
cbreak
| the only thing you can add of a submodule is the hash HEAD points to | 15:47 |
|
anon33_
| cbreak: So how come it doing it only for some submodules but not all? | 15:48 |
|
cbreak
| if you want to make new commits, start tracking files and so on, you have to do that inside the submodule | 15:48 |
|
| because only some have untracked files? | 15:48 |
|
| ... isn't that obvious? :) | 15:48 |
|
anon33_
| Well, I added them all the same way at the same time. So it just doesn't really make sense. | 15:48 |
| ← bdiu left | 15:49 |
|
cbreak
| read what I wrote above | 15:49 |
|
| how or when you added them doesn't matter | 15:49 |
| → OOPMan joined | 15:49 |
| → ereslibre joined | 15:49 |
|
anon33_
| cbreak: So given that I haven't changed any files within the submodule (and don't plan to), the content within it can remain untracked? | 15:49 |
|
cbreak
| sure. | 15:49 |
|
| if you don't care about it, you can just delete it | 15:50 |
|
anon33_
| When I clone the repo at a later time - will those untracked files be cloned? | 15:50 |
|
| They're plugins for vim, so I do care about the files in there. | 15:50 |
|
cbreak
| no... they are UNTRACKED | 15:50 |
|
| untracked means git does not care about them | 15:50 |
|
anon33_
| Alright - so if I want to add all the files within a submodule so that cloning it at a later point they're remain in the repo - how might I do that? The methods I've tried so far haven't worked. | 15:50 |
|
cbreak
| read what I wrote above please... | 15:51 |
|
| if you want to make new commits, start tracking files and so on, you have to do that inside the submodule | 15:51 |
| ← linusoleander left | 15:52 |
|
anon33_
| So I have to manage the repo's within other repo's? I'm sorry - but when I use the same methods for very similar type of files - I still don't understand why it will track some and won't track others. For instance, vim-endwise is in my repo as a new file (don't know about the files within it) yet vim-git is in the stage but is changed but not updated (untracked content) | 15:52 |
|
| So the difference isn't really apparent when it's a nearly identical situation | 15:53 |
|
| I understand git isn't tracking them, but why I don't. | 15:53 |
|
cbreak
| ... | 15:54 |
|
| git only tracks what you told it to track | 15:54 |
|
| it's your own fault if git doesn't track something you want | 15:54 |
|
| or if git tracks something you don't want | 15:54 |
|
| fix it yourself | 15:54 |
|
anon33_
| But I never exclusively told it to track endwise, yet it's treated differently. That's all. So in order to update these submodules I have to go within each, add all files, and then create a commit? | 15:55 |
|
cbreak
| you did. | 15:55 |
|
| git will ONLY track what it is told to | 15:55 |
|
| it will track NOTHING AT ALL unless someone told it to track something | 15:55 |
| → zombor joined | 15:55 |
|
cbreak
| if you want to make a new commit in a submodule, you have to make a new commit in the submodule | 15:55 |
|
| (don't forget to switch to a branch first) | 15:56 |
|
| a submodule is like any other git repository | 15:56 |
|
anon33_
| cbreak: Yeah, I got that. Anyways - the following command isn't working and I don't know why exactly: 'git submodule foreach git commit -m "Initial commit"' | 15:56 |
|
| Returns an error with 'commit' diesn't match any files known to git. Yet when I do the same but 'commit -a' I get an error of something to do with the editor 'editor' | 15:57 |
|
cbreak
| use quotation marks | 15:58 |
|
anon33_
| I did. | 15:58 |
| ← pantsman left | 16:00 |
| → storrgie_ joined | 16:02 |
| ← shiba_yu36 left | 16:02 |
| ← Swimming_bird left | 16:02 |
| ← gjvc left | 16:03 |
| ← EricInBNE left | 16:04 |
| → pantsman joined | 16:04 |
| → zombor_ joined | 16:05 |
| ← zombor left | 16:05 |
| → zombor joined | 16:06 |
| ← quadz left | 16:06 |
| → quadz joined | 16:07 |
| → stringoO joined | 16:09 |
| ← zombor_ left | 16:09 |
| ← jhoepken left | 16:09 |
| ← OOPMan left | 16:11 |
| → ustunozgur joined | 16:14 |
| → normanrichards joined | 16:14 |
| ← priidu left | 16:14 |
| → AAA_awright_ joined | 16:15 |
| → sftp joined | 16:16 |
| → priidu joined | 16:17 |
| ← sftp left | 16:17 |
| ← AAA_awright left | 16:17 |
| ← ereslibre left | 16:19 |
| ← MattDiPasquale left | 16:21 |
| ← Cromulent left | 16:21 |
| ← anon33_ left | 16:21 |
| → sftp joined | 16:21 |
| → MattDiPasquale joined | 16:22 |
| ← pgib left | 16:22 |
| → alberto56 joined | 16:23 |
| → bdiu joined | 16:24 |
| → thrillERboy joined | 16:24 |
| ← thrillERboy left | 16:24 |
| → thrillERboy joined | 16:25 |
| → OOPMan joined | 16:25 |
| ← matjas left | 16:26 |
| ← thrillERboy left | 16:26 |
| → thrillERboy joined | 16:27 |
| ← thrillERboy left | 16:29 |
| → zivester__ joined | 16:32 |
| → matjas joined | 16:33 |
| → io_a_ joined | 16:34 |
| → sivy joined | 16:35 |
| → jmil joined | 16:35 |
| → ereslibre joined | 16:35 |
| ← jmil left | 16:36 |
| ← io_a left | 16:37 |
| → mariaharten_ joined | 16:37 |
| ← mariaharten left | 16:37 |
| → _ke joined | 16:38 |
|
_ke
| is there a way to just get some files of the remote repo? e.g. there is a remote repo with a/ b/ c/ and i want to just get the changes of b/ to my local repository | 16:39 |
|
wereHamster
| no | 16:39 |
| ← SirFunk left | 16:39 |
| → HG` joined | 16:39 |
| ← nebuchadnezzar left | 16:40 |
| ← koo5 left | 16:40 |
| ← juangiordana left | 16:40 |
| ← sivy left | 16:41 |
| → bcardarella joined | 16:42 |
|
patrikf
| _ke: you can get a snapshot with git archive, but not the full history due to the way git works | 16:42 |
| ← robins left | 16:42 |
| → juangiordana joined | 16:42 |
|
_ke
| patrikf, so the only way is to manually get b/ from remote and add it the the local repo? | 16:43 |
| → robinsmidsrod joined | 16:43 |
| → AAA_awright joined | 16:43 |
| ← henrikbjorn left | 16:44 |
| → henrikbjorn joined | 16:44 |
| ← AAA_awright_ left | 16:45 |
|
patrikf
| _ke: no, there is no way at all unless b/ is a submodule | 16:48 |
| → Textmode joined | 16:48 |
| → NewtonianB joined | 16:48 |
|
patrikf
| or you don't want the commit history (also implying that you cannot easily share new commits with the remote) | 16:48 |
| ← envi left | 16:49 |
|
cbreak
| _ke: just b/ is worthless anyway since the whole repository is one single project | 16:49 |
|
| just a part of it wouldn't do you any good | 16:49 |
|
| just get the whole repository :) | 16:49 |
|
_ke
| cbreak, actually there are different programs in each subdir and i just want one | 16:49 |
|
cbreak
| go kick the ass who who ever made that repository | 16:50 |
|
| he clearly had no clue how git works | 16:50 |
|
| those should be in their own repos | 16:50 |
| → mmw joined | 16:50 |
|
cbreak
| you can fix it with git-filter-branch | 16:51 |
|
| but that's history rewriting | 16:51 |
|
| and it won't help you now | 16:51 |
|
_ke
| right | 16:51 |
| → sivy joined | 16:51 |
| ← storrgie_ left | 16:52 |
| ← yhager left | 16:52 |
| → lamefun joined | 16:53 |
| → FilipeMaia joined | 16:54 |
| ← NewtonianB left | 16:54 |
| ← FilipeMaia left | 16:54 |
| → joel_ joined | 16:55 |
| ← joel_falcou left | 16:56 |
| ← Textmode left | 16:57 |
| → Cromulent joined | 16:57 |
| ← mariaharten_ left | 17:01 |
| ← joel_ left | 17:01 |
| → FilipeMaia joined | 17:02 |
| ← lamefun left | 17:03 |
| → canton7 joined | 17:04 |
| → Buglouse joined | 17:09 |
| → spvensko joined | 17:11 |
| ← banister`out`bab left | 17:11 |
| → kukks joined | 17:12 |
| Unknown[OFF] → Unknown[NF] | 17:12 |
| Unknown[NF] → Unknown[OFF] | 17:15 |
| Unknown[OFF] → Unknown[NF] | 17:15 |
| ← FilipeMaia left | 17:15 |
| → anon33_ joined | 17:17 |
| → hyvi joined | 17:18 |
| → SirFunk joined | 17:19 |
| → TheMoonMaster joined | 17:19 |
| ← matjas left | 17:19 |
| → maleknet joined | 17:19 |
| → joel_falcou joined | 17:20 |
| → matjas joined | 17:20 |
|
RobertLaptop
| gitolite question? Has anyone setup a way to manage there hooks from gitolite-admin? | 17:20 |
|
sitaram
| RobertLaptop: see shell-games.mkd | 17:21 |
|
RobertLaptop
| sitaram, Reading now. | 17:21 |
| → Textmode joined | 17:22 |
|
RobertLaptop
| sitaram, Thanks. | 17:22 |
|
sitaram
| RobertLaptop: dont take it as tested or gospel, but as a general idea. It will work, of course, but it doesn't have exact code etc -- depending on what you need, you change the code as you like | 17:22 |
| Chillaway → Chillax | 17:23 |
|
RobertLaptop
| Still reading though the doc. I just really want a way to mange my hooks without having to shell into the server every time to change it. | 17:24 |
|
sitaram
| yeah that is what that document is about... some initial setup and you'll have what you want | 17:24 |
|
RobertLaptop
| Who has access to gitolite-admin is limited and controlled enough to be strong enough security for me. :) | 17:25 |
| → io_a joined | 17:26 |
|
sitaram
| good for you, so you should have no worries setting it up as described in that document | 17:27 |
| Chillax → Chillaway | 17:28 |
|
RobertLaptop
| I am continually amazed at how robust and well documented gitolite is. | 17:28 |
|
sitaram
| RobertLaptop: thanks :) | 17:29 |
| → bduncan joined | 17:29 |
| → smolyn joined | 17:29 |
| → Swimming_bird joined | 17:30 |
| → fedesilva_ joined | 17:30 |
| ← io_a_ left | 17:30 |
| → linusoleander joined | 17:30 |
| ← ketas left | 17:31 |
| ← spvensko left | 17:31 |
| → rgr joined | 17:31 |
| ← normanrichards left | 17:31 |
|
RobertLaptop
| sitaram, Not what I was looking for. I was looking for a way to manage per repo hooks. Not gitolite-admin repo hooks. Example. I have a repo called abc and I want a way to add/edit just it hooks from within gitolite instead of having to shell into the box to update. | 17:32 |
| → spvensko joined | 17:33 |
| ← fedesilva left | 17:33 |
| fedesilva_ → fedesilva | 17:33 |
|
RobertLaptop
| but I don't want to do global hook that effect all other repo's | 17:33 |
| ← juangiordana left | 17:33 |
|
sitaram
| RobertLaptop: well its not that hard to adapt the same code in that document to place hooks anywhere you want. You could maintain an entire *tree* of hooks inside the admin repo and the post-update hook would copy them using cp -a and that would be that | 17:35 |
| ← spvensko left | 17:35 |
|
sitaram
| not a big deal, really... code wise it's almost just 1 line | 17:35 |
|
RobertLaptop
| 1 line of perl is a lot of code to me :) | 17:35 |
| → FilipeMaia joined | 17:36 |
| → juangiordana joined | 17:36 |
| → eean joined | 17:37 |
| → spvensko joined | 17:38 |
| → leo2007 joined | 17:38 |
| ← FilipeMaia left | 17:38 |
| ← j0ran left | 17:38 |
| → napster_123 joined | 17:38 |
|
RobertLaptop
| sitaram, I will re-read I am having trouble seeing it maybe I just a few min to sink in. | 17:38 |
| → m_3 joined | 17:39 |
| ← Agos left | 17:39 |
| → koo5 joined | 17:39 |
| → lol_h joined | 17:39 |
|
sitaram
| RobertLaptop: sometimes i write too much. here're 3 simple steps to do what you want: | 17:39 |
|
RobertLaptop
| cool | 17:40 |
| → jogla joined | 17:41 |
|
sitaram
| (1) inside the admin clone create a new directory tree called repohooks. Inside this tree, for each repo (say foo and bar/baz) for which you *want* to manage hooks, create "foo.git/hooks" and bar/baz.git/hooks | 17:41 |
|
| (2) copy the hooks you want to these directories, commit, push etc | 17:41 |
| ← Mpenz_ left | 17:41 |
|
sitaram
| sorry that was step 3 | 17:41 |
| → Mpenz joined | 17:41 |
|
RobertLaptop
| following you so far. | 17:41 |
|
sitaram
| (2) setup a post-update.secondary hook (one time job) that contains a "cp -a $GL_ADMINDIR/repohooks/* $GL_REPO_BASE_ABS/" | 17:42 |
| ← bentob0x left | 17:43 |
|
sitaram
| all youre doing is "setup a tree structure similar to what's on the other side (not complete tree structure, only the files you want) and when a push happens arrange to copy it out | 17:43 |
|
RobertLaptop
| OK that I get. | 17:43 |
| ← fedesilva left | 17:43 |
| → fedesilva joined | 17:43 |
|
wereHamster
| sitaram: are you two talking about how to manage hooks with gitolite? | 17:44 |
|
sitaram
| RobertLaptop: really, your imagination is the limit, which is why that document is more of a guideline thana actual code | 17:44 |
|
| wereHamster: yes, but gitolite is really incidental in this case. We're discussing how a git post-update hook (albeit a special one, on a special repo) can do some standard unix cp stuff, really :-) | 17:45 |
|
RobertLaptop
| sitaram, I wasn't seeing step 2 for what ever reason. | 17:45 |
| → lamefun joined | 17:45 |
|
sitaram
| but you see it now? | 17:45 |
|
RobertLaptop
| Yep | 17:45 |
| ← jogla left | 17:45 |
|
sitaram
| thats the only part of that document that has actual code | 17:45 |
| ← hyvi left | 17:45 |
| → jogla joined | 17:46 |
| ← ceej left | 17:46 |
|
RobertLaptop
| It was more I wasn't seeing how to setup my local tree then anything else. | 17:46 |
| → galtgendo joined | 17:48 |
| → NewtonianB joined | 17:48 |
|
galtgendo
| if a file is in a non-utf8 encoding, how can I set it back in history as such ? | 17:49 |
|
tango_
| galtgendo: git doesn't actually care about encoding, afaik | 17:50 |
|
galtgendo
| gitview, on the other hand, does | 17:50 |
|
wereHamster
| not in the slightest | 17:50 |
|
galtgendo
| the plan is to convert that file to utf8 anyway, but I'd like a clean history | 17:52 |
|
wereHamster
| so yu want to rewrite history? | 17:53 |
|
galtgendo
| only as far as get that file marked with its correct encoding | 17:53 |
|
bremner
| gitview is some gtk based equivalent of gitk? or it does something more? | 17:54 |
|
galtgendo
| gitview is that pygtk program shipped with git | 17:54 |
| ← HG` left | 17:54 |
| → HG` joined | 17:55 |
|
bremner
| ah, I see it now. Not installed by default here. | 17:55 |
| → SimonP86 joined | 17:56 |
| → hyvi joined | 17:58 |
| → ereslibre_desk joined | 17:59 |
| → kumbayo_ joined | 18:00 |
| → abstrakt joined | 18:01 |
| → c0d3f1234k joined | 18:01 |
| ← ereslibre left | 18:01 |
|
RobertLaptop
| sitaram, Just to confirm. On place post-update.secondary in $GL_ADMINDIR/hooks/common not $GL_ADMINDIR/hooks/gitolite-admin? | 18:02 |
|
sitaram
| yes | 18:02 |
|
RobertLaptop
| ok | 18:03 |
| ← kumbayo left | 18:04 |
|
abstrakt
| how can I sync a local clone/checkout with multiple external repos? | 18:05 |
|
wereHamster
| add remotes for each, then git remote update | 18:05 |
|
abstrakt
| k | 18:05 |
|
| and what about pushing my changes to all the remote repos? | 18:05 |
|
| git remote push? | 18:05 |
|
wereHamster
| git push | 18:05 |
|
RobertLaptop
| git push remotename | 18:05 |
| ← NewtonianB left | 18:06 |
|
abstrakt
| RobertLaptop, ok what about pushing to all of them at the same time? | 18:06 |
|
wereHamster
| are you lazy? | 18:06 |
|
abstrakt
| wereHamster, like all good programmers, yes I am :) | 18:06 |
|
wereHamster
| make an alias | 18:06 |
|
abstrakt
| wereHamster, bash alias? or does git have some concept of aliases? | 18:06 |
| ← sraue left | 18:06 |
|
wereHamster
| abstrakt: either | 18:06 |
|
abstrakt
| so git has aliases? | 18:06 |
|
wereHamster
| google 'git aliases' | 18:07 |
|
abstrakt
| ok thanks, will do | 18:07 |
| timj__ → timj | 18:07 |
| → ketas joined | 18:07 |
|
RobertLaptop
| abstrakt, I was just looking for something for the short howto I used. You can great simple git command using alias. | 18:09 |
|
| I have one setup like this. | 18:09 |
| → sraue joined | 18:09 |
|
RobertLaptop
| [alias] | 18:09 |
|
| pu50 = "!git checkout 5.0.1; git fetch origin -v; git fetch wgm -v; git fetch github -v; git merge wgm/5.0.1" | 18:09 |
|
wereHamster
| RobertLaptop: better to use && instead of ; | 18:09 |
| → PrinceAndCrack joined | 18:10 |
|
RobertLaptop
| wereHamster, Will make a note of that. | 18:10 |
|
abstrakt
| indeed && is superior to ; | 18:10 |
|
offby1
| it has more apersanditude | 18:10 |
|
abstrakt
| RobertLaptop, && will prevent further exec if one of the commands fails | 18:10 |
|
| RobertLaptop, where does that alias go btw? in ~/.gitrc ? | 18:11 |
|
RobertLaptop
| Will make the change. As I said I grab that from someone else site :) | 18:11 |
|
| repo/.git/config | 18:11 |
|
abstrakt
| k | 18:11 |
| ← lamefun left | 18:11 |
| → p3rg2z joined | 18:11 |
|
wereHamster
| abstrakt: git config alias.<name of the alias> <command ...> | 18:11 |
| → adamm joined | 18:11 |
|
RobertLaptop
| That works also :) | 18:12 |
|
abstrakt
| wereHamster, ahh, nice thanks | 18:12 |
| → rgr_ joined | 18:16 |
| → zehrique joined | 18:17 |
| ← sivy left | 18:17 |
| → robotarmy joined | 18:18 |
| ← robotarmy left | 18:18 |
| → robotarmy joined | 18:18 |
| → tty2 joined | 18:21 |
| → pankajm joined | 18:22 |
|
pankajm
| i want to setup a git repo on the ssh based server , every user has ssh access but | 18:22 |
|
| they need r/w access to my files | 18:22 |
|
| i cant do groupadd | 18:22 |
|
| how do i give acces to say foo and bar | 18:23 |
|
| and not everone else | 18:23 |
|
| i m not root | 18:23 |
|
bremner
| pankajm: sounds like gitolite might help | 18:23 |
|
tango_
| consider using gitolite | 18:23 |
|
| damn, second | 18:23 |
| ← tty1 left | 18:23 |
|
bremner
| and I even waited ;) | 18:24 |
|
pankajm
| gitolite i hv heard abt it , but is it required for my simple need | 18:24 |
|
| i only want to give r/w access to particular users | 18:24 |
|
abstrakt
| so if I wanted to add a remote repo that I access like this: git clone [email@hidden.address] | 18:24 |
|
| and that repo is hosted with gitolite | 18:24 |
|
bremner
| pankajm: what you have without gitolite is unix permissions. | 18:24 |
|
abstrakt
| what would I use as a git remote add command? | 18:24 |
|
| git remote add somename [email@hidden.address] | 18:25 |
|
| or do I need to specify the ssh:// protocol? like this | 18:25 |
|
| git remote add somename ssh://foouser@somehost.com:myrepo | 18:25 |
| → workmad3 joined | 18:26 |
| → gusnan joined | 18:26 |
| → laj_ joined | 18:26 |
|
bremner
| abstrakt: see man git-push, GIT URLS | 18:26 |
|
jast
| abstrakt: the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html [automatic message] | 18:26 |
|
abstrakt
| bremner, how does that have to do with actually adding the repo? | 18:28 |
|
| hmm, nm I see the GIT URLS bit | 18:28 |
| ← gnufied left | 18:29 |
| ← AAA_awright left | 18:29 |
| → TLMonitor joined | 18:30 |
| ← laj_ left | 18:31 |
| → AAA_awright joined | 18:31 |
| ← DiGitalX left | 18:31 |
| ← paradoxx left | 18:32 |
| ← juangiordana left | 18:33 |
| ← matjas left | 18:34 |
| ← MattDiPasquale left | 18:34 |
| ← rdegraci2 left | 18:34 |
| → matjas joined | 18:34 |
| → MattDiPasquale joined | 18:35 |
| → gnufied joined | 18:36 |
| ← lol_h left | 18:37 |
| ← abstrakt left | 18:38 |
| ← bcardarella left | 18:40 |
| → DiGitalX joined | 18:41 |
| ← HG` left | 18:42 |
| → Yuffster joined | 18:42 |
| → bousquet joined | 18:43 |
| → malumalu joined | 18:43 |
| ← linusoleander left | 18:44 |
| → kelvie joined | 18:45 |
| → tjackgnu joined | 18:45 |
| → fr joined | 18:48 |
| → zehrique_ joined | 18:49 |
| ← pantsman left | 18:49 |
| ← TheFox21 left | 18:49 |
| ← Cromulent left | 18:50 |
| ← zehrique_ left | 18:50 |
| ← Bombe left | 18:50 |
| ← fr left | 18:51 |
| → fr joined | 18:51 |
| → Bombe joined | 18:51 |
| → laj joined | 18:52 |
| ← zehrique left | 18:52 |
| ← Bombe left | 18:53 |
| → Bombe joined | 18:53 |
| → jsquared joined | 18:53 |
| → normanrichards joined | 18:54 |
| ← ereslibre_desk left | 18:54 |
| → dreiss joined | 18:56 |
|
RobertLaptop
| sitaram, You still around? | 18:57 |
|
sitaram
| yup | 18:57 |
| ← rgr_ left | 18:58 |
|
RobertLaptop
| Well doing the update I pushed the latest PU branch and now getting | 18:58 |
|
| remote: Undefined subroutine &main::repo_rights called at hooks/update line 41. | 18:58 |
|
| remote: error: hook declined to update refs/heads/master | 18:58 |
| → pantsman joined | 18:58 |
|
RobertLaptop
| When I attempt to push | 18:58 |
|
sitaram
| hmm | 19:00 |
| → Cromulent joined | 19:00 |
| ← _iron left | 19:00 |
|
RobertLaptop
| I know what I did | 19:00 |
| ← matjas left | 19:01 |
| ← Buglouse left | 19:01 |
| ← rgr left | 19:01 |
|
RobertLaptop
| I copied /.gitolite/common/hooks to gitolite-admin/local/hooks/ and then upgrade gitolite and replaced my hooks with old version. | 19:01 |
|
sitaram
| you've got old hook code mixed up with new main code | 19:02 |
|
| yeah | 19:02 |
|
RobertLaptop
| So I need to rerun the install. | 19:02 |
|
| Should fix it. | 19:02 |
| ← jsquared left | 19:03 |
|
RobertLaptop
| and remove all but post-receive.secodary and any other global hooks I created from the folder 1st. | 19:03 |
| → jsquared joined | 19:04 |
| → clarkfischer joined | 19:05 |
|
sitaram
| RobertLaptop: ok, added some more warnings to that doc: http://pastebin.com/Gqc5H3j8 | 19:05 |
| → sivy joined | 19:05 |
| → napster_123_ joined | 19:06 |
|
RobertLaptop
| OK | 19:07 |
| ← napster_123 left | 19:07 |
| napster_123_ → napster_123 | 19:07 |
| → Slix` joined | 19:08 |
| ← jsquared left | 19:09 |
| → banister`out`bab joined | 19:10 |
| ← curtana left | 19:10 |
| ← mastro left | 19:10 |
| → rgr joined | 19:10 |
| ← spvensko left | 19:10 |
| → spvensko joined | 19:11 |
|
RobertLaptop
| sitaram, A warning just for idiots like me :) | 19:11 |
| → mastro joined | 19:11 |
|
sitaram
| I look at it as "sitaram covering his ass" ;-) | 19:11 |
| ← Cromulent left | 19:12 |
| ← mmw left | 19:12 |
| ← tvw left | 19:15 |
| → linusoleander joined | 19:15 |
| → JohnBat26 joined | 19:16 |
| ← frakturfreak left | 19:22 |
| → frakturfreak joined | 19:22 |
| → jsquared joined | 19:24 |
| → matjas joined | 19:25 |
| ← fedesilva left | 19:25 |
| ← matjas left | 19:27 |
| ← hyvi left | 19:27 |
| → santa-horst joined | 19:28 |
| → nimrod10` joined | 19:29 |
| ← rgr left | 19:29 |
| ← winterweaver left | 19:31 |
| ← santa-horst left | 19:31 |
| ← nimrod10 left | 19:32 |
| → Agos joined | 19:33 |
| → rgr joined | 19:33 |
| ← NickyP left | 19:33 |
| → FilipeMaia joined | 19:33 |
| → eletuchy_ joined | 19:36 |
|
RobertLaptop
| sitaram, That fixed things. Although I am now getting 4 cp messages about files being the same during every commit. | 19:36 |
|
sitaram
| every commit to the gitolite-admin repo? caused by "cp" command in your post-update hook? | 19:36 |
| ← tjackgnu left | 19:37 |
| → Buglouse joined | 19:37 |
|
sitaram
| then the cp command is wrong... look I cant really help on that right now; it's just a shell script really | 19:37 |
| → jhoepken_ joined | 19:37 |
| ← jsquared left | 19:37 |
|
sitaram
| and its past 1am here :) | 19:37 |
|
RobertLaptop
| sitaram, I think it is being caused by $HOME/gitolite-install/src/gl-install -q | 19:37 |
|
sitaram
| not likely | 19:37 |
| ← spvensko left | 19:38 |
| → spvensko_ joined | 19:38 |
| → mikepack joined | 19:38 |
| → AAA_awright_ joined | 19:38 |
| jhoepken_ → jhoepken | 19:38 |
| ← eletuchy left | 19:39 |
| → shamrock joined | 19:40 |
|
RobertLaptop
| sitaram, https://gist.github.com/782075 | 19:40 |
| → dgs joined | 19:40 |
| ← AAA_awright_ left | 19:40 |
|
RobertLaptop
| I posted my script and the output. That is the only line that makes since to me. | 19:41 |
| ← Buglouse left | 19:41 |
|
RobertLaptop
| sitaram, ^^^ | 19:41 |
| → AAA_awright_ joined | 19:41 |
| ← AAA_awright left | 19:41 |
| → Buglouse joined | 19:42 |
| ← AAA_awright_ left | 19:42 |
| → jsquared joined | 19:42 |
|
RobertLaptop
| sitaram, I understand it is getting late your time. Nothing is broken so ping me later when you have some time. | 19:42 |
| → rgr_ joined | 19:42 |
|
sitaram
| yeah; mal me a copy of your install transcript if you have it | 19:43 |
|
| mail | 19:43 |
| ← eletuchy_ left | 19:43 |
|
sitaram
| looks like you mixed up 2 install methods... what install method did you use? | 19:44 |
|
| RobertLaptop: ^^ | 19:44 |
| → eletuchy joined | 19:44 |
| → juangiordana joined | 19:44 |
| → AAA_awright joined | 19:45 |
|
RobertLaptop
| I do remote install from my laptop using ssh | 19:46 |
|
| sitaram, easy install from remote system. | 19:47 |
| → joshsmith joined | 19:47 |
|
RobertLaptop
| from-client method | 19:47 |
| ← mikepack left | 19:47 |
|
RobertLaptop
| I guessing you sample assumes another method? | 19:48 |
| ← robotarmy left | 19:51 |
| → mikepack joined | 19:52 |
|
sitaram
| not really; what I meant was that in easy install the directories should be different | 19:53 |
|
| anyway, maybe later... | 19:53 |
|
| sitaram is out for the count | 19:54 |
|
sitaram
| actually, gl-install should not even *run* on a push to the admin repo | 19:55 |
| ← TheMoonMaster left | 19:56 |
| ← jsquared left | 19:56 |
| ← PrinceAndCrack left | 19:56 |
| → TheMoonMaster joined | 19:57 |
|
sitaram
| ok I got it now... I see why this is happening. For now, in your case, since you're talking about hooks for specific repos, you don't need that line anyway; ignore it | 19:58 |
|
| or remove it | 19:58 |
| → jsquared joined | 19:58 |
| ← jhoepken left | 19:58 |
|
RobertLaptop
| I commented it out for now. | 19:58 |
| ← spvensko_ left | 19:58 |
| → spvensko joined | 19:59 |
|
RobertLaptop
| It will only effect me if I add or update a global hook. | 19:59 |
| → matjas joined | 19:59 |
| ← ChrisPitzer left | 19:59 |
| → John___ joined | 19:59 |
|
sitaram
| RobertLaptop: that doc needs to be updated to reflect the new setup; there are some subtle differences | 20:00 |
|
| yeah | 20:00 |
|
RobertLaptop
| That is pretty rear for me :) | 20:01 |
| → rorist_ joined | 20:01 |
|
RobertLaptop
| local hooks are much more common for me :) | 20:01 |
| ← jsquared left | 20:02 |
| → dfr|mac joined | 20:03 |
| ← rorist left | 20:04 |
| ← _Vi left | 20:05 |
| → ProLoser joined | 20:06 |
| → t0rc joined | 20:06 |
| → _Vi joined | 20:06 |
| ← smolyn left | 20:07 |
| → jsquared joined | 20:08 |
| ← spvensko left | 20:10 |
| → spvensko_ joined | 20:10 |
| ← linusoleander left | 20:13 |
| → jmil joined | 20:13 |
| → linusoleander joined | 20:14 |
| ← c0d3f1234k left | 20:17 |
| ← clarkfischer left | 20:17 |
| ← John___ left | 20:17 |
| ← rgr left | 20:18 |
| ← bousquet left | 20:18 |
| ← DiGitalX left | 20:18 |
| ← zenom left | 20:18 |
| ← ProLoser left | 20:19 |
| → NickyP joined | 20:21 |
| → beatak joined | 20:22 |
| ← shamrock left | 20:22 |
| ← rgr_ left | 20:22 |
| → AAA_awright_ joined | 20:23 |
| → cirwin joined | 20:23 |
| → lamefun joined | 20:24 |
| → smolyn joined | 20:25 |
| → s0ber_ joined | 20:26 |
| ← AAA_awright left | 20:26 |
| ← rorist_ left | 20:26 |
| ← s0ber left | 20:28 |
| s0ber_ → s0ber | 20:28 |
| → shamrock joined | 20:29 |
| ← Buglouse left | 20:30 |
| → robotarmy joined | 20:30 |
| ← maleknet left | 20:31 |
| ← |RicharD| left | 20:33 |
| ← matjas left | 20:34 |
| AAA_awright_ → AAA_awright | 20:34 |
| ← pantsman left | 20:34 |
| → srji joined | 20:34 |
| → pantsman joined | 20:34 |
| ← napster_123 left | 20:35 |
| → c0d3f1234k joined | 20:35 |
| → anjen joined | 20:36 |
| → Buglouse joined | 20:37 |
| ← Zephyrus left | 20:40 |
| ← gnufied left | 20:40 |
| → ofeone joined | 20:40 |
| ← TheMoonMaster left | 20:41 |
| ← jogla left | 20:43 |
| → jogla joined | 20:43 |
| → matjas joined | 20:44 |
| → santahorst joined | 20:44 |
| ← priidu left | 20:45 |
| ← santahorst left | 20:47 |
| → mmw joined | 20:47 |
| ← GoGi left | 20:47 |
| → AAA_awright_ joined | 20:48 |
| ← AAA_awright left | 20:48 |
| → steph021 joined | 20:49 |
| ← anjen left | 20:49 |
| → pgib joined | 20:50 |
| → TheMoonMaster joined | 20:51 |
| → maleknet joined | 20:52 |
| ← spvensko_ left | 20:52 |
| AAA_awright_ → AAA_awright | 20:54 |
| → jfkw joined | 20:54 |
| → priidu joined | 20:58 |
| ← doener left | 21:00 |
| ← smolyn left | 21:01 |
| ← eletuchy left | 21:01 |
| ← ptl left | 21:02 |
| → Mage3 joined | 21:04 |
| ← khmarbaise left | 21:04 |
| → |RicharD| joined | 21:04 |
| ← ustunozgur left | 21:05 |
| → alsuren__ joined | 21:05 |
| → rseifert joined | 21:05 |
| → bentob0x joined | 21:06 |
| → chessguy joined | 21:06 |
| ← priidu left | 21:09 |
| → SvenDowideit_ joined | 21:13 |
| → dr_win joined | 21:13 |
| → MikhX joined | 21:13 |
| ← SvenDowideit left | 21:14 |
| ← stringoO left | 21:17 |
| ← v0n left | 21:17 |
| → StrongOrder joined | 21:18 |
| ← maleknet left | 21:18 |
| → davetoo joined | 21:19 |
| ← p3rg2z left | 21:20 |
| ← StrongOrder left | 21:20 |
| → StrongOrder joined | 21:21 |
| ← Swimming_bird left | 21:21 |
| ← robotarmy left | 21:21 |
| → Silanus joined | 21:23 |
| ← tmw left | 21:23 |
| → priidu joined | 21:23 |
| → stringoO joined | 21:24 |
| ← StrongOrder left | 21:24 |
| → Cromulent joined | 21:26 |
| batrick_ → batrick | 21:28 |
| ← Silanus left | 21:28 |
| → Silanus joined | 21:29 |
| → robotarmy joined | 21:29 |
| ← kumbayo_ left | 21:30 |
| ← Maletor left | 21:30 |
| ← cooperbear left | 21:33 |
| ← joel_falcou left | 21:34 |
| ← nicoulaj left | 21:36 |
| → uroboros joined | 21:37 |
| ← uroboros left | 21:38 |
| ← srji left | 21:38 |
| → mjf joined | 21:38 |
| ← jkp left | 21:38 |
| ← MikhX left | 21:41 |
|
dstorrs
| I'm about to bring changes from a feature branch back into the source branch (which, in this case, is called 'staging') | 21:42 |
|
| I have been doing this through merging, but I was in here a day or so ago asking about rebasing, | 21:42 |
|
| and I figured I'd ask what the recommended practice is. | 21:42 |
| ← jepler left | 21:42 |
| → jepler joined | 21:43 |
|
dstorrs
| Do people generally merge a feature branch in directly, or rebase it onto the current state, or what? | 21:43 |
|
thiago_home
| depends on the people and on the project | 21:43 |
|
dstorrs
| (or cherrypick it, even. I've got some interim checkins on the feature branch where I saved off broken state just so I could roll back to it) | 21:43 |
|
thiago_home
| and on the feature | 21:43 |
| → jkp joined | 21:44 |
| → ptl joined | 21:44 |
|
cirwin
| dstorrs: the whole idea is to create a readable history | 21:44 |
|
dstorrs
| thiago_home: fair enough. The project has to do with harvesting stats from YouTube. The feature in question is a rewrite of our video harvester. There are only two devs on the project. | 21:45 |
|
cirwin
| if it's clearer to say "we worked on X and then we worked on Y and then we worked on Z" you can rebase | 21:45 |
| ← Cromulent left | 21:45 |
|
thiago_home
| dstorrs: then ask the two devs what they prefer | 21:45 |
|
cirwin
| if it's clearer to say, once we worked on X we merged in the work on Y, merge | 21:45 |
|
thiago_home
| dstorrs: check if the project has an established guideline for merging stuff | 21:45 |
|
Sajaki
| my workflow is pretty simple : code, add--all , commit, push, pull. but i'm alone on the project | 21:45 |
|
thiago_home
| dstorrs: and finally, check if a rebase is even possible. A complex history or a long one usually aren't rebasable. | 21:45 |
|
dstorrs
| thiago_home: it's my project. I'm the founder and one of the devs. :> | 21:45 |
|
thiago_home
| dstorrs: the recommendation remains | 21:46 |
|
dstorrs
| but I'm still learning about the various Git workflows. | 21:46 |
|
thiago_home
| ask yourself and the other guy what you prefer. | 21:46 |
|
| rebasing is recommended if possible | 21:46 |
|
| but it's not always possible | 21:46 |
|
dstorrs
| Sajaki: that's pretty much what I've been doing. | 21:46 |
|
| But, someone else has just been hired (on the 10th) and partly because I'm trying to advance with git, | 21:47 |
|
| so I'm trying to learn more. | 21:47 |
|
| thiago_home: ok, I'll do that. Thanks. | 21:47 |
| ← ludde left | 21:48 |
| ← JohnBat26 left | 21:49 |
| ← robotarmy left | 21:49 |
| ← bduncan left | 21:50 |
| ← TheMoonMaster left | 21:53 |
| ← _Vi left | 21:57 |
| → crowbar joined | 21:59 |
| ← amund left | 22:01 |
| → EricInBNE joined | 22:04 |
| ← FilipeMaia left | 22:04 |
| → _Vi joined | 22:05 |
| ← stringoO left | 22:05 |
| ← anon33_ left | 22:06 |
| → jogla_ joined | 22:07 |
| ← tewecske left | 22:07 |
| → Cromulent joined | 22:07 |
| → paradoxx joined | 22:07 |
| ← joshsmith left | 22:07 |
| ← henrikbjorn left | 22:07 |
| → tewecske joined | 22:09 |
| ← jogla left | 22:09 |
| jogla_ → jogla | 22:09 |
| ← orafu left | 22:10 |
| → orafu joined | 22:10 |
| → artefon joined | 22:11 |
| → HG` joined | 22:13 |
| ← malumalu left | 22:15 |
| → Zenopus joined | 22:15 |
| ← matjas left | 22:18 |
| → urbanmonk joined | 22:19 |
| ← sftp left | 22:19 |
| → delinquentme joined | 22:19 |
|
delinquentme
| so if i do a " git reset --hard HEAD " for some SHA lets say 20 commits back ... is there a way to get back to the most recent commit? | 22:20 |
|
wereHamster
| delinquentme: man git-reflog | 22:20 |
|
jast
| delinquentme: the 'git-reflog' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-reflog.html [automatic message] | 22:20 |
|
wereHamster
| and you either use reset --hard HEAD or reset --hard <somesha>. I assume you mean the later | 22:20 |
|
dstorrs
| actually, on that subject...am I correct that "HEAD" is nothing more than an alias for "the SHA of the most recent commit" ? | 22:22 |
|
| (in this branch, that is) | 22:22 |
|
wereHamster
| dstorrs: man gitglossary -> HEAD | 22:22 |
|
jast
| dstorrs: the 'gitglossary' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/gitglossary.html [automatic message] | 22:22 |
|
dstorrs
| wereHamster: thanks, I didn't know about that page. | 22:22 |
|
delinquentme
| wereHamster, yeaaap somesha1 | 22:24 |
|
| yeah! this is awesome! | 22:24 |
| → xiong joined | 22:26 |
|
dstorrs
| wereHamster: cool, ok. A bit of reading a bit of poking through .git goes a long way. Thank you. :> | 22:28 |
| → stringoO joined | 22:28 |
| → MikhX joined | 22:28 |
| → Maletor joined | 22:29 |
|
wereHamster
| dstorrs: I recommend against poking round .git | 22:29 |
|
dstorrs
| even in read-only? | 22:30 |
|
wereHamster
| just don't | 22:31 |
|
| there is no reason to | 22:31 |
| → Cro_Crx joined | 22:31 |
| ← Cro_Crx left | 22:31 |
|
dstorrs
| Well, several minutes of reading the gitglossary did not help clarify waht a "named reference" really was. 30 seconds of looking at the contents of .git did. | 22:31 |
| ← juangiordana left | 22:32 |
|
dstorrs
| So that strikes me as one pretty good reason. | 22:32 |
|
| Not to be rude, but is there a reason not to look that is more rational than "just don't" ? | 22:32 |
| → mase_wk joined | 22:32 |
| ← rseifert left | 22:33 |
|
wereHamster
| all its contents can be accessed through plumbing commands | 22:33 |
|
dstorrs
| Ok, fair enough. But that's of limited help to me, since I don't know what commands are going to spit out that information. In fact, I'm still learning what I need to learn. | 22:34 |
| ← Maletor left | 22:34 |
|
dstorrs
| So long as I am in pure read-only mode, is there any actual damage that I can inflict on .git by looking at it? | 22:34 |
| → angelsl joined | 22:35 |
| → bduncan joined | 22:37 |
| ← koo5 left | 22:37 |
| → FilipeMaia joined | 22:37 |
|
cirwin
| dstorrs: of course not, it's just a directory | 22:37 |
|
dstorrs
| good to know. | 22:38 |
| ← DrNick left | 22:39 |
| → Chani joined | 22:41 |
| → psoo joined | 22:42 |
|
Chani
| so I committed A, then I committed B, and now I realize A was stupid and I want to undo it. what was the command for that... git rebase -i <A's id> ? | 22:42 |
| ← Cromulent left | 22:43 |
| → sftp joined | 22:44 |
|
Chani
| ah, it was <commit before A> :) | 22:45 |
|
delinquentme
| git mergebase is used to find the commit which would be used as the mergebase for a merge of two branches right? | 22:46 |
| ← mmw left | 22:46 |
| → koo5 joined | 22:46 |
| ← banister`out`bab left | 22:47 |
| → banisterfiend joined | 22:47 |
|
banisterfiend
| Chani: git reset | 22:47 |
|
| or rebase | 22:47 |
| ← Buglouse left | 22:49 |
| ← andrewvos left | 22:51 |
| → engla joined | 22:51 |
| ← engla left | 22:52 |
| → engla joined | 22:52 |
| → DrNick joined | 22:52 |
| ← ThomasLocke left | 22:52 |
| ← _ke left | 22:53 |
| → hoggarth joined | 22:53 |
| → sputnick joined | 22:56 |
| ← sputnick left | 22:56 |
| → sputnick joined | 22:56 |
| ← sputnick left | 22:56 |
| ← FilipeMaia left | 22:56 |
| → FilipeMaia joined | 22:58 |
| → ereslibre joined | 22:58 |
| ← alberto56 left | 22:58 |
| ← FilipeMaia left | 22:59 |
| → smolyn joined | 23:00 |
| → Buglouse joined | 23:00 |
| ← hoggarth left | 23:01 |
| ← pantsman left | 23:02 |
| ← Chani left | 23:03 |
| → bcardarella joined | 23:04 |
| ← c0d3f1234k left | 23:04 |
| → alberto56 joined | 23:05 |
| ← d0k left | 23:05 |
| → Cro_Crx joined | 23:06 |
| ← lamefun left | 23:06 |
| → lamefun joined | 23:07 |
| → NewtonianB joined | 23:08 |
| → robotarmy joined | 23:10 |
| → TheMoonMaster joined | 23:10 |
| ← SirFunk left | 23:12 |
| ← ketas left | 23:13 |
| ← Adaptee left | 23:13 |
| → Cromulent joined | 23:14 |
| KyleXY[2] → KyleXY[CoD] | 23:14 |
| → clarkfischer joined | 23:15 |
| ← ch077179 left | 23:18 |
| ← madewokherd left | 23:20 |
| ← clarkfischer left | 23:20 |
| → sterlo joined | 23:22 |
| → madewokherd joined | 23:22 |
| ← oracal left | 23:23 |
| → ketas joined | 23:24 |
| → jackdempsey joined | 23:24 |
| ← workmad3 left | 23:24 |
| → theoros joined | 23:24 |
| → workmad3 joined | 23:24 |
| ← jackdempsey left | 23:25 |
| ← silanus_ left | 23:25 |
| ← jogla left | 23:27 |
| → jogla joined | 23:27 |
| ← linusoleander left | 23:27 |
| → ketas-l joined | 23:29 |
| → tyteen4a03 joined | 23:29 |
| → juangiordana joined | 23:31 |
| → Maletor joined | 23:31 |
| ← workmad3 left | 23:31 |
| ← lamefun left | 23:31 |
| ← DiaPo left | 23:32 |
| ← madewokherd left | 23:32 |
| → madewokherd joined | 23:33 |
| → anon33_ joined | 23:34 |
| → alnewkirk joined | 23:34 |
| → rahult_ joined | 23:34 |
| ← HG` left | 23:35 |
| ← tizbac left | 23:38 |
| ← Cromulent left | 23:39 |
| ← MattDiPasquale left | 23:39 |
| ← anon33_ left | 23:39 |
| ← mjf left | 23:40 |
| ← NewtonianB left | 23:41 |
| → NewtonianB joined | 23:42 |
| ← jkp left | 23:42 |
| ← ofeone left | 23:42 |
| ← gusnan left | 23:43 |
| ← koo5 left | 23:43 |
| ← davetoo left | 23:43 |
| → cantropy joined | 23:44 |
| ← cantropy left | 23:45 |
| ← bentob0x left | 23:46 |
| ← giallu left | 23:48 |
| ← mikepack left | 23:48 |
| → Zoresvit joined | 23:48 |
| ← Sajaki left | 23:52 |
| ← robotarmy left | 23:53 |
| ← benlangfeld left | 23:54 |
| ← dabd left | 23:54 |
| ← Dave^| left | 23:55 |
| ← FsTluxe left | 23:55 |
| ← artefon left | 23:57 |
| → eletuchy joined | 23:58 |
| ← rahult_ left | 23:59 |
| ← Cro_Crx left | 23:59 |