| 2011-01-02 |
| → phaedrix joined | 00:00 |
| ← ZoeB left | 00:00 |
| → normanrichards joined | 00:00 |
| → noahcampbell joined | 00:00 |
| ← _inc left | 00:00 |
| ← chrischambers left | 00:02 |
| → _inc joined | 00:04 |
| ← napster_123 left | 00:08 |
| ← amerine left | 00:09 |
| → chrischambers joined | 00:09 |
| → Cromulent joined | 00:17 |
| → ketas joined | 00:20 |
| ← masonkramer left | 00:29 |
| → masonkramer joined | 00:29 |
| → eletuchy joined | 00:33 |
| ← marioxcc left | 00:33 |
| ← Mage left | 00:35 |
| ← marsilainen left | 00:35 |
| ← txomon left | 00:36 |
| → Adaptee joined | 00:39 |
| → linusoleander joined | 00:39 |
| → davetoo joined | 00:40 |
|
davetoo
| What is git-svn ignore-paths actually supposed to accomplish? | 00:40 |
| → justin-george joined | 00:41 |
| ← stephan48 left | 00:42 |
| → ^Simon^ joined | 00:51 |
|
^Simon^
| Anyone know if gitolite config can have the comments anywhere or if they have to be at the end of a block? | 00:52 |
|
| converting from gitosis and the convert script put the comment at the end | 00:52 |
|
| repo test | 00:52 |
|
| RW = simon | 00:52 |
|
| # this is a test repo | 00:52 |
| → CarlFK joined | 00:52 |
|
^Simon^
| nvm | 00:53 |
| → DaveIngram joined | 00:54 |
| ← davetoo left | 01:06 |
|
^Simon^
| Looks like sitaram just got another convert from gitosis :) everything appears to be working fine. | 01:06 |
| → Slix` joined | 01:07 |
| ← ^Simon^ left | 01:07 |
| → Cro_Crx joined | 01:10 |
| ← noahcampbell left | 01:10 |
| ← CarlFK left | 01:10 |
| ← Cromulent left | 01:13 |
| Unknown[NF] → Unknown[OFF] | 01:15 |
| → linusoleander_ joined | 01:20 |
| ← linusoleander left | 01:21 |
| linusoleander_ → linusoleander | 01:21 |
|
sitaram
| :) | 01:25 |
| → MikhX_ joined | 01:26 |
| ← MikhX left | 01:26 |
| MikhX_ → MikhX | 01:26 |
| ← d0k left | 01:26 |
| ← robotarmy left | 01:27 |
| ← nixbox left | 01:30 |
| → angelsl joined | 01:38 |
| → brendon joined | 01:41 |
| ← khmarbaise left | 01:41 |
| ← MikhX left | 01:42 |
| ← rsewill left | 01:44 |
| → Cromulent joined | 01:47 |
| ← linusoleander left | 01:47 |
| ← icwiener left | 01:54 |
| ← tewecske left | 01:56 |
| → Bass10 joined | 02:00 |
| ← Bass10 left | 02:01 |
| → Bass10 joined | 02:02 |
| → _waseem joined | 02:02 |
| ← _waseem left | 02:02 |
| → _waseem joined | 02:02 |
| ← _waseem left | 02:02 |
| ← frakturfreak left | 02:04 |
| ← chrischambers left | 02:09 |
| ← vitor-br left | 02:11 |
| → simplechat joined | 02:14 |
| → frakturfreak joined | 02:16 |
| → MikhX joined | 02:22 |
| → Vampire0_ joined | 02:28 |
| ← Vampire0 left | 02:31 |
| ← ExtraSpice left | 02:33 |
| → scorp007 joined | 02:33 |
| ← nchaimov left | 02:33 |
| ← Schmallon left | 02:38 |
| → vitor-br joined | 02:38 |
| ← Cro_Crx left | 02:39 |
| → Cro_Crx joined | 02:40 |
| ← darthdeus left | 02:41 |
| → flaguy48 joined | 02:42 |
| → nchaimov joined | 02:50 |
| → karpar joined | 02:54 |
| ← adamm left | 02:54 |
| ← Determinist left | 03:03 |
| → kukks joined | 03:03 |
|
sadmac
| Is there a way to have git pull with no arguments and git push with no arguments act on different urls? | 03:07 |
|
| i.e. pull from git://foo by default and push to ssh://bar by default | 03:07 |
| ← Cromulent left | 03:08 |
|
sadmac
| never mind I think I found it | 03:09 |
|
rudi_s
| sadmac: How? | 03:09 |
|
sadmac
| rudi_s: git remote set-url --push | 03:09 |
|
rudi_s
| sadmac: Thanks. | 03:09 |
| ← Amorphous left | 03:15 |
| ← Casmoo left | 03:15 |
| → bcardarella joined | 03:15 |
| → Elfe joined | 03:18 |
| ← Elfe_ left | 03:20 |
| ← sivy left | 03:20 |
| → alester joined | 03:25 |
| → davetoo joined | 03:26 |
| → tty1 joined | 03:27 |
|
tty1
| charon, hey, you around yet? wanted to discuss the email (no rush if your busy) | 03:27 |
| ← DaveIngram left | 03:27 |
| → Amorphous joined | 03:29 |
| ← vitor-br left | 03:30 |
| ← flaguy48 left | 03:33 |
| ← serard left | 03:34 |
| ← _inc left | 03:45 |
|
davetoo
| The font used in Scott's Peepcode PDF is horrible for a book | 03:49 |
| ← justin-george left | 03:55 |
| ← jsoft left | 03:58 |
| ← alip left | 04:06 |
| ← alester left | 04:06 |
| → alester joined | 04:07 |
| ← alester left | 04:07 |
| → alip joined | 04:08 |
| → fowlduck joined | 04:08 |
| ← Bird|ghosted left | 04:10 |
| → jsoft joined | 04:24 |
| ← loincloth left | 04:26 |
| → dxman joined | 04:27 |
| ← dxman left | 04:28 |
| → alester joined | 04:28 |
| ← jfkw left | 04:33 |
| → robotarmy joined | 04:39 |
| ← davetoo left | 04:40 |
| → gilaniali joined | 04:45 |
| ← orafu left | 05:01 |
| → orafu joined | 05:01 |
| ← unixtippse left | 05:05 |
| → unixtippse joined | 05:06 |
| → webPragmatist joined | 05:12 |
|
webPragmatist
| how can i diff a file with the current master version (diff local changes) | 05:13 |
| → ceej joined | 05:25 |
|
Mage_Dude
| webPragmatist: You get it yet? | 05:31 |
|
webPragmatist
| ya | 05:31 |
| ← amerinese left | 05:39 |
| ← unixtippse left | 05:40 |
| → unixtippse joined | 05:40 |
| ← Mage_Dude left | 05:43 |
| ← Bass10 left | 05:45 |
| ← kukks left | 05:45 |
| → Mage_Dude joined | 05:50 |
| → noktoborus_ joined | 05:51 |
| ← noktoborus left | 05:52 |
| ← aah left | 05:54 |
| ← gilaniali left | 05:56 |
| → zombor joined | 06:00 |
| ← karpar left | 06:03 |
| ← Revision17 left | 06:03 |
| → urbanmonk joined | 06:14 |
| ← alester left | 06:20 |
| ← ceej left | 06:34 |
| → maleknet joined | 06:36 |
| ← sraue left | 06:38 |
| ← eno left | 06:51 |
| → eno joined | 06:53 |
| → sraue joined | 06:54 |
| ← fowlduck left | 06:55 |
| ← webPragmatist left | 06:56 |
|
hyperair
| is there a way to use git stash in a script? | 07:08 |
|
| or rather, i'm trying to have my script switch to a (possibly different) branch, do stuff, and then switch back | 07:08 |
|
| it needs to also take care of uncommitted changes | 07:09 |
|
| hyperair wishes there was a way to properly interface with git that didn't involve screen scraping | 07:11 |
|
tango_
| hyperair: git stash; switch branch ; git stash pop | 07:12 |
|
| what do you mean by screen scraping? parsing script output? | 07:13 |
|
hyperair
| tango_: that doesn't handle the case where the tree was clean | 07:13 |
|
| i guess i should test for cleanliness before stashing | 07:13 |
|
| and then pop after | 07:13 |
|
| tango_: i'd like something more like this though: git stash; switch branch; do stuff; switch back to orig branch; git stash pop | 07:13 |
|
| tango_: or better yet, if i can access submodules of another branch without needing to switch, that would be great | 07:14 |
|
tango_
| hyperair: yah, that's what I meant | 07:14 |
|
| hyperair: depending on what you need, it might be possible | 07:14 |
|
| although I don't know about submodules much | 07:15 |
|
hyperair
| tango_: i need something like git archive-all | 07:15 |
|
| tango_: basically i need to recursively git archive and combine the tarballs | 07:15 |
|
tango_
| hyperair: I honestly have no idea how you could do that including submodules, sorry. as I said, I really don't know much about them | 07:20 |
|
hyperair
| tango_: thanks anyway. | 07:20 |
|
| i guess i'll go for the branch switching approach | 07:21 |
|
| tango_: is there a simple way i can get the current branch? | 07:21 |
| ← brendon left | 07:21 |
|
tango_
| hyperair: probably git name-rev HEAD | 07:27 |
|
| but that would find more names than just the branch | 07:28 |
|
| hm | 07:28 |
|
| git branch | grep -E '^* ' | cut -f2- -d' ' ? 8-D | 07:28 |
| ← robotarmy left | 07:29 |
|
tango_
| hyperair: git symbolic-ref HEAD (gives you the whole refs/heas/... ref) | 07:29 |
| ← Slix` left | 07:30 |
| → TML joined | 07:30 |
| → Mage joined | 07:30 |
|
tango_
| hyperair: I suggest looking at the bash completion script for git to find a couple of trickson how to tell if the tree is dirty or not, too | 07:30 |
|
hyperair
| tango_: ah okay, thanks. | 07:43 |
|
divVerent
| 08:29:43 tango_ | hyperair: git symbolic-ref HEAD (gives you the whole refs/heas/... ref) | 07:57 |
|
| unless HEAD is detached :P | 07:57 |
|
hyperair
| divVerent: right. | 07:57 |
|
divVerent
| I ended up using | 07:57 |
|
| git symbolic-ref HEAD || git rev-parse --short --verify HEAD | 07:57 |
|
| as part of my bash prompt | 07:57 |
|
| name-rev is... bad, it may show a different branch just because the current commit is in two branches | 07:58 |
|
hyperair
| heh | 07:58 |
|
| i see. | 07:58 |
|
| how about symbolic-ref HEAD || git name-rev? | 07:58 |
|
divVerent
| (sometimes I work intentionally on a detached head) | 07:58 |
|
hyperair
| =p | 07:58 |
|
| yeah, so do i | 07:58 |
|
divVerent
| that will use name-rev | 07:58 |
|
| e.g. after git checkout HEAD^0, you are in detached head state | 07:59 |
|
| but git name-rev will show master again | 07:59 |
|
hyperair
| mine's git symbolic-ref HEAD | sed -e 's,refs/heads/,,' || nothing | 07:59 |
|
divVerent
| hyperair: yes, that sed then comes too | 07:59 |
|
| export PS1='\[\e[0;1m\][\[\e[0m\]\u@\h\[\e[0;1m\] \[\e[0;1;33m\]\W`{ git symbolic-ref HEAD || git rev-parse --short --verify HEAD; } 2>/dev/null | sed "s/^\(refs\/heads\/\)\?\(.*\)/\[\e[0;1m\] -> \[\e[0;1;35m\]\2/"`\[\e[0;1m\]]\$\[\e[m\] ' | 07:59 |
|
| to be specific :P | 07:59 |
|
hyperair
| git symbolic-ref HEAD 2> /dev/null | sed -e 's/refs\/heads\///; s/^/ [/; s/$/]/;' | 07:59 |
|
| oh i used a function for mine | 08:00 |
|
divVerent
| I just still want to show something sensible even if I am on detached head, as I sometimes do that | 08:00 |
|
hyperair
| hmm it's an interesting approach. | 08:00 |
|
| i'll try that | 08:00 |
|
divVerent
| I mainly do that when doing temporary changes not meant to be ever pushed | 08:00 |
|
| to prevent me from accidentally uploading them :P | 08:00 |
|
| (and when I later decide otherwise, it's still easy to reset master to them) | 08:01 |
|
hyperair
| i see. | 08:01 |
|
| i've recently taken to using git remote show origin and pushing only what i want to push | 08:01 |
|
divVerent
| e.g. my release build script can merge extra topic branches into daily test builds | 08:01 |
|
| it does that merge in detached head state | 08:01 |
|
| to prevent me from accidentally poushing that merge :P | 08:01 |
|
| as I sometimes also do work on that checkout when it is currently not building | 08:02 |
|
hyperair
| hmm you can merge in detached head state? | 08:02 |
|
| that's interesting | 08:02 |
|
divVerent
| of course | 08:02 |
|
hyperair
| i'll take that into consideration | 08:02 |
|
divVerent
| although, one SHOULD only merge named branches, not commit hashes | 08:02 |
|
hyperair
| i'm working on my own test build script | 08:02 |
|
divVerent
| or the commit message gets useless :P | 08:02 |
|
| but what you merge INTO can be a named branch | 08:03 |
|
| *a detached head | 08:03 |
| → dools joined | 08:03 |
|
hyperair
| the current version i'm using is at http://people.ubuntu.com/~hyperair/prepare-bansheedaily, but it's not good enough (need to generate extensions as well) | 08:03 |
| ← zombor left | 08:03 |
|
hyperair
| s/test build/daily build/ | 08:03 |
| → napster_123 joined | 08:05 |
| → dr_win joined | 08:16 |
| → doener joined | 08:29 |
| → lagrande joined | 08:32 |
| → accel joined | 08:47 |
|
accel
| anyone here tried pit with git ? | 08:47 |
|
| anyone here tried pit with git? | 08:48 |
|
sitaram
| what is it? | 08:48 |
|
accel
| https://github.com/michaeldv/pit | 08:48 |
| → toabctl joined | 08:51 |
| → guardian joined | 08:52 |
| ← toabctl left | 08:53 |
| → ExtraSpice joined | 08:59 |
| ← alip left | 09:00 |
| → alip joined | 09:01 |
| Unknown[OFF] → Unknown[NF] | 09:07 |
| ← ExtraSpice left | 09:07 |
|
lagrande
| how would I use git filter-branch to purge all files except certain files? | 09:09 |
| → ExtraSpice joined | 09:10 |
| → KiiK joined | 09:15 |
|
KiiK
| how to set git diff --no-prefix forever ? ( Ive tried git config diff.noprefix true, and don't working) | 09:16 |
| ← ExtraSpice left | 09:20 |
|
doener
| lagrande: --index-filter "git rm --cached '*'; git reset \$GIT_COMMIT -- <certain_files>" should do | 09:20 |
| ← Mage left | 09:20 |
| ← accel left | 09:22 |
| → khmarbaise joined | 09:25 |
| ← alip left | 09:32 |
| → alip joined | 09:33 |
| → napster_123_ joined | 09:33 |
| ← napster_123 left | 09:36 |
| napster_123_ → napster_123 | 09:36 |
|
lagrande
| doener: hmm, that seems to delete everything | 09:39 |
| → TheFox21 joined | 09:41 |
| → henrikbjorn joined | 09:48 |
| → tewecske joined | 09:52 |
| ← lagrande left | 09:54 |
| → tizbac joined | 10:00 |
| ← shine-neko left | 10:06 |
| ← tewecske left | 10:27 |
| ← alip left | 10:32 |
| ← MikhX left | 10:32 |
| → alip joined | 10:35 |
| → Schmallon joined | 10:36 |
| ← Adaptee left | 10:45 |
| → shreef joined | 10:46 |
|
shreef
| any one using git-svn daily? | 10:47 |
|
sgronblo
| KiiK: I just created a shell alias gd which expands to git diff --no-prefix | 10:48 |
|
shreef
| any one having problems with empty directories after running "git svn rebase" | 10:51 |
| → duckinator joined | 10:52 |
| → ch077179 joined | 10:52 |
| ← Unknown[NF] left | 10:52 |
| → zorzar_ joined | 10:53 |
| → rseifert joined | 10:54 |
| ← zorzar left | 10:55 |
|
KiiK
| sgronblo, just install a new version. it works. thanks for your reply :) | 11:00 |
| ← shreef left | 11:03 |
| → Oxyde joined | 11:03 |
| ← KiiK left | 11:04 |
|
Oxyde
| Hi, 'git blame' correctly ignores whitespace change commits, anyway to ignore newline commits too? | 11:06 |
| → Adaptee joined | 11:09 |
| ← workmad3 left | 11:10 |
| → workmad3 joined | 11:10 |
| ← napster_123 left | 11:11 |
| → linusoleander joined | 11:12 |
| ← hobodave left | 11:19 |
| → shreef joined | 11:20 |
| ← alip left | 11:20 |
| noktoborus_ → noktoborus | 11:21 |
|
charon
| Oxyde: since each line takes blame separately, isn't ignoring inserting/removing newlines equivalent to simply not blaming them? | 11:22 |
| ← linusoleander left | 11:23 |
| ← eletuchy left | 11:24 |
| → eletuchy joined | 11:24 |
| → alip joined | 11:24 |
| → reecefowell joined | 11:25 |
|
reecefowell
| if i want to add new files to my git repo, but i don't want to specify them all, can i just do git add ./* or what would be the equivalent? i want it to recursively add stuff through all the dirs | 11:26 |
|
| and sub dirs | 11:26 |
|
scorp007
| git add . | 11:26 |
|
reecefowell
| thanks | 11:26 |
|
Oxyde
| charon: how do you not blame them? | 11:26 |
|
charon
| Oxyde: er, if you really want to go there: grep -v '^$' file | git blame --contents - file | 11:27 |
|
| Oxyde: i doubt your motives, though. what is this supposed to be good for? | 11:28 |
| → darthdeus joined | 11:28 |
|
Oxyde
| charon: I want to do a whitespace (including newlines) only change to a xml file, but I don't want to be blamed for the word wrapping | 11:29 |
| → mhiku joined | 11:29 |
| ← mhiku left | 11:30 |
|
charon
| Oxyde: eh? | 11:30 |
|
| if you want to get better blames for xml files, you could make a textconv filter that canonically wraps the file | 11:30 |
|
| (presumably in more places than your xml producer would) | 11:30 |
|
| also, take a LART stick to the person who decided to use xml as a human-readable format | 11:30 |
| ← doener left | 11:31 |
| → doener joined | 11:31 |
| ← Adaptee left | 11:31 |
|
charon
| if you go the textconv way and use blame a lot, you might also want to use the textconv cache support | 11:32 |
|
Oxyde
| charon: I see, I'm reading into git & textconv now | 11:33 |
| → _sh3 joined | 11:37 |
| → Anubisss joined | 11:41 |
| → Cromulent joined | 11:42 |
| → hobodave joined | 11:45 |
| ← Oxyde left | 11:47 |
| ← neilkod left | 11:48 |
|
charon
| tty1: now i'm here ;) | 11:58 |
|
bremner
| two chips, passing in the night... | 11:59 |
| ← Cromulent left | 12:00 |
|
charon
| at least with ships you know that they're in the same timezone ;) | 12:01 |
| → bentob0x joined | 12:02 |
| ← OOPMan left | 12:05 |
|
tty1
| charon, i still beleive time is all a lie, these people on the west coast keep claiming time is 4 hours earlier there, one day i went all the way out there to find out time seemed perfectly the same there as it was here! all a lie i tell ya, they claim its still bright there at 9pm at night, but their all just lieing to ya | 12:07 |
|
| I was there, it wasnt dark at 9pm at all! | 12:07 |
|
| But i gotta say, people are really commited to the lie! | 12:08 |
| ← workmad3 left | 12:13 |
|
charon
| tty1: so, i take it you had some questions about the filter-branch stuff? | 12:15 |
|
tty1
| charon, well im a bit confused in general, like i dont even know what mailing list i was put on for starters :) | 12:16 |
|
charon
| tty1: oh you weren't. we have this great habit of cc'ing everyone involved in the thread. so by putting the list on cc, i basically threw it up for discussion and you got the replies of j6t too | 12:17 |
|
| (i'm a bit torn on his comment that it should be an index-filter example, but meh) | 12:17 |
|
tty1
| charon, ahh ok, linus did that once when i was contributing to a linux kernel patch, i was a bit suprised to get a bunch of emails from linux in my email box all of a sudden with him asking me questions :) lol | 12:18 |
| → workmad3 joined | 12:18 |
|
tty1
| charon, the other thing that im not sued to is that he diffs seeme to be embeded as text int he email, rather than an attachment... i assume these are so i can patch git.git, however wont that screw up EOL characters as well as tabs vs space? (not that it should matter i guess, but still) | 12:19 |
|
charon
| tty1: no, if you send them out with git-send-email or otherwise ensure your MUA doesn't mess with the whitespace, it will get through alright | 12:20 |
|
| tty1: the format is such that you can save the mails to one or several mbox files, and then run git am <files> | 12:21 |
|
tty1
| charon, ahh thats a git thing, yea i think i remember reading about that deature breifly | 12:21 |
|
charon
| tty1: it's far easier to review the patches this way (as opposed to attachments or pull requests) | 12:22 |
|
tty1
| charon, ahh i seenot as ideal here because my mail client is on a windows box and the git i usually play with is on my linux box however .. but i suppose it wont be too hard to work them regardless.. i just i can just copy and paste the contents over or something | 12:22 |
|
| charon, by the way, what mailing list is this anyway? | 12:22 |
|
charon
| tty1: hrm, c&p has a tendency to screw with whitespace especially on windows. it's probably better if you use the "save" feature or whatever you have to export them to an mbox file | 12:23 |
|
| it's "the" git list, as in the only one that is used by both users and developers | 12:23 |
|
tty1
| charon, ahh, are you a git dev then? | 12:24 |
|
| charon, official dev i mean | 12:24 |
|
charon
| tty1: er, nobody except junio (i guess) is "official" | 12:25 |
|
tty1
| charon, i have no idea how the git dev's even structure themselves really | 12:26 |
|
charon
| but yeah, run 'git shortlog -sn' in a git tree and you'll get the idea of who is a regular contributor | 12:26 |
| → xiangfu joined | 12:27 |
|
charon
| we just send patches to junio cc the list, and see what happens ;) | 12:27 |
|
tty1
| charon, ahh so your in there a decent bit i assume :) just curious as to what was going on, hehe needed to get my bearings. | 12:27 |
| ← masonkramer left | 12:29 |
| → masonkramer joined | 12:29 |
|
tty1
| charon, ok so now to the meat and potatoes, should i be applying this to git.git, is there a specific vbersion, and is it ok to apply it to the version with --split-submodule patched on? | 12:30 |
| → sivy joined | 12:32 |
|
charon
| tty1: i think you'll get conflicts in the option parser if you patch it on top of --split-submodule, but since it's just added features they should be easy to resolve | 12:32 |
|
tty1
| charon, well to be honest i dont really need the --split-submodule feature anymore after i split up a few more repos, so thats not a huge deal.. but im not ready to wipe that jsut yet as i still need it.. which may make installing this new patch hard as i cant replace the old version just yet | 12:33 |
|
charon
| tty1: conflict resolution is indeed simple, but not quite trivial as you need to make sure ;; and fi are correctly doubled | 12:36 |
|
| tty1: here's a resolution (untested): git://repo.or.cz/git/trast.git t/gfb-both-submodule-features | 12:36 |
|
tty1
| charon, i havent seent he conflict yet, but ther eis a good chance it will be straight forward | 12:36 |
|
charon
| oh hrm | 12:38 |
|
| tty1: i forgot to rebase the submodule-filter series on top of something official first, so that also gets you a few patches not in mainline yet | 12:38 |
|
tty1
| charon, hehe your killin me here :) | 12:39 |
|
charon
| tty1: see, that's why you should learn how to apply patches yourself ;) | 12:42 |
|
tty1
| charon, hehe yea i am sure i can handle it, i am a professional programmer after all :) | 12:42 |
| → nagnatron joined | 12:45 |
| → vitor-br joined | 12:50 |
| ← xiangfu left | 12:55 |
| ← ptl left | 13:00 |
| → chrischambers joined | 13:03 |
| → Casmoo joined | 13:09 |
| → napster_123 joined | 13:11 |
| → [Po]lentino joined | 13:12 |
| → OOPMan joined | 13:20 |
| ← sivy left | 13:25 |
| → bemson joined | 13:28 |
|
bemson
| I just pushed my repo to github, but it won't show any commits after a reversion I did last week | 13:28 |
|
cbreak
| how did you push? | 13:29 |
|
bemson
| I did "git push origin master" a few times | 13:29 |
|
cbreak
| pastebin the output of git status | 13:29 |
|
| oh, and the output of git remote -vv | 13:29 |
|
bemson
| scrolling through the output now | 13:29 |
|
| http://pastebin.com/B3WdakUE | 13:30 |
|
| what does "git remote -vv" do? | 13:31 |
|
tango_
| spout lots of info about the remotes | 13:32 |
|
cbreak
| send me your bank account details | 13:32 |
|
bemson
| well, it didn't seem to spout out much - http://pastebin.com/dgNrHF13 | 13:32 |
|
| Well, github is showing _something_ | 13:33 |
|
cbreak
| and now git status | 13:33 |
|
bemson
| After the first push, I deleted a file and pushed again, but the file is still there | 13:33 |
|
cbreak
| yeah, you have to commit the deletion | 13:33 |
|
bemson
| git status -> "nothing to commit" | 13:33 |
|
| I did that too and pushed it - but github doesn't show anything past the reversion | 13:34 |
|
cbreak
| so, you still didn't tell me if you are on master | 13:35 |
|
bemson
| yes, no branches, tags or anything fancy | 13:35 |
|
cbreak
| no branches? so you're not on master | 13:35 |
|
bemson
| no I am - it's whatever the default setup is | 13:35 |
|
| I did this before with a different repo, the only difference (ie. clue) is that it falls off a cliff after the reversion (on github) | 13:36 |
|
cbreak
| so, what happens if you do git push origin master? | 13:36 |
|
| it says nothing to push? | 13:36 |
|
bemson
| locally, the log shows everything just fine | 13:36 |
|
| yes | 13:36 |
|
cbreak
| git log shows what you think it should? | 13:36 |
|
bemson
| yes | 13:36 |
| ← [Po]lentino left | 13:36 |
|
bemson
| maybe I should kill the remote on git? And start a new local git? | 13:37 |
|
| It _is_ my first commit (on github) afterall | 13:37 |
|
| The project is just starting, so I would only lose on a few commits before version 1.0 | 13:37 |
|
cbreak
| you can have as many remotes as you want | 13:37 |
|
bemson
| that way the reversion won't be there - and it might work normally | 13:38 |
|
cbreak
| and as long as you have one git repository, you don't lose anything | 13:38 |
|
bemson
| yes but it seems the reversion is getting in the way with this remote | 13:38 |
|
cbreak
| no | 13:38 |
|
| I have no idea what happens, but revisions getting in the way? That makes no sense. | 13:38 |
| → linusoleander joined | 13:38 |
|
cbreak
| have you tried to clone from github and look at the history that way? | 13:39 |
|
| maybe their web interface is weird. | 13:39 |
|
bemson
| so clone my own repo on git hub? | 13:39 |
|
cbreak
| yeah | 13:40 |
| → Zephyrus joined | 13:40 |
|
bemson
| k, I'll have to do it all later - been up all night and happy that _something_ got pushed | 13:40 |
|
| sorta a new years resolution thang | 13:40 |
|
| I'll pick this up tomorrow | 13:40 |
|
| many thanks!! | 13:40 |
|
cbreak
| good luck | 13:41 |
|
bemson
| :-) | 13:41 |
| ← bemson left | 13:41 |
| ← scorp007 left | 13:42 |
| → DaveIngram joined | 13:44 |
| → ThomasLocke joined | 13:49 |
| ← DaveIngram left | 13:50 |
| → d0k joined | 13:51 |
| → graphitemaster joined | 13:54 |
|
graphitemaster
| how can I restore a directory of files with git without touching anything else? | 13:54 |
|
cbreak
| define "restore" | 13:55 |
| → airborn_ joined | 13:55 |
|
cbreak
| you can check out a past version | 13:55 |
|
| but that will just get you the past into the present working directory | 13:55 |
| ← EricInBNE left | 13:55 |
|
graphitemaster
| I made some changes in the source directory that I want to leave alone but I want to revert some stuff from my data directory | 13:55 |
|
| like in svn I can just update the folder instead of everything else it will get the removed files | 13:56 |
|
cbreak
| you can git checkout HEAD:path/to/data | 13:56 |
|
| where HEAD is the revision you want to get the files from | 13:56 |
| airborn_ → airborn | 13:57 |
| → ptl joined | 13:58 |
| → Cromulent joined | 14:00 |
| ← ptl left | 14:01 |
| → Bird|ghosted joined | 14:08 |
| → Bass10 joined | 14:13 |
| ← Bass10 left | 14:21 |
| → timj joined | 14:25 |
| timj → timj__ | 14:31 |
| ← timj__ left | 14:33 |
| → napster_123_ joined | 14:33 |
| ← napster_123 left | 14:35 |
| napster_123_ → napster_123 | 14:35 |
| → Adaptee joined | 14:37 |
| ← unixtippse left | 14:37 |
| → timj joined | 14:38 |
| → albel727_2 joined | 14:38 |
| ← maleknet left | 14:39 |
| → gnif joined | 14:39 |
|
gnif
| hi all | 14:40 |
| ← tty1 left | 14:40 |
|
gnif
| need some assist, I have been developing a branch for XBMC and we are moving the entire project across from svn to git | 14:40 |
|
| i have been using git via the svn plugin | 14:40 |
| ← sraue left | 14:41 |
|
gnif
| my code has been merged with the trunk numerous times which I am told is going to cause issues with applying my changes and retaining commit history | 14:41 |
| ← albel727 left | 14:41 |
| → sivy joined | 14:42 |
|
gnif
| i am still learning git so this confuses me | 14:43 |
|
| https://github.com/xbmc/xbmc/network - AudioEngine is my branch | 14:43 |
| → tty1 joined | 14:45 |
|
tty1
| charon, quick comment/question about the git send mail thing.. any reason it wasnt made into an attachment, the patch filei meant, this way it would be compatible with patch program as-is and i suspect git could still apply the patch by pointing it to the mbox file if it was jsut told how to look inside it for the attachment.. or am i missing its point? | 14:46 |
| → gilaniali joined | 14:47 |
| → napster_123_ joined | 14:51 |
| ← nagnatron left | 14:51 |
| → AlexanderS joined | 14:52 |
| ← albel727_2 left | 14:52 |
| ← tty1 left | 14:52 |
| → albel727_2 joined | 14:52 |
| ← napster_123 left | 14:53 |
| napster_123_ → napster_123 | 14:53 |
|
tango_
| tty234: assuming you are tty1, send-mail inlines patches because that's better for review _and_ it can be applied directly with git am | 14:53 |
| → sraue joined | 14:54 |
| → jefferai joined | 15:00 |
| ← ThomasLocke left | 15:02 |
| → ThomasLocke joined | 15:03 |
| ← OOPMan left | 15:04 |
| → darkredandyellow joined | 15:11 |
| ← airborn left | 15:12 |
| → TLMonitor joined | 15:14 |
| → flaguy48 joined | 15:14 |
| ← guardian left | 15:17 |
| → nagnatron joined | 15:17 |
| → linusoleander_ joined | 15:19 |
| → ods15 joined | 15:20 |
| → OOPMan joined | 15:20 |
|
ods15
| Hi. Could someone clarify for me the difference between "git repack -a" and "-A"? I've read it several times and I'm still confused... | 15:21 |
| ← gilaniali left | 15:21 |
| ← linusoleander left | 15:23 |
| linusoleander_ → linusoleander | 15:23 |
| → _inc joined | 15:25 |
|
sid3k
| guys, what HEAD means? | 15:27 |
| → gilaniali joined | 15:27 |
|
wereHamster
| sid3k: man gitglossary | 15:28 |
|
jast
| sid3k: the 'gitglossary' manpage can be found at http://git.or.cz/man/gitglossary [automatic message] | 15:28 |
| ← gilaniali left | 15:30 |
| ← Cromulent left | 15:30 |
| ← linusoleander left | 15:34 |
|
doener
| ods15: if you have unused objects, -a drops them, but -A leaves them as loose objects (i.e. not in a pack, so "git prune" can remove them later) | 15:44 |
|
| ... well, -ad and -Ad, without -d, they're the same | 15:47 |
|
ods15
| ah, so, "-ad" is the same as "-Ad" plus "prune"? | 15:48 |
| ← flaguy48 left | 15:48 |
|
ods15
| the man page is pretty confusing on this! "-A Same as -a, unless -d is used. Then any unreachable objects in a previous pack become loose, unpacked objects, instead of being left in the old pack." | 15:49 |
| → pyther joined | 15:49 |
|
pyther
| Hi | 15:49 |
|
| Is it possible to see the changes to the code I haven't commited yet? | 15:50 |
|
ods15
| ok, so basically, "-a" and "-A" affect how "-d" behaves - does it delete or keep the unreachable objects... | 15:50 |
| → MattDiPasquale joined | 15:50 |
|
ods15
| pyther, git diff ? | 15:50 |
|
pyther
| ahh nice :) | 15:51 |
|
ods15
| ok, thanks doener ... cya | 15:51 |
| ← ods15 left | 15:51 |
| → flaguy48 joined | 15:52 |
| → timotei joined | 15:53 |
|
timotei
| cbreak: hi there | 15:53 |
|
| remember my problem from yesterday, where I got on the following command "git svn clone http://svn3.xp-dev.com/svn/gitsvn_test/ dga34as" the error: RA layer request failed: PROPFIND request failed on '/svn/gitsvn_test': PROPFIND of '/svn/gitsvn_test': 403 Forbidden (http://svn3.xp-dev.com) at D:\bin\Git/libexec/git-core/git-svn line 1773 ? | 15:54 |
|
| well, on other windows machines (in VM) it works. but on my current Windows 7 - I tested win xp and win 7 on VM - it doesn't work | 15:54 |
|
cbreak
| weird. | 15:54 |
|
| same git? | 15:54 |
|
timotei
| yep | 15:55 |
|
| I even downloaded the portable one | 15:55 |
|
| and use the same instance | 15:55 |
|
| that line is: | 15:55 |
|
| my $ra = Git::SVN::Ra->new($url); | 15:55 |
|
cbreak
| so it's probably some library/environment/config/windows issue | 15:55 |
|
timotei
| I've read on the web that it may be something with the SVN libs?? | 15:56 |
|
cbreak
| no idea :/ | 15:56 |
|
| I haven't used git svn a lot, and it never gave problems that weren't subversion's fault | 15:56 |
|
timotei
| I guess I'll just send the guys from msysgit an email | 15:56 |
| → ExtraSpice joined | 15:59 |
| → guardian joined | 15:59 |
| ← dr_win left | 16:01 |
| → maleknet joined | 16:01 |
| → juangiordana joined | 16:02 |
| ← timotei left | 16:02 |
| → dr_win joined | 16:04 |
| ← ExtraSpice left | 16:04 |
| ← orafu left | 16:06 |
| → orafu joined | 16:06 |
| → ExtraSpice joined | 16:08 |
| ← flaguy48 left | 16:09 |
| → dharrigan joined | 16:09 |
| ← ExtraSpice left | 16:10 |
| → linusoleander joined | 16:11 |
| ← linusoleander left | 16:14 |
| → loincloth joined | 16:16 |
| → TrineLocke joined | 16:18 |
| → khaije|minder joined | 16:18 |
|
khaije|minder
| using git grep, how would i search the entire project for '*.doc' files? | 16:18 |
|
| oh wait, that a git log question isn't it | 16:19 |
| ← orafu left | 16:19 |
| → orafu joined | 16:19 |
| ← graphitemaster left | 16:20 |
|
cbreak
| current project? | 16:20 |
|
| or history too? | 16:20 |
|
| git ls-files can show you the currently tracked files | 16:20 |
|
khaije|minder
| ya entire history | 16:20 |
|
| i thought, git log --name '*.doc' ,would be it but no... | 16:21 |
| → muneeb joined | 16:21 |
|
khaije|minder
| rather, git log --name-status | 16:21 |
|
cbreak
| git log with --name-only would show all changed files | 16:21 |
|
khaije|minder
| git log --name-only | 16:21 |
|
cbreak
| but you'd have to search the output for the pattern | 16:21 |
|
khaije|minder
| lol wrong window :) | 16:22 |
| ← reecefowell left | 16:24 |
| ← rseifert left | 16:25 |
| ← _Vi left | 16:25 |
| → txomon joined | 16:26 |
| ← maleknet left | 16:27 |
| → maleknet joined | 16:28 |
|
khaije|minder
| i was thinking there was a way to do it entirely in git but that was probably the wrong approach, i ended up do ..$ git log --all --name-only | grep -e ".doc$" | 16:31 |
| ← angelsl left | 16:32 |
| → mmw joined | 16:35 |
| → ceej joined | 16:35 |
| ← eletuchy left | 16:36 |
| ← napster_123 left | 16:36 |
| → eletuchy joined | 16:36 |
| → flo|linux joined | 16:39 |
|
flo|linux
| hi | 16:39 |
|
| can i checkout a certain branch or so and "mount" it somewhere, while not changing my current working tree? | 16:40 |
|
| i'd like dir1/ to contain branch1 and dir2/ branch2. is that possible? | 16:40 |
|
sitaram
| look for "new-workdir" or some such script in contrib in the git sources | 16:41 |
|
bremner
| flo|linux: but be aware there are limitations. | 16:41 |
| → gilaniali joined | 16:41 |
|
wereHamster
| contrib/workdir/git-new-workdir | 16:41 |
|
flo|linux
| bremner, which limitations? | 16:41 |
| ← workmad3 left | 16:42 |
|
cbreak
| I think you can't switch branches in such workdirs | 16:42 |
|
| and I am not sure you can commit from them | 16:42 |
|
| (probably not) | 16:42 |
|
flo|linux
| hrm. commiting from them would rock ^^ | 16:43 |
| → bettsp joined | 16:43 |
|
bremner
| flo|linux: basically, it won't magically turn git's branching model into svn's for you ;) | 16:43 |
|
cbreak
| just git clone then | 16:43 |
|
flo|linux
| svn does this for me :)? | 16:43 |
|
cbreak
| if you want more repositories, just make more | 16:43 |
|
flo|linux
| well... i'm looking for an easy way to do a bugfix in the working branch in the master as well | 16:44 |
|
bettsp
| I just did something dumb - I typed 'git commit -a -m' instead of 'git commit -m'; is there any way to take the latest commit and add it back to my working tree? | 16:44 |
|
wereHamster
| bettsp: git reset HEAD^ | 16:44 |
|
bettsp
| And undo it? I can rebase it away, but it was a big change | 16:44 |
|
flo|linux
| maybe git-stash is the simplest solution for that? | 16:44 |
|
| stash, switch to master, fix, switch to working and unstash? | 16:44 |
|
bremner
| flo|linux: git cherry-pick ? | 16:44 |
|
| or git merge, depending. | 16:45 |
|
bettsp
| flo|linux: can I stash something I already committed? | 16:45 |
|
cbreak
| bettsp: no | 16:45 |
| → engla joined | 16:45 |
|
flo|linux
| well, cherry-picking pr merging doesn't work good, too much changes in the source | 16:45 |
|
cbreak
| bettsp: do what wereHamster told you | 16:45 |
|
bettsp
| cbreak: This brings me back to where I was but loses my changes | 16:45 |
|
flo|linux
| bettsp, git-stash was not said to you ;) | 16:45 |
|
wereHamster
| bettsp: no | 16:45 |
| ← _inc left | 16:46 |
|
wereHamster
| bettsp: your changes remain in the working tree | 16:46 |
|
cbreak
| he didn't say --hard. | 16:46 |
|
bettsp
| wereHamster: I don't believe you but I'll try it anyways :) | 16:46 |
|
cbreak
| you only lose your changes if you do it --hard | 16:46 |
|
wereHamster
| bettsp: what grounds do you have for not believing me | 16:46 |
|
cbreak
| flo|linux: I'd just do the fix in one branch and cherry-pick it to the other | 16:47 |
| → joschi joined | 16:47 |
|
bettsp
| wereHamster: I just don't think I explained what happened clear enough | 16:47 |
|
cbreak
| of course it's cleaner if you can rebase or merge your feature branch | 16:47 |
|
| but if you can't | 16:47 |
| ← joschi left | 16:47 |
|
bettsp
| I committed stuff I didn't want to commit *then*, but eventually *do* | 16:47 |
|
wereHamster
| bettsp: you did a commit, and youw ant to undo it. reset HEAD^ does exactly that | 16:47 |
|
| bettsp: the changes remain in the working tree. YOu can add and commit the changes if you want to | 16:48 |
|
cbreak
| bettsp: go read the man page instead of complaining | 16:48 |
|
bettsp
| cbreak: I'm not complaining, sorry if it came off that way | 16:48 |
|
cbreak
| you either have to believe us, or find it out yourself | 16:48 |
| → joschi joined | 16:48 |
|
bettsp
| cbreak: I just wanted to fully understand what was going on | 16:48 |
|
wereHamster
| bettsp: man git-reset | 16:48 |
|
jast
| bettsp: the 'git-reset' manpage can be found at http://git.or.cz/man/git-reset [automatic message] | 16:48 |
|
cbreak
| reset HEAD^ will nuke away the latest commit from your history | 16:49 |
|
| (and the index) | 16:49 |
|
| it won't touch your working directory | 16:49 |
|
| so all the files that are there will be there and will stay there until something else changes them | 16:49 |
|
bettsp
| cbreak: Okay, but it's still in 'git log', should I use rebase to get rid of it? | 16:49 |
|
cbreak
| no | 16:50 |
|
| git reset will remove it from the history | 16:50 |
|
bettsp
| cbreak: Oh yes, I think you're right | 16:51 |
|
| Thanks a lot for your help, that was easier than I thought it would be | 16:52 |
| → zombor joined | 16:52 |
| → rseifert joined | 16:54 |
| ← dharrigan left | 16:54 |
| → _inc joined | 16:55 |
| ← bettsp left | 16:55 |
| → joel_falcou joined | 16:59 |
| → lresende joined | 17:00 |
| → noahcampbell joined | 17:02 |
| → rgr joined | 17:02 |
| → adamm joined | 17:05 |
| ← Adaptee left | 17:05 |
| → DaveIngram joined | 17:10 |
| → napster_123 joined | 17:11 |
| ← sivy left | 17:12 |
| → Rickardo1 joined | 17:12 |
| → niko joined | 17:13 |
| ← zombor left | 17:13 |
| ← lemonchicken left | 17:13 |
| → flaguy48 joined | 17:16 |
| ← eletuchy left | 17:20 |
| ← simplechat left | 17:20 |
| → zombor joined | 17:21 |
| ← DaveIngram left | 17:22 |
| → icwiener joined | 17:24 |
| ← orafu left | 17:24 |
| → orafu joined | 17:24 |
| → airborn joined | 17:25 |
| → nanotube joined | 17:25 |
| → workmad3 joined | 17:25 |
| ← frakturfreak left | 17:26 |
| → rolfb joined | 17:32 |
| → armence joined | 17:33 |
| → frakturfreak joined | 17:33 |
|
armence
| Whoever wrote the --amend option for git commit, I love you! | 17:34 |
| → WonTu joined | 17:35 |
| ← WonTu left | 17:35 |
| → robotarmy joined | 17:39 |
| → Cromulent joined | 17:40 |
| ← henrikbjorn left | 17:48 |
| ← darkredandyellow left | 17:51 |
| ← robotarmy left | 17:54 |
| ← _inc left | 17:54 |
| → jfkw joined | 17:54 |
| → slaskis joined | 17:55 |
|
slaskis
| i wanted to rename my submodules so i renamed the ones i had in .gitmodules and removed the directories and now i'm trying to reinitialize them but it doesn't seem to do anything | 17:56 |
| → Bass10 joined | 17:57 |
|
cbreak
| you did git submodule sync? | 17:57 |
|
| and git submodule update --init? | 17:57 |
|
| wonder if sync detects removed submodules | 17:57 |
|
slaskis
| cbreak: yes, but it just returns | 17:58 |
| ← Bass10 left | 17:58 |
|
slaskis
| no output | 17:58 |
|
| `git submodule` should list the submodules too right? | 17:58 |
| → Bass10 joined | 17:58 |
|
slaskis
| i'll just re-add them for now | 18:00 |
| ← Zephyrus left | 18:01 |
|
joel_falcou
| i have a remote branch i dont use anymore, how can i delete it ? | 18:02 |
| → DaveIngram joined | 18:05 |
| → ceej_ joined | 18:08 |
| → pantsman joined | 18:09 |
| ← ceej left | 18:10 |
| ceej_ → ceej | 18:10 |
| → thiago_home joined | 18:14 |
| thiago_home → thiago | 18:14 |
| → ilker joined | 18:14 |
| ← niko left | 18:16 |
| ← phaedrix left | 18:17 |
| → niko joined | 18:17 |
|
slaskis
| anyone knows of a handy post push submodule update hook script? | 18:18 |
|
cbreak
| joel_falcou: man git-push, either git push remotename :branchname | 18:19 |
|
jast
| joel_falcou: the 'git-push' manpage can be found at http://git.or.cz/man/git-push [automatic message] | 18:19 |
|
cbreak
| or push -d | 18:19 |
|
| if it's new enough | 18:19 |
| ← gilaniali left | 18:20 |
|
ilker
| hello, i cannot use github. that is error: https://gist.github.com/762708 anyone can tell me the reason why? i had done it at office before. | 18:20 |
| ← Cromulent left | 18:21 |
|
cbreak
| ilker: git remote -vv | 18:22 |
| → phaedrix joined | 18:22 |
| offby1 → rms | 18:24 |
| rms → offby1 | 18:24 |
|
khaije|minder
| ilker: http://alephnullplex.appspot.com/blog/view/2009/10/04/secret-to-github-at-work worked for me under similar circumstances | 18:26 |
| → Slix` joined | 18:26 |
|
khaije|minder
| though i used .ssh/config and msysgit's openssh | 18:27 |
| ← armence left | 18:31 |
| → gilaniali joined | 18:35 |
| → _Vi joined | 18:35 |
| ← Cro_Crx left | 18:36 |
| ← maleknet left | 18:38 |
| → Zephyrus joined | 18:38 |
| → Cro_Crx joined | 18:41 |
| → nohk joined | 18:41 |
| ← nohk left | 18:42 |
| → Cromulent joined | 18:45 |
| ← bentob0x left | 18:46 |
| → Dieterbe joined | 18:46 |
|
Dieterbe
| is there something about .git directories that makes them inherently harder to restore (after being removed) then other files and dirs? | 18:46 |
|
| i'm dealing with a mostly wiped ext4, i can recover a whole bunch of files and directories, but suprisingly the .git dir itself is missing | 18:47 |
|
| which i find interesting | 18:47 |
|
| and it must have an entry in the journal if it got wiped | 18:47 |
| ← gigamonkey left | 18:48 |
| ← lresende left | 18:48 |
| → gigamonkey joined | 18:49 |
|
cbreak
| Dieterbe: .git folders are just normal folders with files in them | 18:50 |
|
| the only thing that could be exotic about them is that some of the files might have multiple files pointing to the same data (aka. be hard linked) | 18:51 |
|
Dieterbe
| uhu | 18:51 |
|
| i guess this is more an ext question then git | 18:52 |
|
cbreak
| maybe your backup program ignored folders/files with a name starting with a dot | 18:53 |
|
Dieterbe
| nah, oh well | 18:54 |
| → elly joined | 18:54 |
| ← workmad3 left | 18:55 |
| ← ft left | 18:55 |
| → ft joined | 18:56 |
| ← pantsman left | 18:57 |
| → maleknet joined | 18:59 |
| ← bcardarella left | 19:01 |
| → armence joined | 19:01 |
|
armence
| So, is there a way to configure git to use different methods for push and pull? I mean, I need ssh to push, but it's annoying to have to enter my passphrase when I pull. I mean, it's a public repo | 19:02 |
| ← napster_123 left | 19:02 |
| → napster_123 joined | 19:03 |
| ← rseifert left | 19:04 |
| → workmad3 joined | 19:06 |
|
Dieterbe
| armence: you could add multiple remotes (same location, but different protocols) | 19:07 |
|
| and btw, setup ssh keypairs | 19:07 |
| → Mage joined | 19:08 |
|
armence
| Dieterbe, I am using a key. But I have a passphrase on the key. So whenever I need to push I have to enter the passphrase to unlock the key, | 19:08 |
|
tlonim
| armence: use a ssh-agent to remember the key | 19:10 |
|
Dieterbe
| yep | 19:10 |
| → babbio joined | 19:12 |
|
armence
| TLMonitor, Well, I don't want ssh-agent to remember the key because I have a tendency to forget to shutdown my laptop and so I want to have to enter my passphrase when I push | 19:12 |
| ← napster_123 left | 19:14 |
|
Dieterbe
| i see, well that's your call | 19:14 |
|
babbio
| Guys I'm new on git and I have a problem, I have a local repository called it "repo" and two local repository named "localA" and "localB"…now in localB I have a source file without some string, if I run "git push origin" it says that everything is up to date. Then if I run "git pull" from localA it says that everything is up to date but in the localA version of the same source file of localB I have the strings I deleted in localB | 19:15 |
|
| what is going wrong? | 19:15 |
| ← rolfb left | 19:16 |
|
tlonim
| armence: or create another remote with same url but with ssh:// and use that url for push | 19:16 |
|
armence
| ok, thanks. | 19:16 |
| ← zombor left | 19:16 |
| ← workmad3 left | 19:17 |
| ← flo|linux left | 19:18 |
| ← muneeb left | 19:19 |
|
txomon
| armence: you are using a ssh protocol to contact the server, so you need autentification, if you don't want it, just use http | 19:20 |
| → napster_123 joined | 19:20 |
|
txomon
| (to pull, obiously) | 19:20 |
|
babbio
| somebody could help me please? | 19:20 |
|
charon
| babbio: lots of reasons are possible. maybe you haven't committed our work yet, or you are misunderstanding the push.default / tracking-branch settings... | 19:22 |
| → drizzd joined | 19:23 |
| → napster_123_ joined | 19:23 |
| ← txomon left | 19:23 |
|
babbio
| I have also use push ssh://repo branch | 19:23 |
| ← khmarbaise left | 19:23 |
| → txomon joined | 19:23 |
|
babbio
| so I should be sure I'm pushing to the remote reposutory…is'n it? | 19:24 |
| ← napster_123 left | 19:24 |
| napster_123_ → napster_123 | 19:24 |
| ← txomon left | 19:25 |
|
babbio
| git status says to me nothing to do so I have commit everything | 19:26 |
| ← drizzd_ left | 19:26 |
| → Rotham joined | 19:28 |
| ← maleknet left | 19:29 |
|
joel_falcou
| cbreak perfect | 19:29 |
| → khmarbaise joined | 19:30 |
| → davetoo joined | 19:31 |
| → sveri joined | 19:34 |
| ← doener left | 19:35 |
|
sveri
| hi there, first of all, i am a bloody noob, regarding git, now, i have a problem, we have two repos, the old svn repo, and a new git repo, our "live" system still runs on a checked out svn repo, we have a gui, who took the svn repo and imported it into the new git repo, but he is not available now, and now its up to me to get the latest svn changes into the git repo, he told me to add a svn block into .git/config and then run git svn rebase, and | 19:46 |
|
| now, my question basically is, how do i get the svn changes into my git repo? | 19:46 |
|
davetoo
| that "gui" no longer works for you? :) | 19:47 |
| ← Cromulent left | 19:47 |
|
sveri
| whups, i meant guy and not gui :D | 19:48 |
|
davetoo
| I'm still trying to figure out git-svn myself, so I'll be interested to see what kind of replies you get | 19:48 |
|
sveri
| davetoo: welcome to the boat | 19:48 |
| → JohnBat26 joined | 19:48 |
| ← slaskis left | 19:49 |
|
davetoo
| is there a section in your .git/config file labeled "[svn-remote "svn"]" ? | 19:50 |
|
sveri
| davetoo: yea, thats the one i added | 19:51 |
|
| and within it the location of the svn repo and infos about tags and branches | 19:51 |
|
davetoo
| added? How did he get the stuff in there ni the first place? | 19:51 |
|
| oh, he just created a git repo from a checked-out svn copy? | 19:52 |
|
sveri
| davetoo: i am not sure how he did it | 19:52 |
|
| he told me to remove the section after the import | 19:52 |
|
davetoo
| sounds pretty hackish | 19:53 |
|
sveri
| yea | 19:53 |
| → napster_123_ joined | 19:53 |
| ← napster_123_ left | 19:53 |
|
davetoo
| Why didn't he want the git repo to track the svn repo when he set it up? | 19:53 |
|
sveri
| jeez, i am not sure if i really want to mess around with all of that | 19:53 |
| ← JohnBat26 left | 19:53 |
|
sveri
| i suspect he has not much knowledge about it either | 19:54 |
| ← noahcampbell left | 19:54 |
| ← armence left | 19:54 |
| ← napster_123 left | 19:55 |
|
davetoo
| What rev number is the svn repo at now? | 19:55 |
|
sveri
| 3202 | 19:56 |
|
davetoo
| I'm importing a large project which is at r25000 or so and it's probably going to take a couple of days :) | 19:56 |
|
sveri
| :D | 19:56 |
|
| sounds like that | 19:56 |
|
| i even found svn2git | 19:56 |
|
| i may even do a completely new git repo | 19:57 |
|
davetoo
| well, with my very limited knowledge, I would be thinking about "starting from scratch" and using git-svn to start a git repo that tracks the svn repo | 19:57 |
|
| and then merge the changes in somehow. | 19:57 |
|
sveri
| somehow sounds hackish too :D | 19:57 |
|
davetoo
| svn2git appears to use git-svn | 19:58 |
| → LauJensen joined | 19:59 |
| ← Zephyrus left | 19:59 |
|
davetoo
| What I'm trying to do is create my own private playground from a public SVN repo of a project I dont' belong to | 19:59 |
|
LauJensen
| Ive accidentally done a soft reset, which has left dirty changes in my working dir. Is there a command to get rid of all uncomitted changes? | 19:59 |
|
davetoo
| so I wont' be writing back to the svn repo | 19:59 |
|
| but I need to stay up to date with it | 20:00 |
|
sveri
| that must work somehow, but, i dont know exactly how too | 20:00 |
|
| but, svn2git seems to be able to do that too: "As of svn2git 2.0 there is a new feature to pull in the latest changes from SVN into your git repository created with svn2git. This is a one way sync, but allows you to use svn2git as a mirroring tool for your SVN repositorie" | 20:01 |
| ← zenom left | 20:01 |
|
LauJensen
| Ive accidentally done a soft reset, which has left dirty changes in my working dir. Is there a command to get rid of all uncomitted changes? | 20:05 |
| ← eno left | 20:07 |
| → zenom joined | 20:08 |
| → eno joined | 20:09 |
| ← _Vi left | 20:09 |
| → _Vi joined | 20:09 |
| → armence joined | 20:10 |
|
davetoo
| (sorry, I don't know) | 20:11 |
| ← orafu left | 20:12 |
| → orafu joined | 20:12 |
|
LauJensen
| git reset --hard HEAD, did the trick | 20:13 |
| ← LauJensen left | 20:13 |
| → _ollie joined | 20:13 |
| → lresende joined | 20:13 |
| ← lresende left | 20:14 |
| → Cromulent joined | 20:18 |
|
davetoo
| git is to svn as a jet RC airplane kit is to tinkertoys | 20:20 |
|
| it seems | 20:20 |
|
ukleinek
| davetoo: if you have a fast hard disk, yes | 20:20 |
|
davetoo
| heh | 20:20 |
| ← _ollie left | 20:21 |
|
davetoo
| well the local SVN mirror I'm cloning from is on a 4-disk RAID-10 array (7200rpm sata2), but the destination is a single disk | 20:21 |
|
| but my point is that I'm a little overwhelmed by all the parts and knobs, still. | 20:22 |
| ← gilaniali left | 20:25 |
| → Unknown[NF] joined | 20:25 |
| → _ollie joined | 20:30 |
| ← tmandry left | 20:34 |
| ← pyther left | 20:36 |
| → rolfb joined | 20:37 |
| ← rolfb left | 20:40 |
| → rolfb joined | 20:40 |
| → werdan7 joined | 20:42 |
| → robotarmy joined | 20:43 |
| ← Rotham left | 20:44 |
| → eletuchy joined | 20:44 |
| → BiggFREE joined | 20:45 |
| → henrikbjorn joined | 20:46 |
| ← henrikbjorn left | 20:46 |
| → henrikbjorn joined | 20:46 |
| → murr4y joined | 20:47 |
| → zombor joined | 20:51 |
| ← eletuchy left | 20:54 |
| → eletuchy joined | 20:55 |
| ← robotarmy left | 21:00 |
|
FauxFaux
| I don't seem to be able to get pushInsteadOf to work, it's just entirely ignored. 1.7.2.3 (debian). Halp? config: http://pastie.org/1424115 | 21:00 |
| → LauJensen joined | 21:04 |
|
LauJensen
| I didnt like the last commit in MASTER so I branched, reset --hard, redid the code and commited the updated code. How can I merge this into MASTER so that MASTERS HEAD will be overridden by this commit? | 21:05 |
|
FauxFaux
| If you want master to look exactly like the current branch just reset --hard master to the current branch. | 21:05 |
|
LauJensen
| When im in master or the branch ? | 21:06 |
| → rseifert joined | 21:06 |
|
FauxFaux
| git checkout master; git reset --hard foobranch | 21:06 |
| → robotarmy joined | 21:07 |
| → dAnjou joined | 21:08 |
|
dAnjou
| hey folks, in `git push origin master` is origin just a convention, right? | 21:08 |
|
| i could use any name i added before, right? | 21:09 |
|
engla
| dAnjou: the 'origin' part there is just the name of the remote yes | 21:09 |
|
FauxFaux
| Yep. | 21:09 |
|
sveri
| i dont get it, i still fiddle around with git-svn, what i did was a rebase, but it always ends in: but, when i open gitk in my git repo i see the latest svn changes? how is that? but i cannot see these changes in the local files? i dont understand that :( | 21:09 |
|
dAnjou
| k, thanks | 21:09 |
|
davetoo
| sveri: which of the Git books have you read? :) | 21:10 |
|
| Two of them are free on-line | 21:10 |
|
FauxFaux
| sveri: What does "git status" say? You should always see the latest changes. | 21:10 |
|
sveri
| FauxFaux: git status says: On branch master - nothing to commit, uhm, i forgot the error message, svn rebase says: Unable to determine upstream SVN information from working tree history | 21:11 |
|
FauxFaux
| Oh. It's probably not rebasing at all. Try gitk --all or gitk HEAD or whatever. /me can't be bothered to remember how it works. | 21:12 |
| ← davetoo left | 21:12 |
|
sveri
| FauxFaux: yea, thats what i suspected, but like i said, gitk shows me the last changes from svn :( | 21:13 |
|
| what may cause that upstream error? | 21:14 |
|
dAnjou
| uhm, does this name ("origin" or whatever it is) appear in the git revision history or is it just for your local convenience? | 21:14 |
|
| or in the logs | 21:15 |
|
sveri
| dAnjou: i am afraid i dont know what you mean? | 21:15 |
|
dAnjou
| hmm | 21:16 |
|
sveri
| git log shows me the last changes from svn too | 21:16 |
|
LauJensen
| FauxFaux: Worked perfectly, thanks | 21:16 |
|
sveri
| but the files and the content are the ones from the svn repo, without the changes gitk shows me | 21:17 |
| ← LauJensen left | 21:17 |
|
dAnjou
| let's say you name a remote repo "fucking_project_i_hate" using `git remote add ...`. does anybody else who work on this remote repo notice that you did that? | 21:17 |
| ← Cromulent left | 21:18 |
| ← MattDiPasquale left | 21:18 |
|
Arrowmaster
| dAnjou: i think it shows up in the commit message of merge commits | 21:19 |
|
sveri
| dAnjou: i cannot test that yet, i am alone | 21:19 |
|
dAnjou
| hmm | 21:19 |
| ← babbio left | 21:20 |
|
dAnjou
| i'll browse some github projects | 21:20 |
|
engla
| dAnjou: yeah it can be noticed if you merge yes. It doesn't have to be that way (any commit messages can be worded completely by you if you want) | 21:24 |
| → Giles joined | 21:24 |
|
Giles
| how do i amend the commit message on a un-pushed commit, that its two back from HEAD | 21:25 |
|
FauxFaux
| git rebase -i HEAD~4 # and reword or edit the commit in question. | 21:28 |
| ← robotarmy left | 21:28 |
| → JordiGH joined | 21:28 |
| → workmad3 joined | 21:28 |
|
JordiGH
| How do I figure out where "git pull" well pull from? | 21:28 |
|
| will | 21:28 |
|
| Aha, git remove -v | 21:29 |
|
dAnjou
| engla: but i push on/to(?) the master. where would be a merge commit? | 21:29 |
|
JordiGH
| Thanks. | 21:29 |
| ← JordiGH left | 21:29 |
| ← _Vi left | 21:30 |
|
dAnjou
| hmm, an example would be nice | 21:30 |
|
FauxFaux
| dAnjou: "pull" is "fetch" + "merge", or when you run merge explicitly.. but a merge won't generate a merge commit unless someone else has changed things. | 21:30 |
|
| git checkout -b foo; git commit -am "on foo"; git checkout master; git commit -am "on master"; git merge foo; # will generate a merge commit. | 21:30 |
| ← Giles left | 21:32 |
| ← borior left | 21:32 |
|
dAnjou
| and in that commit message could appear how i named the remote repo? | 21:35 |
| ← henrikbjorn left | 21:35 |
|
engla
| dAnjou: let's pretend you have a remote named origin and it has a branch named topic. When you say "git merge origin/topic", then that "origin/topic" appears in the merge commit message. | 21:36 |
| ← joel_falcou left | 21:36 |
| → JordiGH joined | 21:37 |
| ← JordiGH left | 21:37 |
| → MattDiPasquale joined | 21:37 |
| → JordiGH joined | 21:38 |
| ← JordiGH left | 21:38 |
|
dAnjou
| engla: but i can edit it on the fly? | 21:38 |
| → AAA_awright_ joined | 21:39 |
| → jasonn1234 joined | 21:40 |
| ← jasonn1234 left | 21:40 |
| ← murr4y left | 21:40 |
| ← AAA_awright left | 21:41 |
| AAA_awright_ → AAA_awright | 21:41 |
|
dAnjou
| well, doesn't really matter, thanks for your help | 21:42 |
|
engla
| dAnjou: yes sure, either with passing a message using the -m flag to merge or using --no-commit and concluding the merge directly afterwards with git commit | 21:42 |
| → Buglouse joined | 21:42 |
|
dAnjou
| k, thanks again :) | 21:42 |
|
dsop
| git notes and the github api is just a pain | 21:46 |
|
engla
| dsop: github supports git notes? what does it do with notes? | 21:49 |
| → amerine joined | 21:49 |
|
dsop
| engla: display them | 21:49 |
|
| engla: but it doesnt have a api call for it | 21:49 |
| → kipras joined | 21:51 |
| → Morasiqu1 joined | 21:55 |
|
engla
| ok. I guess you can get at your notes with regular git | 21:55 |
| ← khmarbaise left | 21:55 |
|
orafu
| I just wonder, where would you draw the line between core git and non-core git? Is core git just the commands listed in the plumbing section in git(1), and non-core is everything else, aka the porcelain (including git "merge", "log", ...)? | 21:57 |
| ← Morasiqu1 left | 21:57 |
|
orafu
| the term "core git" was used by Linus, Junio and others on the git mailing list | 21:58 |
| ← kipras left | 21:59 |
| → Morasique joined | 22:04 |
| ← Morasique left | 22:04 |
| ← DaveIngram left | 22:05 |
| ← Drakevr left | 22:07 |
| ← Anubisss left | 22:13 |
| → MikhX joined | 22:13 |
| ← dAnjou left | 22:14 |
| ← ThomasLocke left | 22:14 |
| ← TheFox21 left | 22:20 |
| ← TrineLocke left | 22:20 |
|
vmiklos
| orafu: yeah, something like that. in the past there was the git core repo and there was git-tools or something, containing git-am. but they got merged, so it's not that interesting these days | 22:21 |
|
| also Debian started to use git-core as a package name to avoid the conflict with the other git (gnu interactive tools) | 22:22 |
| → patthoyts joined | 22:22 |
| → DaveIngram joined | 22:25 |
| ← DaveIngram left | 22:25 |
|
Arrowmaster
| the git package in debian was renamed from git-core to just git for the upcoming release | 22:25 |
| → frogonwheels_ joined | 22:27 |
| → koo5 joined | 22:28 |
| ← shreef left | 22:28 |
|
vmiklos
| then that's history as well :) | 22:29 |
| ← amerine left | 22:32 |
| → JamesA_ joined | 22:36 |
| ← MattDiPasquale left | 22:37 |
| → babbio joined | 22:37 |
| ← compengi left | 22:37 |
| ← selckin left | 22:38 |
|
babbio
| Guys I have a problem with push...I clone a bare repository into my home folder, modified it and pushed it back...now if a change local folder and clone the repository again I can't view the modify made by me before the push command....what am I doing wrong??? | 22:38 |
| ← drizzd left | 22:38 |
| ← jdav_gone left | 22:38 |
| ← sadmac left | 22:38 |
| → sadmac joined | 22:39 |
| → Drakevr joined | 22:39 |
| → drizzd joined | 22:39 |
| JamesA_ → JamesA | 22:39 |
|
SethRobertson
| When you say "clone a bare repo into your home folder" do you mean that the home folder has the bare repo, or upstream is bare? | 22:39 |
|
babbio
| no sorry I create a bare repo then I run "git clone" inside my home folder | 22:40 |
|
| so upstream is bare | 22:40 |
|
SethRobertson
| Is "change local folder" a necessary part of the problem? It sounds like that is irrelevant | 22:41 |
|
frogonwheels_
| babbio: did it actually send anything when you did git push? or did you not push the branch? | 22:41 |
| ← sraue left | 22:41 |
|
babbio
| I think I 've push the branch correctly, I have a branch named sysenter so I made "git push origin sysenter:sysenter" | 22:41 |
|
SethRobertson
| What output do you see when you do that? | 22:43 |
| → archis joined | 22:43 |
|
SethRobertson
| Also, what does `git branch` return? | 22:43 |
|
frogonwheels_
| babbio: ok.. and when you cloned the second time, can you 'git checkout sysenter' ?? | 22:43 |
|
babbio
| yes | 22:43 |
| → jdav_gone joined | 22:43 |
|
frogonwheels_
| babbio: presumably 'git branch' didn't return 'yes' :) ? | 22:43 |
|
babbio
| i checkout to sysenter but there is not the modify in the sysenter branch | 22:44 |
|
SethRobertson
| On the *original* clone, what does `git branch` return? | 22:44 |
| ← archis left | 22:44 |
|
SethRobertson
| Also what does `git status` return? | 22:44 |
|
babbio
| the same on the second clone, two branches | 22:44 |
| ← workmad3 left | 22:44 |
| ← BiggFREE left | 22:44 |
| ← zenom left | 22:44 |
| ← phaedrix left | 22:44 |
| ← ilker left | 22:44 |
| ← jfkw left | 22:44 |
| ← icwiener left | 22:44 |
| ← rgr left | 22:44 |
| ← mmw left | 22:44 |
| ← guardian left | 22:44 |
| ← juangiordana left | 22:44 |
| ← masonkramer left | 22:44 |
| ← alip left | 22:44 |
| ← robinbowes left | 22:44 |
| ← khaije|minder left | 22:44 |
| ← batrick left | 22:44 |
| ← krosenvo- left | 22:44 |
| ← tangledhelix left | 22:44 |
| ← crash\ left | 22:44 |
| ← Gitzilla left | 22:44 |
| ← tlonim left | 22:44 |
| ← cbreak left | 22:44 |
| ← robinsmidsrod left | 22:44 |
| ← wagle left | 22:44 |
| ← agile left | 22:44 |
| ← nb left | 22:44 |
| ← blalor_afk left | 22:44 |
| ← SvenDowideit left | 22:44 |
| ← ericdc left | 22:44 |
| ← blathijs left | 22:44 |
| ← jonmasters left | 22:44 |
| ← _ikke_ left | 22:44 |
| ← Caelum left | 22:44 |
| ← Tuomas left | 22:44 |
| ← mapreduce left | 22:44 |
| ← Adys left | 22:44 |
| ← tehbaut left | 22:44 |
| ← LotR left | 22:44 |
| nb_ → nb | 22:44 |
| ← patthoyts left | 22:44 |
| ← eletuchy left | 22:44 |
| ← hyperair left | 22:44 |
| ← offby1 left | 22:44 |
| ← Teo` left | 22:44 |
| ← drry left | 22:44 |
|
SethRobertson
| Which one has the * | 22:45 |
| → drry joined | 22:45 |
|
babbio
| I moved to the sysenter with "git checkout sysenter" | 22:45 |
| → workmad3 joined | 22:46 |
| → BiggFREE joined | 22:46 |
| → zenom joined | 22:46 |
| → phaedrix joined | 22:46 |
| → ilker joined | 22:46 |
| → jfkw joined | 22:46 |
| → icwiener joined | 22:46 |
| → rgr joined | 22:46 |
| → khaije|minder joined | 22:46 |
| → juangiordana joined | 22:46 |
| → guardian joined | 22:46 |
| → masonkramer joined | 22:46 |
| → alip joined | 22:46 |
| → robinbowes joined | 22:46 |
| → LotR joined | 22:46 |
| → krosenvo- joined | 22:46 |
| → batrick joined | 22:46 |
| → tangledhelix joined | 22:46 |
| → crash\ joined | 22:46 |
| → Gitzilla joined | 22:46 |
| → tlonim joined | 22:46 |
| → cbreak joined | 22:46 |
| → robinsmidsrod joined | 22:46 |
| → wagle joined | 22:46 |
| → agile joined | 22:46 |
| → AAB05FD joined | 22:46 |
| → blalor_afk joined | 22:46 |
| → SvenDowideit joined | 22:46 |
| → ericdc joined | 22:46 |
| → mapreduce joined | 22:46 |
| → jonmasters joined | 22:46 |
| → blathijs joined | 22:46 |
| → _ikke_ joined | 22:46 |
| → Caelum joined | 22:46 |
| → Tuomas joined | 22:46 |
| → Adys joined | 22:46 |
| → tehbaut joined | 22:46 |
| → metze joined | 22:46 |
| → wolog joined | 22:46 |
| → piotr_ joined | 22:46 |
| → __rob joined | 22:46 |
| → jense joined | 22:46 |
| → dna joined | 22:46 |
| → Zenopus joined | 22:46 |
| → hyperboreean joined | 22:46 |
| → piti joined | 22:46 |
| → ramsey joined | 22:46 |
| → Utoxin joined | 22:46 |
| → dominikh joined | 22:46 |
| → coldboot joined | 22:46 |
| → srcerer joined | 22:46 |
| → BeerSerc joined | 22:46 |
| → jsquared joined | 22:46 |
| → aburgess joined | 22:46 |
| → apetrescu joined | 22:46 |
| → Gitbot joined | 22:46 |
| → csgeek joined | 22:46 |
| → magcius joined | 22:46 |
| → mardum joined | 22:46 |
| → tychoish joined | 22:46 |
| → charon joined | 22:46 |
| → BearPerson joined | 22:46 |
| → wereHamster joined | 22:46 |
| → homa_rano joined | 22:46 |
| → ndim joined | 22:46 |
| → egrouse joined | 22:46 |
| → sunn joined | 22:46 |
| → divVerent joined | 22:46 |
| → valberg_ joined | 22:46 |
| → jailbox joined | 22:46 |
| → Juri_Agarin joined | 22:46 |
| → aef joined | 22:46 |
| → Will| joined | 22:46 |
| → Risar joined | 22:46 |
| ← drry left | 22:46 |
| ← ch077179 left | 22:46 |
| → drry joined | 22:46 |
| ← drry left | 22:46 |
|
babbio
| wait...I have tryed to RE-clone the repository and now I see the modify | 22:46 |
| → patthoyts joined | 22:46 |
| → eletuchy joined | 22:46 |
| → hyperair joined | 22:46 |
| → offby1 joined | 22:46 |
| → Teo` joined | 22:46 |
|
babbio
| probably something went wrong the first time | 22:46 |
| ← BiggFREE left | 22:47 |
| ← zombor left | 22:48 |
| ← MikhX left | 22:49 |
| → BiggFREE joined | 22:49 |
| ← srcerer left | 22:49 |
| → candybar joined | 22:50 |
| → sraue joined | 22:51 |
| → tty1 joined | 22:51 |
| → zombor joined | 22:51 |
|
tty1
| so whats the best way to enforce the line endings, i want to block develoeprsw from commiting witht he wrong line endings, i know the way to do this is with hooks of course, but i have yet to find a good source for such a script out there, and from what i can tell writing one may be non-trivial | 22:53 |
| ← sraue left | 22:54 |
| ← timj left | 22:54 |
| ← engla left | 22:54 |
| ← hobodave left | 22:54 |
| ← darthdeus left | 22:54 |
| ← ribasushi left | 22:54 |
| ← marienz left | 22:54 |
| ← mika left | 22:54 |
| ← tomaw left | 22:54 |
| ← harv left | 22:54 |
| ← sutto left | 22:54 |
| ← patthoyts left | 22:54 |
| ← eletuchy left | 22:54 |
| ← hyperair left | 22:54 |
| ← offby1 left | 22:54 |
| ← Teo` left | 22:54 |
| → ch077179 joined | 22:57 |
| → ribasushi joined | 22:57 |
|
orafu
| vmiklos: I see, thanks :) | 22:57 |
| → MattDiPasquale joined | 22:58 |
| → qknight joined | 22:58 |
| → EgS joined | 22:58 |
| → dr4g joined | 22:58 |
|
dr4g
| I got 4 files modded in my git clone | 22:59 |
|
| but i only want to commit one of those files, and leave the 3 there | 22:59 |
| → Marquel joined | 22:59 |
|
dr4g
| git commit -a tries to do them all | 22:59 |
|
| help ? | 22:59 |
|
teuf
| git add onefile; git commit | 22:59 |
| → rubydiamond joined | 22:59 |
| → squentin joined | 22:59 |
| → ceej_ joined | 22:59 |
| → ruskie joined | 22:59 |
|
| frogonwheels_ personally never uses commit -a. | 23:00 |
|
teuf
| same here | 23:00 |
|
| frogonwheels_ also confesses to liking git gui :) | 23:01 |
|
teuf
| ah | 23:01 |
|
vmiklos
| tty1: it should be trivial. one way is to run git-diff --cached, grep for each added line and run your check on it | 23:01 |
|
| teuf uses git add -p most of the time | 23:01 |
|
dr4g
| teuf, the file is under version control | 23:01 |
|
frogonwheels_
| .. well I also use fugitive.vim :) | 23:01 |
|
teuf
| dr4g: doesn't matter | 23:01 |
|
dr4g
| k i thought 'add' was for new files | 23:01 |
| → jakob joined | 23:01 |
|
teuf
| it adds changes to the index | 23:01 |
| → sraue joined | 23:01 |
|
tty1
| vmiklos, yea but is there some package that provides some standard hooks or something, or a place i can go to get them, there are a handful of things that seem common place that i would expect to be able to find somewhere\ | 23:02 |
|
teuf
| can be a new file, can be a modified file | 23:02 |
| → hobodave joined | 23:02 |
| ← rseifert left | 23:02 |
|
dr4g
| thanks teuf | 23:02 |
|
| commit -a is everything then | 23:02 |
|
| and git commit is only the files done by 'add' | 23:02 |
|
| right ? | 23:02 |
| ← MattDiPasquale left | 23:03 |
|
teuf
| dr4g: yep | 23:03 |
|
frogonwheels_
| dr4g: git commit -a 'adds' all modified files before committing | 23:03 |
| → patthoyts joined | 23:03 |
| → eletuchy joined | 23:03 |
| → hyperair joined | 23:03 |
| → offby1 joined | 23:03 |
| → Teo` joined | 23:03 |
| → d1zzy joined | 23:04 |
|
vmiklos
| tty1: just grep for any line starting with + in the diff output. templates/hooks--pre-commit.sample in git.git is a good starting point | 23:04 |
| → gilaniali joined | 23:04 |
| ← gilaniali left | 23:05 |
|
dr4g
| frogonwheels_, ty | 23:05 |
|
| i'm hardcore svn guy moving to git for github niceness | 23:05 |
| → bburhans joined | 23:06 |
|
frogonwheels_
| dr4g: gl. just remember git at it's heart is very simple (hence it's name) - however it take a while for the conceptual shift to kick in. | 23:09 |
| → shachaf joined | 23:09 |
| ← ceej_ left | 23:10 |
| frogonwheels_ → frogonwheels | 23:10 |
| → darthdeus joined | 23:11 |
| → Sutto joined | 23:11 |
|
dr4g
| yea | 23:12 |
| ← eletuchy left | 23:13 |
|
tty1
| vmiklos, yea i dont like homebrewing stuff like this as it always turns out to be bigger than you think, like one consideration is detecting binaries vs non-binaries and when to actually enforce the line ending and when not to (domr binaries it would be data and not a line ending at all) | 23:14 |
|
| vmiklos, i also wanna do others things i dont wanna homebrew like making sure large binaries dont get in | 23:14 |
| → paradigm joined | 23:14 |
|
vmiklos
| unless you use git diff -a, binaries won't show in the output, don't worry :) | 23:15 |
|
| anyway, i don't want to force you do anything. you can search, maybe someone write exactly what you need. but it should be easy to do it yourself, too | 23:17 |
|
tty1
| vmiklos, yea doesnt sound to hard, and i appreciat ethe help,. i was just hoping to look for a good resource for a collection of common hooks or a library or some package offered somewhere | 23:19 |
| → _Vi joined | 23:20 |
| → kukks joined | 23:23 |
| → ddv joined | 23:25 |
| ← Schmallon left | 23:27 |
|
vmiklos
| the templates/ dir in git.git contains such a collection, though that's one example / type :) | 23:27 |
| ← Marquel left | 23:27 |
| ← workmad3 left | 23:27 |
| ← zenom left | 23:27 |
| ← phaedrix left | 23:27 |
| ← ilker left | 23:27 |
| ← jfkw left | 23:27 |
| ← icwiener left | 23:27 |
| ← rgr left | 23:27 |
| ← guardian left | 23:27 |
| ← juangiordana left | 23:27 |
| ← tty1 left | 23:27 |
| ← dr4g left | 23:27 |
| ← masonkramer left | 23:27 |
| ← alip left | 23:27 |
| ← robinbowes left | 23:27 |
| ← khaije|minder left | 23:27 |
| ← batrick left | 23:27 |
| ← krosenvo- left | 23:27 |
| ← tangledhelix left | 23:27 |
| ← crash\ left | 23:27 |
| ← Gitzilla left | 23:27 |
| ← tlonim left | 23:27 |
| ← cbreak left | 23:27 |
| ← robinsmidsrod left | 23:27 |
| ← wagle left | 23:27 |
| ← agile left | 23:27 |
| ← paradigm left | 23:27 |
| ← blalor_afk left | 23:27 |
| ← SvenDowideit left | 23:27 |
| ← ericdc left | 23:27 |
| ← blathijs left | 23:27 |
| ← jonmasters left | 23:27 |
| ← _ikke_ left | 23:27 |
| ← Caelum left | 23:27 |
| ← Tuomas left | 23:27 |
| ← mapreduce left | 23:27 |
| ← Adys left | 23:27 |
| ← tehbaut left | 23:27 |
| ← metze left | 23:27 |
| ← wolog left | 23:27 |
| ← piotr_ left | 23:27 |
| ← __rob left | 23:27 |
| ← jense left | 23:27 |
| ← dna left | 23:27 |
| ← Zenopus left | 23:27 |
| ← hyperboreean left | 23:27 |
| ← piti left | 23:27 |
| ← ramsey left | 23:27 |
| ← Utoxin left | 23:27 |
| ← dominikh left | 23:27 |
| ← coldboot left | 23:27 |
| ← BeerSerc left | 23:27 |
| ← jsquared left | 23:27 |
| ← aburgess left | 23:27 |
| ← apetrescu left | 23:27 |
| ← Gitbot left | 23:27 |
| ← csgeek left | 23:27 |
| ← magcius left | 23:27 |
| ← mardum left | 23:27 |
| ← tychoish left | 23:27 |
| ← charon left | 23:27 |
| ← BearPerson left | 23:27 |
| ← wereHamster left | 23:27 |
| ← homa_rano left | 23:27 |
| ← ndim left | 23:27 |
| ← sunn left | 23:27 |
| ← divVerent left | 23:27 |
| ← valberg_ left | 23:27 |
| ← jailbox left | 23:27 |
| ← Juri_Agarin left | 23:27 |
| ← aef left | 23:27 |
| ← LotR left | 23:27 |
| ← Will| left | 23:27 |
| ← Risar left | 23:27 |
| ← egrouse left | 23:27 |
| ← kukks left | 23:27 |
| ← qknight left | 23:27 |
| ← rolfb left | 23:27 |
| ← orafu left | 23:27 |
| ← Rickardo1 left | 23:27 |
| ← chrischambers left | 23:27 |
| ← vitor-br left | 23:27 |
| ← Elfe left | 23:27 |
| ← Thumper_ left | 23:27 |
| ← roxlu left | 23:27 |
| ← sven^ left | 23:27 |
| ← tpope left | 23:27 |
| ← Leonidas left | 23:27 |
| ← mentor left | 23:27 |
| → AAA_awright_ joined | 23:28 |
| → guybrush joined | 23:29 |
| → tomaw joined | 23:29 |
| → kukks joined | 23:29 |
| → paradigm joined | 23:29 |
| → Marquel joined | 23:29 |
| → dr4g joined | 23:29 |
| → qknight joined | 23:29 |
| → tty1 joined | 23:29 |
| → teuf joined | 23:29 |
| → ivank joined | 23:29 |
| → Leonidas joined | 23:29 |
| → tpope joined | 23:29 |
| → sven^ joined | 23:29 |
| → mentor joined | 23:29 |
| → roxlu joined | 23:29 |
| → Thumper_ joined | 23:29 |
| → Elfe joined | 23:29 |
| → vitor-br joined | 23:29 |
| → chrischambers joined | 23:29 |
| → Rickardo1 joined | 23:29 |
| → orafu joined | 23:29 |
| → rolfb joined | 23:29 |
| → workmad3 joined | 23:29 |
| → zenom joined | 23:29 |
| → phaedrix joined | 23:29 |
| → ilker joined | 23:29 |
| → jfkw joined | 23:29 |
| → icwiener joined | 23:29 |
| → rgr joined | 23:29 |
| → khaije|minder joined | 23:29 |
| → juangiordana joined | 23:29 |
| → guardian joined | 23:29 |
| → masonkramer joined | 23:29 |
| → alip joined | 23:29 |
| → robinbowes joined | 23:29 |
| → LotR joined | 23:29 |
| → krosenvo- joined | 23:29 |
| → batrick joined | 23:29 |
| → tangledhelix joined | 23:29 |
| → crash\ joined | 23:29 |
| → Gitzilla joined | 23:29 |
| → tlonim joined | 23:29 |
| → cbreak joined | 23:29 |
| → robinsmidsrod joined | 23:29 |
| → wagle joined | 23:29 |
| → agile joined | 23:29 |
| → AAB05FD joined | 23:29 |
| → blalor_afk joined | 23:29 |
| → SvenDowideit joined | 23:29 |
| → ericdc joined | 23:29 |
| → mapreduce joined | 23:29 |
| → jonmasters joined | 23:29 |
| → blathijs joined | 23:29 |
| → _ikke_ joined | 23:29 |
| → Caelum joined | 23:29 |
| → Tuomas joined | 23:29 |
| → Adys joined | 23:29 |
| → tehbaut joined | 23:29 |
| → metze joined | 23:29 |
| → wolog joined | 23:29 |
| → piotr_ joined | 23:29 |
| → __rob joined | 23:29 |
| → jense joined | 23:29 |
| → dna joined | 23:29 |
| → Zenopus joined | 23:29 |
| → hyperboreean joined | 23:29 |
| → piti joined | 23:29 |
| → ramsey joined | 23:29 |
| → Utoxin joined | 23:29 |
| → dominikh joined | 23:29 |
| → coldboot joined | 23:29 |
| → BeerSerc joined | 23:29 |
| → jsquared joined | 23:29 |
| → aburgess joined | 23:29 |
| → apetrescu joined | 23:29 |
| → Gitbot joined | 23:29 |
| → csgeek joined | 23:29 |
| → magcius joined | 23:29 |
| → mardum joined | 23:29 |
| → tychoish joined | 23:29 |
| → charon joined | 23:29 |
| → BearPerson joined | 23:29 |
| → wereHamster joined | 23:29 |
| → homa_rano joined | 23:29 |
| → ndim joined | 23:29 |
| → egrouse joined | 23:29 |
| → sunn joined | 23:29 |
| → divVerent joined | 23:29 |
| → valberg_ joined | 23:29 |
| → jailbox joined | 23:29 |
| → Juri_Agarin joined | 23:29 |
| → aef joined | 23:29 |
| → Will| joined | 23:29 |
| → Risar joined | 23:29 |
| ← AAA_awright left | 23:30 |
| AAA_awright_ → AAA_awright | 23:31 |
| → JordiGH joined | 23:31 |
|
JordiGH
| How do I import an unrelated git repo into my current one? I want it in a separate branch. | 23:32 |
|
thiago
| git fetch | 23:32 |
|
dr4g
| fetch doggy | 23:33 |
|
frogonwheels
| JordiGH: you can add it as a remote first (man git-remote) and then fetch it by remote name | 23:35 |
|
jast
| JordiGH: the 'git-remote' manpage can be found at http://git.or.cz/man/git-remote [automatic message] | 23:35 |
|
wereHamster
| dr4g: how so? | 23:36 |
|
JordiGH
| frogonwheels: Well, it's a local repository? I mean, file:// instead of http:// Does that matter? | 23:36 |
|
wereHamster
| not at all | 23:36 |
|
dr4g
| wereHamster, what ?! | 23:37 |
|
JordiGH
| I just want to do this once. I'm a little confused. I have some files I want to go on a different branch. I turned them into a git repo and now I want to import them... Or maybe I guess what I really want to do is import a remote svn repo into a separate git branch. | 23:38 |
| ← zombor left | 23:39 |
|
wereHamster
| dr4g: wh doggy? | 23:39 |
|
dr4g
| wereHamster, i was just messing, "fetch the stick, doggy" | 23:40 |
|
| sorry if you took that literally :) | 23:40 |
| ← tizbac left | 23:41 |
|
frogonwheels
| JordiGH: Specifically, how are you confused? | 23:41 |
| ← AAA_awright left | 23:41 |
|
JordiGH
| frogonwheels: I got no idea how to accomplish this. I mostly use hg. | 23:42 |
|
wereHamster
| JordiGH: git remote add blabla /path/to/other/repo; git fetch blabla; and then do somethig with the branches in refs/remotes/blabla/* | 23:42 |
|
JordiGH
| wereHamster: Okay, thanks. | 23:42 |
|
frogonwheels
| JordiGH: is this svn repo the same project / a different fork/snapshot of the smae project? | 23:42 |
|
tty1
| when you clone a repo does it clone the hooks too (im guessing no?) | 23:43 |
|
JordiGH
| frogonwheels: I'm doing a Debian packaging, I want the upstream svn repo in a different branch. | 23:43 |
| ← d0k left | 23:43 |
| → AAA_awright joined | 23:43 |
|
wereHamster
| tty1: no | 23:44 |
|
frogonwheels
| tty1: Copying /executing arbitrary shell scripts from a clone.. sounds like a Bad Idea. | 23:44 |
|
tty1
| frogonwheels, yea im not complaining, just making sure | 23:44 |
|
frogonwheels
| tty1: also for example git 'servers' like gitolite have hooks that are specific to permissions &c.. wouldn't want them locally. | 23:45 |
| ← guardian left | 23:47 |
| ← babbio left | 23:48 |
| → pandrew joined | 23:51 |
| hobodave → hobodave_away | 23:52 |
| hobodave_away → hobodave | 23:52 |
| ← rolfb left | 23:55 |
| → remur_030 joined | 23:59 |
| ← ch077179 left | 23:59 |