IRCloggy #git 2009-05-02

Logs Search ←Prev date Next date→ Channels Documentation

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

2009-05-02

← jds left00:02
→ Tricon joined00:02
→ Catfish joined00:02
← FlyingFoX left00:03
luke-jr_ → luke-jr00:05
← DavidKlein left00:06
→ Radar_ joined00:08
← offby1 left00:11
← Radar left00:11
→ wsc joined00:12
→ zygen joined00:14
← kn1tt1 left00:14
→ FlyingFoX joined00:15
→ riverrat66 joined00:15
← Yuuhi left00:17
← almostautomated left00:17
→ luke-jr_ joined00:17
← vmiklos left00:19
← luke-jr left00:20
→ vmiklos joined00:20
← mpg left00:22
→ ebeard joined00:25
← ebeard left00:25
← binjured left00:25
← vmiklos left00:27
→ sfwc joined00:27
← paulboone left00:34
← Ademan left00:34
← lazyshrk left00:37
← brink left00:38
← scarabx left00:39
→ DrNick joined00:39
→ slestak joined00:40
← Circuitsoft left00:45
→ vmiklos joined00:50
← wshimmy left00:50
→ wshimmy joined00:51
slestak can i bounce some scm ideas off someone. we have nothing at this point for the misc src for our erp package. small it staff with a revolving door of contractors. the erp app is on aix. i haved looked at svn and git, and really appreciate the speed, efficieny and syntax of git.00:53
→ mnob joined00:53
slestak i dont need the disributed aspect of git too much, but has what i just described sound liek a situation any of you have dealt with?00:54
← ereslibre left00:55
slestak there doesnt appear to be anyaix builds for git, but we have a slew of other machines that can host any tools necessary00:56
jim try building it now00:57
doener slestak: git's Makefile checks for AIX, so building it should be supported00:57
← markelikalderon left00:57
→ lazyshrk joined00:58
slestak cool, i have gcc on there so i will try it tonight00:58
← lazyshrk left00:58
→ lazyshrk joined00:58
← mnob left00:59
→ bdrewery joined00:59
bdrewery jast been around lately?01:00
slestak i wantto make sure i am not missing the _whole point_ of git. the devs and contractors all use the rs6000, so cloning branches to their pc's doesnt seem necessary.01:00
bdrewery besides the howto/maintain-git.txt file from Junio, I cant find any good examples of release/branch eningeering. Any good examples?01:00
doener slestak: if you could define "use the rs6000" for me, AIX and stuff is a bit out of my league01:02
← lazyshrk left01:04
← vmiklos left01:05
← aziz left01:06
→ catalis joined01:06
→ vmiklos joined01:07
tswicegood → tswicegood-afk01:07
slestak doener: every dev ssh's in to the aix box to edit inplace. the concept of copying the whole set of programs is alien to us.01:08
→ WALoeIII_ joined01:10
Radar_ If I have a repository initialized by "git init --bare", how can I check after any period of time if that repository has been committed to?01:10
slestak doener: the data and other supporting libs needed are all on the aix box, so really, the code needs to stay there01:10
← Dashkal left01:10
← WALoeIII_ left01:10
Ilari Radar_: You mean pushed to? You can use git log there...01:10
← catalis left01:11
doener slestak: so you basically have just one copy of the code (or maybe two, one for development and one for production) and can't have two devs working at the same time?01:11
Radar_ Ilari: oh of course! thanks :)01:11
slestak doener: that pretty much sums it up. conflict management is totally voluntary and insufficient01:12
← nejucomo left01:13
Fissure slestak: that sounds like a terrible way to run things01:13
slestak Fissure: yes.01:14
doener slestak: basically, you can of course just add git (or any other SCM) on top of that workflow. AFACIT right away, you won't lose anything, as you already sacrificed almost everything ;-)01:16
slestak we dont have to worry abt ditribution or releases, it is all stuff that is for internal use01:16
doener slestak: OTOH, you of course don't gain as much as, for example, someone that switches from SVN (or no SCM at all) to git and changes his workflow to make use of the new features01:17
Fissure git will work fine as a harder-to-forget-to-update changelog and backup service in that case :)01:17
slestak doener: yeah.01:18
← ferdy left01:18
doener slestak: and of course I can't tell whether you could make good use of branches/merging etc. at all, though it is an major part of development for me nowadays01:18
← MisterN left01:18
slestak i think my first goal is to just get proper attribution for every change. who, what, when, etc01:19
doener slestak: do the devs have their own accounts? Or just one big account for everyone?01:19
Fissure do they use different user accounts, or all login as the same one to make changes?01:19
haha01:19
→ catalis joined01:20
← FlyingFoX left01:21
slestak ync the data from PROD to TEST biweekly. Code is not synced, each dev is responsible for packaging and moving their changes manually01:21
doener slestak: I guess that message got messed up in some way. Started with "ync the data from PROD"01:22
slestak doener was pretty close. 200 users use one aix. 4-5 of them are devs. 2 diffrent dirs, PROD and TEST. we s01:22
Fissure git will make that part *much* easier01:22
slestak sorry, using a netbook01:22
fatfingered the keyboard01:23
Fissure those things are a pain to type on01:23
especially when the shift is all intermingled with the arrow keys01:23
slestak its a mini9, so its a little easier than a eee01:23
doener slestak: just to see if I got that right: You update the test data biweekly from the production data, so you can test against recent data.01:24
slestak yes01:24
doener slestak: and the test code is (hopefully not so often) a mix of stuff the different devs did, and each one is responsible for just his code making it to production?01:24
slestak doener: yes.01:25
doener ok01:25
doener tries to think that through01:25
← diegoviola left01:26
slestak im pretty confident about our internal ppl picking up anychanges we need, but i need to account for contractors too, and checking for out of band changes. hardheads refusing01:26
← parasti left01:26
slestak to comply01:26
← WALoeIII left01:27
→ diegoviola joined01:27
← e_6 left01:27
doener slestak: "checking for out of band changes"? (sorry, not a native speaker, and it's 3:30am over here)01:28
jim slestak: git is distributed, which means each developer will have his/her own repo, and that includes developers within vendor companies01:28
← vmiklos left01:28
← qhoxie left01:28
slestak doener: i mean devs who make changes without using scm01:28
doener jim: s/will/can/ -- you can "happily" work with just one working tree/repo, though of course that has its drawbacks01:29
jim who make changes to what tho?01:29
slestak jim: me?01:30
jim: i mean, is that question for me01:30
jim yeah01:30
slestak jim: you mean what are we physically editingand how?01:30
jim in the decentralized model,01:31
doener slestak: ok. How large is the code base that is to be tracked?01:31
jim each dev has their own tree and perhaps some way to publish01:31
doener slestak: (in KB/MB/GB, not SLOC)01:32
slestak just a sec and i'llget some real numbers01:32
jim a dev can say "hey, this fixes bug #F00, and is tested to work behind the bar"01:32
sdiz-afk → sdiz01:32
doener slestak: some estimate is ok, just about the right magnitude01:32
jim that dev gives the other devs a url for it and they pull the changeset and apply it01:33
slestak maybe 500 individual text files, most of which are stable and not changing much, maybe 10-20 that are always in constant need of changes.01:33
doener ok, so we're in the "a few MB" range01:34
slestak the buld environemnt and data are not portable, so centralized is more our thing01:35
so technically, if we moved peoples changes to their home dirs, then we could sync data and code from PROD to TEST, then afterwards, apply everyones in process patches from their home dirs01:38
s/apply/re-apply01:39
→ danielnewman joined01:39
→ [intra]lanman joined01:40
jim under git that would probably look more like the the main TEST tree (say) has someone in charge who accepts changesets from each dev... once accepted, it's merged into that tree01:41
← diegoviola left01:41
slestak so if the containing file system is say /ud/USER-PROGS, and we have 2 devs, J and S. We could make a /ud/USER-PROGS.git repo, and /home/J and /home/S would each have a USER-PROGS.git as well01:41
→ seangrove joined01:42
slestak yeah, PROD accounts gets locked down, TEST si subject to being synced at any time (so dont leave anything there. the only changes that are preserved are changes you have stored yourself in ~01:43
doener slestak: http://git.pastebin.com/mded8a29 -- I actually wanted to elaborate a bit more there, but I'm too tired01:43
slestak: you can also have something "in between", where you have just one repo like in 1), but each dev may have his own branches01:44
slestak: and of course, you can have multiple testing areas as well, if your setup is not too picky about where it lives01:45
it's totally fine to have just multiple repos on the AIX box, you're still distributed ;-)01:46
slestak thx for the time guys, im going to read some and take in what we've aleady discussed01:47
doener and the nice thing is that when you just need to inspect the history, you can clone the repo to some other fast/cheap/graphical/whatever box and do that there01:47
for such use cases, running the software doesn't even matter, and you could even do it on a plane. With SVN, it would be a pain ;-)01:48
anyway, off to bed now... good luck!01:49
slestak i like the idea of getting the devs into ~, at that point which machine you are one becomes moot. one step towards getting decentralized.01:49
← dmlloyd left01:50
slestak i dont have logging enabled on this client yet, does this channel have a archive01:51
doener slestak: yep, it's in the topic01:51
slestak doh. ok./ tyvm doener, jim01:51
cpg → cpg|biab01:52
← rettub_ left01:55
→ rettub_ joined01:55
→ vmiklos joined01:55
→ WALoeIII joined01:56
← vmiklos left01:57
← WALoeIII left01:59
→ WALoeIII joined01:59
← jfkw_ left02:00
jim slestak: np... good luck switching if you do02:01
← dreiss left02:02
jim again, you might try building git just to satisfy your curiousity as to whether it will build in your env02:02
slestak it probably will, if not now, someone will get an itch and patch it. ive already got current builds of vim, screen, and bash on there02:03
← cpg|biab left02:03
→ cpg joined02:04
← danielnewman left02:04
← Radar_ left02:05
→ fujin joined02:05
→ vmiklos joined02:06
← riverrat66 left02:06
← doener left02:08
→ plasticine joined02:10
← spearce left02:11
← wsc left02:12
← vmiklos left02:13
→ releod joined02:13
← sekimura left02:15
→ qrush joined02:16
← shadowhand left02:18
→ vmiklos joined02:18
← vmiklos left02:18
← [intra]lanman left02:20
→ cytrinox joined02:20
→ [1]intripoon joined02:21
← cytrinox_ left02:22
→ [intra]lanman joined02:22
→ cookiecaper joined02:26
→ Kimmie joined02:27
→ Leemp joined02:28
cookiecaper hello. I have two simple questions: 1) what does ORIG_HEAD refer to? and 2) how can I check the size and interesting information about repository size and question from the commandline (number of commits, current size, etc.)02:29
← gaveen left02:29
← [intra]lanman left02:29
→ gaveen joined02:30
→ wsc joined02:31
→ clsdaniel joined02:32
← whaley left02:35
← intripoon left02:37
[1]intripoon → intripoon02:37
→ vmiklos joined02:38
← catalis left02:42
qrush ORIG_HEAD is usually used in a merge, cookiecaper02:42
→ catalis joined02:42
qrush that's the branch you're merging into02:42
MERGE_HEAD is the head you're merging from02:42
repo size is a good question, i'd like to know02:43
← vmiklos left02:44
→ vmiklos joined02:44
qrush you could do something like this for number of commits on a branch: git rev-list master | wc -l02:45
← wsc left02:45
← kuadrosx left02:46
tswicegood-afk → tswicegood02:46
→ Radar joined02:48
← gaveen left02:48
← bryanl left02:50
→ tjafk2 joined02:51
→ kuadrosx joined02:51
← catalis left02:54
← rutski left02:54
→ catalis joined02:55
← drewr left02:58
← Kimmie left03:00
→ Flathead joined03:04
← Casan left03:07
← tjafk1 left03:07
← justatheory left03:12
→ schacon joined03:13
← jacoblyles left03:13
tswicegood → tswicegood-afk03:14
→ wsc joined03:15
→ cemerick joined03:19
→ WALoeIII_ joined03:20
→ bremner_ joined03:26
cookiecaper qrush: thanks very much. :)03:31
→ faithfulgeek joined03:35
← WALoeIII left03:37
← orafu left03:37
→ orafu joined03:37
← Leemp left03:39
← __iron left03:40
tswicegood-afk → tswicegood03:41
→ __iron joined03:41
← scientes left03:42
→ binjured joined03:45
← Radar left03:46
→ bobmcw joined03:48
→ Radar joined03:48
← faithfulgeek left03:51
→ Weems joined03:52
← WALoeIII_ left03:52
→ faithfulgeek joined03:55
→ qhoxie joined03:55
→ victori joined03:55
victori how can you revert a revert?03:55
→ commondream joined03:55
victori or re-sync with head?03:55
← kukks left03:57
← cemerick left04:06
← intripoon left04:07
impulze hm04:08
if i have a local only repository (no origin) and i have another checkout of it, how do i push to that local repository without getting git warnings?04:09
do i have to set the origin to the current directory in the initial clone?04:09
← davidfetter left04:09
→ davidfetter joined04:10
→ hyperair joined04:14
← Eridius left04:20
→ travisjeffery joined04:21
← victori left04:21
→ Eridius joined04:22
← catalis left04:25
← FreakGuard left04:26
→ intripoon joined04:27
cpg → cpg|brb04:31
← octagon left04:32
← bgerber left04:33
→ WALoeIII joined04:33
→ bgerber joined04:37
→ jrmuizel joined04:37
→ sgrimm joined04:37
→ p0w3r3d joined04:41
← jrmuizel left04:44
→ jrmuizel joined04:48
← schacon left04:50
tswicegood → tswicegood-afk04:51
← jrmuizel left04:51
→ jrmuizel joined04:51
← binjured left04:53
← faithfulgeek left04:54
→ faithfulgeek joined04:55
→ catalis joined04:57
← releod left04:59
← WALoeIII left04:59
← neoeinstein_ left05:02
← curvature left05:05
→ curvature joined05:05
← ia left05:06
→ ia joined05:07
← yec left05:08
← aspotashev|eeepc left05:13
← mika left05:14
← catalis left05:14
← faithfulgeek left05:15
→ rubydiamond joined05:18
Radar Anyone here have experience setting up gitorious? I'm getting unknown command gitorious.05:20
← jrmuizel left05:20
← hyperair left05:24
→ yec joined05:26
→ eletuchy joined05:30
→ _daniel_ joined05:30
_daniel_ hi guys , need some help05:31
i've forked a project05:31
on github05:31
and then I cloned it on my local machine05:31
how do i keep my fork version up to date with the initial repo05:31
← AkumaStreak_ left05:34
← eletuchy left05:37
→ eletuchy joined05:37
← altrux left05:38
Ilari _daniel_: Register the original as remote (if you don't have one already, and fetch from it and merge the changes.05:41
_daniel_: Or use 'git pull <repository> <branch>'.05:41
_daniel_ k, thx05:41
Ilari _daniel_: You should have remotes for both the original upstream and your fork repo.05:42
_daniel_ lll: yes I have for both05:43
→ paulboone joined05:44
_daniel_ Ilari: :)05:44
Ilari: but if i set the original as remote when i pull from it won't merge automatically with my working copy?05:45
Ilari _daniel_: Pull is fetch + merge.05:45
_daniel_ ok :)05:45
but this will not modify only my local copy ?05:46
how do i modify my remote forked repo05:46
Ilari _daniel_: Push to it.05:46
_daniel_ ok , but before push should i change the remote repo?05:46
Ilari _daniel_: You can specify to what repo to push: 'git push <repo>' or 'git push <repo> <branches>...'.05:49
_daniel_ ok :)05:49
→ catalis joined05:49
Ilari _daniel_: In Git, all commit transfer between repos (and git init/git clone creates independent repo) is manual. There are no "repositories elsewhere that are committed to" like in CVS/SVN.05:54
_daniel_: fetch (plus what's built on top, like pull) and push.05:55
_daniel_: Also, bundles05:55
_daniel_ I'm working on github and I use git as follows05:55
there is one initial repo of the project05:55
then i forked this , and as far as i understand this creates my own remote repo05:56
then i cloned my remote repo , and I work on my local machine on my cloned repo05:56
my problem is that the initial repo has some changes :)05:56
i cannot do a fork again so I must somehow merge the changes from initial repo to my own remote repo and from there , to merge with my local repo :)05:57
and you suggested to temporarily change my remote repo as being the initial one05:58
bdrewery it was explained already05:58
_daniel_ then to pull the changes from it on my local repo05:58
bdrewery you can add as many remotes as you want05:58
_daniel_ and then to push it to my remote repo05:58
Ilari _daniel_: First, add it as remote (git remote add -f upstream <URL>).05:58
bdrewery git remote add upstream git://....05:58
← cloudhead left05:58
_daniel_ ok , now i understand :)05:58
bdrewery git fetch upstream05:58
→ g3d joined05:58
bdrewery git merge upstream/master05:58
_daniel_ so i can have more remote repos05:58
bdrewery yup05:59
_daniel_ ok now it clear05:59
bdrewery :)05:59
Ilari _daniel_: Yes, you can have as many remotes as you want.05:59
_daniel_ and If I have more than 1 repo than every operation with a remote repo must precisely specify the remote repo05:59
name05:59
Ilari _daniel_: Well, disk space and fs entry limititations might limit it a bit, but those limits are likely very large.06:00
_daniel_: Well, some ops might have defaults, but...06:00
→ rbogner joined06:00
_daniel_ i thought that there is a default remote repo06:01
in which your ops are done06:01
and if you want to use other repo you have to change the default remote repo06:01
but now is clear , with this addition of remote repos06:01
Ilari _daniel_: git push picks the default repo to act upon from tracking data of current branch (if not present, defaults to 'origin'). First non-parameter argument overrides.06:02
_daniel_: git fetch might be the same.06:03
← plasticine left06:04
← g3d left06:07
→ g3d joined06:14
→ Weaselweb joined06:15
_daniel_ Ilari: how can what remote repos i have added06:18
← Weaselweb left06:21
_daniel_ Ilari: * how can i list all my remote repos06:24
→ Weaselweb joined06:30
_daniel_ git remote show :D06:30
g3d _daniel_: not really, just git-remote06:30
_daniel_ yes you are right , but it works with "show" too06:31
→ ilor joined06:36
← marvil07 left06:39
← zygen left06:44
→ zygen joined06:45
→ binjured joined06:46
→ Tuomas joined06:49
→ ph^ joined06:50
→ naeu joined06:53
← p0w3r3d left06:55
← paulboone left06:57
← Radar left06:59
→ texel joined06:59
→ guille_ joined07:02
→ eddyp joined07:03
→ advany joined07:04
→ aspotashev|eeepc joined07:15
→ hobodave_ joined07:15
→ Radar joined07:16
← clsdaniel left07:17
← g3d left07:19
→ g3d joined07:19
← stuffcorpse left07:22
← Radar left07:23
→ tatsuyao joined07:24
→ robinr joined07:26
→ stuffcorpse joined07:28
→ quoin joined07:28
→ advany_ joined07:29
← tvakah left07:29
← moh left07:29
→ tvakah joined07:30
→ moh joined07:30
← hobodave left07:32
← bobesponja left07:50
← kuadrosx left07:50
joshthecoder → joshthecoder_afk07:50
→ gilimanjaro joined07:51
← texel left07:52
→ kn1tt1 joined07:53
→ petercoulton joined07:53
→ j416 joined07:56
← advany left08:00
→ mika joined08:01
→ mbroeker joined08:06
← catalis left08:06
← orafu left08:16
→ orafu joined08:16
← robinr left08:16
→ amors joined08:18
amors come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come ew muonline #mu.eff3cts08:19
come new muonline #mu.eff3cts08:19
come new muonline #mu.eff3cts08:19
come new muonline #mu.eff3cts08:19
come new muonline #mu.eff3cts08:19
come new muonline #mu.eff3cts08:19
← amors left08:19
← tatsuyao left08:19
→ jceb joined08:20
← seangrove left08:20
← vmiklos left08:24
→ Zaba joined08:29
→ aussiegeek joined08:29
→ vmiklos joined08:30
→ radarek joined08:31
← yec left08:34
→ voker57 joined08:35
← Zaba_ left08:38
→ Andurin joined08:40
← vmiklos left08:45
← aussiegeek left08:45
← sgrimm left08:46
← _daniel_ left08:47
→ ferdy joined08:48
→ somebee_ joined08:50
→ priidu joined08:51
somebee_ what is the cleanest way to remove a submodule? I have a directory that is now a submodule, but I want to include all the files directly in my repo instead08:51
→ ashleyw joined08:53
thiago_home rm the submodule, commit, then add all the files, commit08:54
→ vmiklos joined08:55
← vmiklos left08:55
somebee_ thiago_home: with git rm? doesnt that leave the submodule in .gitmodules etc?08:55
thiago_home I don't know, I've never tried08:56
somebee_ fatal: git rm: app/models: Operation not permitted08:56
ok08:56
Ilari somebee_: 'git rm --cached' it?08:57
thiago_home try just rm then commit -a08:57
→ vmiklos joined08:58
somebee_ Ilari: I actually found your answer on the interwebs :) http://blag.ahax.de/post/37298571/recently-on-git-how-to-remove-a-git-submodule.. thanks!08:59
← somebee_ left09:02
→ somebee joined09:02
← vmiklos left09:03
→ vmiklos joined09:04
← vmiklos left09:10
→ vmiklos joined09:10
← travisjeffery left09:12
← jceb left09:13
← somebee left09:14
→ somebee_ joined09:14
← Octalot left09:16
← vmiklos left09:17
→ kumbayo joined09:17
→ vmiklos joined09:20
← Eridius left09:21
← univate_ left09:21
→ Eridius joined09:26
← ashleyw left09:26
← aspotashev|eeepc left09:26
→ ashleyw joined09:30
← Weaselweb left09:30
← ashleyw left09:31
→ vernile joined09:33
← mbroeker left09:39
→ d0k joined09:40
→ hyperair joined09:41
→ ashleyw joined09:41
← Andurin left09:44
→ univate joined09:44
← somebee_ left09:45
→ somebee joined09:45
← somebee left09:50
→ somebee_ joined09:50
→ gaveen joined10:03
→ elmob joined10:03
← somebee_ left10:04
→ somebee joined10:04
← somebee left10:05
→ somebee_ joined10:05
← rubydiamond left10:07
→ khmarbaise joined10:11
→ advany joined10:11
← advany_ left10:11
← somebee_ left10:17
→ somebee joined10:17
→ aspotashev joined10:22
→ Zaba_ joined10:23
← somebee left10:27
→ somebee_ joined10:27
→ markelikalderon joined10:28
← hummingkid left10:28
→ aspotashev|eeepc joined10:29
→ hummingkid joined10:29
→ struberg joined10:31
← gaveen left10:31
→ name joined10:32
→ fantomas joined10:33
→ philsturgeon joined10:33
fantomas hi all10:33
I was clonning a kernel when disconnect happened. Now when I'm running git clone ... it tells directory exists. How can I continue?10:33
never used git before10:34
struberg fantomas go in that directory and try git-pull10:34
fantomas without params?10:34
→ FreakGuard joined10:35
struberg fantomas yes10:35
← Mr_Grieves| left10:35
← Zaba left10:36
→ mbroeker joined10:36
→ kssddy joined10:40
← felipec left10:44
← philsturgeon left10:46
← guille_ left10:46
← markelikalderon left10:48
← somebee_ left10:52
→ somebee joined10:52
→ Jinzhu joined10:52
← commondream left10:53
← hummingkid left10:53
→ aziz joined10:53
→ markelikalderon joined10:54
→ felipec joined10:54
← ashleyw left10:55
→ bryanl joined10:57
→ smeevil joined10:58
→ bremner__ joined11:03
← bremner__ left11:03
→ bentob0x joined11:05
→ ashleyw joined11:05
← markelikalderon left11:06
← smeevil left11:07
← somebee left11:08
→ somebee_ joined11:08
← hyperair left11:11
→ _daniel_ joined11:16
→ FlyingFoX joined11:17
_daniel_ i;m little bit confused about origin and HEAD can anyone explain11:19
← Jinzhu left11:20
→ bremner__ joined11:20
→ jamesmacleod joined11:21
→ nicholas joined11:22
← jamesmacleod left11:22
nicholas → nick_fn11:22
← naeu left11:22
nick_fn I have a laptop that doesn't have a fixed IP (and is often behind NAT, firewall, etc.) - I'd like for it to push/pull from my desktop (available over ssh) - when I do this, it messes up because I'm pushing to a non-bare repository. How can I set up branches so this works?11:23
→ drewr joined11:25
thiago_home don't push to a non-bare repository11:26
it has nothing to do with a fixed IP address or not11:26
on a non-bare, pull only11:26
← bremner_ left11:27
nick_fn can't I push to a branch that isn't the checked out one?11:28
thiago_home you can11:28
you shouldn't push to a non-bare repository, though11:28
can != should11:28
← rbogner left11:28
nick_fn otherwise , should as soon as I want to do this, clone the repo to a bare one, then clone that twice (once on desktop, once on server) ?11:29
if I introduce a 3rd bare repo to be the "central server", then the desktop repo can't tell me thinks like "checkout is n commits behind..." etc.11:30
and I always heard you can push between repositories "in a decentralised fashion"?11:30
→ Yuuhi joined11:31
→ markelikalderon joined11:32
thiago_home you can push11:33
you should pull11:33
nick_fn but the desktop can't reach the laptop (easily) :-/11:33
→ seangrove_ joined11:35
← somebee_ left11:36
→ somebee joined11:36
→ voker57_ joined11:36
→ IRSeekBot joined11:37
← dkr21 left11:37
→ dkr21 joined11:41
← mnick left11:42
← _daniel_ left11:42
→ doener joined11:42
← bremner__ left11:43
← dkr21 left11:44
→ voker57__ joined11:45
← kn1tt1 left11:46
← somebee left11:47
→ dkr21 joined11:47
→ somebee_ joined11:47
← j416 left11:48
→ knittl joined11:48
Ilari nick_fn: For pushing current branch, 'git pull, 'git push origin HEAD:refs/remotes/incoming', and then on remote side check out the same branch and 'git merge incoming'. Or something like that.11:48
→ scientes joined11:49
Ilari nick_fn: The operation that "messses up" it push to currently checked out branch. refs/remotes/incoming (remote tracking branch 'incoming') can't be checked out, so its safe to push to.11:50
nick_fn thanks - this is inline with what I was trying to think of ; does this create some loop? after I've done this, the next time the laptop does a git pull; we won't have a problem related to "the same change seen twice" or anything like this?11:51
← voker57 left11:53
← __iron left11:53
→ __iron joined11:54
← FlyingFoX left11:54
Ilari nick_fn: Since pull is fatch + merge, the inverse of that would be push + merge-on-remote. That command sequence does that, with extra pull in order to get conflict resolution to happen on local side.11:54
nick_fn Can I make "git push" do "git push origin HEAD:refs/remotes/incoming" by default?11:55
Ilari nick_fn: If you want to make something like that the default, use something like 'git config remote.origin.push +refs/heads/*:refs/remotes/laptop/*'.11:56
nick_fn: That uses laptotp/foo remote tracking branches for pushes from the laptop.11:57
nick_fn ta11:57
→ Kbyte joined11:57
← jkp_ left11:57
← somebee_ left11:57
→ somebee joined11:57
Ilari nick_fn: The '+' means automatically imply --force for that update.11:58
← voker57_ left11:58
← somebee left12:01
→ somebee_ joined12:01
→ MisterN joined12:03
← somebee_ left12:06
→ somebee joined12:07
← simosx left12:12
→ simosx joined12:13
nick_fn many thanks Ilari12:13
← aspotashev|eeepc left12:13
← nick_fn left12:13
← stuffcorpse left12:16
→ stuffcorpse joined12:17
→ saurabh1403 joined12:19
← aspotashev left12:21
← ashleyw left12:22
→ aspotashev joined12:22
← somebee left12:24
→ somebee_ joined12:24
→ philsturgeon joined12:25
philsturgeon I have a directory that currently contains a third-party framework. that framework has a git repo of its own. how can i convert that normal directory to be a sub-module?12:26
→ khmarbaise_ joined12:27
voker57__ man git-submodule12:27
Gitbot voker57__: the git-submodule manpage can be found at http://git.or.cz/man/git-submodule12:27
→ _slacker_ joined12:28
← priidu left12:29
→ whaley joined12:32
← eletuchy left12:32
← struberg left12:33
→ Radar joined12:34
→ peritus_ joined12:34
← advany left12:34
→ advany joined12:34
→ ashleyw joined12:34
← AAA_awright left12:34
→ AAA_awright joined12:35
← ashleyw left12:35
← drewr left12:37
← somebee_ left12:40
→ somebee joined12:40
→ HG` joined12:40
← khmarbaise left12:42
→ eletuchy joined12:42
philsturgeon voker57__ how about if i only want contents of a certain folder from that repo?12:43
← atsampson left12:43
philsturgeon i want all the contents of their /system/ folder, in my repo as /codeigniter/*12:43
→ ashleyw joined12:44
← kssddy left12:46
wereHamster philsturgeon: not possible to clone only a subdirectory12:46
philsturgeon wereHamster: We meet again :)12:47
→ faithfulgeek joined12:47
wereHamster sorry, I don't remember you12:47
philsturgeon ahh, I was making some php scripts for transmission automation12:47
← javatexan left12:47
philsturgeon but ok might have to try a branch with a remote repo12:47
wereHamster remembers now (after having checked the irc logs)12:49
→ storrgie joined12:50
→ hummingkid joined12:50
→ dodo_the_last joined12:53
← somebee left12:53
→ somebee_ joined12:53
← somebee_ left12:55
→ somebee joined12:55
→ ashleyw_ joined12:57
← somebee left12:58
→ somebee_ joined12:58
← bryanl left12:58
→ philiKON joined12:59
→ ashleyw__ joined12:59
philsturgeon erf not sure how to go about getting only one directory from a remote repo13:01
← somebee_ left13:01
→ somebee joined13:01
→ Radar_ joined13:02
← Radar left13:02
→ jrmuizel joined13:04
→ ashleyw___ joined13:04
uau philsturgeon: i think there's no way to use a submodule without having the whole directory structure of the submodule repo in your tree13:05
philsturgeon any other method to submodule?13:05
← ashleyw left13:05
← somebee left13:07
→ somebee_ joined13:07
jargan → jast13:07
← Yuuhi left13:08
← jrmuizel left13:09
→ commondream joined13:11
→ struberg1 joined13:12
→ scarabx joined13:12
wereHamster philsturgeon: subtree merge13:13
→ ashleyw joined13:13
← ashleyw___ left13:13
wereHamster but no idea if that works when you only want a subdirectory..13:14
← philiKON_ left13:14
uau wereHamster: what would you do with the subtree merge?13:14
← ashleyw_ left13:14
uau it's mainly of some use when you want to update an embedded copy of an external repository13:15
→ dna joined13:16
uau the opposite case where it's embedded as a separate copy of the files in the containing repository, not as a proper separate project13:16
← somebee_ left13:17
→ somebee joined13:17
→ jzellman joined13:18
← ashleyw__ left13:18
← Radar_ left13:19
← somebee left13:22
→ somebee_ joined13:22
← commondream left13:23
← vernile left13:23
→ tatsuyao joined13:24
→ ashleyw_ joined13:24
→ Casan joined13:26
← somebee_ left13:27
→ somebee joined13:27
tswicegood-afk → tswicegood13:27
← sfwc left13:29
← kumbayo left13:29
← tatsuyao left13:30
← ashleyw left13:30
→ DavidKlein joined13:30
← hobodave_ left13:31
← somebee left13:33
→ somebee_ joined13:33
→ jrmuizel joined13:34
← ashleyw_ left13:34
→ jkp joined13:35
← _slacker_ left13:36
→ priidu joined13:37
→ hyperair joined13:38
← somebee_ left13:40
→ Sho_ joined13:40
→ somebee joined13:40
→ Leemp joined13:41
← eletuchy left13:42
→ ballessay joined13:42
→ jfkw joined13:43
→ riovena joined13:43
← dodo_the_last left13:44
→ ashleyw joined13:46
tswicegood → tswicegood-afk13:47
→ Yuuhi joined13:47
→ Jinzhu joined13:47
← Leemp left13:50
← faithfulgeek left13:53
→ LiamH joined13:56
→ bryanl joined13:57
→ altrux joined13:59
→ commondream joined13:59
← name left14:00
→ name joined14:00
← somebee left14:00
→ somebee_ joined14:00
→ Knightingale joined14:02
Knightingale say i have branches master and experimental of the same repo and i've commited some changes to experimental, is there a way to merge it to master without 'git checkout master; git merge experimental;'?14:03
in just 1 command i was hoping.14:03
hyperair i don't think there is14:05
← __iron left14:05
hyperair i'd use an alias, or a function in .bashrc if i wanted something like that =\14:05
Ilari Knightingale: Only if master doesn't contain any commits that aren't in experimential.14:07
Knightingale Ilari, it doesn't cause i never work on master.14:08
→ __iron joined14:08
Ilari Knightingale: 'git push . HEAD:master'.14:10
Knightingale ok thanks.14:10
Ilari Knightingale: I.e. push HEAD as 'master' to '.' (current repo) without forcing.14:11
← somebee_ left14:12
→ somebee joined14:12
← peritus_ left14:13
thiago_home that will only work as long as the merge is a fast-forward14:13
← somebee left14:14
→ somebee_ joined14:14
jast if it isn't, you typically want a merge in the working tree anyway14:14
→ TreeDave joined14:15
Ilari If master won't contain any commits not in current branch, it will be fast forward...14:16
TreeDave I'm attempting to determine through the git api if a file has been added, modified, or deleted - and I'm coming up empty14:16
I'm using the Grit gem14:16
does anybody have any ideas on how to do this?14:16
← bryanl left14:16
jast if I knew Grit, I might, but I don't14:17
← Flathead left14:17
TreeDave I guess you can't tell from the Diff itself14:17
← philsturgeon left14:17
TreeDave It's giving me the a side of the commit, the b side of the commit, and the diff14:17
jast git's special diff headers tell you about it, actually14:19
thiago_home TreeDave: usually, a diff from /dev/null means file added, a diff to /dev/null means file removed14:19
TreeDave hmm interesting - makes sense14:20
thiago_home TreeDave: Git adds extra metadata indicating the SHA-1 of the file14:20
if it is from 0000000000.. it means file added14:20
if it's to 000000000000000000.. it's file removed14:20
← somebee_ left14:20
→ somebee joined14:21
TreeDave number of characters?14:21
jast what thiago_home said... in lines like this one: index 8d818a2..76fc84d 10064414:21
Gitbot [git 8d818a2]: http://tinyurl.com/c74vu3 [blob]14:21
jast shut up, bot :(14:21
← somebee left14:22
→ sergeykish joined14:22
→ somebee_ joined14:22
← riovena left14:23
TreeDave I just added a file to the repo, committed it, and it's saying a_path and b_path are the same - so not seeing /dev/null unfortunately14:23
oh crap - Grit includes this in the API - just not in the docs14:24
→ reprore joined14:24
← ballessay left14:24
TreeDave though it doesn't seem to be correct14:25
← somebee_ left14:25
thiago_home diff -uN does the /dev/null trick14:25
Git doesn't14:25
→ somebee joined14:25
TreeDave gotcha14:25
← somebee left14:26
→ somebee_ joined14:26
← saurabh1403 left14:29
→ somebee joined14:30
← somebee_ left14:30
→ Eridius_ joined14:30
← Eridius left14:31
← jrmuizel left14:32
→ catalis joined14:33
← somebee left14:34
→ somebee joined14:34
→ rubydiamond joined14:35
← aziz left14:35
← TreeDave left14:37
← univate left14:37
← catalis left14:39
doener thiago_home: interesting. I see /dev/null with git diff, but not with diff -uN14:40
sergeykish hello, I want ignore line indentation change in `git diff`14:41
doener sergeykish: diff -w14:41
jast I wouldn't look at the /dev/null things anyway... you've got the "index" lines, after all, and they're absolutely reliable14:41
sergeykish doener: thanks I know that diff flag, but that about git diff?14:41
I found `git diff --ignore-space-change` but it is not the same14:42
jast git diff has -w too, doesn't it?14:42
doener sergeykish: same thing, I've just been too lazy to type "git"14:42
sergeykish: -w, --ignore-all-space14:42
jast (it does)14:42
doener .oO( saved four characters, had to type dozens... bad TCS )14:43
sergeykish doener: amazing, thanks :)14:43
← somebee left14:45
→ somebee_ joined14:45
← ashleyw left14:47
→ Leemp joined14:48
← rubydiamond left14:49
→ dmlloyd joined14:49
← somebee_ left14:49
→ somebee joined14:49
→ catalis joined14:50
→ fantomas_ joined14:51
← scarabx left14:52
→ reuss joined14:55
← somebee left14:55
→ somebee_ joined14:55
→ riverrat66 joined14:56
← columbo left14:56
← Sho_ left14:56
→ Sho_ joined14:57
← somebee_ left14:57
→ somebee joined14:57
→ Alinermedia joined14:57
→ drewolson joined14:58
→ dragonball_ joined14:59
← hyperair left15:01
→ hyperair joined15:01
← fantomas left15:02
← whaley left15:03
← dragonball_ left15:07
← somebee left15:09
→ somebee_ joined15:09
← priidu left15:10
← somebee_ left15:11
→ somebee joined15:11
→ rubydiamond joined15:11
→ Bass10 joined15:12
→ columbo joined15:12
← Bass10 left15:13
→ Bass10 joined15:14
→ marvil07 joined15:14
← somebee left15:16
→ somebee_ joined15:16
← khmarbaise_ left15:17
← somebee_ left15:17
→ somebee joined15:17
← bentob0x left15:19
← somebee left15:21
← Bass10 left15:21
→ somebee_ joined15:21
→ ashleyw joined15:21
← somebee_ left15:22
← ashleyw left15:22
→ somebee joined15:22
→ nazdalf joined15:26
→ elmo2k3 joined15:26
← somebee left15:26
→ somebee_ joined15:26
→ ashleyw joined15:26
→ fridim_ joined15:28
→ _daniel_ joined15:30
nazdalf ~500 people...nothing being said 0_015:31
← columbo left15:31
thiago_home better than 500 people talking15:31
hyperair indeed15:31
nazdalf err....kinda stupid question....but what is the topic for this channel...15:32
??15:32
doener uhm, git?15:32
← elmo2k3 left15:33
← komplex left15:33
nazdalf sorry, but still don't get the idea15:33
doener it's a distributed version control system, see http://git-scm.com/15:33
nazdalf ohh15:33
thank you15:34
← elmob left15:34
thiago_home why would you join a channel if you don't know what the channel is for?15:34
nazdalf to see whats being said....well, me checking out IRC for the first time....so was curious...and there seemed to be a lot of people here....15:35
← catalis left15:35
hyperair heh lol15:35
thiago_home ok15:35
hyperair in ##c++ just now...15:36
[23:35:37] <hyperair> /w #git15:36
[23:35:39] <hyperair> whoops15:36
don't you just hate the stray space?15:36
nazdalf anyways, will check out something on perl channel.......bye guys, have a nice day...n thank you15:37
← nazdalf left15:37
← Jinzhu left15:37
← markelikalderon left15:39
→ whaley joined15:40
→ almostautomated joined15:41
← ph^ left15:41
→ rylar joined15:41
almostautomated Hi all! Anyone happen to have a D/L link for a git-all-1.6.2.4 rpm for CentOS 5?15:41
→ markelikalderon joined15:41
→ schacon joined15:43
← knittl left15:43
← somebee_ left15:43
→ somebee joined15:43
thiago_home ask in #centos15:46
we can give you a link to the source code only15:46
almostautomated thiago_home: I did still waiting for a response; I've got the source. Before building my own I thought I might 'get licky' :)15:46
s/licky/lucky15:46
→ aziz joined15:49
← somebee left15:49
→ somebee_ joined15:49
→ rylar_ joined15:50
← d0k left15:50
→ Thirsteh joined15:52
← somebee_ left15:52
→ somebee joined15:52
→ quoin- joined15:53
→ d0k joined15:53
→ saurabh1403 joined15:56
→ releod joined15:57
← Thirsteh left15:57
→ Thirsteh joined15:58
← somebee left15:59
→ somebee_ joined15:59
← jzellman left16:02
← fantomas_ left16:02
← whaley left16:03
← schacon left16:03
→ columbo joined16:04
← columbo left16:05
→ Nugget joined16:05
sdiz → sdiz-afk16:06
→ columbo joined16:06
← rylar left16:06
→ jzellman_ joined16:08
→ peritus_ joined16:08
← somebee_ left16:08
→ somebee joined16:08
→ [quoin] joined16:10
← quoin left16:10
← somebee left16:11
→ somebee joined16:11
→ prateeksaxena joined16:13
prateeksaxena → prtksxna16:14
← somebee left16:14
→ somebee joined16:14
→ kukks joined16:17
→ Bass10 joined16:17
← drewolson left16:18
→ j416 joined16:18
← Bass10 left16:18
← j416 left16:18
→ Bass10 joined16:19
← Bass10 left16:20
cookiecaper hello. how can I check the size and interesting information about repository size and compression from the commandline (number of commits, current size, etc.)? It's readily available in git-gui, but I don't want to start that all the time.16:23
→ Bass10 joined16:23
← Bass10 left16:26
← rylar_ left16:26
← quoin- left16:26
→ ereslibre joined16:29
→ Bass10 joined16:29
← Bass10 left16:30
→ justatheory joined16:30
→ scarabx joined16:30
→ whaley joined16:31
mithro_ → mithro16:31
Ilari cookiecaper: 'git count-objects -v'?16:31
→ Bass10 joined16:31
← somebee left16:32
→ somebee_ joined16:33
← Bass10 left16:33
← fujin left16:33
← prtksxna left16:33
→ Bass10 joined16:34
← markelikalderon left16:34
← marvil07 left16:34
→ _slacker_ joined16:35
→ parasti joined16:36
→ markelikalderon joined16:37
← somebee_ left16:38
→ somebee joined16:39
→ yec joined16:40
→ khmarbaise joined16:40
← Bass10 left16:40
→ Bass10 joined16:40
← justatheory left16:42
← somebee left16:44
→ somebee_ joined16:44
→ sgrimm joined16:44
← hyperair left16:46
→ hypera1r joined16:46
← binjured left16:47
hypera1r → hyperair16:47
→ bizhat joined16:48
→ marvil07 joined16:49
→ guille_ joined16:49
bizhat I have pushed some changes from local respo to remote. Now i have a live site, i need to update the site with latest code from git remote respo. I run "git fetch -v", it says "= [up to date] master -> origin/master"16:50
g3d bizhat: I'm not sure but what you said might've got cut. Last thing I got was origin/master"16:52
← somebee_ left16:52
→ somebee joined16:52
Ilari Likely that amount of output won't get cut.16:52
bizhat: You sure you didn't mix up branches?16:53
g3d ah ok, I guess there was no question then...16:53
Ilari bizhat: I.e. work on wrong branch...16:53
← nadim left16:53
← whaley left16:55
← Knightingale left16:58
← name left17:00
→ paulboone joined17:04
→ kuadrosx joined17:05
← somebee left17:05
joshthecoder_afk → joshthecoder17:05
→ somebee_ joined17:05
← somebee_ left17:07
→ somebee joined17:07
→ ereslibre_ joined17:08
→ riovena joined17:09
→ nadim joined17:09
→ cloudhead joined17:10
← ereslibre_ left17:10
→ ereslibre_desk joined17:10
← bizhat left17:10
← guille_ left17:11
← somebee left17:12
→ somebee_ joined17:12
← Bass10 left17:12
→ Bass10 joined17:12
← Alinermedia left17:12
← Bass10 left17:13
← somebee_ left17:13
→ Bass10 joined17:14
→ mithro_ joined17:15
→ somebee joined17:15
→ rekoerb joined17:16
→ drewr joined17:16
cookiecaper Ilari: thanks very muhc17:16
← somebee left17:17
→ somebee_ joined17:17
← ereslibre_desk left17:18
← hyperair left17:18
→ hyperair joined17:18
← rekoerb left17:18
cpg|brb → cpg17:20
→ kumbayo joined17:20
→ rekoerb joined17:20
← mithro left17:21
← mbroeker left17:21
→ mbroeker joined17:21
→ schacon joined17:22
← rekoerb left17:22
← cookiecaper left17:23
→ justatheory joined17:23
← paulboone left17:24
← ereslibre left17:24
← mithro_ left17:28
← reprore left17:29
← xkr47 left17:29
← sheikpunk left17:31
→ struberg joined17:33
→ reprore joined17:33
← somebee_ left17:34
← justatheory left17:35
→ elmob joined17:36
← reprore left17:37
← khmarbaise left17:38
← struberg1 left17:39
→ somebee joined17:40
ruskie http://rafb.net/p/jk4Qi390.html <-- any help appreciated17:40
→ mithro_ joined17:43
→ reprore joined17:44
ruskie I already tried git fsck --full but there's nothing reported17:45
← sergeykish left17:45
← reprore left17:46
→ reprore joined17:47
→ texel joined17:50
← doener left17:50
→ aisbaa joined17:51
← riovena left17:52
→ doener joined17:54
→ bryanl joined17:55
← saurabh1403 left17:56
→ saurabh1403 joined17:57
← marvil07 left17:57
← thiago_home left17:58
Ilari ruskie: Could be bad install...17:59
ruskie: What git version on remote side?18:02
← elmob left18:02
→ AkumaStreak joined18:03
→ thiago_home joined18:03
→ xkr47 joined18:03
ruskie Ilari, both sides have git: 1.6 1.6.1 remote side 1.6.1.2 local18:05
and directly on the box I can clone safely18:06
there is one other thing that might be an issue: my install on the remote side is non-system-wide18:07
← reprore left18:08
ruskie so I have to provide -u /home/ruskie/local/bin/git-upload-pack each time18:08
and the exec path for git points to the correct spot for all the support files18:09
doing a clone localy works fine18:09
Ilari ruskie: I looked through the codepath that produces that 'exec ... failed'-message. Looks more like bad install. Maybe set up .basrc properly and then you don't need that --upload-pack thingy.18:11
→ bobesponja joined18:12
Ilari ruskie: Or actually, just pointing to git-upload-pack won't work as it needs more executables to support it and it won't find those.18:13
ruskie: So you need to set up .bashrc18:13
ruskie my .zshrc is set properly... but it's not called it seems at that point18:13
← voker57__ left18:14
→ voker57__ joined18:14
← peritus_ left18:15
Ilari ruskie: Well, interactive and non-interactive logins (git uses non-interactive ones) might not use the same run control files...18:15
ruskie: What errors it gives if you specify --upload-pack=/home/ruskie/local/bin/git\ upload-pack18:16
ruskie ahh got it18:16
.zshenv helped18:16
thanks for your help18:17
→ rylar joined18:17
← rylar left18:17
← voker57__ left18:20
→ voker57__ joined18:20
← voker57__ left18:21
→ voker57__ joined18:21
→ rbogner joined18:21
← Kbyte left18:22
→ guille_ joined18:23
← rbogner left18:26
← voker57__ left18:26
→ voker57__ joined18:26
← schacon left18:28
← _daniel_ left18:31
→ paulboone joined18:32
← voker57__ left18:32
← paulboone left18:32
almostautomated Is there a sep channel for msysgit? I just tried my first git svn clone via msysgit and it inits and checks the revs but doesn't add the files or checkout like it does with the same command on CentOS18:38
→ Paf joined18:38
→ brett_h joined18:39
almostautomated msys git version 1.6.2.2.1669.g7eaf8 and centos git version 1.5.5.618:39
→ peritus_ joined18:41
→ octagon joined18:42
Arrowmaster almostautomated: where was the last svn commit done to? trunk/branches/tags?18:43
almostautomated Arrowmaster: trunk18:43
← peritus_ left18:43
← ashleyw left18:43
→ peritus_ joined18:43
Arrowmaster did you try gitk --all?18:43
→ emiltin joined18:44
almostautomated Arrowmaster: I hadn't but it yields: no commits selected ( which is to be expected I guess after not adding them )18:45
the svn .metedata files for both are equal18:48
bleything → bleything|away18:49
← bleything|away left18:49
emiltin hi, i can checkout to the master, i get error: Untracked working tree file 'so-and-so' would be overwritten by merge.18:49
← felipec left18:49
→ jaredg joined18:49
emiltin *can't18:50
→ bleything joined18:50
← peritus_ left18:50
emiltin i'm not sure how to get out of this situation?18:50
almostautomated Arrowmaster: the main diff I can see is that git log on the msysgit yield bad default revision 'HEAD'18:51
emiltin in the other branch i git removed a folder and added it as a submodule instead18:51
almostautomated That means it is empty, yes?18:51
Arrowmaster almostautomated: i havent used git-svn on msysgit so i dont really know what could be going wrong18:52
almostautomated nods18:52
← PuffTheMagic_ left18:52
almostautomated Arrowmaster: understood18:53
Arrowmaster emiltin: means you have uncommited changes before switching branches with checkout18:53
→ felipec joined18:53
emiltin ok i see18:53
Arrowmaster if you are using windows the files might have been changed automaticly without you doing anything18:54
emiltin so how can i commit changes in the master without first check it out?18:54
i don't have any changes in the current (non-master) branch18:54
Arrowmaster if you run 'git status' it should show that you do have changes18:55
emiltin nothing to commit (working directory clean)18:55
→ ashleyw joined18:56
emiltin i'm on os x, btw...18:56
→ javatexan joined18:56
→ PuffTheMagic joined18:57
← ashleyw left18:57
Arrowmaster you can add -f to the checkout command to force it, doing that will lose any uncommited changes but you say you dont have any18:57
sebleier → sebleier|away18:59
emiltin ok19:00
→ bizhat2 joined19:00
emiltin but i still don't get why i get the error - you say it simply means i've got uncommited changes in the branch in switching to?19:02
bdrewery ?? faq19:02
Pieter emiltin: you have a local file that isn't tracked by git. However, on the branch you want to switch, there's a file with the same name. If you're going to switch to that branch, the local file will be overwritten19:04
emiltin: and there'll be no way to get it back because it's untracked19:04
emiltin ok that makes sense19:04
thanks19:04
→ ashleyw joined19:07
← ashleyw left19:08
→ marvil07 joined19:08
→ paulboone joined19:09
← kumbayo left19:09
→ voker57 joined19:10
← Weems left19:10
← bizhat2 left19:13
← paulboone left19:14
→ catalis joined19:14
← zygen left19:14
→ leanucci joined19:14
← leanucci left19:15
→ dodo_the_last joined19:16
← seangrove_ left19:17
← scarabx left19:17
← voker57 left19:18
→ voker57 joined19:18
→ ashleyw joined19:19
→ dreiss joined19:20
← gilimanjaro left19:23
→ sprite- joined19:23
sprite- How do I check out a specific branch from github?19:24
→ paulboone joined19:24
thiago_home is the repository cloned already?19:25
tclineks sprite-: once you clone you should have the remote branches -- do 'git branch -r' to see them19:25
→ mnick joined19:25
→ codesurgeon joined19:25
sprite- thiago_home: yeah19:25
thiago_home then what tclineks said19:25
tclineks then checkout a local branch tracking the remote with 'git checkout -b (localbranchname) (remotename)/(branchname)19:25
'19:25
← AAA_awright left19:26
sprite- thanks19:26
→ AAA_awright joined19:26
← codesurgeon left19:26
← AAA_awright left19:28
← dodo_the_last left19:28
→ AAA_awright joined19:28
← AAA_awright left19:28
→ dodo_the_last joined19:28
← catalis left19:30
→ justatheory joined19:32
→ AAA_awright joined19:34
→ catalis joined19:36
← Leemp left19:38
→ JasonWoof joined19:39
← voker57 left19:43
← g3d left19:43
→ voker57 joined19:47
← hyperair left19:47
→ hyperair joined19:47
← cbreak left19:49
← AAA_awright left19:51
→ AAA_awright joined19:51
← voker57 left19:51
→ cbreak joined19:53
→ gotgenes joined19:53
← cbreak left19:54
← ashleyw left19:55
→ bcardarella joined19:58
← catalis left20:01
← jfkw left20:01
← struberg left20:04
← dreiss left20:04
← HG` left20:06
→ elmob joined20:08
← _slacker_ left20:09
→ whaley joined20:09
← guille_ left20:11
→ e319 joined20:13
→ UnderSampled joined20:14
← emiltin left20:14
e319 hey everyone, i have installed the gui and command line binary successfully on osx/darwin, im wondering how i can create a local repository ... essentially git is a distributed p2p source version control correct?20:14
UnderSampled how do I run git-svnimport with msysgit?20:15
→ hobodave joined20:15
→ cbreak joined20:17
← cbreak left20:18
→ cbreak joined20:19
Ilari e319: If you have new enough version of git gui, just run it and select "Create new repository". It then asks for directory.20:20
e319: Or create/go to the directory where you want the repo and run 'git init'.20:20
→ ashleyw joined20:21
e319 ok ty20:22
Ilari e319: If you have used other version control systems, be aware that git is quite different. Especially when coming from centralized ones.20:23
e319 ok20:23
Ilari: how do i decentralize it now that i have created my local repo? is there a git "server" (daemon) running now constantly so when someone selects a repo they are "linked" ? sorry for all of the questions i did however look at documentation and did not see that ....20:24
Ilari e319: Git repositories are not linked to each other. There are transports that copy commits (as part of a branch) between repositories.20:25
e319 ahh ok20:25
i see20:25
Ilari e319: The most common ones is ssh:// (served by sshd with git installation) and git:// (served by git-daemon, for anonymous access).20:26
e319 awesome thanks Ilari20:26
flexd What would be the best way of having a pretty new version of git in debian lenny?20:26
I just noticed the package in aptitude is beyond ancient :/20:26
It doesnt work with braid, so im going to have to update it :/20:27
← aisbaa left20:27
Ilari flexd: Ancient? 1.5.6.X (or whatever) isn't that old...20:27
flexd Ilari, well, it's too old.20:27
braid add git://github.com/mislav/will_paginate.git -p20:27
Braid: Error: git version too low: 1.5.6.5. 1.6 needed.20:27
Ilari flexd: Install one from unstable then? It has 1.6.2.1 at least...20:28
flexd Ilari, yes, trying to figure out how.. Not that good at linux stuff yet :)20:28
→ catalis joined20:28
flexd I see it here, http://packages.debian.org/unstable/devel/git-core but i dont know how to install it20:29
← aspotashev left20:29
Ilari flexd: If you have apt-get config right: 'apt-get install -t unstable git-core' or something.20:29
→ altrux_ joined20:29
← altrux left20:29
flexd that says the git-core is already newest20:29
i havent touched the config20:30
← bcardarella left20:30
e319 Ilari: in GitX i created a folder and then a new git, i created a branch, which i dont see, now how do i add files to my first commit?20:30
Ilari e319: No idea about GitX. I only use git gui, which is quite good although not very pretty.20:31
UnderSampled Is there support for git-svnimport on windows?20:32
Pieter git-svniport hasn't been supported for years20:32
Ilari e319: At least on command line, 'git add <file>' adds file to be tracked (needs to be under repository working tree). 'git add <dir>' does recursive add for all regular files (and symlinks) under that directory.20:33
→ altrux joined20:33
Ilari flexd: For me 'sudo apt-get install -t unstable git-core' began upgrading git-core to 1.6.2.4-1...20:33
UnderSampled Pieter: how do you convert from svn to git? are you supposed to just use git-svn and delete the svn version?20:33
flexd hmm20:33
odd20:33
Ilari, how does your sources.list look?20:33
Pieter UnderSampled: there's a --no-metadata option to git-svn20:33
flexd UnderSampled, http://github.com/guides/import-from-subversion maybe? :)20:34
Ilari flexd: I have line "deb http://ftp.de.debian.org/debian unstable main contrib non-free" there.20:34
flexd I don't seem to have that20:35
← drewr left20:35
← e319 left20:35
flexd http://pastie.org/46617420:35
There's mine20:35
→ bcardarella joined20:35
UnderSampled flexd: thank you, but it doesn't say anything about windows20:35
flexd UnderSampled, oh.20:35
Ilari, added that ,seems to work :)20:36
← jaredg left20:37
→ jayallen joined20:37
→ aresnick joined20:37
aresnick Under what conditions could a file be lost, but not show up under git ls-files --deleted?20:37
← altrux left20:39
→ seangrove joined20:39
thiago_home aresnick: when it was deleted and committed20:39
aresnick thiago_home: I see, how can I restore it to the master branch? That is, if I checkout the right commit, I'm off any branch. Is there a better way to put it back on the master branch than just copying it anew?20:40
← hobodave left20:41
thiago_home aresnick: copy it anew20:41
aresnick thiago_home: I see; OK. Thanks!20:41
cpg → cpg|away20:44
← catalis left20:46
← KiBi left20:46
→ mjf joined20:47
→ priidu joined20:48
← altrux_ left20:49
→ naeu joined20:50
→ Drakeson joined20:51
→ HG` joined20:52
Drakeson Is it possible to define an extra repository-specific path that git looks for extra commands? I can put export PATH="$PATH:$PWD/.git/bin" in a file in the repos and run it everytime I get to work in there, but that is a bit crude.20:53
→ gberdyshev joined20:55
flexd Uh, is it possible to see which files are not tracked by git?20:57
I need to ignore something :/20:57
→ apeiron joined20:58
FreakGuard how to apply a patch receved by format-patch?20:59
Drakeson git status should give you enough information20:59
git apply ?20:59
is it in patch format or in the mail?20:59
→ dreiss joined21:00
FreakGuard patch format21:00
Drakeson git apply21:00
← jzellman_ left21:01
→ Octalot joined21:03
Ilari flexd: 'git ls-files --others --exclude-standard'?21:06
→ jzellman joined21:06
flexd Ilari, nothing appears21:06
Ilari flexd: It should show everything that's untracked but not ignored.21:08
← jzellman left21:08
flexd Ilari, i guess it's nothing21:08
but nevermind21:08
Ilari flexd: To display the list without filtering for ignore: 'git ls-files --others'.21:08
flexd I just dropped the issue :D21:08
← deavid left21:09
→ deavid joined21:09
Drakeson are there configurations for affecting how git looks for git-* executables?21:12
→ KiBi joined21:12
→ schacon joined21:12
← schacon left21:12
Ilari Drakeson: It looks them from directory dependant on install prefix and from directories in $PATH.21:12
→ schacon joined21:13
Drakeson I want to add a third place to look, a GIT_DIR relative path.21:14
either GIT_DIR relative or WORK_DIR relative will do, actually.21:15
→ beni- joined21:15
UnderSampled If there is a SVN repository that has been around since 2002 and has 20000 commits, with a total working directory size (for the trunk) of 228mb, how big do you think a git copy would be?21:15
doener UnderSampled: depends on the type of data stored in there21:15
UnderSampled doener: Mostly C files21:16
← deavid left21:16
← wsc left21:16
beni- hi guys. I'm new to git and i am following the gittutorial on kernel.org. I try to clone a repo via ssh from localhost: git clone localhost:/Users/beni/... but I get a error git-pack-objects died with error. http://pastie.org/466207 how can that happen?21:16
doener UnderSampled: so no binary files? Then I'd say a well packed repo might be 150-250MB, but it's hard tell to21:16
beni-: hm, did you try "git fsck --full" (might take a while) on the repo you're trying to clone? Maybe it is really corrupted for some reason21:18
UnderSampled: also, how large is the SVN repo? The git repo will most likely be smaller...21:19
beni- doener: tried that: http://pastie.org/466211 (my repo is quite small, i.e. only one file for testing)21:19
doener beni-: ok, that's fine21:20
Ilari beni-: You can't use --upload-pack like that.21:20
beni- Ilari: without the --upload-pack, I get errors about upload pack not found21:21
doener Ilari: hm? why not?21:21
beni- Ilari: and I found the option for --upload-pack here: http://kerneltrap.org/mailarchive/git/2008/3/6/109228421:21
Ilari beni-, doener: Because it won't then find rest of the required stuff...21:21
beni- Ilari: so what should I do then?21:22
Ilari beni-: Set up .bashrc (or whatever) right...21:22
beni-: $PATH specifically.21:22
← aresnick left21:22
thiago_home UnderSampled: total guess: around 100 MB21:22
doener Ilari: hm? the libexec path is compiled into the executable21:22
→ bolle joined21:22
← bolle left21:22
beni- Ilari: PATH is ok. when I open the Terminal and enter git-upload-pack, it works fine21:22
doener beni-: for interactive shells, but not for non-interactive ones21:23
beni-: try "ssh localhost git-upload-pack"21:23
→ deavid joined21:23
beni- doener: ah... not found ^^21:23
→ olaf joined21:24
← ashleyw left21:24
doener beni-: but that shouldn't matter. --upload-pack is exactly for your use case, where git-upload-pack is not in PATH (and cannot be added, for whatever reason)21:24
Ilari doener: pretty much only 'git' wrapper actually uses the compiled path. Even 'git daemon' doesn't (can be bit of a nasty surprise).21:24
beni- doener: okay... so how could I fix the problem with "git-pack-objects died with error"?21:25
Ilari beni-: Set up $PATH right and it should go away with need for --upload-pack21:25
doener Ilari: upload-pack calls setup_path() which adds the libexec dir to $PATH21:26
beni- Ilari: okay good - but when I put into .bashrc, PATH will not be set when I connect via ssh?21:26
doener Ilari: if it wouldn't work that way, the --upload-pack option would seem totally useless to me21:26
← markelikalderon left21:27
→ kennethlove joined21:29
Ilari doener: It also says about 'exec pack-objects failed.'. That message only comes up if execve of 'git pack-objects' fails...21:29
← bcardarella left21:29
doener Ilari: then it would say "git upload-pack: unable to fork git-pack-objects"21:29
← olaf left21:30
beni- hm any hint, where I should put the export PATH=$PATH:/usr/local/bin to get it work via SSH?21:30
← saurabh1403 left21:30
Drakeson how about /etc/profile or the top of /etc/bash.bashrc ?21:31
beni- Drakeson: but is /etc/profile executed, when i run 'ssh localhost git-upload-pack'?21:32
→ dduncan joined21:32
doener beni-: did you do anything "special" in the gittest repo?21:33
Ilari doener: 'exec pack-objects failed' is printed if execve fails. Since it can't be running 'pack-objects', it must be via execv_git_command(), which calls 'git' (which is probably not in execdir)...21:34
Drakeson beni-: try /etc/bash.bashrc (before [ -z "$PS1" ] )21:34
beni- doener: created repo, branched, switch branch, switch back to master, merged, did a clone locally, some modifications in clone, committed the modifications in clone, pull (in the original location, back from the clone)21:34
Thirsteh → thirsteh21:35
beni- doener: when merging, i had a conflict, and fixed it by hand (just took out all the stuff between <<<<< and =====). I guess I don't need to say something like 'resolved testfile.cpp', do I?21:35
Ilari beni-: 'git add file'.21:35
→ Leemp joined21:36
beni- Ilari: yep, I did that. But I know from SVN that I have to say "svn resolved my_conflicted_file"21:36
ok21:36
← dduncan left21:36
→ Aikawa joined21:37
doener beni-: which git version is that?21:38
beni- doener: git version 1.6.0.2, and I run Mac OS X 10.521:38
Ilari beni-: If you think git works like SVN, you got loads of more nasty surprises... :-)21:38
beni- Ilari: nope, don't think that... but I used SVN for years, and just started with git today ^^21:39
Ilari: I know that git works quite differently... thats the reason why I probably want to switch from SVN to git21:39
→ eletuchy joined21:39
→ Radar joined21:40
← sprite- left21:40
Ilari beni-: ex-SVN users are even unclear about basic concepts. Like that there are no automatic linkages between repositories, all branches are local and each clone is its own repository.21:41
← seangrove left21:41
← HG` left21:41
← kuadrosx left21:41
→ kuadrosx joined21:43
Ilari beni-: Then there's the index (a.k.a. staging area) that represents what's in *next* commit.21:45
beni- Ilari: yeah... and i need to 'add' all modified files every time21:45
(or use commit -a)21:45
Ilari beni-: git gui has 'stage hunk for commit' and 'stage line for commit'. 'git add -p' has similar features.21:46
beni-: If you want only to commit changes to already tracked file 'foo', you can also say 'git commit foo'.21:47
jurg` → jurg21:47
← radarek left21:47
jurg → jurg`21:47
beni- ok :)21:47
so ok, fixed now the issue with PATH21:47
but still get the error from git-pack-objects21:47
← aziz left21:51
beni- ah I just found the hint, that git installation may be corrupted on my OS21:51
so I'll try to reinstall git tomorrow21:51
hopefully, problems will go away then ^^.21:52
thank you for your help!21:52
Ilari beni-: Heh, reminds me of one Mac OS X install that had broken OpenSSL(!).21:52
beni- lol21:52
Ilari beni-: Computed total crap as "SHA-1" hash.21:52
beni-: So pushes to anywhere else wouldn't work...21:53
doener yeah, IIRC when you mixed git from fink with openssl from "that other" thing21:53
or something like that21:53
Ilari Wonder how that could happen... Did it dispatch to wrong routine?21:54
← rubydiamond left21:56
→ gabeodess_ joined21:56
doener ah, it was openssl from fink, and git from somewhere else (apparently self-compiled failed, too)21:56
gabeodess_ okay, I'm trying to push to my 'gabeodess' branch, but when I push I get this message: ! [rejected] master -> master (non-fast forward)21:57
why is it trying to push to master?21:57
beni- YES21:57
gabeodess_ or rather, how do I tell it to push to gabeodess? Please help me!21:57
beni- works now :)21:57
doener gabeodess_: the default refspec for push is ":", which means "push all branch heads that exist in this and in the other repo"21:58
gabeodess_ doener: so how do I tell it just gabeodess branch?21:58
doener gabeodess_: if you want it to do something else, you'll have to tell it, e.g. "git push <remote> HEAD" to push the checked out branch head. Or "git push <remote> foo" to push "foo"21:58
← dodo_the_last left21:58
→ dodo_the_last joined21:59
beni- doener / Ilari: got git source from kernel.org and compiled it. now everything works21:59
thank you both! bye21:59
gabeodess_ doener: can't I set that in my config file somehow? I thought I had it working before, but I don't know why it isn't now...21:59
← beni- left22:00
doener gabeodess_: you can set the default push refspec for a remote in the config, sure. The config entry is remote.<name>.push22:00
gabeodess_ http://pastie.org/466238 that...22:00
doener gabeodess_: you probably just didn't have "master" out of date, and so never saw what the default behaviour is, and assumed something that's wrong ;-)22:01
→ QTourist joined22:02
← SRabbelier left22:03
→ _slacker_ joined22:04
← _slacker_ left22:05
Ilari Reminds me of one project. If you built it with the shipped script, it would produce somewhat broken executable (it didn't crash outright, but neither did it work right). Repeat the reported final link command it gave and the built executable worked right.22:08
→ SRabbelier joined22:09
← Yuuhi left22:11
← naeu left22:12
→ seangrove joined22:15
← dreiss left22:17
→ knittl joined22:20
← thirsteh left22:20
→ bremner_ joined22:24
→ thirsteh joined22:25
← slestak left22:25
→ e319 joined22:27
→ binjured joined22:28
→ Murr joined22:28
e319 still trying to setup my local repo, i used git initi, then i tried to add files and it said that the files were not within the repository....22:29
← bremner_ left22:30
← Paf left22:33
← justatheory left22:35
→ aziz joined22:37
← mbroeker left22:41
gabeodess_ I have a master and a gabeodess branch on my repo, and I want to merge them... is there an easy way to do this?22:43
← priidu left22:44
bleything → bleything|away22:46
← riverrat66 left22:47
→ ericindc joined22:47
ericindc Is there an inverse of .gitignore to pick which files to track? I want to ignore everything but for one file.22:48
doener ericindc: for tracked files, .gitignore has no meaning22:48
ericindc: so you can just ignore everything and use "git add -f" to add the files you want to track22:49
ericindc: or you can use inverted rules in .gitignore to exclude some files from being ignored22:49
ericindc doener: ok, i guess i was looking to get rid of the untracked files list22:49
doener: but i'll just stick to git add22:49
doener ericindc: hm? Ignoring everything will obviously make the list of untracked files empty22:50
almostautomated I'm switching over a svn repo to git and cleaned deleted a bunch of stale branches, as well as a root level externals folder. I've done git svn clone of the repo, and am curious what command I need to read up on to clean-up the history before pushing to my public repo. ?22:50
doener almostautomated: filter-branch22:51
almostautomated doener: thank you.22:51
doener: I did not mention that all I want in the end is the svn trunk and the history associated with the existing files; does that make a difference to your answer?22:53
← advany left22:53
→ sakyamuni joined22:53
almostautomated when I did the git svn clone I specified mysvnroot/trunk22:54
doener almostautomated: no, filter-branch is the only "general purpose" history cleanup tool (unless you consider writing a filter for fast-export/import)22:54
→ fynn joined22:54
almostautomated doener: fantastic. thx again22:54
fynn OK, I've done a bunch of changes, but I want to onlu 'git add' some of them.22:54
doener fynn: within a single file? git add -i/-p22:55
fynn Is there an easy way to tell Django which changes to add?22:55
doener Django?22:55
fynn heh, sorry, s/Django/Git/22:55
→ bobmcw_ joined22:55
fynn doener: thanks, what would be the difference between i and p?22:55
doener fynn: -p directly starts the patch mode, -i is just the interactive mode22:55
→ Paf joined22:55
doener (from which you can also start the patch mode)22:56
← brett_h left22:56
← gotgenes left22:56
fynn doener: ah, so -p is like -i and choosing p immediately?22:56
anyways, git add -p is _exactly_ what I wanted, thanks.22:56
thiago_home git add -i used to be "console adventure game" :-)22:56
doener fynn: yeah, kind of. I use -i too seldomly to tell22:56
fynn thiago_home: what do you mean? it still looks like Adventure ;)22:57
anyways, add -p is like good ol' Darcs.22:57
which is great.22:57
thiago_home fynn: it was worse22:57
fynn thiago_home: haha, really? now I'm curious22:58
← SRabbelier left22:58
thiago_home ever noticed the need for the double enter?22:58
gabeodess_ doener: so when I do a push or pull, it will merge master and the branch on my local machine?22:59
thiago_home the interface now allows selecting commands by letter22:59
before it was only by number22:59
doener gabeodess_: no. push will never merge. And pull has its own defaults (and it's not the opposite of push. The opposite of push is fetch, and pull is fetch + merge/rebase)23:00
← bobmcw left23:00
gabeodess_ doener... so when I pull from my branch and it says it's also pulling from master... it's merging them on my machine?23:01
doener gabeodess_: that makes no sense to me. For "git pull" behaviour and defaults, try http://git.pastebin.com/m5f1ac3b123:02
gabeodess_ k, thanks23:03
← e319 left23:03
doener gabeodess_: If I may rant: If someone told you to use "git pull" without telling you about "git pull <remote> <refspec>" and "git fetch", then, uhm, he didn't exactly do you a favour23:04
ok, not quite a rant... not in the mood... :-/23:05
← stuffcorpse left23:05
→ stuffcorpse joined23:06
gabeodess_ yeah, no one really told me anything, I'm just sort of wandering around aimlessly in the dark.23:06
→ JohnnyL joined23:08
← QTourist left23:09
← schacon left23:11
→ schacon joined23:11
→ leanucci joined23:15
→ hobodave joined23:16
→ seed95 joined23:20
seed95 Hi, I just push my changes on my production server, when I do a git status on it I get many changes not yet commit, how can I apply the changes I push on the server please?23:21
→ jzellman joined23:22
← marvil07 left23:22
MisterN seed95: git commit -a && git push23:23
seed95 MisterN: I did this already on my local machine to push on the production server23:24
→ justatheory joined23:24
MisterN seed95: did you push to a non-bare repo?23:24
doener gabeodess_: http://git.pastebin.com/m3541864 -- some incomplete quick guide to fetching, might help your understanding about the "git pull" stuff23:25
seed95 MisterN: I am not sure about the non-bare, it is a repository with files in it , in there I did a git init23:25
cj I need some help creating, modifying and publishing a branch of quagga (git://code.quagga.net/quagga.git)23:26
← davidfetter left23:26
cj something like this? - mkdir quagga ; cd quagga ; git init ; git fetch git://code.quagga.net/quagga.git refs/heads/master:refs/heads/origin ; git branch cjac origin23:27
← thiago_home left23:27
→ catalis joined23:28
← mjf left23:28
MisterN seed95: you are supposed not to push to non-bare repositories23:28
→ bcardarella joined23:28
seed95 MisterN: I believe it's too late :)23:28
← tmz left23:29
→ tmz_ joined23:29
← ilor left23:29
← Tuomas left23:29
tmz_ → tmz23:30
← jzellman left23:30
← justatheory left23:31
← elmob left23:33
→ plasticine joined23:34
→ bremner_ joined23:35
← catalis left23:36
← Aikawa left23:37
→ jonnybbb_ joined23:37
→ Aikawa joined23:37
← bremner_ left23:37
seed95 MisterN: If I did that mistake how can I apply changes I pushed please?23:38
← d0k left23:38
MisterN seed95: i don't know.23:38
seed95 I think using git reset will apply changes ...23:38
doener seed95: faq non-bare23:38
Gitbot doener: Pushing to non-bare repositories is discouraged. See http://git.or.cz/gitwiki/GitFaq#non-bare23:38
seed95 doener: thank you23:38
doener seed95: the reset --hard mentioned there is one way23:39
seed95: you can also look into the reflog and just reset --soft to the old pre-push state23:40
seed95: that preserves uncommitted changes (if any), and you can then merge the pushed state23:40
← UnderSampled left23:41
jonnybbb_ i would like to set up a git server. Write access to the hosted repositories should be available through several protocols (http (webdav), git, ssh) is such a configuration possible and recommended?23:42
doener jonnybbb_: write access over pure git:// is not recommended, as that supports no authentication23:42
→ hobodave_ joined23:43
→ altrux joined23:43
doener jonnybbb_: ssh is no problem. webdav I never used, I just heard rumours that it can be a bitch23:44
→ Bartman007 joined23:44
→ dsop joined23:44
→ Nilbus joined23:44
→ aphexer joined23:44
→ da5id joined23:44
→ Bluehorn joined23:44
→ sr joined23:44
→ drfreeze joined23:44
← leanucci left23:45
→ jzellman joined23:45
jonnybbb_ we just need in an friendly environment, so authorization is currently not a big issue. but would it be possible to use several protokolls in paralell?23:45
doener jonnybbb_: at least git:// and ssh:// should pose no problems, no clue about webdav. http read access should be no problem either23:46
→ Derega joined23:50
→ flaguy48 joined23:50
→ leanucci joined23:51
← jzellman left23:51
← kuadrosx left23:54
jonnybbb_ so git takes somehow care that the repository doesn't get corrupted while beeing accessed from different sources without having central server (entry point)?23:54
← kennethlove left23:54
bdrewery yes23:54
apeiron Has anyone read the pragmatic git book? Is it any good for someone with a basic familiarity with git, enough to do simple daily workflow stuff?23:54
bdrewery apeiron: I would just read the onlin docs and google tutorials. I bought the book but it's almost TOO verbose23:55
apeiron bdrewery, Hmm. Verbose + 180 pages == bad23:55
← DavidKlein left23:58
→ MarcWebe1 joined23:58
← leanucci left23:59
← hobodave left23:59

Logs Search ←Prev date Next date→ Channels Documentation