IRCloggy #git 2010-03-28

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.

2010-03-28

→ sgh_ joined00:00
← sgh left00:02
← adam12 left00:04
rocketeerbkw how do I replace all files in my working directory with repository versions?00:08
xer0x → xer0x|away00:09
sohum how do I specify repository-root-relative paths?00:10
ProLoser|Trmnl do you mean revert to the last commit?00:10
in git?00:11
← ProLoser|Trmnl left00:11
← _iron left00:11
sohum found it - $(git rev-parse --show-cdup)/whatever00:13
rocketeerbkw i want to nuke my working dir, and get new versions from repository. `git reset --hard` doesn't seem to do that00:15
wereHamster why dosen't it seem to do it?00:16
sohum: beware that git rev-parse --show-cdup ptints nothing if you are already in theroot00:17
jnareb rocketeerbkw: `git reset --hard HEAD` or `git checkout HEAD -- .` (perhaps together with git-clean00:17
sohum wereHamster: oh grrr. that's really quite annoying. so ./$(git rev-parse --show-cdup)/whatever, then, I suppose00:19
rocketeerbkw I'm on windows and had core.autocrlf = true so all my files in repo are LF, but my working dir is still crlf. I set core.autocrlf = input and now I want all my working dir to be replaced00:19
nither git reset or checkout do that00:19
cbreak you can just rm them all00:19
rocketeerbkw if I delete the file, then check it out, it works, but those commands won't delete files for me I guess00:19
cbreak and and do a new checkout?00:19
rm -Rf *?00:20
make sure to not delete the .git dir :)00:20
xer0x|away → xer0x00:21
→ kpreid_ joined00:22
← kukks left00:22
← chittoor left00:22
rocketeerbkw after delteing working dir, you have to `git checkout -- ./` to get it all back00:23
→ loinclot_ joined00:24
← loincloth left00:25
← sgh_ left00:25
→ bcoca joined00:25
xer0x → xer0x|away00:28
← Louie` left00:28
← rgr left00:31
xer0x|away → xer0x00:32
← amerine left00:32
→ rgr joined00:35
→ chittoor joined00:36
← yevlempy left00:36
→ hobodave joined00:37
→ sgh joined00:37
← rgr left00:37
xer0x → xer0x|away00:37
→ loincloth joined00:38
← dol-sen left00:40
← loinclot_ left00:40
→ mithro joined00:42
← jnareb left00:43
→ alester joined00:46
← xiong left00:46
→ frakturfreak_ joined00:50
→ loinclot_ joined00:51
→ dreiss joined00:51
← loincloth left00:51
rothspec is it possible to git-clone a remote repo and set it up for --shared=group locally?00:52
← bcoca left00:52
← malumalu left00:53
→ rgr joined00:53
→ bcoca joined00:53
← frakturfreak left00:53
→ Mage joined00:54
Ilari rothspec: Yes it is possible. But such clone should be bare because shared working copies are a bad idea.00:55
rothspec Ilari: perfect, I meant to specify that--it's what I want.00:55
Ilari: would that be something like git clone --bare --shared=group remoteRepo ?00:55
Ilari: I guess I'm confused because I've only seen --shared=group mentioned in the git-init man page00:56
Ilari rothspec: Unfortunately --shared of clone means something completely different...00:56
rothspec Ilari: yeah, I noticed. do I have to hack this manually?00:56
Ilari rothspec: Its enough to set core.sharedrepository to group and chmod _DIRECTORIES_ (don't do recursive chmod!) to 2770.00:57
→ r11t joined00:58
→ xiong joined00:59
→ dj_tjerk joined01:01
→ corni_ joined01:01
← r11t left01:02
→ r11t joined01:02
→ brothers_ joined01:02
← royalty left01:04
← corni left01:05
sohum does git preserve permissions and track permissions changes?01:06
← sgh left01:06
sohum like +x or a-r?01:06
→ sgh joined01:06
← r11t left01:06
Ilari sohum: Only +x01:07
→ r11t joined01:07
sohum Ilari: well, that's slightly annoying.01:07
hm.01:07
rektide git submodule doesnt seem to store any information on the -b branch specifier01:08
← Theravadan left01:08
← LiamH left01:10
← r11t left01:11
→ r11t joined01:11
→ hebz0rl_ joined01:15
← r11t left01:15
→ r11t joined01:16
sohum also, is there any thing I can put in to git diff _ that'll get me /all/ changes since the repo was created? 00000000 doesn't work.01:16
Ilari sohum: There is hash of empty tree...01:17
→ loincloth joined01:17
sohum Ilari: ?01:17
← hebz0rl left01:18
Ilari sohum: Try using 4b825dc642cb6eb9a060e54bf8d69288fbee4904 as the source.01:19
Gitbot [git 4b825dc64]: http://tinyurl.com/ylz5umq [tree]01:19
← hebz0rl_ left01:19
← loinclot_ left01:19
Ilari sohum: And that object is bit special so shortening the hash might not work...01:19
← sgh left01:20
sohum Ilari: oh, excellent. that's interesting...01:20
→ Prototyp1X29A joined01:23
Ilari sohum: Yup. That object is magic, git recognizes it even if it doesn't exist in repository, but in that case shortening the hash won't work.01:24
→ sgh joined01:25
Ilari sohum: But if the object exists in object DB, then it behaves like normal object (shortening works, etc...)01:25
← PrototypeX29A left01:25
→ glasspen joined01:28
sohum Ilari: how'd you get that hash?01:30
Ilari sohum: 'git hash-object -t tree /dev/null'.01:31
← altogether left01:33
sohum Ilari: excellent, thank you01:33
← corni_ left01:34
← pantsman left01:35
← brothers_ left01:35
sohum hm. why do "git log --reverse --name-only --format="format:" 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD" and "git diff --name-only 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD" output commits in a different order?01:35
Gitbot [git 4b825dc64]: http://tinyurl.com/ylz5umq [tree]01:35
← ksn left01:36
→ ksn joined01:37
sohum *changed files, not commits, but remove --name-only to see what I mean01:37
→ fr| joined01:37
→ resmo_ joined01:38
← resmo left01:39
→ przemoc joined01:41
← hipe_ left01:45
← ocs_ left01:45
← ph^ left01:46
← dj_tjerk left01:51
← sgh left01:52
→ hipe joined01:53
→ rudi_s joined01:57
← ksn left01:58
← kingfishr left01:59
← rudi_s_ left02:01
← kms left02:04
→ dwmw2 joined02:04
→ kms joined02:04
→ enygma joined02:07
enygma queston for you all - say I have some commits in my queue on github but the site says they won't go in clean. Is there a way to pull only those commits from the branch (fork of the main repo)?02:08
→ simplechat joined02:09
← mithro left02:10
Arrowmaster queue? is that something github specific?02:11
enygma it's a list of commits that someone who's forked the repo has suggested I pull from02:11
like this: http://github.com/enygma/joind.in/forkqueue02:11
before I was lazy and just did a git pull over the top of my working copy02:12
← Yuuhi left02:12
→ R0b0t1 joined02:12
R0b0t1 Is it possible to set up a protected git repository without gitosis?02:12
Arrowmaster you probably want to add the fork as another remote and fetch it then use rebase, or just tell the fork owner to rebase/merge it and submit it again02:13
enygma hmm, okay...i'll give that a shot02:13
thanks02:13
→ krynnotaur joined02:13
→ ocs_ joined02:14
Arrowmaster if github is saying it doesnt apply cleanly then it means youll like have to edit it to get it to work, which is why its probably a better idea to ask the fork owner to do it since they know their changes best02:15
enygma nods02:16
enygma most of them seem pretty simple (and like they actually would go in clean) but I want to know how to do this for the future02:16
← locklace left02:20
→ ajpi joined02:20
→ cytrinox_ joined02:20
→ royalty joined02:21
TML enygma: Fancy meeting you here :)02:23
→ locklace joined02:23
enygma TML: oh hello :)02:23
← sitaram left02:23
← ajpiano left02:24
← cytrinox left02:24
cytrinox_ → cytrinox02:24
← parasti left02:24
← zehrique left02:24
← rgr left02:26
→ mrtazz joined02:27
esr So, I fixed up the somewhat broken CIA hook scripts from the git wiki, posted them to the git mailing list...and have been *completely ignored*. Is this, er, normal?02:28
TML I've been considering making an alias so that merge has --no-ff by default. Are there any risks to that?02:28
← R0b0t1 left02:28
frakturfreak_ → frakturfreak02:30
→ webchick joined02:32
→ enherit joined02:33
rudi_s TML: Why would you want to do this? Why generate a merge commit when it isn't necessary?02:33
TML rudi_s: I find it easier to walk back a topic branch when it's been merged with --no-ff, and this is something I find myself having to do often02:34
← enherit left02:34
rudi_s TML: I see, I prefer ffs, but it shouldn't cause any problem, so the alias is no problem.02:35
TML rudi_s: I just happen to have a pair of VERY junior programmers on my team that commit a lot of things they shouldn't, and want git to help me unravel those :)02:36
s/commit/merge/02:36
rudi_s Ah, yeah, then it's a good idea ;-)02:37
→ enherit joined02:38
→ tvw joined02:39
→ Stravy joined02:44
→ justin-george joined02:44
← patmaddox left02:45
→ _VVSiz_ joined02:46
← glasspen left02:46
← VVSiz_ left02:49
← pheaver left02:51
← enherit left02:51
→ gnufied joined02:52
→ timj_ joined02:52
→ dpino joined02:52
→ stkrzysiak joined02:53
← tvw left02:54
fcoury|away → fcoury02:55
→ glasspen joined02:55
← timj__ left02:56
→ altogether joined02:57
← disappearedng left02:57
← disappearedng_ left02:57
→ rctay joined02:58
← DavidKlein left03:00
→ DavidKlein joined03:01
← aresnick left03:02
→ timepilot joined03:04
← Prototyp1X29A left03:04
→ disappearedng_ joined03:06
← brntbeer left03:06
→ disappearedng joined03:07
→ pheaver joined03:10
→ sagsousuke joined03:10
← stkrzysiak left03:11
← sagsousuke left03:11
→ anathematic joined03:11
← enygma left03:12
→ sitaram joined03:12
→ seezer_ joined03:14
→ warthog9 joined03:16
← alip left03:16
← spearce left03:18
→ ArdRigh joined03:19
→ _Vi joined03:19
_Vi git version 1.7.0.303:20
→ cehteh joined03:20
→ alip joined03:20
_Vi cd ~/code; git status -> "Changed but not updated:": a bunch of subprojects that are not really modified.03:20
"git ls-files -m" -> one subproject that is really modified.03:21
→ gaveen joined03:22
_Vi And "git add" doesn't eliminate entries from "Changed but not updated".03:22
And "git stash" says "No local changes to save".03:26
← chittoor left03:26
_Vi (Trying to bisect)03:26
→ falican joined03:26
→ Carneus joined03:29
→ ijuma_ joined03:29
← glasspen left03:30
← locklace left03:30
→ locklace joined03:32
← justin-george left03:34
falican does anyone know of a good tute on setting up a workflow with git for webapp development (I'm a git noob contaminated by years of svn)03:35
xer0x|away → xer0x03:36
← disappearedng_ left03:36
→ disappearedng_ joined03:37
← locklace left03:38
→ chittoor joined03:40
→ locklace joined03:42
→ sh1mmer joined03:43
→ Mkools joined03:45
← chittoor left03:45
Mkools Hello sir I wanted to participate as soc student in git for soc.03:46
← bojicas left03:46
fcoury → fcoury|away03:48
cehteh Mkools: you probably apply at some mentor or ask on the ML, IRC at this time is a bit slow (is there some offical application procedure?)03:48
Mkools cehteh: What's Ml03:51
→ amerine joined03:51
cehteh Mailinglist03:51
Mkools cehteh: Are Scott Chacon / Sam Vilain available on IRC?03:51
→ ObjectMind joined03:52
cehteh mugwump is Sam Vilain03:53
dunno about Scott Chacon03:53
Mkools cehteh: Can I contact directly to them?03:56
Sam is available.03:56
rtyler Mkools: perhaps the mailing list..03:57
there's been some threads on soc03:57
cehteh send them a email, well maybe logged in but sleeping03:57
from where are you?03:57
→ eno joined03:57
rudi_s falican: I don't have a specific web tutorial, but progit and gitmagic are both good guides for git.03:57
cehteh this time of the day there is usually not much activity03:57
Tama01 → Tama0003:57
Mkools cehteh: I am from India.03:58
cehteh its 6am in europe03:58
Mkools cehteh: It's 9:00 AM here.03:58
cehteh try to stay here and watch, the people may wake up later or at evening03:59
→ chittoor joined03:59
falican rudi_s, the main thing i am worried about is how to handle dev/staging/live code03:59
cehteh best is you subscribe to the ML and read the archive04:00
falican: we currently have a 'live' repo which gets checked out on each push04:00
but that something which requires some fairy dust to get right04:00
rudi_s falican: Simplest would be one repo where you develop in, another one for the testing, and then one live where you push to.04:00
Mkools cehteh: What will be benefit from subscribing the mailing list?04:01
cehteh normally pushable repos should be bare04:01
you see whats going on04:01
falican rudi_s, so push code to a staging repo then push code to the live repo when it is ready?04:01
→ mithro joined04:01
rudi_s falican: Yes, for example. But be careful to not push to a branch which is checked out (the FAQ has some information about that).04:02
The "push" to the live repo could also be rsync for example.04:02
cehteh i dont know much about gsoc projects, but if i would mentor a stundent i would like if he is a bit involved with the project and knows whats going on04:02
falican rudi_s, hmm thnx04:03
rudi_s np04:03
cehteh falican: http://lumiera.org/ ... moreover http://lumiera.org/post-receive04:04
falican cehteh, thnx04:04
cehteh the website is a live git repo, made with asciidoc04:04
Mkools cehteh: Can you please provide me the link for ML.04:05
cehteh the build-website.sh script rebuilds that, you dont need that and there are better/more generic post-receive hooks around, that one is just hacked and works for us04:05
Mkools: vger.kernel.org04:05
rtyler Mkools: google it :)04:05
← chittoor left04:05
cehteh Mkools: the there is a symlink from .git/hooks/post-receive to the toplevel post-receive04:06
means its versioned too :)04:06
→ kamol_ joined04:07
← kamol_ left04:07
← sitaram left04:07
Mkools cehteh: But it is saying it is of kernel.04:08
cehteh http://vger.kernel.org/vger-lists.html#git04:09
uhm04:09
← krynnotaur left04:10
→ krynnotaur joined04:10
cehteh What would you do for git?04:10
Mkools cehteh: As matter of my experience of git I have listened first of it from tech talks available on you tube of linus torvalds.04:13
I am interested in git mirror support.04:13
cehteh you are experienced in C programming?04:14
well i ever wanted to hack some caching proxy/mirror but had no time04:14
Mkools Yeah, got some.04:15
cehteh kindof transparent proxy which intercepts all git protocoll and caches it, primes and updates repos by crontab too to speed up git from home04:15
well .. no time04:15
→ chittoor joined04:18
← royalty left04:20
← dpino left04:23
← timepilot left04:27
→ sitaram joined04:27
← sitaram left04:27
→ sitaram joined04:27
← ObjectMind left04:27
← eno left04:29
Mkools cehteh: Do I have do send a mail for subscription.04:30
← sitaram left04:30
→ ObjectMind joined04:30
→ eno joined04:30
Mkools because when I clicked the subscribe it opened a mailing window.04:30
cehteh http://xkcd.com/293/04:31
← Guest54800 left04:31
← rctay left04:33
→ R0b0t1 joined04:34
R0b0t1 How do I tell git to use a nonstandard port?04:34
→ sitaram joined04:34
rudi_s R0b0t1: ssh? ~/.ssh/config04:35
← Mkools left04:35
R0b0t1 I was talking about on the command line... I'd rather not have to do that for everywhere I go.04:35
sitaram R0b0t1: man git-clone and look for the string :port04:37
Gitbot R0b0t1: the git-clone manpage can be found at http://git.or.cz/man/git-clone04:37
R0b0t1 git clone [email@hidden.address]04:38
That seems to fail.04:38
And it says it was using port 22.04:38
← NicelyNicely left04:39
R0b0t1 *sigh*04:40
new question04:40
git@digger ~ $ sudo gitosis-init < ~/.ssh/id_rsa.pub04:40
-bash: /var/git/.ssh/id_rsa.pub: Permission denied -- why might this fail?04:40
I just created it.04:40
→ jmcantrell joined04:41
← R0b0t1 left04:42
cehteh always curses about gitosis too :P04:43
→ loinclot_ joined04:43
← loincloth left04:45
→ shennyg_ joined04:49
← shennyg left04:52
shennyg_ → shennyg04:52
← chittoor left04:53
→ fool_ joined04:53
← fool_ left04:53
→ fool_ joined04:53
← jmcantrell left04:53
← fool__ left04:57
← loinclot_ left04:59
→ loincloth joined04:59
→ ProLoser|Trmnl joined04:59
ProLoser|Trmnl hallo04:59
i don't get this: git checkout -b beta --track remote/origin/beta04:59
fatal: git checkout: updating paths is incompatible with switching branches.04:59
Did you intend to checkout 'remote/origin/beta' which can not be resolved as commit?04:59
← sergio__ left05:01
← madewokherd left05:02
sitaram ProLoser|Trmnl: put --track first then -b beta05:04
yes I know the docs arent very clear on that05:04
→ stringo0 joined05:05
→ sergio__ joined05:05
ProLoser|Trmnl git checkout --track remote/beta -b beta05:06
fatal: git checkout: updating paths is incompatible with switching branches.05:06
Did you intend to checkout 'remote/beta' which can not be resolved as commit?05:06
i don't get it05:06
→ chittoor joined05:07
xer0x → xer0x|away05:07
xer0x|away → xer0x05:07
sitaram the remote/beta still goes at the end: git checkout -t -b newbranch origin/oldbranch05:08
and you had remote/beta once and remote/origin/beta once; make sure you use the right one in the actual command05:08
ProLoser|Trmnl i'm getting the same error05:11
and i don't know which one to use05:11
i did git branch -a and i saw remotes/origin/beta05:11
that's the branch i want05:11
sitaram ProLoser|Trmnl: pastebin output of "git branch -v; echo ====; git branch -r -v" please05:12
(if its not confidential info)05:12
→ justin-george joined05:13
→ pabloh joined05:14
→ Shawna joined05:15
→ Fissure1 joined05:16
← Bass10 left05:17
← sh1mmer left05:17
← bauruine left05:17
ProLoser|Trmnl don't get why it'd be private http://pastebin.com/Zn072hmk05:17
Shawna kmh270nZ/moc.nibetsap//:ptth etavirp eb d'ti yhw teg t'nod05:17
← Shawna left05:17
cehteh deniL-K :)05:18
← Fissure left05:18
pabloh hi, is it possible to edit a commit with rebase and merge it back to upstream, without creating a new one?05:18
sitaram ProLoser|Trmnl: git --version ??05:19
cehteh its already published?05:19
if yes then dont rebase05:19
pabloh cehteh: yep05:19
i may break something?05:19
sitaram ProLoser|Trmnl: even 1.6.1 seems to accept different variants of giving -b and -t05:20
pabloh s/i/it05:20
cehteh rebase rewrites history, yes anyone depends on it will curse you05:20
consider --revert05:20
anathematic I think I'm failing at adding hooks onto my post-receive - is there any easy way to test this?05:20
sitaram ProLoser|Trmnl: at the very least "git branch --track beta origin/beta; git checkout beta" should work for you05:20
cehteh anathematic: chmod +x ?05:21
anathematic cehteh: I thought I had - it seems to be working for the post-commit but not post-receive05:21
pabloh cehteh: ok, so it migth create conflitcs that git mat not be able to solve by itself?05:21
anathematic cehteh: I just had a simple echo "foo" so I could see it's working but it's not :<05:21
cehteh pabloh: just dont do it05:22
→ bauruine joined05:22
pabloh cehteh: ok, :) , i got it05:22
cehteh it will create a mess05:22
pabloh just tring to undestand a bit more05:22
why is a bad i idea05:22
cehteh the others have that old commit in their history05:23
they merge your new one in, have to fix the conflicts (or maybe this works without conflict)05:23
but then you have old and new version in history and all a bit messed up05:24
← darwin_ left05:24
pabloh so the old version won't just dissapear when they pull?05:24
cehteh anathematic: post-receive has to be established on the receiving side of course ..05:24
← p_masho left05:24
anathematic cehteh: so I guess I just have to figure out what's wrong with my permissions :)05:24
cehteh: a echo "foo" should display in a post-receive for console right?05:24
cehteh yes05:25
anathematic mm05:25
cehteh see what i saied about receiving side05:25
→ darwin_ joined05:25
cehteh hooks are not versioned they have to be set up on each repo/clone anew05:26
anathematic yeah05:26
cehteh or you do as we do, verion them somewhere else and symlink them05:26
anathematic well I figured I'd get this bit working first05:27
and then go from there :)05:27
cehteh you can browse our lumiera website setup that all reachable from the webserver05:27
http://lumiera.org/git/website/05:28
→ Tristany joined05:29
anathematic looks05:29
Mage o.O05:30
Tristany O.o05:30
← darwin_ left05:30
Mage why would you do such a thing05:30
Tristany gniht a hcus od uoy dluow yhw05:30
Mage oh a bot05:30
Tristany tob a ho05:30
Mage pasky: hi05:30
Tristany ih :yksap05:30
anathematic lol05:30
Tristany lol05:30
Mage racecar05:30
Tristany racecar05:30
anathematic subaru05:31
Tristany urabus05:31
→ Theravadan joined05:31
← pheaver left05:32
→ rburton- joined05:33
→ darwin_ joined05:33
← chittoor left05:34
← Tristany left05:34
→ ethercrow joined05:35
← ObjectMind left05:35
→ codeswing joined05:37
← codeswing left05:37
→ codeswing joined05:37
← ProLoser|Trmnl left05:39
→ ProLoser|Trmnl joined05:40
→ sunaku joined05:44
→ chittoor joined05:48
← sunaku left05:50
← eldragon left05:51
offby1 bumble05:53
offby1 pouts05:53
← warthog9 left05:53
← chittoor left05:53
→ warthog9 joined05:55
→ pheaver joined05:56
← justin-george left06:02
→ thiago_home joined06:02
→ loinclot_ joined06:05
← loincloth left06:06
→ chittoor joined06:07
← sergio__ left06:07
→ svbg joined06:07
→ yitz_ joined06:15
← loinclot_ left06:16
→ loincloth joined06:16
← anathematic left06:16
← ProLoser|Trmnl left06:20
← Determinist left06:20
→ bob2 joined06:25
← dreiss left06:26
→ marcial5 joined06:26
← pheaver left06:27
← kinabalu left06:28
→ fool__ joined06:34
← fool__ left06:34
→ fool__ joined06:34
→ Tan7188 joined06:34
← loincloth left06:35
Tan7188 hi is there any good guide on how to use git? not a general command i mean. some how i get download a clone but i cannot seems to build it06:35
i did't change anything but the eroor keep pop out autogen.sh aclocal not found06:36
→ loincloth joined06:36
Tan7188 anybody be kind to guid me?06:36
please?06:36
im new06:36
← fool_ left06:37
← sitaram left06:37
→ anathematic joined06:37
anathematic I'm trying to add a post-receive hook into my git repo but I'm sucking at it06:38
thiago_home Tan7188: just type 'make'06:38
anathematic tips? I've made sure the permissions are correct06:38
the post-commit will work fine :(06:38
→ aiscss joined06:42
← alester left06:43
Tan7188 thanks for the info06:45
→ Paraselene_ joined06:46
← Yuffster left06:47
← rburton- left06:48
← aiscss left06:48
← r11t left06:50
Fissure1 → Fissure06:51
→ aiscss joined06:52
← amerine left06:52
← darwin_ left06:53
→ sitaram joined06:55
← cedricv left06:56
→ spat joined06:57
anathematic which hook should I be editing for my local computer to update something once I've pushed?06:59
spat can use 'git remote add' to set a "local" directory?07:01
← webchick left07:03
→ rudi_s_ joined07:03
← marcial5 left07:04
→ Nugget joined07:04
← rudi_s left07:04
→ marcial5 joined07:04
aiscss hi all07:05
← jfkw left07:05
← sitaram left07:05
aiscss some one pushed into my local branch07:05
← xiong left07:05
aiscss how i can merge my work with him07:05
← fcoury|away left07:07
spat push to his branch or let him pull from you?07:11
→ simNIX joined07:12
→ loinclot_ joined07:14
← loincloth left07:14
← ethercrow left07:15
← anathematic left07:16
aiscss he already pulled from mine07:17
and modified some file and pushed back into mine07:18
→ gebi joined07:18
spat than what do you want?07:21
GyrosGeier automatic checkout after pushing into a non-bare repo07:22
GyrosGeier guesses07:22
GyrosGeier that can't be done07:22
aiscss I want to merge his work with my trr07:22
I want to merge his work with my tree07:22
GyrosGeier ah07:22
he pushed into his own branch07:23
(at least I hope so)07:23
then you'd use git merge hisbranch07:23
aiscss he is using the master branch07:24
← xer0x left07:24
→ loincloth joined07:24
spat than merge orig07:24
← loinclot_ left07:24
← warthog9 left07:25
aiscss but he already pushed into mine07:26
and mu HEAD is pointing to his changes07:26
← ArdRigh left07:29
→ davr_ joined07:29
→ ralphz joined07:29
GyrosGeier that is wrong then07:29
Gitbot, bare07:30
hmm07:30
there was supposed to be a long help text there why one does not push into non-bare repos07:30
ralphz hello. i configured trac with ghit backend but when i go to browse source i dont see anything. does anyone have experience with trac?07:30
GyrosGeier basically, you need to create a new branch with his changes and reset master to your last state07:30
then you can merge07:31
← lemonchicken left07:31
← chittoor left07:31
aiscss thanks I'll try it07:33
← doener left07:36
← loincloth left07:37
→ doener joined07:38
→ loincloth joined07:43
→ chittoor joined07:45
← lanthan__ left07:46
→ darwin joined07:47
← altogether left07:47
← anjen left07:49
→ ProLoser|Trmnl joined07:50
ProLoser|Trmnl anyone around mind helping me with something?07:50
← Garen left07:50
→ sitaram joined07:50
← sitaram left07:50
→ sitaram joined07:50
thiago_home not until you say what you need help with07:51
→ Garen joined07:51
ProLoser|Trmnl pssh07:51
uh deleted a file07:51
need to revert it07:51
git reset filename, no?07:52
hmm didn't work07:53
thiago_home git checkout -- filename07:53
ProLoser|Trmnl dammnit07:53
i just did git reset HEAD filename07:53
and now i see a bunch of files lol07:54
← codeswing left07:54
ProLoser|Trmnl i wonder what i broke07:54
hmmm looks like it's okay07:54
okay so i have a new issue07:54
bunch of changes, none of em committed yet07:55
instead of applying them, i want to branch from where i'm at and apply them to that branch07:55
cuz i've decided these changes should be in a new branch07:55
is there a way to do that?07:55
without losing these changes?07:55
← _Vi left07:56
sitaram git checkout -b newbr07:58
then commit07:58
ProLoser|Trmnl and then just commit when i'm there?07:58
sitaram yup07:58
→ ixti joined07:58
→ mosno joined07:58
ProLoser|Trmnl for some reason all my files in my project are waiting to be staged cuz they are mode 100755 instead of 10064407:59
→ psankar joined07:59
→ mtkd joined08:03
ProLoser|Trmnl is there a way to fix this?08:03
← _VVSiz_ left08:05
ProLoser|Trmnl god some days i hate mac/git08:06
→ VVSiz joined08:06
ProLoser|Trmnl can anyone help me?08:06
← chittoor left08:06
ProLoser|Trmnl for some reason all my files in my project are waiting to be staged cuz they are mode 100755 instead of 10064408:07
→ aziz joined08:08
→ warthog9 joined08:08
sitaram man git-config and look for core.fileMode08:10
Gitbot sitaram: the git-config manpage can be found at http://git.or.cz/man/git-config08:10
sitaram ProLoser|Trmnl: ^08:10
← mosno left08:13
→ pheaver joined08:22
← ralphz left08:22
← gebi left08:22
→ cedricv joined08:22
← ProLoser|Trmnl left08:23
→ chittoor joined08:23
→ mosno joined08:26
→ Adaptee joined08:26
← pheaver left08:31
← psankar left08:37
← mosno left08:38
← loincloth left08:41
→ loincloth joined08:41
→ nanoo joined08:44
→ jjuran joined08:47
→ lucsky joined08:47
← jjuran left08:47
→ d0k joined08:49
← sitaram left08:52
→ sitaram joined08:52
sitaram oops... sorry all!08:52
frakturfreak just wordered ^^08:54
* wondered08:54
sitaram my network connection seemed dead and I did a /ping #git without thinking :)08:55
→ dpino joined08:58
→ mazenharake joined09:04
→ loinclot_ joined09:11
← loincloth left09:13
← mithro left09:14
→ tvw joined09:14
→ webus joined09:15
← shennyg left09:18
← priidu left09:18
→ rgr joined09:19
→ dytrivedi joined09:31
→ doobry joined09:31
→ codeswing joined09:33
← codeswing left09:33
→ codeswing joined09:33
← hobodave left09:35
← o_a left09:36
→ _iron joined09:38
→ lhz joined09:39
→ mosno joined09:40
→ vivien joined09:41
→ priidu joined09:42
← dytrivedi left09:44
→ fool_ joined09:45
← fool_ left09:45
→ fool_ joined09:45
← fool__ left09:48
← stringo0 left09:51
← doobry left09:53
← David-T left10:01
→ Chillance joined10:02
→ David-T joined10:04
→ ff_ joined10:04
← lucsky left10:05
← ff_ left10:06
→ dj_tjerk joined10:06
→ ph^ joined10:06
← sitaram left10:06
← mtkd left10:07
→ spicyWith joined10:07
→ ProLoser|Trmnl joined10:12
← makubi_ left10:13
← simNIX left10:15
→ exg joined10:18
← exg left10:18
→ exg joined10:18
→ simNIX joined10:19
→ loincloth joined10:20
← spicyWith left10:20
← loinclot_ left10:21
→ maxter joined10:22
→ emoboy joined10:24
emoboy hi10:25
→ sh1mmer joined10:25
emoboy anybody here who know about pc a lot?10:25
← emoboy left10:25
← marcial5 left10:25
wereHamster pc as in personal computer? Or program counter?10:29
← sh1mmer left10:32
→ sixteneighty joined10:33
→ malumalu joined10:36
← Mage left10:41
→ mcdebugger joined10:41
→ Soliton joined10:42
← sixteneighty left10:42
← malumalu left10:46
→ tbf joined10:46
← loincloth left10:48
→ loincloth joined10:48
← codeswing left10:51
← Tan7188 left10:51
→ infogulch joined10:52
→ parasti joined10:55
→ dmg_ joined10:56
dmg_ sorry, maybe very silly question, but after doing: git clone git://github.com/datamapper/dm-core.git10:57
how can I switch to 0.10.2 tag?10:57
clone it, download it or checkout it.. ;)10:57
up to date I was using bzr10:57
tokkee dmg_: git checkout <tag_name>10:57
← krynnotaur left10:59
dmg_ just a moment, I'm waiting until git clone repo10:59
← chittoor left10:59
jast if you want to actually commit things that are based on the tag, I'd recommend that you create a new local branch from the tag instead: git checkout -b <new branch> <some tag>11:00
← falican left11:00
jast otherwise just go ahead with what was suggested11:00
dmg_ I received this error: http://dpaste.com/176942/11:01
← gnufied left11:01
→ corni joined11:01
dmg_ ahh ok, the files are for '0.10.2' version11:02
← corni left11:02
dmg_ tokkee: so this was just a warning that I'm moving from trunk to other version, right?11:02
Note: moving to "v0.10.2" which isn't a local branch11:03
→ Xeross joined11:03
Xeross How can I modify the --shared after having initialized a repository, want to make it accessible for the entire group instead of just the user11:03
Arrowmaster your better off just cloning the repo, renaming the old one, and renaming the new one to the old name11:05
→ anjen joined11:06
→ Louie` joined11:07
Xeross Seems I'd have to clone it, redo the git --init on the source and then push it11:08
right ?11:08
Arrowmaster yeah that would work11:09
you can do it without using a temp repo but then you have to change permissions and file modes on every file in the repo11:10
Xeross I tried manually modifying the repos once11:11
ended up with borked permissions and all hooks executing11:11
If I push something to a repo that was initialized with --shared=group the new files get the correct permissions automatically ?11:11
← marc_kdab left11:12
Arrowmaster yeah i dont recommend doing it manually without a temp repo unless you are very familiar with unix file permissions11:12
← joeconyers left11:12
→ corni joined11:12
Xeross I'm familiar with permissions but not with how the git ones should be11:12
charon Xeross: note that if your sample hooks still don't end in .sample (and can thus be enabled with chmod a+x) you should update your git. this was changed ages ago11:12
Xeross they end with .sample now that was with an old version I used11:13
tokkee dmg_: Right.11:13
Xeross wth I now have the following permissions on my git folders drwxrwsr-x11:13
wth is s11:13
Arrowmaster yeah if the repo is initialed with --shared=group then every file in the dir will be created using that group and all directories will be g+rwxs and all files will be g+rw11:14
Xeross but what does the S mean ?11:14
← Xeross left11:14
→ chittoor joined11:15
Arrowmaster means new files will have the same group and rw permissions as the dir and new dirs in it will also have the s11:15
→ Xeross joined11:15
Xeross back11:15
Arrowmaster means new files will have the same group and rw permissions as the dir and new dirs in it will also have the s11:15
its documented in the chmod man page11:15
Xeross so it's a special flag for making stuff group shared or something11:15
Arrowmaster kinda11:15
Xeross ok11:16
→ icwiener joined11:18
Xeross Execute only if the file is a directory or already has execute permission for some user (X),11:19
that's useful11:19
that way I wont accidentally +x files right11:19
→ jceb joined11:20
Arrowmaster right11:21
← mosno left11:21
Arrowmaster too bad there isnt a S11:21
Xeross as in directories only ?11:25
→ marc_kdab joined11:26
← chittoor left11:26
→ malumalu joined11:27
Arrowmaster yeah11:29
← pabloh left11:33
Xeross I've been using linux for years but I still feel as quite a newb when it comes to linux :/11:36
→ chittoor joined11:39
→ mithro joined11:40
→ loinclot_ joined11:40
→ vals_ joined11:40
← tango_ left11:41
← jelmer left11:41
← loincloth left11:43
Xeross is it possible to clone a repository that has no master branch I keep getting "warning: remote HEAD refers to nonexistent ref, unable to checkout."11:44
I tried using -b branchname but that segfaults11:44
→ loincloth joined11:44
drt24 !11:47
← loinclot_ left11:47
Xeross and then I push a master branch and everything works just fine :L/11:47
jast Xeross: you can clone repositories that are broken like that, you just need to run "git checkout somebranch" inside the clone so that you can actually see something11:52
→ khelll joined11:55
khelll just added some changes, and want to undo that, how can i do so11:55
?11:55
tychoish git reset11:55
^ is non distructive11:55
(without arguments)11:55
khelll so just git reset ?11:56
tychoish did you commit them as well11:56
or just `git add`11:56
→ lemonchicken joined11:56
khelll just git add11:57
tychoish yeah, then reset will work11:58
→ g0bl1n joined11:58
← loincloth left12:00
→ loincloth joined12:00
← marc_kdab left12:00
→ marc_kdab joined12:01
← chittoor left12:03
khelll ok just for the record, if i did the same but with commit, so what to do?12:03
tychoish I think you have to git reset [hash-of-good-commit] --hard12:05
to rewind12:05
--hard only if you want ot throw away the change entirely, w/o the hard if you just want to reset the state of of the tree12:06
→ jjann joined12:07
jjann Hi. Is there some way to just see if there are any changes to pull/push without actually doing it? like hg in/out with mercurial12:08
bob2 git remote update ; git log master...remote/blah12:08
→ vlatombe joined12:09
→ chittoor joined12:12
jjann bob2: thanks12:14
← kpreid_ left12:15
→ kpreid_ joined12:16
← darwin left12:17
→ stamina_ joined12:21
← Adaptee left12:23
→ Adaptee joined12:24
← ajpi left12:25
→ mazenharake_ joined12:32
← mazenharake left12:33
mazenharake_ → mazenharake12:33
→ poseid joined12:41
← corni left12:42
← David-T left12:43
← mazenharake left12:43
← dwmw2 left12:46
→ razvand joined12:46
→ dwmw2 joined12:46
→ David-T joined12:46
← TDJACR left12:47
→ mazenharake joined12:47
→ Textmode joined12:47
Textmode morning all12:48
→ NotADJ joined12:49
← Akufen left12:49
→ Akufen joined12:49
→ kbingham joined12:50
← maxter left12:50
← infogulch left12:51
drt24 morning Textmode12:52
← mcdebugger left12:54
→ kumbayo joined12:55
offby1 yawns and stretches12:55
→ mcdebugger joined12:56
→ loinclot_ joined12:56
← loincloth left12:57
→ wvd joined12:59
wvd Is it possible to use git functions via a com object on Windows?13:00
→ pantsman joined13:05
wereHamster git only comes as a binary, not as a service13:05
wvd Oh, ok.13:07
poseid what is the problem when trying to push, and I get: ! [rejected] master -> master (non-fast forward)13:09
wereHamster poseid: faq non-ff13:09
poseid: https://git.wiki.kernel.org/index.php/GitFaq#non-ff13:09
← jceb left13:10
← dwmw2 left13:10
→ Axius joined13:13
→ _Vi joined13:15
→ karpar joined13:16
→ sitaram joined13:16
← sitaram left13:16
→ sitaram joined13:16
→ dwmw2 joined13:17
← flaguy48 left13:20
← Axius left13:25
← g0bl1n left13:26
→ sagsousuke joined13:26
← resmo_ left13:26
← locklace left13:28
→ scarabx joined13:29
→ hebz0rl joined13:29
→ xiong joined13:29
← mazenharake left13:33
ProLoser|Trmnl personally id ont' remember exactly but i think there's some mixture of 'prefix' => 'special' and 'special' => true13:33
→ yevlempy joined13:34
← yevlempy left13:36
→ yevlempy joined13:36
poseid how can i proceed in this case: I do a pull from master repo, and get: error: Entry 'log/development.log' not uptodate. Cannot merge.13:36
thereby log/development.log is not important and can be ignored13:36
wereHamster commit your local changes, or throw them away, or stash them13:37
→ Mkools joined13:37
← karpar left13:38
← _Vi left13:38
Mkools mugwump: Are you their?13:39
poseid git rm <file> -f removes the file, that works13:39
← ProLoser|Trmnl left13:39
→ locklace joined13:39
→ allenwei joined13:39
poseid although I get a new developmen.log which now I will commit and throw away13:39
wereHamster log/development.log is part of the repository you pulled from13:40
→ Axius joined13:40
poseid I see.. thanks13:41
← ocs_ left13:41
← poseid left13:41
offby1 wvd: there's a "git-sharp" project which might supply a COM-style interface. I doubt it's anywhere near ready for Prime Time though13:42
→ poseid joined13:42
wvd offby1: mmh, going to google that, thanks.13:42
→ ocs_ joined13:43
→ mazenharake joined13:43
Mkools mugwump: I wanted to talk about soc.13:44
→ loincloth joined13:44
← loinclot_ left13:45
← poseid left13:46
← alezandro left13:49
→ _Vi joined13:49
→ LiamH joined13:50
→ poseid joined13:50
← pantsman left13:50
← rgr left13:51
← gaveen left13:53
← Axius left13:56
← malumalu left13:56
→ malumalu joined13:56
→ kukks joined13:57
→ lucsky joined13:57
← dwmw2 left14:02
← spat left14:02
→ g0bl1n joined14:02
← g0bl1n left14:02
← kbingham left14:04
← RobertLaptop left14:04
← David-T left14:04
← allenwei left14:06
→ dwmw2 joined14:09
→ David-T joined14:10
→ Axius joined14:11
← vlatombe left14:15
→ vlatombe joined14:15
← vlatombe left14:15
→ vlatombe joined14:16
← David-T left14:17
← dwmw2 left14:17
→ SimManiac joined14:17
SimManiac hi14:17
→ kbingham joined14:17
→ maxter joined14:18
← CaptTofu left14:19
← _Vi left14:19
← yitz_ left14:20
→ dwmw2 joined14:24
→ CaptTofu joined14:24
→ Boriskr joined14:24
drt24 hello SimManiac14:24
← razvand left14:24
→ David-T joined14:24
SimManiac :)14:24
→ elmob joined14:24
→ gnufied joined14:25
SimManiac all dead here, heh?14:25
it's around 10:25 am on PDT?14:25
← yevlempy left14:25
poseid here it is 4:25 pm, after the summer time started this night14:26
wereHamster it's not the time, but weekday14:26
sunday is usually a quiet day in here14:26
→ _Vi joined14:28
→ joeconyers joined14:32
→ icwiener_ joined14:33
← Tureba left14:33
← icwiener left14:33
→ Bass10 joined14:34
→ fool__ joined14:35
← fool__ left14:35
→ fool__ joined14:35
← _Vi left14:35
← joeconyers left14:35
← aiscss left14:36
→ bentob0x joined14:36
← fool_ left14:38
→ ggk joined14:38
← ggk left14:38
→ jjuran joined14:39
→ MassimoLauria joined14:40
→ mssm joined14:40
← Axius left14:43
← poseid left14:44
→ FauxFaux joined14:44
→ mtkd joined14:44
→ madewokherd joined14:45
→ tazle_ joined14:45
FauxFaux I'm sure I read somewhere that you can configure remotes based on a pattern (i.e. if you frequently clone/push projects to the same machine), but I can't find what I'm thinking of?14:45
wereHamster git remote add ?14:46
FauxFaux: man git-clone and search 'insteadOf'14:47
Gitbot FauxFaux: the git-clone manpage can be found at http://git.or.cz/man/git-clone14:47
FauxFaux Yes, that. Thanks. :)14:48
wereHamster you can put those config values into your global config file14:48
→ jfkw joined14:49
→ Fissure1 joined14:50
→ RobertLaptop joined14:51
→ alezandro joined14:52
→ croxio5 joined14:53
← Fissure left14:53
dmg_ how can I generate diff between my version and some tagged version?14:54
← croxio5 left14:55
wereHamster git diff HEAD <the tag>14:55
dmg_ what is HEAD?14:55
← Fissure1 left14:55
Mkools sitaram: Where to mail information about me?14:56
Ilari dmg_: The revision currently checked out.14:56
→ Fissure joined14:56
→ g0bl1n joined14:56
wereHamster dmg_: https://git.wiki.kernel.org/index.php/GitGlossary#HEAD14:56
dmg_ thanks, BTW I need additional memory in my head and more time to read docs...14:57
;)14:57
→ loinclot_ joined14:58
← mazenharake left14:59
← webus left14:59
← Gitzilla left15:00
← loincloth left15:00
→ qrc1 joined15:01
→ aiscss joined15:02
← g0bl1n left15:04
→ hursttx joined15:05
← MassimoLauria left15:06
← fujin left15:07
→ poseid joined15:09
← aiscss left15:10
← Mkools left15:11
← hursttx left15:13
← loinclot_ left15:14
→ loincloth joined15:14
→ ProLoser|Trmnl joined15:17
ProLoser|Trmnl hallo15:17
anyone around?15:17
for some reason all my files are staged because the chmod of em changed15:17
jjann yes, file mode is part of the changes tracked for a file15:18
tpope just the executable bit15:21
← mtkd left15:22
→ elmo2k3 joined15:24
→ loinclot_ joined15:24
peper can i config default params for git commands? e.g. --decorate for git log15:25
→ mtkd joined15:25
Ilari peper: No. And you can't alias over existing commands either.15:26
peper shame15:26
← loincloth left15:27
← elmob left15:27
→ ajpiano joined15:30
→ Cylindric joined15:37
← SimManiac left15:37
→ kar8nga joined15:37
Cylindric I've got a submodule that in 'git status' always shows up in the "Changed but not updated" list. I can't "git add" it or "git checkout --" it.15:38
charon Cylindric: i think the equivalent of 'git checkout -- $path' for submodules is 'git submodule update $path', isn't it?15:39
not that i really work with submodules, mind you15:39
Cylindric Yeah, tried that. Everything just says the equivalent of "no changes required"15:40
← NotADJ left15:40
→ TDJACR joined15:41
← loinclot_ left15:43
→ loincloth joined15:43
← iaj left15:44
→ flaguy48 joined15:45
→ hakunin joined15:46
→ marcial5 joined15:46
→ Guest55074 joined15:47
→ aresnick joined15:47
→ iaj joined15:49
← weary left15:49
→ weary joined15:50
← jjuran left15:50
← iaj left15:51
→ loinclot_ joined15:53
← khelll left15:54
← loincloth left15:54
→ iaj joined15:54
← ProLoser|Trmnl left15:55
→ aspotashev|eeepc joined15:56
→ dmgr joined15:58
→ shennyg joined15:59
_rane what's the easiest way to remove history from a repo upto HEAD?15:59
so that only one commit exists15:59
Espen-_- create a new repo16:00
:)16:00
← scarabx left16:00
→ hobodave joined16:00
← iaj left16:00
← dmg_ left16:00
← Guest55074 left16:01
→ iaj joined16:03
→ rolfb joined16:05
← tvw left16:07
← simplechat left16:09
← bronson left16:12
→ dreiss joined16:15
wereHamster _rane: rm -rf .git; git init; git add .; git commit16:15
charon or "out of the box": git symbolic-ref refs/heads/fresh; git commit16:16
er. of course i meant: git symbolic-ref HEAD refs/heads/fresh; git commit16:17
← mtkd left16:17
→ mtkd joined16:18
→ codeswing joined16:18
← codeswing left16:18
→ codeswing joined16:18
← EricInBNE left16:20
→ o_a joined16:21
← priidu left16:21
→ g0bl1n joined16:21
→ merlin83_ joined16:21
← merlin83_ left16:21
→ merlin83_ joined16:21
← svbg left16:22
← kar8nga left16:27
→ priidu joined16:28
← poseid left16:28
→ sergio_ joined16:29
→ xiong_ joined16:32
← xiong left16:33
→ rgr_ joined16:35
→ brizly joined16:35
→ Zephyrus joined16:35
→ khelll joined16:36
→ Yuffster joined16:36
xiong_ → xiong16:36
→ beni- joined16:37
← Bass10 left16:38
→ yatiohi joined16:40
← Pupeno left16:40
← aspotashev|eeepc left16:41
← mcdebugger left16:41
← Soliton left16:41
← DavidKlein left16:41
← cytrinox left16:41
← ph^_ left16:41
← esc left16:41
← tg left16:41
← uau left16:41
← Yuffster left16:41
← elmo2k3 left16:41
← alezandro left16:41
← icwiener_ left16:41
← CaptTofu left16:41
← sagsousuke left16:41
← kumbayo left16:41
← parasti left16:41
← exg left16:41
← vivien left16:41
← Azeroth-IsWorkin left16:41
← Mage_Dude left16:41
← drunknbass_work left16:41
← duairc left16:41
← Blackshark left16:41
← Caius left16:41
← luckyone left16:41
← keytoaster left16:41
← shennyg left16:41
← dmgr left16:41
← tazle_ left16:41
← chittoor left16:41
← Paraselene_ left16:41
← MacGyverNL_ left16:41
← maattd left16:41
← segher left16:41
← cbreak left16:41
← yann left16:41
← hron84 left16:41
← blast_hardcheese left16:41
← hadees left16:41
← sven^ left16:41
← merlin83_ left16:41
← Xeross left16:41
← tbf left16:41
← ph^ left16:41
← przemoc left16:41
← agile left16:41
← Haarg left16:41
← meanburrito920 left16:41
← tpope left16:41
← steveire left16:41
← kadoban_ left16:41
← tildeequals left16:41
← squentin left16:41
← keseldud1 left16:41
← beni- left16:41
← gnufied left16:41
← vals_ left16:41
← simNIX left16:41
← ixti left16:41
← bcoca left16:41
← cenuij left16:41
← multi_io left16:41
← Baughn left16:41
→ orospakr joined16:41
→ tro|| joined16:41
tro|| → tro16:41
→ steveire joined16:42
← steveire left16:42
→ steveire joined16:42
→ Xeross joined16:42
→ ianmcorvidae joined16:42
← ianmcorvidae left16:42
→ ianmcorvidae joined16:42
→ karihre joined16:42
→ sshc joined16:43
→ mcdebugger joined16:43
→ et- joined16:43
et- → et16:43
← maxter left16:44
→ tbf joined16:45
→ avar joined16:45
→ squentin joined16:45
→ kadoban__ joined16:45
→ bourbon joined16:45
→ v0n joined16:45
→ beni- joined16:45
→ Yuffster joined16:45
→ merlin83_ joined16:45
→ shennyg joined16:45
→ dmgr joined16:45
→ aspotashev|eeepc joined16:45
→ elmo2k3 joined16:45
→ alezandro joined16:45
→ tazle_ joined16:45
→ icwiener_ joined16:45
→ gnufied joined16:45
→ CaptTofu joined16:45
→ sagsousuke joined16:45
→ kumbayo joined16:45
→ chittoor joined16:45
→ vals_ joined16:45
→ parasti joined16:45
→ Soliton joined16:45
→ simNIX joined16:45
→ exg joined16:45
→ ph^ joined16:45
→ vivien joined16:45
→ ixti joined16:45
→ Paraselene_ joined16:45
→ DavidKlein joined16:45
→ cytrinox joined16:45
→ przemoc joined16:45
→ bcoca joined16:45
→ Azeroth-IsWorkin joined16:45
→ MacGyverNL_ joined16:45
→ agile joined16:45
→ Haarg joined16:45
→ keytoaster joined16:45
→ meanburrito920 joined16:45
→ keseldud1 joined16:45
→ maattd joined16:45
→ segher joined16:45
→ ph^_ joined16:45
→ Caius joined16:45
→ esc joined16:45
→ luckyone joined16:45
→ tpope joined16:45
→ cbreak joined16:45
→ Mage_Dude joined16:45
→ tg joined16:45
→ drunknbass_work joined16:45
→ yann joined16:45
→ duairc joined16:45
→ Blackshark joined16:45
→ cenuij joined16:45
→ hadees joined16:45
→ tildeequals joined16:45
→ hron84 joined16:45
→ multi_io joined16:45
→ blast_hardcheese joined16:45
→ uau joined16:45
→ sven^ joined16:45
→ Baughn joined16:45
→ bburhans joined16:45
→ LeLutin joined16:45
→ cods joined16:45
→ werdan7 joined16:45
→ cwillu_at_work joined16:45
→ joevano joined16:45
→ chris_n` joined16:45
→ jrockway joined16:45
→ fivetwentysix joined16:45
→ Grum joined16:45
→ levifig joined16:45
→ Plouj joined16:45
→ kloeri joined16:45
→ eplots joined16:45
→ nairb774 joined16:45
→ numbah joined16:45
→ lucs joined16:45
→ jaswope joined16:45
→ xenoterracide joined16:45
→ MarcWeber joined16:45
→ mahound joined16:45
→ Zenopus_ joined16:45
→ ciaranm joined16:45
→ thijso joined16:45
→ mutex joined16:45
→ awx joined16:45
→ f00li5h joined16:45
→ pilif|away joined16:45
→ slabanja_ joined16:45
→ murbank` joined16:45
→ TML joined16:45
→ pcc1 joined16:45
→ imarcusthis joined16:45
→ RobertMeta joined16:45
→ eco joined16:45
→ felipe joined16:45
→ robinsmidsrod joined16:45
→ pmcnabb joined16:45
→ DrNick joined16:45
→ arctanx joined16:45
→ optixx joined16:45
→ meuh joined16:45
→ ThiefMaster joined16:45
→ ToXedVirus joined16:45
→ gk__ joined16:45
→ teuf joined16:45
→ Aides joined16:45
→ zomg joined16:45
→ avtobiff joined16:45
→ dibber joined16:45
→ dutchie joined16:45
→ jarh joined16:45
→ guerrilla joined16:45
→ ndim joined16:45
→ dmlloyd joined16:45
→ ozzloy joined16:45
→ sdboyer joined16:45
→ edenc joined16:45
→ pcgod joined16:45
→ jacobat joined16:45
→ maiOo joined16:45
→ chrizz joined16:45
→ niko joined16:45
→ tokkee joined16:45
→ wanders joined16:45
→ Derega joined16:45
→ ec joined16:45
→ juice_d joined16:45
→ wimt joined16:45
→ ScottMac joined16:45
→ schweizer joined16:45
→ lu_zero joined16:45
→ yousef joined16:45
→ xaxes joined16:45
→ EgS joined16:45
→ StyleWarz joined16:45
→ osfameron joined16:45
→ grumpytoad joined16:45
→ joel____ joined16:45
→ broonie joined16:45
→ nothingmuch joined16:45
→ spb joined16:45
→ tomaw joined16:45
→ andres joined16:45
→ d-snp joined16:45
→ bd joined16:45
→ BearPerson joined16:45
→ s_edrik joined16:45
→ gkelly joined16:45
→ pom joined16:45
→ Hadaka joined16:45
→ \yrlnry joined16:45
→ LotR joined16:45
→ cxreg joined16:45
→ Ingmar joined16:45
→ a3li joined16:45
→ eyzn joined16:45
→ biz joined16:45
→ shabble joined16:45
→ kokx joined16:45
→ reaVer joined16:45
→ agrippa joined16:45
→ majoh joined16:45
→ TTilus joined16:45
→ inclement joined16:45
← Boriskr left16:45
→ bigpresh joined16:45
← bigpresh left16:45
→ bigpresh joined16:45
→ brizly1 joined16:45
← squentin left16:45
→ squentin joined16:45
→ eMBee joined16:46
← brizly left16:47
→ Boriskr joined16:47
← ph^ left16:47
→ fcoury joined16:47
← sshc left16:50
← eno left16:50
→ frakturfreak_ joined16:50
→ sshc joined16:50
→ dionoea joined16:50
← przemoc left16:50
→ aziz_ joined16:50
→ wagle_ joined16:50
→ lol_h joined16:50
→ Will| joined16:51
→ meatmanek_ joined16:51
→ przemoc joined16:52
→ madduck_ joined16:52
→ knittl_ joined16:52
→ jfkw_ joined16:52
→ MadCoder_ joined16:52
→ Rakhun_ joined16:52
→ drt24_ joined16:52
→ chaoflow_ joined16:52
→ sohum_ joined16:52
→ Rh0nda joined16:52
→ rtyler_ joined16:52
→ WHARGARBL joined16:52
→ Pev_away_ joined16:52
→ ppr joined16:52
← VVSiz left16:52
→ dentifrice joined16:52
→ masa- joined16:53
← Akufen left16:53
← CaptTofu left16:53
→ VVSiz joined16:53
→ imajes_ joined16:53
→ ponzao__1_ joined16:53
→ Akufen joined16:53
→ jakob joined16:53
→ tetha_ joined16:53
→ |kukks| joined16:53
← beni- left16:54
→ dahankzter joined16:54
← kukks left16:54
← ricky left16:54
← knittl left16:54
← weary left16:54
← unreal left16:54
← Garen left16:54
← jfkw left16:54
← meatmanek left16:54
← ajpiano left16:54
← frakturfreak left16:54
← karihre left16:54
← bentob0x left16:54
← lemonchicken left16:54
← PuffTheMagic_ left16:54
← kbingham left16:54
← warthog9 left16:54
← tetha left16:54
← iaj left16:54
← giallu left16:54
← eletuchy left16:54
← BeerSerc left16:54
← aziz left16:54
→ redtricy1le joined16:54
frakturfreak_ → frakturfreak16:54
← rjc left16:54
→ stuffcorpse joined16:54
← disappearedng left16:54
→ ewanm89_ joined16:54
← doener left16:54
→ cj joined16:54
→ rjc joined16:55
→ mstormo joined16:55
→ docgnome joined16:55
→ Bartman007 joined16:55
← drry left16:55
→ Garen_ joined16:55
→ karihre_ joined16:55
→ ph^__ joined16:55
→ noodl_ joined16:55
← noodl_ left16:55
→ noodl_ joined16:55
→ disappearedng joined16:55
→ twmi_ joined16:55
← twmi_ left16:55
→ twmi_ joined16:55
→ Leonidas_ joined16:55
→ Solefald_ joined16:55
← Leonidas_ left16:55
→ Leonidas_ joined16:55
→ kbingham_ joined16:55
→ dermoth joined16:55
← marc_kdab left16:55
→ iaj joined16:55
→ weary joined16:55
→ siprbaum joined16:55
→ marc_kdab joined16:55
← sshc left16:55
→ sshc joined16:55
← frakturfreak left16:55
→ frakturfreak joined16:55
← madduck_ left16:55
→ madduck_ joined16:55
← ppr left16:55
→ ppr joined16:55
← sohum_ left16:55
→ sohum_ joined16:55
→ floppyears joined16:55
ewanm89_ → Cap_J_L_Picard16:55
← Bartman007 left16:55
→ Bartman007 joined16:55
madduck_ → madduck16:55
→ eletuchy joined16:55
← marc_kdab left16:55
→ loincloth joined16:55
imajes_ → imajes16:55
→ unreal joined16:55
← priidu left16:55
← hebz0rl left16:55
→ BeerSerc joined16:55
→ marc_kdab joined16:56
ppr → peper16:56
hakunin folks, say you have A-B-C-D-E-F on master branch. You want to change history and make B-C-D into one commit to get A-X-E-F (where X = B+C+D). How do you do that? I realize things can break for other devs, but the guy will delete and re-clone his repo.16:56
→ hebz0rl joined16:56
→ priidu joined16:56
← TDJACR left16:56
← Textmode left16:56
← dj_tjerk left16:56
← seezer_ left16:56
← fr| left16:56
← eMBee- left16:56
← GyrosGeier left16:56
← robinbowes left16:56
← Wicked left16:56
← Helios left16:56
← impulze left16:56
← LRN left16:56
← FauxFaux left16:56
→ drry joined16:56
→ ijuma joined16:56
→ giallu joined16:57
← loinclot_ left16:57
→ Wicked joined16:57
→ jacobat_ joined16:57
→ eMBee- joined16:57
→ henr_k_ joined16:57
→ dreamcat5 joined16:57
hakunin lemme try again16:57
folks, say you have A-B-C-D-E-F on master branch. You want to change history and make B-C-D into one commit to get A-X-E-F (where X = B+C+D). How do you do that? I realize things can break for other devs, but the guy will delete and re-clone his repo.16:57
→ mahound` joined16:58
→ eno joined16:58
→ jefferai joined16:58
→ dj_tjerk joined16:58
→ dec_ joined16:58
→ linxeh joined16:58
→ tonyj joined16:58
wereHamster hakunin: interactive rebase (rebase -i), see man git-rebase16:58
Gitbot hakunin: the git-rebase manpage can be found at http://git.or.cz/man/git-rebase16:58
dreamcat5 hi! git format-patch patch wont apply to an earlier commit, just gives up?16:59
hakunin wereHamster: thanks16:59
← johnjay left16:59
← ponzao____ left16:59
← sohum left16:59
→ doener joined16:59
→ Morasique joined16:59
→ johnjay joined16:59
→ ekneuss_ joined16:59
→ Limb joined16:59
→ FauxFaux joined16:59
→ Textmode joined16:59
→ VAAMNED joined16:59
→ seezer_ joined16:59
→ fr| joined16:59
→ GyrosGeier joined16:59
→ robinbowes joined16:59
→ impulze joined16:59
→ Pistahh joined16:59
→ Guest96461 joined16:59
→ magcius joined16:59
→ jonmasters joined16:59
→ blazzy joined16:59
→ mugwump joined16:59
→ GodEater joined16:59
→ kenyon joined16:59
→ ft joined16:59
wereHamster dreamcat5: format-patch is for generating patches, it can't apply them16:59
← johnjay left16:59
→ johnjay joined16:59
→ Saur joined16:59
→ ricky joined16:59
← Morasique left16:59
← blazzy left16:59
→ blazzy joined16:59
→ xenoterracide_ joined17:00
→ Helios joined17:00
← seezer_ left17:00
← magcius left17:00
→ magcius joined17:00
← magcius left17:00
→ magcius joined17:00
→ jjore joined17:00
← jonmasters left17:00
→ LRN joined17:00
→ dentifri1e joined17:00
→ bdowning joined17:00
→ knittl joined17:00
→ x|ixti|x joined17:00
→ pcgod_ joined17:00
← tonyj left17:00
← |kukks| left17:00
← dreamcat5 left17:00
← peper left17:00
← meatmanek_ left17:00
← fcoury left17:00
← fool__ left17:00
← David-T left17:00
← stamina_ left17:00
← mithro left17:00
← bauruine left17:00
← elendal left17:00
← ruxpin left17:00
← erikvold left17:00
← Rawxor left17:00
← Elfix left17:00
← piotr left17:00
→ avtobiff_ joined17:01
→ gnufied_ joined17:01
→ Rakhun joined17:01
hakunin wereHamster: what if i don't want to preserve the history of those commits? i just want to kind-of munge them together. so B-C-D becomes X, an altogether new commit that contains everything from B to D?17:01
← mstormo left17:01
→ Baughn_ joined17:01
→ PuffTheMagic joined17:01
← chaoflow_ left17:01
← bcoca left17:01
← levifig left17:01
← jacobat left17:01
← knittl_ left17:01
← v0n left17:01
← fivetwentysix left17:01
← mahound left17:01
← ThiefMaster left17:01
← dentifrice left17:01
← gnufied left17:01
← vals_ left17:01
← simNIX left17:01
← ixti left17:01
← cenuij left17:01
← numbah left17:01
← xenoterracide left17:01
← pcgod left17:01
→ tango_ joined17:01
→ chaoflow_ joined17:01
→ cenuij joined17:01
← niko left17:01
pcgod_ → pcgod17:01
← Baughn left17:01
← avtobiff left17:01
← dibber left17:01
← Rakhun_ left17:01
→ Morasique joined17:01
← robinsmidsrod left17:01
← werdan7 left17:01
→ niko joined17:01
← cenuij left17:01
→ cenuij joined17:01
← niko left17:01
→ niko joined17:01
→ dibber_ joined17:01
→ levifig joined17:01
← impulze left17:01
ilteris_ → ilteris17:01
→ tic joined17:01
→ impulze joined17:01
Morasique → Guest1970317:02
→ v0n joined17:02
→ fivetwentysix joined17:02
→ werdan7_ joined17:02
→ simNIX joined17:02
→ jonmasters joined17:02
→ bcoca joined17:02
→ CaptTofu joined17:02
twmi_ → twmi17:03
hakunin wereHamster: the guy just created a ton of commits that have same commit message, just because he was pushing to github and tweaking something (instead of tweaking locally)... so once he settled on solution we ended up with like 30 commits saying "Tweaking [feature]." Now they all just have to become one commit called "Tweaking [feature]."17:03
→ ThiefMaster joined17:03
← ThiefMaster left17:03
→ ThiefMaster joined17:03
→ warthog9 joined17:03
→ kapowaz joined17:03
→ robins joined17:04
wereHamster use rebase -i to squash those commits together17:04
henr_k_ → henr_k17:04
→ joel__ joined17:04
← yatiohi left17:05
hakunin wereHamster: squash is the word i was looking for, thanks. now i see what to look for in that man page17:05
→ trochala joined17:05
← codeswing left17:05
→ offby1` joined17:06
→ TDJACR joined17:06
→ deavid joined17:06
→ lucid_ joined17:07
→ davr joined17:07
→ frogonwheels_ joined17:07
avar Is there no way to init a submodule that tracks the master branch of the subrepository instead of a given commit?17:08
wereHamster no17:08
← imajes left17:08
_rane merge = refs/heads/master <- what does this mean in gitconfig?17:08
← frogonwheels left17:08
← davr_ left17:08
→ dr_jesus_ joined17:08
wereHamster git pull uses that to figure out which branch to merge17:08
ilteris → 50UAAG9U717:09
→ numbah joined17:09
→ seezer joined17:09
→ tonyj joined17:09
→ dreamcat5 joined17:09
→ |kukks| joined17:09
→ peper joined17:09
→ meatmanek_ joined17:09
→ fcoury joined17:09
→ fool__ joined17:09
→ David-T joined17:09
→ stamina_ joined17:09
→ mithro joined17:09
→ bauruine joined17:09
→ elendal joined17:09
→ ruxpin joined17:09
→ Elfix joined17:09
→ erikvold joined17:09
→ Rawxor joined17:09
→ piotr joined17:09
→ fractal_heart joined17:09
→ jkp joined17:09
→ Derander joined17:09
→ Tuomas joined17:09
→ ilteris joined17:09
→ rox joined17:09
→ bsod joined17:09
→ hap joined17:09
→ comps joined17:09
→ sjohnson joined17:09
→ frsk joined17:09
→ cantoma joined17:09
→ mmattice joined17:09
→ Blafasel joined17:09
→ pasky joined17:09
→ redondos joined17:09
→ homa_rano joined17:09
→ j-o-f joined17:09
→ chuck joined17:09
→ mapreduce joined17:09
→ iff joined17:09
→ xou joined17:09
→ Espen-_- joined17:09
→ lll joined17:09
→ Scotto_ joined17:09
→ tychoish joined17:09
→ rm-f`whoami` joined17:09
→ dsop joined17:09
card.freenode.net set mode: +o17:09
→ ice799 joined17:09
→ unpaidbill joined17:09
→ torben_ joined17:09
→ harv joined17:09
→ Garoth joined17:09
→ jnl joined17:09
_rane and git push -f, rite?17:09
→ imajes joined17:09
→ Tabmow joined17:09
→ smuf joined17:09
← peper left17:09
wereHamster if you have push.defaults set to tracking, yes17:09
← kloeri left17:09
→ peper joined17:09
← lucid left17:10
avar wereHamster: Right, but it gives you stuff like "Subproject commit 59674f4abf3995a25de4e36d2af7abe4e7ebeb41" internally. I was hoping for something like "Subproject branch master"17:10
Tabmow → Guest2089317:10
→ bremner joined17:10
← offby1 left17:10
wereHamster submodules can't track a branch, they always refer to a particular commit17:11
← anjen left17:11
avar Right now I have to make a new commit in the master repo every time something changes in the child17:11
→ ajpiano joined17:11
xenoterracide_ → xenoterracide17:11
→ justin-george joined17:12
cbreak that's working as intended17:12
unfortunately17:12
→ Khisanth joined17:12
→ kristian42 joined17:12
→ gemmes_ joined17:13
→ anjen joined17:13
→ tehbaut_ joined17:13
→ Aku joined17:13
→ BP{k}_ joined17:13
← gemmes_ left17:13
→ TheUni_ joined17:14
→ maiOo_ joined17:14
→ gemmes_ joined17:14
← ocs_ left17:14
← gemmes_ left17:14
→ steveire_ joined17:14
← steveire_ left17:14
→ steveire_ joined17:14
← Akufen left17:14
← maiOo left17:14
← weary left17:14
robins → robinsmidsrod17:14
→ MetaCosm_ joined17:15
← RobertMeta left17:15
← offby1` left17:15
← bcoca left17:15
← dibber_ left17:15
← avtobiff_ left17:15
← x|ixti|x left17:15
← pcgod left17:15
← dj_tjerk left17:15
← hebz0rl left17:15
← eletuchy left17:15
← wagle_ left17:15
← Xeross left17:15
← steveire left17:15
← xiong left17:15
← o_a left17:15
← mtkd left17:15
← dreiss left17:15
← flaguy48 left17:15
← marcial5 left17:15
← qrc1 left17:15
← madewokherd left17:15
← brosner left17:15
← kristian42_ left17:15
← phishy left17:15
← badboy_ left17:15
← pjb left17:15
→ ocs_ joined17:15
drt24_ I have a draft GSoC proposal: https://git.wiki.kernel.org/index.php/User:Drt24/GSoC2010/ does anyone have any comments to make on it before I write an email to the list?17:15
← elmo2k3 left17:15
→ bdash joined17:15
→ qrc1 joined17:16
→ spat joined17:16
→ wagle joined17:16
→ jsquared joined17:16
→ m-takagi_ joined17:16
→ weary joined17:16
→ badboy_ joined17:16
→ Yuuhi joined17:17
← jjann left17:17
→ bcoca joined17:17
→ Bucciarati joined17:17
→ hebz0rl joined17:18
→ runasand joined17:18
← merlin83_ left17:18
← eco left17:18
→ eco joined17:18
→ offby1`` joined17:18
→ eletuchy joined17:18
→ zub joined17:18
→ mtkd joined17:18
→ doki_pen joined17:18
→ brosner joined17:18
→ dna joined17:18
→ kupsch joined17:18
← edenc left17:18
→ avtobiff joined17:18
→ fredriv joined17:18
→ brothers joined17:19
hakunin wereHamster: this worked out perfectly. now can i just push the branch to remote? it will simply become exactly like local? (after which I can tell my colleague to re-clone)17:19
spat I have a repository on my laptop. I wan't to have it on my NAS too (I think I need to git clone --bare so I can push to it). than I want to clone it to my desktop and work on it on both machines. should I use different branches on the laptop and desktop?17:19
→ xiong joined17:19
→ dfr|work joined17:19
→ x|ixti|x joined17:19
wereHamster hakunin: push -f17:19
→ edenc joined17:19
wereHamster spat: on your nas: mkdir /your/repo.git; cd /your/repo.git; git init --bare17:20
hakunin wereHamster: gotcha17:20
wereHamster then use git push/fetch as usual17:20
spat wereHamster: ow that is easy, even I can do that :)17:21
→ Xeross joined17:21
→ ivan joined17:22
→ pcgod joined17:22
→ flaguy48 joined17:22
→ dibber_ joined17:22
→ beachbrake joined17:22
→ R_Rios joined17:22
→ dj_tjerk joined17:22
→ marcial5 joined17:22
→ madewokherd joined17:22
→ phishy joined17:22
→ guyzmo joined17:22
→ murr4y joined17:22
→ lack joined17:22
→ kim-day joined17:22
→ cathper joined17:22
→ tchan joined17:22
→ jones- joined17:22
→ psil joined17:22
→ IRSeekBot joined17:22
→ merlin83 joined17:22
← merlin83 left17:22
→ merlin83 joined17:22
→ jjlee_ joined17:22
→ stringo0 joined17:23
→ Cylindric_ joined17:24
← phishy left17:24
→ camonz_ joined17:25
→ skcidea joined17:25
→ Alex____ joined17:25
→ vmiklos joined17:25
→ tmz_ joined17:25
→ SirFunk_ joined17:25
→ ahf_ joined17:25
← camonz left17:25
← locklace left17:25
← Cylindric left17:25
← jdahm left17:25
← PuffTheMagic left17:25
camonz_ → camonz17:25
→ jdahm1 joined17:25
jjlee_ git status reports what appears to be every file in my working tree as untracked, with the exception of those files that have been modified since the last commit. gitk shows what I expect -- just my most recent changes (but I think it never shows untracked files). Any clues?17:25
← wald0 left17:25
skcidea Someone please help me with the following error message..."fatal: Unable to look up trac.osuosl.org (port 9418) (Name or service not known)"17:26
← nadim left17:26
ahf_ → ahf17:26
→ wald0 joined17:26
→ nadim joined17:26
← Theravadan left17:26
→ elb0w joined17:26
→ PuffTheMagic joined17:26
jjlee_ skcidea: sounds like you have a DNS problem.17:26
spat wereHamster: fatal: '/mnt/nas/ewdm.git' does not appear to be a git repository17:26
fatal: The remote end hung up unexpectedly17:26
→ Theravadan joined17:26
→ raim0 joined17:27
spat it seems that I can not o it17:27
→ locklace joined17:27
spat that happens with a push btw17:27
← chittoor left17:27
← Cylindric_ left17:27
← ajpiano left17:27
→ troyt joined17:28
→ vivien` joined17:28
spat could this be the result of a Fat32 formated disk?17:28
→ mutex__ joined17:28
jast git doesn't work all that well with fat3217:28
→ Azeroth-Working joined17:29
→ sdboyer_ joined17:29
→ xenoterracide_ joined17:29
spat hmm what fs to use17:29
→ navalota joined17:29
rtyler_ → rtyler17:29
→ andres_f joined17:29
→ bburhans_ joined17:29
→ juice__d joined17:30
spat jast: Have only one option left, does git work alright with ntfs?17:30
(using it over cifs btw)17:30
→ kipras joined17:30
→ joel_____ joined17:30
→ d-best joined17:30
← cods left17:30
← EgS left17:30
← d-snp left17:30
← vivien left17:30
← shabble left17:30
← sdboyer left17:30
← wimt left17:30
← juice_d left17:30
← joel____ left17:30
← mutex left17:30
← andres left17:30
← xenoterracide left17:30
← Yuffster left17:30
← Mage_Dude left17:30
← felipe left17:30
→ shabble_ joined17:30
→ cods joined17:30
→ Hadaka_ joined17:31
→ wimt joined17:31
← Hadaka left17:31
navalota hi all,could someone kindly clarify my question.?. there is repo -> index -> working directory. when i modify the file does it staged ?17:31
→ Mage_Dude joined17:31
Hadaka_ → Hadaka17:31
→ Yuffster joined17:31
← d-best left17:31
→ d-snp joined17:31
→ luckyone_ joined17:31
drt24_ no.17:31
← bburhans left17:31
← bd left17:31
← luckyone left17:31
drt24_ see man git-add17:31
Gitbot drt24_: the git-add manpage can be found at http://git.or.cz/man/git-add17:31
→ bd joined17:31
→ EgS joined17:31
drt24_ → drt2417:32
← cwillu_at_work left17:32
→ cwillu_at_work joined17:32
→ munichlinux joined17:33
← icwiener_ left17:33
← sagsousuke left17:33
← kumbayo left17:33
← Azeroth-IsWorkin left17:33
navalota thanks for the link, but i still bit unclear about this index/ie staging area, i modified a file, and when i check git status , and git status -a, both were showing differently17:34
← tetha_ left17:35
→ Diablo joined17:35
← Mage_Dude left17:35
navalota Well, i just checkout master branch, what the index or staging area will contain at this point of time ?. any pointer pls.17:35
→ AlexanderS joined17:36
shabble_ → shabble17:36
dreamcat5 navalota: when you check things out, it wont try and loose the working directory modifications17:36
spat does git work alright with ntfs?17:37
→ tetha joined17:37
→ Mage_Dude joined17:37
dreamcat5 navalota: do a git reset --hard to clear those17:37
d0k spat: it does. don't know about cifs though17:37
→ phishy joined17:38
_rane is there a way to ignore conflicts on merge and just pick the version that is being merged?17:39
jjlee_ doh, I lied: git status is showing only compiled files. I screwed up my gitignore config, obviously.17:39
dreamcat5 _rane: --theirs17:40
wereHamster _rane: git checkotu --theirs/--ours17:40
← Diablo left17:40
→ vinse_ joined17:40
→ pkahle_ joined17:41
_rane so it can be done only on files?17:42
← munichlinux left17:42
← dreamcat5 left17:42
← g0bl1n left17:42
← loincloth left17:43
jast what else would you want to do it on... seagulls?17:43
→ RobertMeta joined17:43
navalota git reset --hard branch-name does it relink the 'master' branch by default ?17:43
→ Hackykid joined17:44
← jjlee_ left17:44
jast navalota: I'm not quite sure what you're asking, but reset always works on the branch that is currently checked out17:45
→ tedoc2000 joined17:45
→ Xeross_ joined17:46
→ dbatbold_ joined17:46
→ clb joined17:47
→ _rane_ joined17:47
→ tapas_ joined17:47
→ fred_ joined17:47
← Adaptee left17:47
← phishy left17:47
→ loincloth joined17:47
fred_ → Guest6526617:48
→ emptyness47_ joined17:48
← Xeross left17:48
← juice__d left17:48
← MetaCosm_ left17:48
← jammi left17:48
← clb_ left17:48
→ jammi joined17:48
→ juice_d joined17:48
→ univate_ joined17:48
← bourbon left17:48
→ felipe joined17:49
spat d0k: you might be right. there is the lack of locking17:49
_rane_ → _rane17:49
et .oO(the lock of lacking)17:49
→ dj_tjerk| joined17:50
→ phishy joined17:50
→ rburton- joined17:50
← Hackykid left17:50
← pkahle_ left17:50
→ Hackykid joined17:50
→ pkahle_ joined17:51
← floppyears left17:51
→ floppyears joined17:51
← dj_tjerk left17:52
← RobertLaptop left17:54
→ matthieu joined17:55
← stamina_ left17:56
← hobodave left17:56
← gnufied_ left17:57
← Mage_Dude left17:57
← skcidea left17:57
spat wereHamster: are you sure I do note have to clone instead of init? push complains about no refs in common17:57
← xenoterracide_ left17:57
← maattd left17:58
→ Mage_Dude joined17:58
→ JEEB joined17:59
→ ehabkost joined18:02
navalota hi, is it possible to bring the change on particular previous commit rather than creating a new one ?18:02
→ adamm joined18:02
navalota i split my functionality and commit for each functionality, and some point of time would like to particular change on some commit ?18:02
wereHamster spat: well, yeah, no refs in common. So tell git what you want to push18:03
navalota could someone suggest me if it is possible ?18:03
_rane navalota: git rebase -i and git --amend together do that18:03
spat wereHamster: well ther only is a master branch18:04
_rane just amending is enough if it's the last commit you want to change18:04
wereHamster spat: then tell git to push the master branch18:04
→ rseifert joined18:04
spat wereHamster: how?18:05
wereHamster spat: man git-push would be a place to start18:05
Gitbot spat: the git-push manpage can be found at http://git.or.cz/man/git-push18:05
← rseifert left18:05
spat wereHamster: already did that doesnt work18:05
wereHamster spat: what did you do and how does it not work?18:05
spat just add master and even tried master:master18:06
→ infogulch joined18:07
wereHamster add master where?18:07
spat error: src refspec master does not match any18:07
wereHamster paste the full command line you used18:07
→ mfwitten joined18:07
→ beni- joined18:08
spat wereHamster: git push /mnt/nas/ewdm.git/ master18:08
wereHamster "src refspec master does not match any" means there is no local branch with the name 'master'18:09
spat wereHamster: never mind i'm an idiot18:10
wereHamster: was still cd'ed in the nas dir...18:11
sorry18:11
→ Pupeno joined18:11
→ kar8nga joined18:11
→ RobertLaptop joined18:13
Alex____ → Alex18:14
← phishy left18:15
→ rseifert joined18:18
→ Zer joined18:18
BP{k}_ → BP{k}18:18
mfwitten While reading a project's documentation, I fix typos and change wording along the way and make a commit for each; some people dislike so many small commits and would at least like to squash the resulting patch series before committing to their main repositories. I'm fine with that approach, but I feel that squashing destroys the connection between a commit message and the diff. Is it really worth it (space savings or performance or ...18:19
... whatever) to squash or is the desire to squash misguided?18:19
→ fool_ joined18:20
← fool_ left18:20
→ fool_ joined18:20
Zer Is there a way to grep over an old version?18:20
wereHamster if multiple commits make the same changes (fix types, change wording), I think it's well worth squashing those together, it makes history cleaner IMHO18:21
→ lanthan joined18:21
wereHamster Zer: man git-grep, look at the <tree>... option18:21
Gitbot Zer: the git-grep manpage can be found at http://git.or.cz/man/git-grep18:21
→ gebi joined18:22
← fool__ left18:23
mfwitten Zer: git grep search-string tree-ish18:23
Zer: Also, git help grep18:24
Zer Ahh tree. Wasn't sure what it would be called18:24
Thanks18:24
mfwitten Zer: Just pass a commit object name18:24
Zer: Like HEAD^18:24
or whatever18:24
→ pantsman joined18:25
← rseifert left18:25
mfwitten wereHamster: Well, a commit message might be something like "Grammar: 'a' -> 'an'" and the diff would show one line removed and one line added; the commit message and the simple diff make it very easy to see what's been done. However, If I squash 10 such changes together (all from different paragraphs), then it becomes harder to see what's gone on, especially with the default linewise diffing.18:26
→ Xeross joined18:26
← Xeross_ left18:26
mfwitten wereHamster: In that case, the small commits actually make the history cleaner in my opinion (as far as understanding what's happened).18:27
wereHamster: Then again, nobody really cares about documentation...18:27
→ munichlinux joined18:27
mfwitten Zer: You should also read about pickaxe18:28
Zer: git help log18:28
← Guest19703 left18:28
→ Guest19703 joined18:28
→ jmcantrell joined18:29
wereHamster mfwitten: I wouldn't write "Grammar: 'a' -> 'an'" into the commit message, that change is clear when you look at the diff. Instead just write 'fixed gramar in XX and YY' or similar that applies to all changes made in the commits18:29
← munichlinux left18:29
wereHamster I find it rather strange when the commit message is longer than the diff itself (for such trivial changes)18:29
mfwitten wereHamster: In my opinion the change is not obvious, especially when there are bunches of such commits; such small word-level changes aren't obvious in linewise diffs.18:30
(especially when lots of lines are shown in the diffs from lots of such changes)18:30
Guest19703 → Morasique18:30
mfwitten wereHamster: Why is that strange? You have to explain what you've done.18:30
← rgr_ left18:31
mfwitten wereHamster: In fact, it's NOT shorter than the diff, as the diff is linewise18:31
→ poseid joined18:32
← rolfb left18:33
wereHamster sure you have to explain, but you can write 'Fis types and other mistakes' in the subject line and then list each change ('a' -> 'an') in the message body18:35
mfwitten wereHamster: Right, except that goes back to my initial statement: "I feel that squashing destroys the connection between a commit message and the diff."18:36
It's much harder now to know what each change in the diff represents without parsing it slowly18:37
With just the individual commits, I can easily know to look for a change from 'a' to 'an'18:37
Naturally, the best compromise is the one I proferred: Submit a bunch of small patches for review, but commit squashed versions18:38
*proffered18:38
→ jelmer joined18:38
wereHamster every decent diff viewer will not only highlight the changed lines, but also the actual changes inside the lines.18:38
mfwitten wereHamster: Perhaps so; I only use the terminal and that's not currently the case.18:39
→ fcarrijo joined18:39
wereHamster I bet there are console diff viewers which can do that ;)18:39
← navalota left18:39
→ hobodave joined18:39
→ navalota joined18:40
mfwitten wereHamster: There are certainly ones that can show word-wise diffs, but I've never seen one that combines the two forms.18:40
(as GUI ones do)18:40
well18:40
vimdiff does18:40
That's all I've seen18:40
← jelmer left18:41
← stringo0 left18:41
← RobertLaptop left18:42
→ Determinist joined18:42
mfwitten wereHamster: Oh well; I guess only validation (by a maintainer) needs to be linewise; otherwise, --color-words works pretty well within git itself.18:43
→ rgr joined18:43
← hobodave left18:44
→ Patrulka joined18:44
→ jelmer joined18:46
← robinsmidsrod left18:46
→ robinsmidsrod joined18:47
← jelmer left18:48
→ jelmer joined18:49
← jelmer left18:51
→ jelmer joined18:52
← Paraselene_ left18:52
← jelmer left18:54
→ jelmer joined18:55
← jmcantrell left18:55
joel__ → joel_falcou18:57
← jelmer left18:57
→ jelmer joined18:58
→ lemonchicken joined18:58
→ pichaga_vn joined19:00
← jelmer left19:00
→ rolfb joined19:00
→ jelmer joined19:01
← jelmer left19:04
→ jaql joined19:04
← pichaga_vn left19:04
→ pheaver joined19:04
→ corni joined19:05
→ jelmer joined19:05
→ loinclot_ joined19:05
← loincloth left19:06
→ SimManiac joined19:06
← jelmer left19:06
SimManiac hi19:07
→ pano_ joined19:07
spat how often should i do a git-gc?19:07
→ jelmer joined19:08
pano_ when using SVN, you can use KWallet to save your accounts password in it. Is this also possible when using git (gitorious to be more specific)?19:08
jast most git hosters use ssh public key authentication rather than password-based authentication. I imagine it's the same with gitorious.19:09
wereHamster spat: you usually don't have to run it manually19:09
← LeLutin left19:10
← jelmer left19:10
pano_ jast: yeah, it's a ssh key I need to enter19:10
wereHamster use gpg-agent19:10
jast pano_: git doesn't do ssh authentication itself, so this is more of an ssh issue19:10
pano_ ah ok19:10
jast any solution that works for ssh authentication in general will probably work for git, too19:10
pano_ jast: ok thx19:10
wereHamster: I'll look into that19:11
thx19:11
→ jelmer joined19:11
spat wereHamster: ok thanks19:12
← jelmer left19:13
← xiong left19:13
→ jelmer joined19:14
→ BuZZ-dEE joined19:14
← aspotashev|eeepc left19:14
← jelmer left19:16
→ sgh joined19:16
→ jelmer joined19:17
← jelmer left19:19
dj_tjerk| → dj_tjerk19:20
→ aspotashev|eeepc joined19:20
→ jelmer joined19:20
← PuffTheMagic left19:20
→ MacGyverNL joined19:20
← MacGyverNL_ left19:20
ekneuss_ → ekneuss19:20
← ekneuss left19:21
→ ekneuss joined19:21
→ sgh_ joined19:21
← poseid left19:21
← jelmer left19:22
→ Gitzilla joined19:22
← sgh left19:23
→ jelmer joined19:23
← BuZZ-dEE left19:24
← jelmer left19:25
→ jelmer joined19:26
← flaguy48 left19:26
→ Eaven joined19:26
→ disturb joined19:27
← jelmer left19:28
← fcarrijo left19:28
→ jelmer joined19:29
← przemoc left19:29
→ lightcap joined19:30
→ mib_mib joined19:30
← jelmer left19:30
← tildeequals left19:32
→ jelmer joined19:32
← hornairs left19:32
→ przemoc joined19:32
← nairb774 left19:32
← jelmer left19:33
→ xiong joined19:34
→ jelmer joined19:35
sgh_ → sgh19:35
← justin-george left19:37
← shennyg left19:37
← aspotashev|eeepc left19:37
← lightcap left19:38
← jelmer left19:38
→ hornairs joined19:38
← mithro left19:40
← rburton- left19:40
← wvd left19:41
→ shennyg joined19:43
→ nairb774 joined19:46
Rh0nda → Rhonda19:46
← Rhonda left19:46
→ Rhonda joined19:46
← brizly1 left19:46
→ jmcantrell joined19:47
← tango_ left19:48
offby1`` → offby119:48
← offby1 left19:48
→ offby1 joined19:48
navalota hi all, how can i find difference between staged and local repo difference on particular file ?19:49
← lucsky left19:49
teuf navalota: "local repo" = working dir ? or latest commit ?19:50
git diff should do the former, git diff --cached the latter19:50
navalota teuf, i am just confused :). you change some file, and do git diff -> does it reflect difference between working copy with local repo ?19:51
→ Twisted_Mentat joined19:51
→ shennyg_ joined19:52
teuf navalota: if you have no staged changes, you change a file, git diff will show the diff between your working copy and the latest commit19:52
if you stage the file (do git add)19:52
then git diff will be empty19:52
← hakunin left19:52
rittyan then you can do git diff --cached, and it will show difference including staged changes19:53
→ R0b0t1 joined19:54
← jmcantrell left19:54
R0b0t1 When using gitosis, I'm apparently supposed to checkout "gitosis-admin.git" to my non-server computer. However, it does not appear to exist.19:54
← kar8nga left19:54
R0b0t1 I followed http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way and I can't see what would be missing.19:54
wereHamster use gitolite19:55
http://github.com/sitaramc/gitolite19:55
← shennyg left19:56
shennyg_ → shennyg19:56
R0b0t1 Oh god perl19:56
nothx19:56
wereHamster the thing with gitosis is that it's old, hasn't been updated in years, and you won't get any support at all with it. Whereas gitolite is still being actively developed and the author provides excellent support19:57
→ patmaddox joined19:57
drt24 R0b0t1: there is perl in git :-)19:58
← sgh left19:58
R0b0t1 Yeah, but that's a necessary evil.19:58
:319:58
Oh, right, /me downloads gitolite19:58
How to I remove gitosis, then ... :|19:58
jast I never get these people who hate on technology that they don't even have to use directly. it makes no sense at all. unless, of course, the technology in question is python or java. ;)19:58
wereHamster another aspect that's better with gitolite - it doesn't need to be installed in the system19:59
d0k git in perl, perl in git19:59
R0b0t1 jast: I might not have to use perl directly through git, but perl still sucks.19:59
And gitosis must be a ninja, I can't figure out how to uninstall it...20:00
← ph^__ left20:00
drt24 wereHamster: though where possible things should be installed on the system so that they get updated properly20:00
jast but clearly gitosis is better despite it being difficult to uninstall because it's not written in perl, right? ;)20:00
(and I wasn't really being serious... since I hate java with a passion, it would be rather stupid if I judged anyone for doing so with a different language/VM)20:00
R0b0t1 No, now that I know it's old it's probably not better.20:01
But if gitolite were rewritten in python, yes, that would be better.20:01
→ siml joined20:01
jast feel free to do so :)20:01
→ ph^ joined20:01
ArjenL I'm always curious what constitutes 'better' in claims like this20:02
wereHamster R0b0t1: are you planing to actually work on gitolite or why do you care in which language it is written?20:03
navalota teuf, rittyan , thanks, and what i did was i did some change and staged, and again did some change, now how can i get the local repo copy, because if i do git checkout file.c it gets from staged20:03
→ sgh joined20:03
SimManiac wereHamster: but gitosis works like a charm20:03
jast SimManiac: depends on your environment and your requirements20:04
teuf navalota: git checkout HEAD file.c maybe20:04
← mfwitten left20:04
SimManiac jast: what would you recommend?20:04
jast gitolite20:04
navalota teuf, thats works. :)20:04
jast though, of course, if gitosis already works well enough for you, there's no huge reason to switch20:05
R0b0t1 wereHamster: I was just saying Perl is a pretty horrible language.20:05
jast it definitely has its weak points20:05
bob2 tychoish: maybe20:05
jast but even though I hate python quite a lot that doesn't stop me from using a couple of programs written in it.20:05
bremner R0b0t1: from the point of view of Haskell, a pox on both your houses :)20:06
jast I hate haskell too, but less so20:06
R0b0t1 wtfHaskell20:06
bremner hey, you started the "your language is ugly" discussion20:06
jast in fact, there's no programming language I don't hate20:06
bremner jast: assembly?20:07
ArjenL They all suck, but some suck less at some things than others20:07
jast ArjenL: indeed, but often enough I don't know in advance which things I'm going to need :)20:07
ArjenL Heheh20:07
I like Perl because I can bend it to my needs20:07
jast bremner: assembly is honest about itself at least, but I still hate it20:08
← loinclot_ left20:08
jast well, you can bend Lisp a lot more than you can bend perl20:08
but I still prefer perl over lisp20:08
ArjenL Sure, but how many systems have a Lisp installed (apart from Emacs :-)20:08
I'm a pragmatic person20:08
mapreduce It can't be any more difficult to get a lisp installed than perl, on Windows.20:09
bremner ArjenL: I'm pragmatic too, that's why I control what software is installed :)20:09
jast both are easy to install20:09
ArjenL mapreduce: I don't use Windows, so for me, that point is moot20:09
mapreduce: Strawberry Perl?20:10
mapreduce And you don't have users?20:11
ArjenL mapreduce: Not on Windows20:11
navalota teuf, rittyan,any way to look together --cached diff and present diff ?20:11
← CaptTofu left20:11
teuf navalota: git diff HEAD ?20:11
jast just wait until I bestow my own Completely Perfect Programming Language upon the world. in a decade or three.20:12
navalota teuf, Ah. super.20:12
← Boriskr left20:13
→ CaptTofu joined20:13
→ loincloth joined20:13
← Gitzilla left20:13
drt24 awaits CPPL20:14
drt24 :-)20:14
→ r11t joined20:14
jast there are a lot of ideas (even new ones) in it. what's missing is, basically, all of the implementation. ;)20:14
← khelll left20:15
drt24 ;-)20:15
bremner waits for CPPL-ng, a bug perfect clone for inane licensing reasons20:15
← navalota left20:15
jast though I'm pretty sure it's actually possible to implement it20:15
drt24 that is always a start :-)20:16
→ g0bl1n joined20:17
← BeerSerc left20:17
→ BeerSerc joined20:17
← joel_falcou left20:20
jast interesting ideas in it: runtime-extensible syntax, a somewhat fresh take on type inference, and something that is neither class-based nor prototype-based OO (this one is still a bit roughly sketched out, though). another thing I wanted to experiment with was runtime profiling of data structures and transparently switching to compatible data structures.20:20
mugwump dude, just learn haskell20:21
jast it has none of these features20:21
mugwump er20:21
ok :)20:21
jast plus it forces you to use monads which come with their own problems20:21
← CaptTofu left20:21
jast and I'm not talking about how bad most of the explanations for monads are :)20:21
← dmgr left20:22
→ khelll joined20:22
→ dmgr joined20:22
mugwump have you played with a recent rakudo?20:22
→ Rix joined20:22
jast no20:22
I'm not all that up-to-date on all things related to perl620:22
but I am loosely following its development20:23
→ CaptTofu joined20:23
← Zer left20:23
← pantsman left20:23
→ rburton- joined20:23
mugwump I think it has all those things. Type inference is probably woefully incomplete20:23
← Rix left20:23
jast if I explained my ideas in a lot more detail the differences would probably be more obvious20:24
though I don't know about the runtime datatype switching part. I haven't gotten that far into haskell. I gave up after failing to be able to parse the reference docs.20:25
s/be.*to//20:25
← khelll left20:25
dr_jesus_ → dr_jesus20:26
→ mjf joined20:27
← patmaddox left20:28
→ Gitzilla joined20:28
→ loinclot_ joined20:31
← loincloth left20:32
← hyperair left20:33
→ mikey_p joined20:35
→ tildeequals joined20:35
mikey_p how can I merge my master against a tag in a remote repo?20:36
← ehabkost left20:37
→ pantsman joined20:38
sdboyer_ → sdboyer20:38
wereHamster fetch everything you want to merge to your local repo, do the merge, push the result wherever you want20:39
→ jmcantrell joined20:39
← corni left20:39
← bradb left20:40
← vlatombe left20:40
mikey_p whenever I try to merge against a tag I get" fatal: Not a valid object name: 'upstream/tagname'.20:41
wereHamster is 'upstream/tagname' listed in git show-ref ?20:41
mikey_p do i need to set up a local tracking branch first, or anything like that?20:41
wereHamster you need to fetch everything you want to merge into your local repo, that's all20:42
mikey_p it was showing up with branch -a20:43
let me try show-ref20:43
← loinclot_ left20:43
→ loincloth joined20:43
→ patmaddox joined20:43
mikey_p yea the tag is showing there, and if I try to use the commit, it doesn't do anything20:44
do I need to have an initial commit before I can merge from a remote?20:45
← vivien` left20:45
wereHamster what does 'git rev-parse upstream/tagname' show?20:46
← ocs_ left20:46
→ aspotashev|eeepc joined20:47
mikey_p fatal: ambiguous argument 'upstream/tagname': unknown revision or path not in the working tree.20:47
wereHamster uhm, and you are sure it's listed in branch -a/show-ref?20:48
→ ocs_ joined20:49
mikey_p yup20:49
i can work around this another way, i just didn't know if there was a shortcut20:49
→ dreiss joined20:50
→ ProLoser|Trmnl joined20:50
wereHamster take the hash that is left of the ref name in the show-ref output, and run 'git show <hash>', does that work?20:50
mikey_p yup20:52
→ tango_ joined20:53
→ justin-george joined20:53
wereHamster does rev-parse work if you supply the full ref name (refs/remotes/upstream/tagname) ?20:54
(or whatever the full ref name is...)20:54
hipe there was a seminal first for me, i forked a project on github, fixed some stuff, and they merged in my changes. yay. Now i'm not sure what I should do: that project also has one new change that i want to pull into my branch. I know this is noobish, how do i merge the changes from master into my branch (effectively making it identical to master) ?20:54
← justin-george left20:55
spat when resolving a conflict do i have to remove all the decoration?20:56
← ricky left20:56
→ ricky joined20:57
wereHamster if you don't want the decorations be part of the final file, yes20:57
← tobier left20:57
→ tobier joined20:58
mikey_p wereHamster: well the tag isn't showing as refs/remote/upstream its just refs/tags/tagname20:58
and rev-parse just returns the hash for that commit20:58
→ RobertLaptop joined20:58
spat thanks20:59
wereHamster you said show-ref and branch -a listed 'upstream/tagame', which was wrong21:00
mikey_p actually it looks like the merge did work, it was just silent since I had no commits on the master21:00
yeah, I'm sorry the tag name was showing up, I didn't look at the ref closely21:01
← aspotashev|eeepc left21:01
wereHamster btw, git branch -a doesn't show tags at all, it only lists branches, so the tag should't even be listed there21:01
mikey_p it seemed to be listing the tags....hrm21:02
wereHamster are you sure itn's not a branch with the same name as the tag?21:02
mikey_p i don't think so21:02
→ aspotashev|eeepc joined21:02
mikey_p this is repo I'm trying to work against: http://github.com/drupal/drupal and I'm trying to create a new repo and merge from the tag DRUPAL-7-0-ALPHA321:03
wereHamster and what is the tag name?21:04
← mssm left21:04
mikey_p DRUPAL-7-0-ALPHA321:04
wereHamster git --version ?21:05
wald0 what is the recommended protocol for a public git repo ? i want to view it via web like a list of git repos too21:05
mikey_p 1.6.3.321:05
← ocs_ left21:05
← nanoo left21:05
→ ocs_ joined21:07
wereHamster weird, here branch -a really shows only branches.. and no sight of DRUPAL-7-0-ALPHA3 in the branch list21:08
bburhans_ → bburhans21:10
← rgr left21:11
→ silence joined21:11
→ rgr joined21:12
silence → Guest2547621:12
→ Bass10 joined21:14
→ Mage joined21:14
← loincloth left21:15
→ loincloth joined21:15
→ jelmer_ joined21:15
← spat left21:16
→ spat joined21:16
← jelmer_ left21:16
← Bass10 left21:16
→ Bass10 joined21:17
→ franckB joined21:18
← aspotashev|eeepc left21:19
→ loinclot_ joined21:23
← loincloth left21:26
← kipras left21:26
→ aspotashev|eeepc joined21:26
→ snarkyboojum joined21:31
→ aryounce joined21:32
→ flaguy48 joined21:33
snarkyboojum newbie question - if I want to look at the git log before a certain date, I'm doing `git log --before=YYYY-mm-dd` and I'm getting something close to what I'd expect - but does this take into account my timezone or something, because I'm noticing that the commits I'm seeing as a result of that aren't the last commits in the previous day (as it were) - any ideas?21:33
← dreiss left21:33
→ __iron joined21:34
← Determinist left21:34
→ Determinist joined21:34
← nevyn left21:34
← DrNick left21:35
→ nevyn joined21:36
← lhz left21:36
← _iron left21:37
← aspotashev|eeepc left21:39
Guest25476 → ajpiano21:39
→ DrNick joined21:40
← jmcantrell left21:42
← Guest20893 left21:43
→ Tabmow joined21:44
offby1 snarkyboojum: time zone indeed sounds relevant. I don't know how to specify it, though21:44
← beni- left21:44
snarkyboojum offby1: managed to working that it is using my timezone by eyeballing the same command with --date=local, but yeah - how to specify a different one... :)21:45
to working = to work out21:45
← rittyan left21:48
← lol_h left21:48
← hipe left21:49
← x|ixti|x left21:50
← SimManiac left21:52
→ loincloth joined21:55
offby1 see how the "date" command specifies time zones21:56
→ xer0x joined21:56
→ juan_arandaalvar joined21:56
← loinclot_ left21:58
← erikvold left21:58
← priidu left21:58
wald0 for what is exactly needed the option --bare and why needs to be set when doing a public repository ?22:00
→ nanoo joined22:00
wereHamster bare repos don't have a working tree22:01
offby1 I don't think it's absolutely necessary; you can get the same effect by tweaking the "bare" setting in .gitconfig, and deleting the work files22:01
wald0 it is for create a empty repository that simply points to the real one ?22:01
← matthieu left22:01
offby1 no, it's for creating a repository that doesn't have a work tree.22:01
→ tildeequals_ joined22:01
← sohum_ left22:01
wald0 mmh, what means "work tree" ?22:01
wereHamster if you have a repository on a server which is only used to exchange commits (a repo where you only push to/fetch from), that repo doesn't need a working tree22:02
→ merlyn joined22:02
← juan_arandaalvar left22:02
merlyn so "git push . thatbranch" no longer does the right thing?22:02
ahh. need to say "git push . thisbranch:thatbranch"22:03
← ph^ left22:03
wereHamster "git push . thatbranch" is pretty pointless22:03
merlyn not in the old day22:03
it used to push HEAD to thatbranch22:03
but that was before the auto-pairing of local and remote branches22:03
wald0 mmh, my idea is to use vcs (with git) to my home files and configurations, that i can share along with my other computers, so if i do a change in computer-2 and commit it, computer-1 will be updated with this change too22:04
← tildeequals left22:04
merlyn egad. another "put $HOME under git" query22:04
yup, 4 past the hour. that's when they always start :)22:04
merlyn wanders off before he starts getting mad22:05
← merlyn left22:05
wald0 scratches his head22:06
← fcoury left22:06
→ fcoury joined22:07
← fcoury left22:07
→ fcoury joined22:07
← fcoury left22:07
wald0 mmh, is there anything wrong by having all my files shared along my computers and with nice features like history and branches ?22:07
maiOo_ → maiOo22:08
→ fcoury joined22:08
wald0 thinks that merlyn thinks that git is that nice that is a shame to use it for things where is not appreciated his potential22:08
offby1 wald0: there's nothing wrong with that, but merlyn feels strongly that git is the wrong tool for that job.22:09
I think he recommends rsync or unison22:09
→ lightcap joined22:09
wald0 i see22:09
offby1 These days DropBox or ZumoDrive might also be worth using22:10
→ riz2 joined22:10
← mtkd left22:10
wald0 well, i have always used rsync until now, and i think that now i need something more powerful :), for example branches and history... branches is a very good feature to return back in old code versions22:10
offby1 assumes meryln is RandallSchwarz22:11
→ major joined22:11
wald0 in my home there's mainly codes, but of course i have some other things too like music or tools, misc files, etc22:11
and yes, rsync and unison is nice for that, but i think that a vcs (and powerful like git) is a better choice :), at least for me22:12
offby1 if any of those files are binary, then you won't get a lot of benefit from git; git's main claim to fame is easy merging, but it cannot merge binary files22:12
wald0 but by other side it can feature these files with history and branches (old versions)22:12
looks good for also a incremental backup system22:13
offby1 yep22:14
major plz22:15
help me with smtp22:15
wald0 quick question: if i dont set up a public repository but just a simple git environment on a directory, i can (everything via ssh) clone it from computer-2 and pull changes from computer-2 too, right ?22:16
→ oal_ joined22:16
DrNick wald0: yes22:16
thiago_home wald0: yes22:16
wald0 major: start asking your question22:16
ok22:16
oal_ Would git be better than svn on a VPS server?22:16
wald0 oal_: define better22:16
major ok22:17
oal_ I have a vps with 512MB ram, and I need to use it for multiple projects22:17
← tbf left22:17
major ok22:17
oal_ Will Git be more efficient in terms of memory, cpu and space usage?22:17
major ok22:17
thiago_home oal_: it will be more efficient in terms of disk space usage22:18
siml ok, so, i have this main git repo that i do a lot of work in(it's kindof a hodgepodge of stuff, but stuff i want on all computers i work on without having 50 repos). certain things i do want split off and world-readable on (eg) github. i'm mostly happy with using submodules to do this, except that i'd like it better if submodule log entries ended up in the main repo22:18
← xer0x left22:18
siml is there a way to do that?22:18
offby1 oal_: I'd start with the assumption that git is better than svn in all cases, and refine that generalization only as needed22:18
thiago_home siml: no22:18
→ icwiener joined22:18
oal_ thiago_home: Thanks. Is Git as simple as Svn to set up and work with?22:18
thiago_home oal_: no22:18
major ok22:19
siml thiago_home: ok. just wanted to see if i missed anything.22:19
major do you smtp22:19
wald0 oal_: in any case is a good change because is a lot more powerful, but i wonder if you have really problems of memory/cpu with any vcs22:19
offby1 oal_: it's a bit harder to set up, and (unfortunately) ((imho)) a lot harder to learn22:19
major or webmail22:19
thiago_home oal_: Git is more powerful, so it's more complex.22:19
→ dreiss joined22:19
offby1 oal_: I (and I'd guess most of the people here) think it's still worthwhile22:19
siml thiago_home: thanks though.22:19
offby1 of course22:19
thiago_home major: I send email via SMTP. It works just fine.22:20
major: completely unrelated to Git, though.22:20
wald0 oal_: i have always worked with svn and now im checking out git, reading the official tutorial that is pretty small looks very simple to use for me22:20
oal_ Hmm, ok. What I need is a version management system that can handle a few projects 3-5, where I can easily work from multiple computers.22:21
offby1 oal_: git is certainly that.22:21
oal_ wald0: Cool. I'll go ahead reading some too22:21
offby1 So, however, is svn, mercurial, bzr, darcs ...22:21
← disturb left22:21
Leonidas_ → Leonidas22:21
mugwump oal_: working with multiple computers with svn will do your head in22:21
← pano_ left22:22
mugwump its branching model just can't cope with the multiple machines, single developer case22:22
oal_ Ok22:22
mugwump with git they are all peers22:22
with svn you have to communicate through a central node, which implies committing and publishing - even if you're not ready22:23
← aryounce left22:23
oal_ Thanks guys. I'll see if I can find any guides that I can use to set it up the way I want.22:23
← rolfb left22:25
→ juan_arandaalvar joined22:25
→ psoo joined22:26
major i need smtp22:27
plz help me22:27
← aziz_ left22:27
← CaptTofu left22:27
← psoo left22:27
offby1 major: I think you're in the wrong channel.22:27
thiago_home major: what's your problem with Git and SMTP?22:27
→ psoo joined22:28
→ CaptTofu joined22:30
|kukks| → kukks22:30
major past me22:32
thiago_home past you what?22:32
← psoo left22:33
major tools22:33
thiago_home you have to start making sense22:33
make a FULL sentence, explaining what your problem with Git and SMTP is. Make sure you spell and punctuate right.22:33
major plz teach me brother22:33
thiago_home teach you what?22:33
make a full sentence.22:33
major ok22:34
i need smtp to send email22:34
that is outgoing22:34
thiago_home ok. What's the relationship with Git?22:34
major mail22:34
← dj_tjerk left22:35
jdahm1 → jdahm22:35
wereHamster engaged, soon to be married :)22:36
major there is no relationship22:36
wereHamster I'd marry git if I could22:36
major that22:36
thiago_home major: then you're asking the wrong channel.22:36
major ok22:37
thank22:37
thiago_home major: if you need help setting up your SMTP server, I suggest you look for help somewhere else. Like your distribution's channel.22:37
major you22:37
ok22:37
but do you have any i dael22:37
plz22:37
thiago_home no, ask somewhere else.22:38
major ok22:39
that you for charting me22:39
→ fujin joined22:41
← ProLoser|Trmnl left22:42
← oal_ left22:42
wald0 if i do for example "mv foo bar", how git understand this modification on the files ?22:43
← major left22:43
→ scarabx joined22:43
siml wald0: probably stick to 'git mv foo bar'22:44
DrNick git mv $A $B is just a handy shortcut for git rm --cached $A; mv $A $B; git add $B22:44
siml DrNick: probably should do the mv first?22:45
wald0 yes, but what about if i dont use "git" commands for that ?22:45
→ ntoll joined22:45
DrNick siml: why?22:45
← loincloth left22:45
→ loincloth joined22:45
DrNick wald0: than you'll need to add $B and remove $A manually22:45
siml ahh, --cached leaves it alone.22:45
nevermind then.22:45
wald0 i see22:46
offby1 wow, major must have been ... shy, or something22:48
← chris_n` left22:49
fcoury → fcoury|away22:49
→ cbcbcb joined22:50
wald0 "git add ." increases the size of the directory (of course), is there any list/description/something saying how much extra space is required for which different types of files ? (same as space required when moving a file, etc etc)22:52
→ bwb joined22:52
→ hobodave joined22:54
bwb workflow question... say I have an svn repository checked locally.. and for various reasons I don't want to use git-svn, but I do want to maintain a few private branches using git22:54
jdahm bwb: why not git-svn? :P22:55
bwb various reasons =)22:55
well, so we have an open source project22:55
that is all used internally22:55
i am a small maintainer of the project22:55
← sgh left22:55
bwb but i also maintain some private branches of the project, just small hacks to get things working with other projects we have going on22:55
→ stringo0 joined22:56
← shennyg left22:56
jdahm well, I manage a few local branches of a larger svn project using git-svn so that I can use git for the branches22:56
← gebi left22:56
jdahm bwb: why not just use git for everything?22:56
← stringo0 left22:56
jdahm maybe I don't understand completely your situtation...22:56
bwb I was thinking of using git checkout master; svn update; git commit -a to have master always mirror svn, and then git checkout this-feature; git rebase master; etc... to have my specific features22:57
← xiong left22:57
bwb yeah... so for the project as a whole there is probably no way we would move to subversion22:57
this is a company supported project22:57
jdahm bwb: you could do a really hacky thing and .gitignore the svn stuff in the directory22:57
bwb and the main devels use subversion22:57
yeah...22:57
← juan_arandaalvar left22:58
bwb also i have eclipse setup finally22:58
← hadees left22:58
→ stringo0 joined22:58
jdahm bwb: thats all I can think of22:58
bwb to work with subversion22:58
ya22:58
okay22:58
just thinking of rebase is better to use than merge22:58
thinking if*22:58
for my case22:59
since I'm never sharing my private branches..22:59
jdahm I think rebase23:00
but then again I'm not an expert23:00
bwb ok, at least my workflow doesn't sound completely crazy23:02
thanks23:02
← d0k left23:02
→ nanooo joined23:02
→ sjain joined23:03
← nanoo left23:05
← v0n left23:05
sjain Hello everyone23:06
I am a final year computer science student at IIIT H, India23:07
mugwump yes, submit for summer of code23:07
:)23:07
jdahm haha23:08
← DavidKlein left23:08
sjain I want to discuss some projects for gsoc 201023:08
Are there any mentors available ?23:08
mugwump I mentored last year23:09
which one are you interested in?23:09
sjain okay23:09
I am interested in Git Fetch/Clone Mirror Support23:10
mugwump awesome23:10
that's also one the one I designed :D23:10
→ lamont joined23:10
sjain I have also participated last year with Globus Alliance as my mentoring organization23:10
ohh great :)23:11
Could you please guide me on the project ?23:12
← dpino left23:12
mugwump what would you like to know? how to submit a good proposal?23:13
what scores the most points for git SoC proposals is patches on the mailing list23:14
could be for anything really, but even better if it's related to the proposal23:15
← marcial5 left23:16
← icwiener left23:16
mugwump what scores even more points, is a re-submission of a patch with highlighted errors corrected23:16
← Mage left23:18
sjain Do you expect it to work like this ? Client sends a request to the server. The server responds back with a list of rep urls from where the client begins the transfers. It tries one by one, with preferred urls first.23:18
okay23:18
← __iron left23:18
→ bradb joined23:19
mugwump that order will be correct, eventually23:19
sjain okay23:19
mugwump first, the client must know how to fetch from mirrors.23:19
second, the client must know how to ask for mirrors, and the server must know how to respond (based on configuration)23:20
sjain yeah23:20
→ kitsched joined23:20
sjain preferred mirrors would be suggested based on the configurations. right ?23:20
mugwump yes, although the server can provide defaults23:20
sjain yeah23:21
→ Mage joined23:21
sjain so should the client contact multiple mirrors simultaneously(using threading)23:21
?23:21
Ilari sjain: Don't use threading.23:21
mugwump later on, perhaps - we call that 'download spreading'23:22
sjain but that would make the fetch fast. right ?23:22
mugwump it is hard to implement23:22
sjain okay23:22
mugwump fetching the first half of a pack from one server and the second half from another is not straightforward23:23
sjain okay23:23
← nanooo left23:23
→ ProLoser|Trmnl joined23:23
ProLoser|Trmnl hallo23:23
every single file in my repo is waiting to be staged with old mode 10064423:23
new mode 10075523:23
← dmgr left23:23
→ aryounce joined23:23
ProLoser|Trmnl is there a way to revert this? it's kind of annoying23:24
Ilari "Not straightforward" wouldn't even start to describe it. AFAICT, if one could do that, one could resume clones (and that is HARD).23:24
→ dmgr joined23:24
← Chillance left23:24
← spat left23:24
← aryounce left23:24
sjain so when the list of mirrors is returned by the server, the client contacts a mirror and fetch data from that and then directly contact server to fetch the remaining data ?23:24
Ilari Presumably mirroring would work by having client insert received mirrors (and perhaps also ones from command line) into list, try them in order, sending as HAVE what was received from previous mirrors (and what was present locally if any).23:25
mugwump sjain: yes - the existing submission works like that23:25
cbcbcb Hi. what's the git equivalent of svn info <path>?23:26
mugwump Ilari: sure, my approach fetches to refs/mirrors/origin/hostname.com/heads/foo etc23:26
Ilari cbcbcb: 'git remote -v'?23:26
Gitbot [git cbcbcb]: http://tinyurl.com/yl2may2 [tree]23:26
mugwump the want/have negotiation happens for free23:27
all going well, the final contact with the server ends up not needing to fetch anything23:27
sjain sorry i am not getting it.23:28
← Louie` left23:28
sjain The present submission works like that23:28
Ilari Actually, one doesn't even have to contact the original server again if mirrors provoded everything...23:29
→ qzg joined23:29
sjain contact a client, fetch and then fetch any remaining data from server23:29
mugwump sjain: see if you can understand the approach of http://thread.gmane.org/gmane.comp.version-control.git/133626/focus=13362823:29
sjain yeah23:29
okay23:29
mugwump Ilari: only to authenticate the refs23:30
← qzg left23:30
→ qzg joined23:30
Ilari Since server dumps the refs anyway before it even listens what the client has to say. And that can be cached.23:32
← mikey_p left23:32
Ilari And if needed objects are obtained from mirrors, the process can be stopped after the mirror that sent the last needed bits.23:32
mugwump sjain: there's a todo list for that submission at http://exporty-bot.appspot.com/export?waveId=googlewave.com!w%252BX89ak6dHA - see if you can understand them23:32
← ntoll left23:33
mugwump Ilari: yes it can be cached, but you still need a way to prove that the response came from the server in question23:34
eg, via signing the list of refs23:35
← qzg left23:35
← Textmode left23:35
mugwump in principle that also lets you push to mirrors23:35
→ spat joined23:36
mugwump ... but one step at a time :-)23:36
Ilari mugwump: You are planning to put some signature algo to Git itself?23:36
mugwump just re-use pgp like in tags23:36
← disappearedng left23:37
← disappearedng_ left23:37
mugwump Ilari: originally I imagined such objects to look like this: http://utsl.gen.nz/gitweb/?p=perl-soyesterday;a=tag;h=seed23:39
and that 'git push' would create them, asking you to sign the new object23:39
← mjf left23:41
→ webchick joined23:41
ProLoser|Trmnl hallo23:41
all my files have been staged because i think their chmod changed23:41
old mode 10064423:42
new mode 10075523:42
how can i change it back?23:42
→ aryounce joined23:42
cbreak git doesn't track permissions I think, just executability23:42
mugwump ProLoser|Trmnl: you could set core.filemode to false23:42
cbreak did you +x them?23:42
mugwump ProLoser|Trmnl: see man git-config23:42
← rgr left23:42
Gitbot mugwump: the git-config manpage can be found at http://git.or.cz/man/git-config23:42
ProLoser|Trmnl i don't remember what i did23:42
← aryounce left23:42
→ rgr joined23:43
ProLoser|Trmnl sometimes i set full permissions on the whole app cuz the damn application needs to be able to create folders23:43
← novas0x2a left23:43
ProLoser|Trmnl but i don't really care for any of that to be tracked23:43
however i normally DO want to track permissions, so i don't want to change git's settings23:43
mugwump sounds like core.filemode is for you23:43
cbreak sounds like the app sucks23:43
ProLoser|Trmnl well i shoulda just set the permissions to the tmp dir23:43
mugwump ProLoser|Trmnl, yes selective perms are better23:44
ProLoser|Trmnl but i've been having issues elsewhere and changed it app-wide so i didn't have to deal with it23:44
mugwump otherwise you open yourself up for nasty attack vectors23:44
→ juan_arandaalvar joined23:44
ProLoser|Trmnl well how do i change it back?23:44
i'm a bash noob23:44
cbreak chmod -R ugo=23:44
→ xer0x joined23:44
ProLoser|Trmnl chmod -R 100644 . doesn't seem to work23:44
cbreak that removes all permissions for everyone23:45
(but that's probably not what you want23:45
ProLoser|Trmnl but then i won't even be able to get into the folder or git23:45
cbreak since yes, indeed23:45
mugwump eg, chmod -R a+rX,og-w,u+w .23:45
then find . -type f -print0 | xargs -0 chmod -x23:45
ProLoser|Trmnl mugwump: chmod: .: Permission denied23:45
mugwump then see what 'git status' says23:45
try '*' instead of '.'23:46
ProLoser|Trmnl permission denied23:46
← thiago_home left23:46
ProLoser|Trmnl should i go up one folder (out of the repo) and do it to the folder itself?23:46
mugwump this is unix basics really23:46
cbreak if you don't have the permissions23:48
ProLoser|Trmnl i'm a windows user natively :)23:48
cbreak then you can't change it23:48
ProLoser|Trmnl so what if i do sudo command23:48
cbreak it's much much worse on windows23:48
mugwump ProLoser|Trmnl: you can use sudo chown -R username .23:49
ProLoser|Trmnl i did sudo chmod -R a+rX,og-w,u+w . but it still wants to version everything23:49
mugwump then the above commands will work23:49
ProLoser|Trmnl oh23:49
mugwump this is resetting to sensible permissions23:49
the other find command turns off the execute bit23:50
presumably you did something like chmod -R 777 .23:50
← juan_arandaalvar left23:50
ProLoser|Trmnl do i need username?23:50
mugwump when what you meant was a+w23:50
username is the user who should own the content23:50
ProLoser|Trmnl uh23:51
mugwump normally that's the user you're using23:51
ProLoser|Trmnl okay23:51
sudo chown -R Dean .23:51
i did that23:51
mugwump sometimes you set up a group, in which case you need g+w and also to use g+s on the directories23:51
← kukks left23:51
ProLoser|Trmnl git status still ooks like it's looking at everything23:51
mugwump use the find command23:52
ProLoser|Trmnl find . -type f -print0 | xargs -0 chmod -x ?23:52
← DrNick left23:52
mugwump right23:52
the first part returns all of the files in the directory23:52
'find . -type f'23:52
→ mithro joined23:53
mugwump you pipe that to 'xargs', which passes them as arguments to 'chmod -x'23:53
ProLoser|Trmnl looks like that worked23:53
mugwump try putting 'echo' before the 'chmod' to understand it better23:53
ProLoser|Trmnl git doesn't track folder permissions, does it23:53
offby1 nope23:53
mugwump no, it doesn't23:53
ProLoser|Trmnl then maybe i should disable mode tracking for git23:53
offby1 the only metadata that it tracks is the executable bit, and another bit that says if the thing is a symlink or not23:54
ProLoser|Trmnl that's the only time i care about permissions23:54
→ LeLutin joined23:54
ProLoser|Trmnl is wether or not you can create files in a folder23:54
i take it git can't track that, right?23:54
mugwump no, but you can .gitignore directories you don't want to track23:55
and make them writable, eg chmod a+w tmp23:55
ProLoser|Trmnl alright i guess i'll disable mode tracking then23:55
git config core.filemode = false ?23:56
mugwump no '='23:56
ProLoser|Trmnl sweet23:56
waitdoes that set it globally for git, or jus tthat repo?23:57
cbreak if you want it globally, use -g23:57
mugwump try reading 'man git-config', the information is there23:57
Gitbot mugwump: the git-config manpage can be found at http://git.or.cz/man/git-config23:57
cbreak globally means user account wide23:57
mugwump thanks Gitbot23:57
→ engla joined23:57
ProLoser|Trmnl i'm reading it, it doesn't specify the parameter order23:57
does it matter where i put -g23:58
ah got it23:58
danke23:58
i had to use --global not -g23:59
engla annoying thing with git am: even when used with only one patch, and it fails because of some condition (unclean index etc), it still is stuck in the "AM" state and I have to say git am --abort. it shouldn't be in some state after an early error23:59
mugwump the more man pages you read, the easier it gets23:59
ProLoser|Trmnl heh ya, the manual has it's own language un to itself23:59
i'm still learning bash for my mac23:59

Logs Search ←Prev date Next date→ Channels Documentation