IRCloggy #git 2011-04-04

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.

2011-04-04

jamescarr yeah00:00
I am going to re-clone00:00
karstensrage so its encrypted and secure correct?00:00
bob2 ssh, of course00:01
(nothing to do with scp)00:01
zarac who's _bitbucket ? : )00:02
← Bucciarati left00:03
→ Bucciarati joined00:03
→ Utkarsh_ joined00:03
← tsbtmn left00:03
→ Teo`` joined00:03
← ThunderChicken left00:03
bremner ssh00:03
there are some non-ssh options too, but those are less common00:03
yes00:03
← Blackguard1 left00:03
← c00kiemon5ter left00:03
← d1b left00:03
→ jargan joined00:03
→ ThunderChicken joined00:03
← ThunderChicken left00:03
→ ThunderChicken joined00:03
← bbergler left00:03
← jast left00:03
← Teo` left00:03
ilteris_ → ilteris00:03
← madsy_ left00:03
← pgib left00:03
→ bbergler joined00:03
→ axle3d joined00:04
→ dj_tjerk joined00:04
→ d1b joined00:04
← chrischambers left00:04
← GrowLinux left00:04
← glitterfang left00:04
axle3d → 13WAAHIMG00:04
→ tsbtmn joined00:04
← 13WAAHIMG left00:04
← Tohuw left00:04
← tchan1 left00:04
→ amling_h1me joined00:04
← tsbtmn left00:04
→ tsbtmn joined00:04
→ Blackguard joined00:04
← ijuma left00:04
→ EXACFPPJ joined00:04
→ Tohuw joined00:04
→ madsy joined00:04
← __name__ left00:04
→ glitterfang joined00:04
→ c00kiemon5ter joined00:04
← madsy left00:04
→ madsy joined00:04
→ Weiss joined00:04
← etnt left00:04
← c00kiemon5ter left00:05
→ c00kiemon5ter joined00:05
← amling_home left00:05
← kermit left00:05
→ dot-slaSh joined00:05
→ ijuma joined00:05
5EXACFPPJ hello, every time i try do "git add ." or "git checkout xyz" my ram usage rises like a pyramid and crashes the system00:05
← FauxFaux left00:06
karstensrage fr'bob2, so ssh secure and encrypted right?00:06
→ levifig joined00:06
→ Ca1us joined00:06
→ agile joined00:06
bob2 5EXACFPPJ: how large are the things you are trying to add00:06
→ jailbox joined00:06
bob2 karstensrage: sure00:06
5EXACFPPJ arounf 6mb00:06
* around00:06
→ pgib joined00:06
→ FauxFaux joined00:06
→ tchan1 joined00:06
karstensrage fr'bob2, sure? or yes?00:07
→ makubi joined00:07
karstensrage i mean is there a time when its not encrypted?00:07
bob2 what?00:07
why do you keep saying "fr'"00:07
karstensrage oh00:07
bob2 yes ssh is considered highly secure00:07
5EXACFPPJ dmesg print shows multiple git entries like "StaRateAdaptive87SE():00:07
karstensrage my shell sees freenode as fr' for tab-complete00:07
ok, you just sound wishy washy00:08
bob2 do you want a personal guarantee?00:08
5EXACFPPJ ** update init_gain to index 2 for date rate xx00:08
karstensrage no just confidence00:08
→ kermit joined00:08
← kermit left00:08
bob2 uh-huh00:08
→ etnt joined00:08
bob2 openssh is extremely widely used and the developers are very highly respected00:08
→ kermit joined00:09
← mramige left00:09
bob2 5EXACFPPJ: sounds totally unrelated to git00:09
→ fr0sty joined00:09
jamescarr argh... how do a pull everything from remote including branches??00:09
→ KB1PKL joined00:09
bob2 git remote update00:09
→ mramige joined00:09
bob2 or do you want to obliterate all local branches in favour of what is in someone else's repository?00:10
→ chrischambers joined00:10
← gusnan left00:11
zarac bob2, now i wonder how you'd do that.. ; )00:11
jargan → jast00:11
→ Dylan16807 joined00:11
→ GrowLinux joined00:13
← nutterpc left00:17
← mdel left00:20
← dnRoyston left00:20
→ ymasory joined00:20
→ cutmail joined00:21
→ dag10 joined00:21
→ mattyb joined00:23
← dim_ left00:24
comawhite_ → comawhite00:24
← comawhite left00:24
→ comawhite joined00:24
← comawhite left00:24
→ comawhite joined00:24
← rettub left00:25
sitaram karstensrage: scp? no. ssh? yes, if your remote url is ssh://...00:26
← larsl left00:26
dag10 Hey. So I read the SSH docs that sitaram pointed me to, and I was able to successfully reinstall Gitolite as per the tutorial (http://sites.google.com/site/senawario/home/gitolite-tutorial).00:26
← KB1PKL left00:26
dag10 I was able to push and pull the gitolite-admin repo with just [email@hidden.address]00:26
It even created the repository foo.git when I added that to the config and pushed the chances.00:27
However00:27
I checked out [email@hidden.address] added a file, committed it to the local repo, and pushed the changes.00:27
When I push the changes, I get this error:00:27
← sanguisleft left00:27
dag10 error: failed to push some refs to 'git@minipenguin.com:foo.git'00:27
→ rettub joined00:28
dag10 I gave my username (drew) RW+ permissions in the Gitolite config.00:28
Did I make any common mistakes that would cause that error?00:28
→ developernotes joined00:28
karstensrage fr'sitaram, its just git@localhost:/foo00:28
so what is it going over?00:28
← alezandro left00:29
karstensrage its asking for my private key password00:29
when i push00:29
← mrevd left00:30
sitaram dag10: nothing to do with gitolite. Read the complete error message and you should see why it failed. (I assume it said something like "...no common branches...")00:30
karstensrage: ssh00:30
Dylan16807 I did something stupid and used git as a backup for a single large file for a few months with a very large window when packing. It takes a few minutes to extract an early version, which isn't terrible by itself, but now I'm trying to use fast-export on the repo and it seems to be repeating the entirety of those few minutes of work per revision.00:31
At the current rate I'm looking at a week minimum for this to finish. Any ideas for something that will work better?00:31
karstensrage fr'sitaram, so secure and encrypted right?00:31
fr'sitaram, by ssh00:31
sitaram karstensrage: I find it incredible that you managed to install gitolite without knowing that the underlying transport is ssh :)00:31
dag10 Hm, yes. It says "No refs in common and none specified; doing nothing.\nPerhaps you should specify a branch such as 'master'.\nfatal: The remote end hung up unexpectedly\nerror: failed to push some refs to 'git@minipenguin.com:foo.git'00:31
sitaram dag10: first push of a branch must be "git push remotename branchname" not just "git push"00:32
karstensrage: by the way, what is this "fr'" you keep prepending to my name?00:32
karstensrage fr'sitaram, heres the deal, i probably do know at some level, im concerned about backups, i dont like the cloud at all, im a bit paranoid, i want to setup a git repo in an office i trust and push to that repo for backup.... Im just paranoid00:32
Dylan16807 Or, wait, no, it wasn't the *window* that was huge it was the *depth*.00:33
karstensrage sorry sitaram, my shell sees freenode as fr' and tab-complete only works with the fr' prepended00:33
bremner karstensrage: fix your client please00:33
sitaram karstensrage: oh no need to say sorry; I was just curious...00:33
karstensrage bremner its not my client00:34
its my shell00:34
sitaram stares blankly00:34
← mramige left00:34
→ nothingHappens joined00:34
bremner don't care00:34
karstensrage my client is xchat, it connects to the shell which is connected to irc00:34
→ Garen_ joined00:35
sitaram Dylan16807: why were you using fast-export? perhaps you can use git bundle instead? (I know they're not equivalent but since I dont know why you're using fast-export...)00:35
→ mattalexx_ joined00:35
→ nibblebot_ny joined00:35
→ albel727_2 joined00:35
← developernotes left00:36
sitaram karstensrage: I have used xchat in the past and tab completion has worked fine without this00:36
→ intripoon joined00:36
→ ianmcorvidae joined00:36
← ianmcorvidae left00:36
→ ianmcorvidae joined00:36
Dylan16807 I wanted to test fossil and the suggested method was fast-export over a pipe. I can try using bundle to rebuild the git repo.00:37
← mattalexx left00:37
→ jmcantrell_ joined00:37
← jmcantrell_ left00:37
sitaram Dylan16807: oh then bundle may not work. Its not exactly a "pipable" thing00:37
→ rubydiamond_ joined00:37
Dylan16807 Sure, but if I can use bundle to make a new git repo that doesn't choke horribly I'll be happy.00:38
← ilteris left00:38
→ callen joined00:38
→ myme_ joined00:38
→ whaley_ joined00:38
karstensrage sitaram, it does work fine with my un-prefixed server... it just prefixes all the other servers00:38
← ianmcorvidae|alt left00:38
← linusoleander left00:38
← rubydiamond left00:38
← jmcantrell left00:38
← alip left00:38
← oc80z left00:38
← RSchulz left00:38
← callen_ left00:38
← Garen left00:38
← rideh left00:38
← whaley left00:38
← shennyg left00:38
← bremner` left00:38
← __null left00:38
← d1zzy left00:38
→ bremner`` joined00:38
→ shennyg_ joined00:38
→ ilteris joined00:38
→ d1zzy_ joined00:38
← BtbN left00:38
← brendon left00:38
← paulproteus left00:38
← TiBook left00:38
← EricInBNE left00:38
← jophish left00:38
← albel727 left00:38
← intripoon_ left00:38
← KUHRT_ left00:38
← nibblebot left00:38
→ BtbN joined00:38
→ rideh joined00:38
→ RSchulz joined00:38
→ _null joined00:39
← SRabbelier left00:39
← siprbaum left00:39
→ brendon joined00:39
→ Risar joined00:39
→ TiBook joined00:39
→ siprbaum joined00:39
← callen left00:39
→ callen joined00:39
← TiBook left00:39
→ TiBook joined00:39
→ EricInBNE joined00:39
sitaram Dylan16807: man git-repack then use fast-export maybe? Making a bundle by itself may not do it00:39
→ mrtazz joined00:39
→ kuhrt joined00:39
jast Dylan16807: the 'git-repack' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-repack.html [automatic message]00:39
← slippyd left00:39
← telmich left00:39
← Elfe left00:39
→ Saur joined00:39
→ alezandro joined00:39
→ paulproteus joined00:39
→ jmcantrell_ joined00:39
→ telmich joined00:39
← SeanTAllen left00:39
→ dnRoyston joined00:39
dag10 sitaram: Thank you, it works now. I've been able to push and pull to it from multiple clients. :D00:39
→ oc80z joined00:39
→ elb0w joined00:39
→ jophish joined00:40
→ hackez_work joined00:40
→ Elfe joined00:40
→ stepnem joined00:40
← Adys left00:40
Dylan16807 Right... Oh it's been a few months and I can't remember what did and did not work with repack.00:40
← alberto56 left00:40
→ SRabbelier joined00:40
Dylan16807 I might be able to force it to repack everything, which may or may not also spend weeks of cpu time on redundant extraction.00:41
bremner karstensrage: it sounds like you should visit #xchat00:41
jamescarr I am f'ing confused.00:41
Dylan16807 But I remember that a lot of settings to repack caused git to leak out gigabytes and die.00:41
→ alip joined00:41
jamescarr git checkout -b branchname just creates a new branch?00:41
even though it is listed?00:42
Dylan16807 Using git the way I did was really an awful awful idea.00:42
bob2 what?00:42
← Yuuhi left00:43
→ alberto56 joined00:44
Dylan16807 If repack can't go any faster I think I'll try hacking at the source to memoize some of the decompression steps.00:45
magcius_ → magcius00:46
← jones- left00:47
jamescarr I'm about to cry here ;)00:47
I dunno how I messed up so bad00:47
git branch --track <branch> <remote-branch>00:48
so that is for switching to a remote branch?00:48
← robotarmy left00:49
bob2 no00:49
→ drl joined00:49
bob2 you're making it all too hard00:49
"git checkout somebranch" checks out a branch00:49
jamescarr I feel that way ;)00:49
bob2 "git branch something origin/whocares" makes a new branch called something from origin/whocares00:50
→ emptyflask joined00:50
bob2 "git checkout -b something origin/whocares" does both those things00:50
jamescarr ah00:50
→ avinashhm joined00:51
→ axle3d joined00:52
jamescarr :(00:52
← chrischambers left00:52
→ jones- joined00:52
→ Einstein__ joined00:52
← dag10 left00:52
← axle3d left00:53
→ axle3d joined00:53
→ chrischambers_ joined00:53
→ Guest24331 joined00:53
bob2 ?00:53
axle3d duplicates of that process just get started and ram clibs up like a pyramid00:53
** when i do simple commands such as "git add ." or "git status"00:54
bob2 of what process00:54
← levifig left00:54
← jlewis left00:54
← charon left00:54
← EricInBNE left00:54
mattalexx_ → mattalexx00:54
← mattalexx left00:55
→ mattalexx joined00:55
→ AnaSilvia joined00:55
axle3d htop reports this command getting launched over and over "git status --porcelain"00:55
← Weust`_ left00:55
← NetHawk left00:55
← avdg left00:56
→ brett joined00:56
Tabmow → Guest9276300:56
→ Tabmow joined00:57
→ Weust` joined00:57
← jfkw left00:57
← thiago left00:57
← Guest24331 left00:57
← ciaranm left00:57
jamescarr bob2, thank you00:57
bob2 jamescarr: sorted?00:58
jamescarr I was losing my head there ;)00:58
← orafu left00:58
jamescarr yeah00:58
→ jfkw joined00:58
bob2 excellent00:58
→ orafu joined00:58
bob2 reductionism ftw00:58
jamescarr pissed me off... I had branched, pushed, and worked from another machine so my fiance could do finances...00:58
→ aalex joined00:58
jamescarr turned out the whole time I was on master (oops)00:58
→ bottiger joined00:58
← fisted left00:58
→ jlewis_ joined00:58
← chrischambers_ left00:58
→ thiago joined00:58
→ ciaranm joined00:58
jamescarr nice to finally have that mess sorted out... got all my commits pushed back to the branch00:59
← posciak left00:59
← f00li5h left00:59
→ Garen joined00:59
→ f00li5h joined00:59
→ mdel joined00:59
→ LP_ joined00:59
← cutmail left00:59
→ pabs3 joined01:00
← axle3d left01:00
← SimonP86 left01:00
← nchaimov left01:00
pabs3 is there a way to set a prefix like [fooproject] in the mails sent by git send-email?01:00
← Guest92763 left01:00
→ offby1` joined01:00
pabs3 s/prefix/subject prefix/01:01
→ nazgul102 joined01:01
→ milki_ joined01:01
← pear left01:01
← tux21b left01:01
← lamont left01:01
← djencks left01:01
← amling_h1me left01:01
← Blackguard left01:02
← geekfactor left01:02
← Garen_ left01:02
← aalex left01:02
← outoftime_ left01:02
← warthog9 left01:02
← mithro left01:02
← n8o left01:02
← sraue left01:02
← whaley_ left01:02
← pgib left01:02
← BlindOracle left01:02
← disappearedng left01:02
← Ramblurr left01:02
← frogonwheels left01:02
← Einstein__ left01:02
→ frogonwheels joined01:02
→ Ramblurr joined01:03
← nazgul101 left01:03
→ pielgrzym joined01:04
→ Delerius joined01:04
→ Blackguard joined01:04
→ fisted_ joined01:04
← gretch left01:04
← drl left01:04
→ pear joined01:04
→ ice799 joined01:04
→ EricInBNE joined01:06
→ djencks joined01:07
→ whaley joined01:07
→ geekfactor joined01:08
→ lamont joined01:09
→ n8o joined01:09
→ dag10 joined01:09
→ nchaimov joined01:09
→ ISF joined01:10
→ jsjgruber_ joined01:11
→ amling_home joined01:11
dag10 How can I make my Gitolite repository be clone-able with a URL such as git://minipenguin.com/foo.git?01:12
← Vampire0 left01:12
bob2 by running git-daemon01:12
→ Determinist joined01:12
← AnaSilvia left01:12
← MetaCosm left01:12
sitaram dag10: but you must understand git daemon has no authentication. Anyone who can reach the machine can clone the repo01:14
dag10 Any repo?01:14
→ sraue joined01:15
bob2 any repo you let git-daemon serve01:15
dag10 Can't I just set my private repos to 770, and the public won't be able to clone it?01:15
→ Nugget_ joined01:15
→ disappearedng joined01:15
→ mithro joined01:15
→ aalex joined01:15
→ warthog9 joined01:15
→ outoftime_ joined01:15
→ pgib joined01:15
← electrogeek left01:16
→ electrogeek joined01:17
← electrogeek left01:17
→ electrogeek joined01:17
→ BlindOracle joined01:18
← joel_falcou left01:19
bob2 ...01:19
Dylan16807 well, looks like fossil really hates large files anyway so that concludes that test01:19
→ tux21b joined01:19
bob2 then why would you point git-daemon at it if you'd made it unreadable to git-daemon?01:19
← rynix left01:21
dag10 There's some repositories I'd like publicly-cloneable (read-only of course), but others that I only want cloneable to members of that project.01:21
bob2 then don't point git-daemon at those01:21
← mdel left01:21
dag10 Also, I just tried cloning [email@hidden.address] and it worked, but it cloned an empty repository.01:22
I know for a fact that foo.git is not empty.01:22
it contains a few revs.01:22
bob2 git branch -a01:22
→ MetaCosm joined01:23
← MetaCosm left01:23
→ MetaCosm joined01:23
← crhan left01:23
→ crhan joined01:24
dag10 I'm using TorgoiseGit on Windows.01:25
← jones- left01:25
dag10 However I just launched git.exe branch -a within the clones foo directory, and nothing happened.01:25
← Guest64399 left01:25
dag10 cloned*01:25
← MetaCosm left01:26
← kermit left01:26
→ kermit joined01:27
→ towski joined01:27
← electrogeek left01:27
→ Vampire0 joined01:27
→ electrogeek joined01:28
← electrogeek left01:28
→ electrogeek joined01:28
→ levifig joined01:31
karstensrage sorry bremner #xchat has no suggestions01:32
→ rchavik joined01:32
← rchavik left01:32
→ rchavik joined01:32
→ MetaCosm joined01:32
← MetaCosm left01:32
→ MetaCosm joined01:32
← ISF left01:33
→ SeanTAllen joined01:35
dag10 If anyone has a moment, can you try cloning "git://minipenguin.com/foo.git" for me and tell me if it works?01:35
→ ISF joined01:35
← zorzar_ left01:35
← bentob0x left01:35
dag10 I'll be AFK for 15 minutes, but please let me know if you were able to clone it. Thanks!01:35
dag10 → dag10_[AFK]01:36
bob2 it only has one commit01:37
→ t3i joined01:38
Dylan16807 yeah works fine01:38
→ zorzar_ joined01:39
→ ISF_ joined01:39
← cschneid left01:41
← SunilThaha left01:41
← ISF left01:41
→ SunilThaha joined01:42
→ vsayer joined01:42
→ gretch joined01:42
→ hyperair joined01:42
← bitkiller left01:43
← dropdrive left01:46
← ymasory left01:48
← crhan left01:49
→ dajhorn joined01:50
← alberto56 left01:50
← SunilThaha left01:52
← ShadowBelmolve left01:53
→ crhan joined01:54
→ mando joined01:58
sitaram dag10_[AFK]: you can run git-daemon with whatever arguments it needs, then use gitolite to specify which repo is served and which is not. See http://sitaramc.github.com/gitolite/doc/2-admin.html#_specifying_gitweb_and_daemon_access01:58
→ ShadowBelmolve joined01:59
← glitterfang left01:59
← ShadowBelmolve left01:59
sitaram dag10_[AFK]: note that *gitolite* per se does not do anything except create "git-daemon-export-ok" file for the repos you chose to be readable by "daemon". The rest of the daemon config is outside gitolite's scope02:00
→ seivan joined02:01
← pear left02:03
→ t3i_ joined02:05
→ smolyn joined02:06
→ bindaas joined02:06
← jsick3 left02:06
← khiroc left02:06
← Elfe left02:06
→ Elfe_ joined02:06
← t3i left02:07
t3i_ → t3i02:07
jamescarr if i have all changes done on a branch is it safe to switch to master, change and commit, and switch back?02:10
← fahadsadah_ left02:11
→ glitterfang joined02:13
← vsayer left02:13
→ mbrumbelow joined02:14
→ vsayer joined02:14
← icwiener left02:14
→ rayners joined02:14
← offby1` left02:15
→ offby1` joined02:15
sitaram all changes committed, then yes of course02:15
offby1` → offby102:15
← Predominant left02:16
→ khiroc joined02:16
→ dropdrive joined02:19
jamescarr hmmm... how can I merge just one file from head to a branch?02:21
→ fahadsadah joined02:22
← alezandro left02:22
← jnylen left02:23
→ BlueAidan_ joined02:23
→ offby1` joined02:23
→ bitslip_ joined02:24
→ aidehua joined02:24
bob2 not really02:24
merge is for merging branches02:24
→ thermal joined02:24
bob2 you could merge -n and reset all the other files02:24
but then merging in future will suck more02:25
→ n8o_ joined02:25
← offby1` left02:25
→ offby1` joined02:25
→ gretch_ joined02:25
→ ormaaj_ joined02:25
jamescarr bob2, nah :)02:25
← TomyLobo left02:25
→ nevyn_ joined02:25
→ jduro__ joined02:26
→ mnemoc joined02:26
← SeanTAllen left02:26
→ dajhorn_ joined02:26
→ mkramer1 joined02:26
← n8o_ left02:26
→ n8o_ joined02:27
→ zivester_ joined02:27
← ciaranm left02:27
← Risar left02:27
← gretch left02:27
→ kloeri_ joined02:27
← n8o left02:27
← oc80z left02:27
← hackez_work left02:27
← RSchulz left02:27
← mrtazz left02:27
← ormaaj left02:27
← BlueAidan left02:27
← offby1 left02:27
← nevyn left02:27
← _null left02:27
← menomc left02:27
← robinsmidsrod left02:27
← dajhorn left02:27
← gebi left02:27
← alip left02:27
← ilab left02:27
← q0rban|afk left02:27
→ robins joined02:27
→ RSchulz joined02:27
→ q0rban|afk joined02:27
← whaley left02:28
→ whaley joined02:28
offby1` → offby102:28
n8o_ → n8o02:28
← fahadsadah left02:28
→ ilab joined02:29
→ hackez_work joined02:29
→ wanders joined02:30
→ _null joined02:30
→ mrtazz joined02:30
→ Risar joined02:30
→ oc80z joined02:31
→ alip joined02:31
→ jnylen joined02:32
→ ciaranm joined02:32
→ Kulrak joined02:32
→ alester joined02:33
← dajhorn_ left02:33
→ dajhorn joined02:34
→ mjv joined02:34
← hcl2 left02:34
→ gebi joined02:34
→ nairb774 joined02:37
← mattalexx left02:37
← emptyflask left02:37
→ sunil joined02:38
→ fahadsadah joined02:38
→ mbrumbelow_ joined02:38
→ robotarmy joined02:42
→ Remixman joined02:44
← Tac_Home left02:45
← mbrumbelow left02:45
mbrumbelow_ → mbrumbelow02:45
→ cesario joined02:49
→ theoros joined02:49
→ alezandro joined02:49
→ morganick joined02:50
← theoros_ left02:51
→ Jobes joined02:51
← dbdii407 left02:51
ISF_ → ISF02:53
→ Niedar joined02:53
→ zarac_ joined02:54
→ Pacman_Home` joined02:54
→ marienz_ joined02:54
← nothingHappens left02:54
→ zomg__ joined02:54
→ meder_ joined02:55
→ jonanin_ joined02:55
← Remixman left02:55
← nairb774 left02:55
← RSchulz left02:55
← mnemoc left02:55
← disappearedng left02:55
← fisted_ left02:55
← Garen left02:55
← ilteris left02:55
← myme_ left02:55
← pabs3 left02:55
← pasky left02:55
← Pacman_Home left02:55
← bla_ left02:55
← danskubr left02:55
← Count_Niedar left02:55
← drev1 left02:55
← zomg_ left02:55
← AlexP left02:55
← Zenith77 left02:55
← Rogi left02:55
← zarac left02:55
← mr_daniel left02:55
← lanthan left02:55
← jonanin left02:55
← mrkodiak left02:55
← Gitzilla left02:55
← dirker left02:55
← eno left02:55
← Zenopus left02:55
← iravid left02:55
← quadz|2 left02:55
← tro left02:55
← CyberDomovoy left02:55
← JP-Dery left02:55
← tty234 left02:55
← mjt left02:55
← javaanse_jongens left02:55
← johnjay left02:55
← Mpenz left02:55
← candybar left02:55
← niko left02:55
← fr left02:55
← tehbaut left02:55
← jrockway left02:55
← rmk left02:55
→ knitt1 joined02:55
→ xoebus_ joined02:55
→ pasky joined02:55
→ jaeckel_ joined02:55
→ mjt joined02:55
→ dansku joined02:55
← Mohjive left02:55
→ tbranyen joined02:55
→ cbz joined02:55
→ myme joined02:55
→ agateau joined02:55
→ s4msung joined02:55
→ dr_lepper joined02:56
→ sneakret joined02:56
→ candybar joined02:56
→ cxreg joined02:56
→ Garen joined02:56
→ Mohjive joined02:56
→ cmyers joined02:56
→ JP-Dery joined02:57
→ johnjay joined02:58
→ Derander joined02:59
→ steven joined02:59
→ javaanse_jongens joined03:00
← alezandro left03:00
← robotarmy left03:00
← q0rban|afk left03:00
← n8o left03:00
← vsayer left03:00
← rchavik left03:00
← electrogeek left03:00
← jsjgruber_ left03:00
← frogonwheels left03:00
← nazgul102 left03:00
← jfkw left03:00
← siprbaum left03:00
← callen left03:00
← fr0sty left03:00
← dot-slaSh left03:00
← madsy left03:00
← Bucciarati left03:00
← dec left03:00
← cworth` left03:00
← jonmasters_ left03:00
← mgaunard left03:00
← phantomcircuit left03:00
← NfNitLoop left03:00
← Soliton left03:00
← Zygo left03:00
← JonT left03:00
← adamm left03:00
← m2_ left03:00
← vandemar_ left03:00
← madduck left03:00
← Neo left03:00
← rphillips_ left03:00
← ryanakca_ left03:00
← luke-jr_ left03:00
← supervacuo left03:00
← j0ran1 left03:00
← pyrony left03:00
← netset_christoff left03:00
← ketas- left03:00
← MacGyverNL_ left03:00
← chrizz left03:00
← project2501a left03:00
← Heimidal left03:00
← kpreid left03:00
← nb left03:00
← durarara left03:00
← hegge left03:00
← no_maam left03:00
← ptl left03:00
← VxJasonxV left03:00
← erichammond left03:00
← mapreduce left03:00
← SethRobertson left03:00
← Lgb left03:00
← jds left03:00
← jamescarr left03:00
← bob2 left03:00
← bmalee left03:00
← muep left03:00
← SJS left03:01
← bartman` left03:01
← lahwran left03:01
← dwmw2_dad left03:01
← cehteh left03:01
← telmich left03:01
← tsbtmn left03:01
← bauruine left03:01
← alanp_ left03:02
← ska-fan left03:02
← colazero left03:03
→ alanp joined03:03
← orospakr left03:03
← sejo left03:03
← magnus_ left03:03
← ivan left03:03
← Amorphous left03:04
← sshc left03:04
→ bauruine joined03:04
→ RSchulz joined03:04
→ tahorg joined03:04
→ quadz|2 joined03:04
→ sitaram joined03:04
→ Zenopus joined03:04
→ Casvah_AFK joined03:04
→ mr_daniel joined03:04
→ BearPerson joined03:04
→ Gitzilla joined03:04
→ bburhans joined03:04
→ bnovc joined03:04
← bnovc left03:04
→ bnovc joined03:04
→ nicomen joined03:04
→ tty234 joined03:04
→ tehbaut joined03:04
→ ThiefMaster|work joined03:04
→ BooK joined03:04
→ quentusrex joined03:04
→ mnemoc joined03:04
→ pabs3 joined03:04
→ Zenith77 joined03:04
→ fr joined03:04
→ bla joined03:04
→ mdel joined03:04
→ aperlstein joined03:04
→ jrockway joined03:04
→ Tac joined03:04
→ tro joined03:04
→ drev1 joined03:04
→ niko joined03:04
→ farktronix joined03:04
→ walf443 joined03:04
→ AlexP joined03:04
→ rmk joined03:04
→ lanthan joined03:04
→ kelvie joined03:04
→ Tac_Home joined03:04
→ CyberDomovoy joined03:04
→ Adam joined03:04
→ dirker joined03:04
→ alezandro joined03:04
→ robotarmy joined03:04
→ q0rban|afk joined03:04
→ n8o joined03:04
→ vsayer joined03:04
→ rchavik joined03:04
→ electrogeek joined03:04
→ jsjgruber_ joined03:04
→ frogonwheels joined03:04
→ nazgul102 joined03:04
→ jfkw joined03:04
→ siprbaum joined03:04
→ callen joined03:04
→ fr0sty joined03:04
→ dot-slaSh joined03:04
→ madsy joined03:04
→ Bucciarati joined03:04
→ jonmasters_ joined03:04
→ jamescarr joined03:04
→ dec joined03:04
→ cworth` joined03:04
→ mgaunard joined03:04
→ phantomcircuit joined03:04
→ Neo joined03:04
→ NfNitLoop joined03:04
→ Soliton joined03:04
→ JonT joined03:04
→ Zygo joined03:04
→ adamm joined03:04
→ madduck joined03:04
→ m2_ joined03:04
→ vandemar_ joined03:04
→ ryanakca_ joined03:04
→ rphillips_ joined03:04
→ luke-jr_ joined03:04
→ supervacuo joined03:04
→ j0ran1 joined03:04
→ pyrony joined03:04
→ netset_christoff joined03:04
→ ketas- joined03:04
→ MacGyverNL_ joined03:04
→ chrizz joined03:04
→ project2501a joined03:04
→ Heimidal joined03:04
→ mapreduce joined03:04
→ kpreid joined03:04
→ nb joined03:04
→ durarara joined03:04
→ hegge joined03:04
→ no_maam joined03:04
→ ptl joined03:04
→ VxJasonxV joined03:04
→ erichammond joined03:04
→ SethRobertson joined03:04
→ Lgb joined03:04
→ jds joined03:04
→ bob2 joined03:04
→ bmalee joined03:04
→ muep joined03:04
→ SJS joined03:04
→ bartman` joined03:04
→ lahwran joined03:04
→ dwmw2_dad joined03:04
→ cehteh joined03:04
→ Cap_J_L_Picard joined03:04
→ up_the_irons joined03:04
→ silfreed joined03:04
→ Will| joined03:04
→ floppyears joined03:04
→ mutex joined03:04
→ helgikrs joined03:04
→ JoeHazzers joined03:04
→ GodEater joined03:04
→ yaotti_aw_ joined03:04
→ xxtjaxx_ joined03:04
→ tharkun joined03:04
→ spb joined03:04
→ joelpet_ joined03:04
→ divVerent joined03:04
→ patrikf joined03:04
→ oelewapperke joined03:04
→ tansell joined03:04
→ Ratler joined03:04
← LP_ left03:04
← alezandro left03:05
→ pigeon joined03:05
→ ska-fan_ joined03:05
→ amerine joined03:05
→ Seta00 joined03:05
← Adam left03:05
→ Adam joined03:05
→ fisted joined03:05
→ Nicolas_Leonidas joined03:05
→ iravid joined03:05
Nicolas_Leonidas hey if I wanna install a web interface for my git, what should I go with?03:05
→ sejo joined03:05
→ sshc joined03:05
→ orospakr joined03:05
→ _W_ joined03:05
→ da5id joined03:05
← pabs3 left03:05
→ nairb774 joined03:05
← Tv left03:05
→ telmich_ joined03:05
→ tsbtmn_ joined03:05
← dajhorn left03:05
← larva_ left03:05
→ colazero joined03:05
← tsbtmn_ left03:05
→ tsbtmn_ joined03:05
→ koki joined03:05
→ larva joined03:05
→ magnus_ joined03:05
→ Mpenz joined03:05
→ mtkd joined03:05
→ disappearedng joined03:05
→ nadim joined03:05
← disappearedng left03:05
→ disappearedng joined03:05
→ Amorphous joined03:05
offby1 git instaweb03:05
→ dna joined03:06
→ coldboot_ joined03:06
← phantomcircuit left03:06
→ eno joined03:06
→ phantomcircuit joined03:06
→ NetHawk joined03:07
→ m0 joined03:07
→ mrkodiak joined03:07
← walf443 left03:07
→ homa_rano joined03:07
← owst left03:07
→ walf443 joined03:07
← marienz_ left03:08
→ ivan`` joined03:08
Nicolas_Leonidas so I have many php projects03:09
should I create one repository and different branches for each project?03:09
what do you create per project?03:09
offby1 that's actually a tough one.03:11
Nicolas_Leonidas how do you normally do it?03:11
offby1 certainly, if you want to have different access control policies for the different projects, that argues for separate repositories.03:11
→ marienz joined03:11
offby1 well, I use git at work, mostly03:12
we only have two pure git repositories; they're almost entirely unrelated.03:12
Nicolas_Leonidas that is not an issue here, It's my personal computer so access is ok03:12
so for each seperate project you create a what? a branch?03:12
→ boombatower joined03:12
← boombatower left03:12
→ boombatower joined03:12
offby1 I'd read about merging separate projects into one, and conversely, about splitting one into many. I'd decide based on which operation seems easiest :)03:12
→ SeanTAllen joined03:13
offby1 no, a separate branch per project doesn't sound reasonable03:13
you shouldn't make a branch unless there's a reasonable chance you'll merge it back into the master03:13
otherwise it's sort of pointless03:13
Nicolas_Leonidas right03:13
so ur saying one rep per project? merge all into one?03:13
offby1 well, would it make sense to use one project without any of the others?03:14
→ ruskie joined03:14
← SeanTAllen left03:14
offby1 if so, one repo per project sounds reasonable03:14
I guess, knowing nothing about your projects, I'm slightly in favor of one repo per project.03:14
but if they were all different parts of a single web site, it might make sense to have them all in the same repo.03:14
← ruskie left03:15
Nicolas_Leonidas they are very independent03:16
I mean they are seperate projects03:16
so if I do that, will I be able to run them in a daemon later?03:16
→ nothingHappens joined03:16
dag10_[AFK] → dag1003:16
← cworth` left03:17
offby1 dunno what you mean by that03:18
→ cworth joined03:18
← amerine left03:18
dag10 Thanks for the link sitaram03:20
→ t3i_ joined03:22
← glitterfang left03:22
luke-jr_ → luke-jr03:23
← t3i left03:23
t3i_ → t3i03:23
← nothingHappens left03:24
→ ruskie joined03:24
← marienz left03:25
→ nibblebot joined03:25
← ruskie left03:25
→ ianmcorvidae|alt joined03:25
← ianmcorvidae|alt left03:25
→ ianmcorvidae|alt joined03:25
→ towski_ joined03:25
← ianmcorvidae left03:25
→ EnTeQuAk_ joined03:25
ianmcorvidae|alt → ianmcorvidae03:25
→ Teo` joined03:26
← Teo` left03:26
→ Teo` joined03:26
→ nicomen_ joined03:26
→ ttelford joined03:26
→ ferai joined03:26
→ Tabstar joined03:26
← theoros left03:26
→ cballou joined03:27
→ BBonifiee joined03:27
→ bindaas1 joined03:27
→ ferrousw1eel joined03:27
→ dj_tjerk| joined03:27
← Bass2 left03:27
→ ketas-av- joined03:27
→ meder joined03:28
→ menomc joined03:28
→ fr| joined03:28
→ ioerror_1 joined03:28
→ pasky_ joined03:28
→ iveqy_ joined03:28
→ Slush-__ joined03:28
→ shennyg joined03:28
→ starcoder- joined03:28
→ NoobSaibot joined03:28
→ efftee joined03:28
→ jepler- joined03:29
← iAsterisk left03:29
← Tabmow left03:29
→ rmk` joined03:30
Tabstar → Tabmow03:30
→ ruskie joined03:30
← ruskie left03:30
← robotarmy left03:30
← outoftime_ left03:31
→ flexd_ joined03:31
→ LuckyNeo joined03:31
→ LuckyNeo_ joined03:31
→ danlentz_ joined03:32
← towski left03:32
← akasimir left03:32
← danlentz left03:32
← bindaas left03:32
← dj_tjerk left03:32
← chitragupt left03:32
← karstensrage left03:32
← mnemoc left03:32
← nicomen left03:32
← khiroc left03:32
← agile left03:32
← Tommy[D] left03:32
← hkjels left03:32
← ajt left03:32
← nimrod10 left03:32
← ketas-av left03:32
← flexd left03:32
← ivan`` left03:32
← Gitzilla left03:32
← pasky left03:32
← meder_ left03:32
← Elfe_ left03:32
← Nicolas_Leonidas left03:32
← nibblebot_ny left03:32
← mattyb left03:32
← ijuma left03:32
← ioerror__ left03:32
← rns left03:32
← slide left03:32
← EricInBNE left03:32
← shennyg_ left03:32
← Teo`` left03:32
← dv310p3r left03:32
← RobertLaptop left03:32
← jefferai left03:32
← fr left03:32
← Nugget_ left03:32
← deekayen left03:32
← rmk left03:32
→ karstensrage joined03:32
→ nimrod10 joined03:32
EnTeQuAk_ → EnTeQuAk03:32
starcoder- → starcoder203:32
→ EricInBNE joined03:32
→ jpieper joined03:32
→ rns joined03:33
karstensrage → Guest2174103:33
→ khiroc joined03:33
→ chitragupt joined03:33
→ agile joined03:33
→ ericdc joined03:33
→ Gitzilla joined03:33
→ slide joined03:33
→ ijuma joined03:34
← vitor-br_ left03:34
← LuckyNeo left03:34
→ dv310p3r joined03:34
→ ivan`` joined03:35
→ deekayen joined03:35
→ ruskie joined03:36
← Swimming_bird left03:36
→ Elfe joined03:38
ormaaj_ → ormaaj03:39
→ Tommy[D] joined03:39
← ruskie left03:40
→ RobertLaptop joined03:40
→ Nugget joined03:45
← rayners left03:55
→ mikepack joined03:55
→ ruskie joined03:55
→ karpar joined03:55
→ kenneth_reitz joined03:55
→ akheron joined03:55
← ruskie left03:55
→ ruskie joined03:56
→ Gryllida joined03:57
Gryllida http://codepad.org/KweWksWY03:57
bob2 yes03:58
read the first line03:58
→ phantomcircuit_ joined04:01
← ruskie left04:01
← phantomcircuit_ left04:02
← rchavik left04:02
← OOPMan left04:02
bob2 then obey the 13th ;)04:02
← tyteen4a03_ left04:02
offby1 about time, too04:02
wagle_ → wagle04:03
→ spb_ joined04:04
→ joelpet joined04:04
→ fr0sty_ joined04:05
→ oele2 joined04:05
→ dirker_ joined04:05
→ xxtjaxx joined04:05
← xxtjaxx left04:05
→ xxtjaxx joined04:05
→ callen_ joined04:05
→ madsy_ joined04:05
→ cehteh` joined04:05
→ ajt joined04:05
→ siprbaum_ joined04:05
→ no_maam_ joined04:05
→ Adam__ joined04:05
← Soliton left04:05
→ Bucciarati_ joined04:05
→ supervac` joined04:05
→ nazgul101 joined04:05
→ ymasory joined04:05
→ helgi joined04:05
→ Soliton joined04:05
→ q0rban|a_ joined04:05
← callen_ left04:05
← ymasory left04:05
→ divVerent_ joined04:05
→ rm-f`whoami` joined04:05
→ project2501b joined04:05
→ jsjgruber__ joined04:06
→ ymasory joined04:06
→ floppyea1s joined04:06
→ shame joined04:06
→ tharkun_ joined04:06
→ jamescarr_ joined04:06
→ mutex_ joined04:06
→ j0ran joined04:07
→ emptyflask joined04:07
→ SNEI joined04:07
→ cworth` joined04:07
→ kpreid_ joined04:07
→ yaotti_aw__ joined04:07
→ frogonwheels_ joined04:07
← jmcantrell_ left04:08
→ dec_ joined04:08
→ cloudpopup joined04:08
← chitragupt left04:08
← agile left04:08
← phantomcircuit left04:08
← coldboot_ left04:08
← CyberDomovoy left04:08
← Adam left04:08
← dirker left04:08
← q0rban|afk left04:08
← n8o left04:08
← vsayer left04:08
← electrogeek left04:08
← jsjgruber_ left04:08
← frogonwheels left04:08
← nazgul102 left04:08
← jfkw left04:08
← siprbaum left04:08
← callen left04:08
← fr0sty left04:08
← dot-slaSh left04:08
← madsy left04:08
← Bucciarati left04:08
← dec left04:08
← cworth left04:08
← jonmasters_ left04:08
← mgaunard left04:08
← NfNitLoop left04:08
← Zygo left04:08
← JonT left04:08
← adamm left04:08
← m2_ left04:08
← vandemar_ left04:08
← madduck left04:08
← Neo left04:09
← rphillips_ left04:09
← ryanakca_ left04:09
← luke-jr left04:09
← supervacuo left04:09
← j0ran1 left04:09
← pyrony left04:09
← netset_christoff left04:09
← ketas- left04:09
← MacGyverNL_ left04:09
← chrizz left04:09
← project2501a left04:09
← Heimidal left04:09
← kpreid left04:09
← nb left04:09
← durarara left04:09
← hegge left04:09
← no_maam left04:09
← ptl left04:09
← VxJasonxV left04:09
← erichammond left04:09
← mapreduce left04:09
← SethRobertson left04:09
← Lgb left04:09
← jds left04:09
← jamescarr left04:09
← bob2 left04:09
← bmalee left04:09
← muep left04:09
← SJS left04:09
← bartman` left04:09
← lahwran left04:09
← dwmw2_dad left04:09
← cehteh left04:09
← Cap_J_L_Picard left04:09
← up_the_irons left04:09
← silfreed left04:09
← Will| left04:09
← floppyears left04:09
← mutex left04:09
← helgikrs left04:09
← JoeHazzers left04:09
← GodEater left04:09
← yaotti_aw_ left04:09
← xxtjaxx_ left04:09
← tharkun left04:09
← spb left04:09
← joelpet_ left04:09
← divVerent left04:09
← patrikf left04:09
← oelewapperke left04:09
← tansell left04:09
← Ratler left04:09
→ ewanm89_ joined04:09
kpreid_ → kpreid04:09
ewanm89_ → Cap_J_L_Picard04:09
spb_ → spb04:09
→ jmcantrell joined04:09
→ jfkw joined04:09
→ patrikf joined04:09
→ chitragupt joined04:09
→ m2 joined04:09
→ n8o joined04:10
→ ruskie joined04:10
→ Will| joined04:10
→ chrizz joined04:10
→ Zygo joined04:11
→ JoeHazzers joined04:11
→ jds joined04:11
→ pyrony joined04:11
→ erichammond joined04:11
← ruskie left04:11
→ Heimidal joined04:11
→ mgaunard joined04:12
→ CyberDomovoy joined04:12
← Heimidal left04:13
→ hegge joined04:14
→ coldboot_ joined04:14
→ phantomcircuit joined04:14
→ vsayer joined04:14
→ electrogeek joined04:14
→ Neo joined04:14
→ NfNitLoop joined04:14
→ JonT joined04:14
→ adamm joined04:14
→ madduck joined04:14
→ vandemar_ joined04:14
→ ryanakca_ joined04:14
→ rphillips_ joined04:14
→ luke-jr joined04:14
→ ketas- joined04:14
→ MacGyverNL_ joined04:14
→ nb joined04:14
→ durarara joined04:14
→ ptl joined04:14
→ VxJasonxV joined04:14
→ SethRobertson joined04:14
→ Lgb joined04:14
→ bob2 joined04:14
→ bmalee joined04:14
→ muep joined04:14
→ bartman` joined04:14
→ lahwran joined04:14
→ dwmw2_dad joined04:14
→ up_the_irons joined04:14
→ silfreed joined04:14
→ tansell joined04:14
→ Ratler joined04:14
Gryllida < Gryllida> http://codepad.org/KweWksWY < bob2> yes < bob2> read the first line < bob2> then obey the 13th ;) <---- I don't have root access there.04:14
← mando left04:14
→ mapreduce joined04:15
← alester left04:15
offby1 it's easy to build from source04:15
→ jonmasters joined04:17
→ GodEater joined04:17
← GodEater left04:17
→ GodEater joined04:17
cmyers Hmm, I am having trouble seeing how to do a thing using the plumbing. I have several branches with non-conflicting file names, and I want to check out all their contents into the working directory at the same time04:17
if I use git read-tree to get it into the index, a bunch of "delete files" also end up getting added.04:17
and checkout-index seems to only move things from the index to the working tree.04:18
and the reason I am trying to avoid merge to begin with is all the merge strategies seem to get it wrong04:19
→ Adys joined04:19
cmyers so I am not sure git merge-base is going to help me.04:19
erm, git-merge I mean04:19
← brendon left04:19
cmyers the multiple branches I am working with have no common base.04:19
← ricky left04:19
← Jobes left04:20
→ ricky joined04:20
← thiago left04:22
→ alester joined04:22
← morganick left04:23
→ OOPMan joined04:24
← avinashhm left04:25
← NoobSaibot left04:28
← sunil left04:28
offby1 you could git-archive 'em all together04:29
→ ruskie joined04:30
← dag10 left04:30
← Zenith77 left04:30
← jonmasters left04:31
→ Predominant joined04:31
← jshsu left04:33
→ thiago joined04:34
← thiago left04:34
→ thiago joined04:34
→ aminpy joined04:34
→ jshsu joined04:35
← mdel left04:38
→ LongBeach joined04:38
→ mdel joined04:39
→ slonopotamus joined04:42
← gretch_ left04:42
← divVerent_ left04:44
→ divVerent joined04:45
→ amerine joined04:45
→ Dave^| joined04:46
← jlewis_ left04:46
→ jlewis_ joined04:46
jlewis_ → jlewis04:46
← milki_ left04:47
→ milki joined04:48
← smolyn left04:49
→ ThomasLocke joined04:49
→ cutmail joined04:50
← Dave^| left04:51
→ RichardBronosky joined04:51
→ dim joined04:52
→ itistoday joined04:52
→ jonmasters joined04:53
← mikepack left04:53
→ gretch_ joined04:55
→ slonopotamus_ joined04:55
itistoday got myself in a small pickle: was using GitX and its weird staging UI caused me to make an extra, completely unnecessary commit. i think the files are the same between the two commits. How do i move HEAD and master to point to the parent commit, and delete the one i just created?04:56
i tried: git checkout [commit-hash], and now i'm in "detached HEAD" state...04:56
← slonopotamus left04:56
itistoday (actually, i did: git checkout HEAD^)04:56
← ISF left04:57
← LuckyNeo_ left04:58
→ anuxs joined04:58
→ [Pi] joined04:59
← TiBook left04:59
→ tgunr joined04:59
← cutmail left05:00
CrazyGir I am a bit unsure how I got here, but in picking up a slightly old repo, I have a local branch for which a git pull does not sync up with the associated remote branch. They are named the same (foo locally, then remotes/origin/foo). how would you "update" git on this association?05:02
← RichardBronosky left05:02
sitaram 'git checkout branchname' to go back to the original branch tip, then 'git reset HEAD^'05:02
← anuxs left05:03
slonopotamus_ → slonopotamus05:03
→ ISF joined05:03
sitaram then 'git status' will tell you if there really weren't any differences between the 2 top commits05:03
→ cutmail joined05:03
CrazyGir I don't quite understand how that would "re-associate" the local and remote branches05:05
itistoday sitaram: hmm... too late, i just tried "git branch -f master [hash]; git checkout master", that seemed to do it.. errr... if that's not right, i've somehow fixed it05:05
and i've lost that child commit somehow as well05:05
which is fine05:05
→ cschneid joined05:05
CrazyGir sitaram: ^05:08
→ NoobSaibot joined05:09
← sunblush left05:10
itistoday sonofabitch!05:10
gitx is piece of crap05:10
CrazyGir hides05:10
itistoday just lost work because of i t05:10
CrazyGir :(05:10
no backups?05:11
itistoday CrazyGir: hey, you're right05:11
i do have a backup i think :-)05:11
CrazyGir :)05:11
w00t05:11
itistoday hehe05:11
sitaram itistoday: "git reflog --date=relative"05:11
→ joel_falcou joined05:11
→ sunil joined05:12
itistoday sitaram: i think i kill the unstaged files05:13
they never made it into a commit05:13
i'll check my backup now though...05:13
CrazyGir I've done that :(05:13
→ Sanda joined05:13
itistoday CrazyGir: to your question, i think there's something about "tracking" a branch05:14
CrazyGir: search for "Tracking Branches" here: http://progit.org/book/ch3-5.html05:14
don't know if that's helpful05:14
CrazyGir looking here too: http://book.git-scm.com/4_tracking_branches.htmlhoow to do what once a branch has been created?05:15
← slonopotamus left05:15
itistoday CrazyGir: unfortunately, you're chatting with a git n00b. :-p05:16
(who just shot himself in the foot)05:16
CrazyGir bah, the second question was lost there... how to do what once a branch has been created?05:17
no backups?05:17
← kenneth_reitz left05:17
← Gryllida left05:17
itistoday i do have a backup, but it's going to take over 2 hours to get it05:17
← JEEB left05:17
CrazyGir bah05:17
→ Dylan168071 joined05:18
itistoday all my code is stored in an encrypted "sparsebundle" (giant disk, ~6GB)05:18
← dim left05:18
itistoday i have to download it from amazon05:18
CrazyGir fun stuff05:18
itistoday heh, this is going to cost me money actually... for the transfer...05:18
→ JEEB joined05:18
CrazyGir :(05:18
use better code next time?05:19
CrazyGir hides05:19
itistoday understand what i'm doing next time05:19
don't use git reset --hard lightly05:19
actually, i didn't!05:19
this is all gitx' falult05:19
its stupid UI made it seem like i had committed the changes when it had not05:19
← Dylan16807 left05:20
itistoday hope you figure out your question, i gotta go05:20
← itistoday left05:20
← bentkus left05:21
→ bentkus joined05:21
→ alezandro joined05:22
← guardian1 left05:24
→ Tuomas_ joined05:24
→ guardian joined05:25
→ VladDrac joined05:25
← brosner left05:26
← engla left05:30
← seivan left05:31
→ seivan joined05:31
← alip left05:32
← karpar left05:32
CrazyGir I found a shortcut, drop the local branch (after confirming I wouldn't lose anythng) then recreate it05:33
fortunately that was possible :)05:33
← ISF left05:35
← boombatower left05:36
→ alip joined05:37
← Octalot left05:37
← alester left05:37
→ dermoth|home joined05:37
← deekayen left05:38
← Sanda left05:40
← dj_tjerk| left05:40
→ dj_tjerk joined05:40
→ misch23 joined05:40
→ ExtraSpice joined05:41
→ kronos joined05:41
→ rseifert joined05:42
← shame left05:42
← jfkw left05:43
→ Remixman joined05:45
← ttelford left05:45
→ jamescarr__ joined05:46
← jamescarr_ left05:46
→ kenneth_reitz joined05:46
← ymasory left05:47
← nchaimov left05:48
→ troyt joined05:48
← JP-Dery left05:48
← hynek left05:48
→ JP-Dery joined05:48
→ karpar joined05:49
→ jamescarr_ joined05:51
← guardian left05:52
← Yuffster_ left05:53
→ deekayen joined05:53
← jamescarr__ left05:54
→ airborn joined05:55
← madewokherd left05:59
← emptyflask left06:00
← cutmail left06:00
← rmk` left06:01
→ rmk joined06:02
ChanServ set mode: +o06:02
wereHams1er changed the topic to: 1.7.4.3 | Homepage: http://git-scm.com | Can't talk on the channel? http://jk.gs/gitvoice/ | Everyone asleep or clueless? Try [email@hidden.address] | Channel log http://j.mp/gitlog | Mailing list archives: http://j.mp/gitlist | Gits on git: http://j.mp/gittalks | Pastebin: http://gist.github.com/ | http://tinyurl.com/GitSurvey2010Results06:02
ChanServ set mode: -o06:02
→ cutmail joined06:03
→ lanthan_ joined06:06
→ workmad3 joined06:07
→ VAAARS8 joined06:08
→ ymasory joined06:09
← lanthan left06:10
→ cbreak_work joined06:10
→ emptyflask joined06:10
→ bdiddy joined06:11
ChanServ set mode: +v06:14
bdiddy Does anyone know any screencasts for using git on a private server setup? (I'm wanting to incorporate in jobs for clients, so don't want it to be using github)06:14
← jepler- left06:15
bob2 github will sell you private repository hosting06:16
← amerine left06:16
bob2 but if it's just you, then run "git init --bare" on the server, then "git remote add origin user@host:/path/to/foo.git ; git push origin master" on the client06:17
bdiddy so when it comes to deploying the site on the staging and live servers would the normal practice be to push to these?06:17
← mbrumbelow left06:18
bob2 if you want to use git to deploy, you'd push to a /bare/ repository and then have a post-receive hook there do a "git pull" or "git fetch ; git reset --hard origin/somebranch" to a 3rd repository06:18
ferai → jefferai06:20
bdiddy I was reading a little on this but didn't see what was meant by bare repository06:20
bob2 = repository without checked out files06:20
ala a svn or cvs repository06:20
bdiddy so not the .git folder?06:20
bob2 or a bzr --no-trees repository06:20
don't understand the question06:20
a bare repository is just the contents of what would be in .git in a non-bare repository06:21
→ psoo joined06:21
→ mramige joined06:22
← karpar left06:22
bdiddy Oh... I may not be thinking right. Was thinking bare meant just the main project folders and files (php, images, css etc)06:22
bob2 no06:22
non-bare = all your files and dirs, with a .git dir containing revision data06:23
bare = just the .git dir containing revision data06:23
→ TrineLocke joined06:23
← arunce left06:25
← efftee left06:26
→ sgh joined06:26
→ ft joined06:26
→ urkud_ joined06:27
bdiddy ahh ok. Think I'll need to read through some deployment documentation. (got my head around the basic of the git status, commits and branches) but still needing the next penny to drop.06:28
bob2 I'd read a whole git book/long tutorial and play before doing the above for real06:28
→ karpar joined06:28
← Tuomas_ left06:28
← workmad3 left06:29
→ Dave^| joined06:31
bdiddy I've had a pretty solid run throgh Andrew Burgess - Getting Good with Git, which has given me the basic understanding of sub-versioning. Would a beginner then just be in the master branch and just FTP the file to the live server? (was hoping I can figure it out, so then it only uploaded the necessary files that have been altered)06:31
← emptyflask left06:31
→ avinashhm joined06:31
→ superdmp joined06:31
→ giallu joined06:33
← avinashhm left06:36
→ tyteen4a03 joined06:36
← cloudpopup left06:36
← towski_ left06:37
→ jepler joined06:38
← robins left06:39
→ robinsmidsrod joined06:39
→ chrischambers joined06:42
→ steph021 joined06:44
→ jceb joined06:45
→ skoop joined06:45
→ rcu joined06:46
→ priidu joined06:46
→ mastroDani joined06:48
← hobodave left06:48
← tango_ left06:48
→ avinashhm joined06:48
→ hobodave joined06:48
→ Dr4g joined06:48
→ darragh joined06:49
← avinashhm left06:49
darragh Can --track option be used to track a remote master when doing fetch from 1 repo to another?06:50
→ tango_ joined06:50
← seivan left06:52
→ rchavik joined06:52
→ maleknet joined06:52
→ seivan joined06:52
→ jamescarr__ joined06:54
← airborn left06:55
← Saur left06:55
← jamescarr_ left06:57
← Determinist left06:57
→ VAAAR3J joined06:59
← deekayen left07:02
→ ereslibre joined07:02
← ereslibre left07:02
→ ereslibre joined07:02
→ workmad3 joined07:04
→ radarek joined07:05
→ larsl joined07:06
→ leo2007 joined07:06
leo2007 How to remove a remote branch?07:06
darragh leo2007: git branch rm07:07
jaeckel_ git push :<branchname>07:08
leo2007 I use git branch -dr07:08
jaeckel_ to remove the branch on the remote07:09
← thiago left07:09
→ deekayen joined07:09
→ guardian joined07:09
leo2007 jaeckel_: I think you are right.07:10
← bartek left07:10
jaeckel_ → jaeckel07:10
→ empity joined07:10
→ dvaske joined07:10
jaeckel man git-push07:10
jast the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html [automatic message]07:10
← Rhonda left07:10
→ Rhonda joined07:10
Rhonda To remove a remote branch that's still locally available, git remote prune <remotename>07:10
← stuffcorpse left07:11
← comawhite left07:11
jaeckel http://www.kernel.org/pub/software/scm/git/docs/git-push.html#_examples07:11
f00li5h → f001i5h07:11
leo2007 cannot connect to github now. I will keep trying.07:11
→ henrikbjorn joined07:12
f001i5h → f00li5h07:13
← mithro left07:14
→ silv3r_m00n joined07:14
silv3r_m00n how to remove a dir from git07:14
leo2007 silv3r_m00n: git doesn't track dir07:14
jaeckel: git push :branchname gives me fatal: The remote end hung up unexpectedly07:15
→ ronr_ joined07:15
→ mishok13 joined07:15
→ AceOfKnaves joined07:16
← workmad3 left07:16
→ shiba_yu36 joined07:16
ronr_ hi everyone, some time ago someone referred me to an ebook to learn how to work with git, but unfortunately, I don't remember its name. anyone has any idea as to what it might have been?07:16
→ chrischambers_ joined07:17
leo2007 ok deleted.07:17
silv3r_m00n git rm dir_name -r worked07:17
bob2 progit perhaps07:17
← chrischambers left07:18
chrischambers_ → chrischambers07:18
← oc80z left07:18
→ oc80z joined07:19
← AceOfKnaves left07:19
← silv3r_m00n left07:19
← ThiefMaster|work left07:19
→ ThiefMaster|work joined07:19
← AAA_awright left07:20
→ thiago joined07:20
← deekayen left07:21
ronr_ bob2: thanks for the reference07:21
→ comawhite joined07:21
← shiba_yu36 left07:21
→ rmAdfinis joined07:21
← comawhite left07:21
→ comawhite joined07:21
→ shiba_yu36 joined07:22
→ AAA_awright joined07:22
← bdiddy left07:22
→ tvw joined07:24
← AAA_awright left07:24
→ AAA_awright joined07:25
→ rue joined07:25
kloeri_ → kloeri07:25
← bindaas1 left07:26
→ bindaas joined07:27
← comawhite left07:27
← joel_falcou left07:28
← ereslibre left07:28
← drev1 left07:28
← bindaas left07:29
→ bindaas joined07:30
← Tommy[D] left07:30
→ bighoss joined07:31
→ toabctl joined07:31
→ ereslibre joined07:31
← ereslibre left07:31
→ ereslibre joined07:31
→ Tommy[D] joined07:32
← ereslibre left07:33
→ ereslibre joined07:34
→ troessner joined07:34
← ereslibre left07:34
→ ereslibre joined07:34
→ dpino joined07:35
← ymasory left07:35
→ Henrik_ joined07:37
← henrikbjorn left07:38
→ ereslibre_laptop joined07:40
← ereslibre_laptop left07:40
→ ereslibre_laptop joined07:40
← ereslibre left07:40
← ronr_ left07:41
← mastroDani left07:43
← toabctl left07:44
→ davzie joined07:45
← nadim left07:46
← tgunr left07:46
→ nadim joined07:47
→ ggxymd joined07:48
→ javajunky joined07:49
→ primalmotion joined07:49
javajunky morning :) Anyone use /know about the p4merge client integration ?07:49
→ stuffcorpse joined07:49
← kenneth_reitz left07:50
javajunky I'm just wondering why 'local' is passed twice when no base is present (rather than a reference to an empty file) … passing an empty file fixes a weird behaviour I have when two branches add the same named file (different content, where p4merge thinks it has correctly resolved the conflict auto-magically) .. ?07:51
but I don't know enough about it to say that this is a valid fix :)07:51
← project2501b left07:51
→ goshawk joined07:52
→ eschnou joined07:52
← stuffcorpse left07:54
← Tac_Home left07:54
← lanthan_ left07:55
→ comawhite joined07:56
→ modulistic joined07:58
← slyphon left07:59
→ saidinesh5 joined08:02
→ krosenvold_ joined08:02
saidinesh5 hi guys basically I have 2 repos A and B on my local machine, and i have a branch on A which i want to add to B08:02
how do i do that?08:02
(A is a clone of gitorious clone of upstream repo of B)08:03
← superdmp left08:04
simplechat Hey guys08:05
I have a directory that contains a repository, and i need to get it to pull from another repo and overwrite any merges08:06
(ie. resolve all merges in favour of the remote repo)08:06
is there any way to do that?08:06
← ereslibre_laptop left08:06
rane_ git merge -X theirs08:06
← jceb left08:07
simplechat is there any way to specify that as part of the git pull?08:07
rane_ git pull -X theirs (maybe)08:07
simplechat Automatic merge failed; fix conflicts and then commit the result.08:08
→ Mek joined08:10
← Samual left08:10
→ Samual joined08:10
← goshawk left08:10
← bentkus left08:11
← radarek left08:11
→ teweWork joined08:12
→ AlexP_ joined08:12
→ entropie` joined08:12
← AlexP left08:12
→ bentkus joined08:13
→ nibblebot_ny joined08:13
← pyrony left08:13
javajunky no ideas on the p4merge tool config question ?08:13
→ courtain joined08:14
→ jepler- joined08:14
← p3rror left08:14
→ ereslibre joined08:14
← ereslibre left08:14
→ ereslibre joined08:14
→ Seta00_ joined08:14
→ aef_ joined08:14
→ daum_ joined08:15
→ tty234_ joined08:16
→ ohcibi_ joined08:16
→ marcamilly_ joined08:16
→ Dave^|| joined08:17
→ jargan joined08:17
→ dirker joined08:17
→ RaceCondition joined08:17
← xerora left08:18
→ Alien_Freak joined08:18
→ pielgrzy1 joined08:18
→ denysonique_ joined08:19
→ tty2 joined08:19
→ wagle_ joined08:19
→ rmblr joined08:19
→ Merwin_ joined08:19
→ orospakr` joined08:19
→ eijk joined08:19
→ d_roge_ joined08:20
→ Haaarg joined08:20
→ lu_zero_ joined08:20
→ jhford_ joined08:20
→ saschagehlich joined08:20
→ sgronblo_ joined08:20
→ cupsh joined08:20
→ sadmac2 joined08:20
→ dhruvasagar_ joined08:20
→ shachaf_ joined08:20
→ Silex_ joined08:20
→ ciaranm_ joined08:20
→ zomg_ joined08:20
→ mkramer joined08:20
← dreiss left08:20
→ jshsu_1 joined08:20
→ tpope_ joined08:20
→ sven^_ joined08:20
→ dhoss_ joined08:20
→ chrizz_ joined08:21
→ m2_ joined08:21
→ JonasF_ joined08:21
→ jakob` joined08:21
→ rue_XIV joined08:21
→ codejunk1 joined08:21
→ vals_ joined08:21
→ tbranyen_ joined08:21
shachaf_ → shachaf08:21
→ ewanm89_ joined08:21
→ gbjk_ joined08:21
→ BtbN_ joined08:21
← saschagehlich left08:21
← rcu left08:21
→ dvaske_ joined08:22
→ JStoker_ joined08:22
← denysonique_ left08:22
→ denysonique_ joined08:22
→ ThC joined08:22
← rue left08:22
← dvaske left08:22
← tango_ left08:22
← Dave^| left08:22
← jshsu left08:22
← chrizz left08:22
← m2 left08:22
← Cap_J_L_Picard left08:22
← kpreid left08:22
← rm-f`whoami` left08:22
← supervac` left08:22
← nazgul101 left08:22
← dirker_ left08:22
← slide left08:22
← jpieper left08:22
← danlentz_ left08:22
← nibblebot left08:22
← Amorphous left08:22
← orospakr left08:22
← Seta00 left08:22
← tty234 left08:22
← RSchulz left08:22
← tbranyen left08:22
← zomg__ left08:22
← ciaranm left08:22
← mkramer1 left08:22
← robinsmidsrod left08:22
← pielgrzym left08:22
← Ramblurr left08:22
← jophish left08:22
← elb0w left08:22
← BtbN left08:22
← jast left08:22
← ThunderChicken left08:22
← funfun left08:22
← wagle left08:22
← Khisanth left08:22
← sycofly left08:22
← segher left08:22
← lu_zero left08:22
← Haarg left08:22
← murr4y left08:22
← marcamilly left08:22
← aef left08:22
← Merwin left08:22
← sven^ left08:22
← AkumaStreak left08:23
← brodo left08:23
← blueyed left08:23
← joeytwiddle left08:23
← jdav_gone left08:23
← ohcibi left08:23
← entropie left08:23
← tty1 left08:23
← Fullma left08:23
← DrNick left08:23
← Pupeno left08:23
← dhruvasagar left08:23
← codejunky left08:23
← msch left08:23
← curtana left08:23
← gabiruh left08:23
← sgronblo left08:23
← gbjk left08:23
← daum left08:23
← RichiH left08:23
← modulistic left08:23
← troessner left08:23
← jepler left08:23
← cutmail left08:23
← yaotti_aw__ left08:23
← SNEI left08:23
← Nugget left08:23
← ferrousw1eel left08:23
← jefferai left08:23
← t3i left08:23
← eno left08:23
← ska-fan_ left08:23
← Zenopus left08:23
← sitaram left08:23
← tahorg left08:23
← dr_lepper left08:23
← jnylen left08:23
← nevyn_ left08:23
← tux21b left08:23
← jlewis left08:23
← bremner`` left08:23
← stepnem left08:23
← rettub left08:23
← GrowLinux left08:23
← makubi left08:23
← mattikus left08:23
← Goliath|2 left08:23
← Caelum_ left08:23
← blast_hardcheese left08:23
← magcius left08:23
← ajpiano_ left08:23
← nixness left08:23
← coffeejunk left08:23
← Leonidas left08:23
← Sil4nc4 left08:23
← logankoester left08:23
← bremner left08:23
← _bitbucket left08:23
← kenyon left08:23
← an0maly left08:23
sadmac2 → sadmac08:23
→ saschagehlich joined08:23
Haaarg → Haarg08:23
ewanm89_ → Cap_J_L_Picard08:23
JStoker_ → JStoker08:23
→ nazgul101 joined08:23
→ funfun joined08:23
→ rjt joined08:23
→ RichiH joined08:23
→ stick joined08:23
→ modulistic joined08:23
→ troessner joined08:23
→ cutmail joined08:23
→ yaotti_aw__ joined08:23
→ SNEI joined08:23
→ Nugget joined08:23
→ ferrousw1eel joined08:23
→ jefferai joined08:23
→ t3i joined08:23
→ eno joined08:23
→ ska-fan_ joined08:23
→ Zenopus joined08:23
→ sitaram joined08:23
→ tahorg joined08:23
→ dr_lepper joined08:23
→ jnylen joined08:23
→ nevyn_ joined08:23
→ tux21b joined08:23
→ jlewis joined08:23
→ stepnem joined08:23
→ bremner`` joined08:23
→ rettub joined08:23
→ GrowLinux joined08:23
→ makubi joined08:23
→ mattikus joined08:23
→ Goliath|2 joined08:23
→ blast_hardcheese joined08:23
→ Caelum_ joined08:23
→ ajpiano_ joined08:23
→ magcius joined08:23
→ nixness joined08:23
→ coffeejunk joined08:23
→ Leonidas joined08:23
→ Sil4nc4 joined08:23
→ logankoester joined08:23
→ bremner joined08:23
→ _bitbucket joined08:23
→ kenyon joined08:23
→ an0maly joined08:23
→ RSchulz joined08:23
→ msch joined08:23
→ naquad_ joined08:23
→ brodo joined08:24
→ supervacuo joined08:24
← t3i left08:24
→ jdav_gone joined08:25
→ radarek joined08:25
← telmich_ left08:25
→ rane_ joined08:25
→ eco joined08:25
→ gabiruh joined08:25
→ AkumaStreak joined08:26
→ kpreid joined08:26
← gbjk_ left08:26
← codejunk1 left08:26
→ Pupeno joined08:26
→ segher joined08:26
← AkumaStreak left08:26
→ danlentz joined08:26
→ codejunky joined08:26
→ gbjk joined08:27
→ scrooloose joined08:27
← comawhite left08:27
→ comawhite joined08:29
→ PigeonFriend joined08:29
ciaranm_ → ciaranm08:30
→ sycofly joined08:30
→ \yrlnry joined08:30
→ DrNick joined08:30
→ Fullma joined08:31
wagle_ → wagle08:31
→ Amorphous joined08:32
→ rm-f`whoami` joined08:32
→ mmattice joined08:32
→ sigmonsay joined08:32
→ slide joined08:33
→ jpieper joined08:33
→ pix_ joined08:33
← albel727_2 left08:33
→ agreen joined08:33
→ darsk1ez joined08:33
→ elb0w joined08:34
→ joeytwiddle joined08:34
ajpiano_ → ajpiano08:35
← mastro left08:35
← brodo left08:36
→ Khisanth joined08:36
← tbranyen_ left08:36
→ fivetwentysix_ joined08:37
← Theravadan left08:39
→ p3rror joined08:40
→ angelsl joined08:41
→ tatsuya joined08:42
→ rendar joined08:43
→ selckin joined08:43
→ achadwick joined08:46
→ Deesl joined08:47
→ _pingu joined08:48
← _pingu left08:48
→ Fullmoon joined08:49
→ project2501a joined08:49
← adaptee left08:51
→ workmad3 joined08:52
← tatsuya left08:54
→ wtfness joined08:55
← itdude left08:57
← ereslibre left09:00
→ mr_blue joined09:00
mr_blue hello all09:00
→ opalka joined09:01
mr_blue when i do 'git svn fetch' i see list of additions / deletions / modifications but no change are made on the file system... Did i miss something ?09:02
← saidinesh5 left09:03
→ bluenovember joined09:03
→ reuteras_ joined09:04
→ ndimitrij joined09:04
→ Tohuw_ joined09:06
→ bjornbjo1n joined09:06
→ lamont` joined09:06
→ nhOmega joined09:07
→ joelpet_ joined09:07
→ GodEater_ joined09:07
← GodEater_ left09:07
→ GodEater_ joined09:07
→ dekroning joined09:08
→ itdude joined09:08
→ jeffhung joined09:08
→ uau` joined09:09
→ iAmerikan joined09:10
← Soliton left09:11
→ Soliton joined09:11
→ rcu joined09:11
← Elfe left09:11
→ Elfe_ joined09:12
← VladDrac left09:12
← ruskie left09:12
← GodEater left09:12
← joelpet left09:12
← Mohjive left09:12
← fahadsadah left09:12
← lamont left09:12
← Tohuw left09:12
← jeffhung_ left09:12
← thoolihan left09:12
← Rhonda left09:12
← uau left09:12
← Brandon_W_ATS left09:12
← bjornbjorn left09:12
← ndim left09:12
← reuteras left09:12
nhOmega → ruskie09:12
→ crashanddie_ joined09:12
→ thoolihan joined09:13
→ VladDrac joined09:13
→ Mohjive joined09:13
→ Brandon_W_ATS joined09:13
→ tatsuya joined09:15
← rseifert left09:15
→ Rhonda joined09:16
← Rhonda left09:17
→ Rhonda joined09:17
→ Adaptee joined09:17
← dekroning left09:17
← leo2007 left09:18
→ fahadsadah_ joined09:19
→ lisak joined09:19
← Deesl left09:20
lu_zero_ → lu_zero09:21
→ rseifert joined09:21
lisak hey, I deleted some files, then $git commit, there was a list of those "deleted" files, but after I run $git clone this repo from a different machine, those files were still under version control09:22
→ wafcio joined09:22
→ ayanes joined09:23
← ayanes left09:23
→ ayanes joined09:23
← fahadsadah_ left09:23
← steph021 left09:23
← rcu left09:23
lisak do I have to run anything after "commit" when deleting files ?09:24
or before09:24
ChanServ set mode: +v09:24
wafcio hello every one09:24
I have problem with starting git daemon in freebsd09:25
route: writing to routing socket: File exists09:25
add net 0.0.0.0: gateway XXX.XXX.XXX.XXX: route already in table09:25
Starting git_daemon.09:25
usage: git daemon [--verbose] [--syslog] [--export-all]09:26
[--timeout=n] [--init-timeout=n] [--max-connections=n]09:26
[--strict-paths] [--base-path=path] [--base-path-relaxed]09:26
[--user-path | --user-path=path]09:26
[--interpolated-path=path]09:26
[--reuseaddr] [--detach] [--pid-file=file]09:26
[--[enable|disable|allow-override|forbid-override]=service]09:26
[--inetd | [--listen=host_or_ipaddr] [--port=n]09:26
[--user=user [--group=group]]09:26
[directory...]09:26
/usr/local/etc/rc.d/git_daemon: WARNING: failed to start git_daemon09:26
→ fahadsadah joined09:28
← msch left09:32
→ SirFunk joined09:38
← sycofly left09:40
← scrooloose left09:40
← rane_ left09:40
← supervacuo left09:40
← rmblr left09:40
← wagle left09:40
← seivan left09:40
← aminpy left09:40
← ricky left09:40
← Adam__ left09:40
← ketas-av- left09:40
← da5id left09:40
← kelvie left09:40
← Casvah_AFK left09:40
← gebi left09:40
← mjv left09:40
← kloeri left09:40
← zivester_ left09:40
← BlueAidan_ left09:40
← Vampire0 left09:40
← djencks left09:40
← ice799 left09:40
← f00li5h left09:40
← kuhrt left09:40
← jailbox left09:40
← d1b left09:40
← tmz left09:40
← hachiya left09:40
← sonnym left09:40
← Juri_Agarin left09:40
← przemoc left09:40
← cbreak left09:40
← nd__ left09:40
← ijuma_ left09:40
← cwillu_at_work left09:40
← lemonchicken left09:40
← KKA left09:40
← daethorian left09:40
← ArjenL left09:40
← jeremy_c left09:40
← sp3000 left09:40
← MrHeavy left09:40
← redfox__ left09:40
→ mastroDani joined09:40
→ UukGoblin joined09:40
→ linusoleander joined09:40
← Henrik_ left09:42
← isimiip left09:42
← VladDrac left09:42
← Mohjive left09:42
← fahadsadah left09:42
jjuran lisak: Either `git rm files` or `rm files; git add -u`, then commit.09:42
→ Mohjive joined09:42
→ cube joined09:42
→ jutaro joined09:42
→ kelvie joined09:43
→ Ramblurr joined09:43
→ meuh joined09:43
ivan`` → ivan09:43
→ xrogaan joined09:43
← xrogaan left09:43
→ xrogaan joined09:43
← Remixman left09:43
→ BlueAidan joined09:43
→ wagle joined09:43
→ wolog joined09:43
→ kode9 joined09:43
→ ivey_off joined09:43
→ ketas-av joined09:43
→ gebi joined09:43
→ Adam__ joined09:44
simplechat hey, is there any way to work out the status of a particular file in vim09:44
→ f00li5h joined09:44
← f00li5h left09:44
→ f00li5h joined09:44
→ clever joined09:44
→ tmz joined09:44
→ sanguisleft joined09:44
→ seivan joined09:44
→ redbrain joined09:44
empity simplechat: some shell magic09:44
→ jeremy_c joined09:44
empity vim can run shell commands09:44
→ scrooloose joined09:44
→ sp3000 joined09:44
→ cmn joined09:44
cube I'm working on a story in a branch. When merging my branch into master I would like every commit message (from the branch) to be prefixed with the story identifier. Howto? What do you you think about that, I'm not sure if it's the good way to go09:44
→ ricky joined09:44
simplechat uh wait, i didn't want vim09:44
*git09:44
→ fahadsadah_ joined09:44
simplechat in git09:44
→ RJD22 joined09:44
→ remi joined09:44
← remi left09:44
→ remi joined09:44
→ LoRe joined09:44
simplechat basically i have some files that are on a commit on one machine, pulled to another and they're gone09:44
and i'm not sure why09:45
→ deavid joined09:45
→ daethorian joined09:45
→ kloeri joined09:45
→ hachiya joined09:45
→ Juri_Agarin joined09:45
→ supervacuo joined09:45
→ sycofly joined09:45
→ rane_ joined09:45
→ aminpy joined09:45
→ da5id joined09:45
→ Casvah_AFK joined09:45
→ mjv joined09:45
→ zivester_ joined09:45
→ Vampire0 joined09:45
→ djencks joined09:45
→ kuhrt joined09:45
→ jailbox joined09:45
→ d1b joined09:45
→ przemoc joined09:45
→ cbreak joined09:45
→ nd__ joined09:45
→ ijuma_ joined09:45
→ cwillu_at_work joined09:45
→ KKA joined09:45
→ redfox__ joined09:45
→ ArjenL joined09:45
→ nigelb joined09:45
→ EqS joined09:45
→ Arrowmaster joined09:45
→ coling joined09:45
→ krisbulman joined09:45
→ piti joined09:45
→ TLMonitor joined09:45
→ JPT joined09:45
→ tabakhase joined09:45
→ docgnome joined09:45
→ ice799 joined09:45
→ ramsey joined09:45
empity git status <file>09:45
works fine09:45
cube: what should be the story identifier?09:45
→ sonnym joined09:45
← lisak left09:45
← aminpy left09:46
cube empity: ie. STW-45609:46
empity and maybe you want to rebase instead, to reorder the commits09:46
simplechat all it says is nothing to commit09:46
→ aminpy joined09:46
cube empity: I'm doing rebase, but still I wan't to somehow mark those commits09:46
→ kenneth_reitz joined09:46
→ Utopiah joined09:46
← ayanes left09:47
← Utopiah left09:47
empity cube: why? but in general I guess you can script an edit of the commit msg09:47
← vandemar_ left09:48
cube empity: so that my bugtracker shows those commits preview when browsing the story09:48
← cwillu_at_work left09:48
← Mohjive left09:49
kloeri → Guest6643309:49
→ henrikbjorn joined09:50
→ cwillu_at_work joined09:51
sgronblo_ → sgronblo09:51
→ vandemar joined09:51
Guest66433 → kloeri09:52
← muep left09:52
→ torotil joined09:52
← karpar left09:52
→ bentob0x joined09:53
← iAmerikan left09:53
← KKA left09:54
→ stuffcorpse joined09:54
torotil hi, I try to mirror a svn repository with git: Is there a way (with git-svn) to get all the branches as local branches (instead of in remotes/…)?09:54
← mr_blue left09:55
→ KKA joined09:57
→ muep joined09:57
→ robert_david joined09:57
→ mr_blue joined09:57
← javajunky left09:59
← fivetwentysix_ left10:00
→ hynek joined10:02
← hynek left10:02
→ hynek joined10:02
→ Mohjive joined10:03
→ jelmer joined10:05
→ Raging_Hog joined10:06
Ca1us → Caius10:06
wereHams1er torotil: git svn clone -s ...; then git for-each-ref refs/remotes/* ...10:06
or adjust the svn fetch refspec10:07
torotil wereHams1er: hm, how can I do that? and does this break successive git svn fetches?10:09
→ owst joined10:09
→ jophish joined10:10
wereHams1er git svn init and then edit .git/config10:10
Caelum_ → Caelum10:10
→ vitor-br joined10:11
torotil wereHams1er: nice - thanks a lot ;)10:11
→ rolfb joined10:13
→ jelmer_ joined10:13
tty234_ → tty23410:16
rue_XIV → rue10:16
← jelmer left10:16
← Mohjive left10:16
→ ianmcorvidae|alt joined10:16
← ianmcorvidae|alt left10:16
→ ianmcorvidae|alt joined10:16
→ homa_ran1 joined10:17
→ EnTeQuAk_ joined10:17
→ ndim joined10:17
→ dna_ joined10:18
→ cworth joined10:18
→ jrockway_ joined10:18
← rideh left10:18
→ Zygo` joined10:18
← SirFunk left10:18
→ chrizz joined10:18
← angelsl left10:19
→ angelsl joined10:19
→ larva_ joined10:19
→ LoRe_ joined10:19
→ TrineLocke_ joined10:20
→ CDomovoy joined10:20
→ achadwick_ joined10:20
→ davzie_ joined10:20
→ _W joined10:20
→ atdiehm joined10:20
← [Pi] left10:20
← tro left10:20
← homa_rano left10:20
← EnTeQuAk left10:20
← ndimitrij left10:20
← cworth` left10:20
← ianmcorvidae left10:20
← dna left10:20
← fisted left10:20
← farktronix left10:20
← jrockway left10:20
← chrizz_ left10:20
← Zygo left10:20
← LoRe left10:20
← CyberDomovoy left10:20
← flexd_ left10:20
← aperlstein left10:20
← dvaske_ left10:20
← TrineLocke left10:20
← LongBeach left10:20
← hynek left10:20
← rseifert left10:20
← achadwick left10:20
← jshsu_1 left10:20
← davzie left10:20
← larva left10:20
← _W_ left10:20
← Tac left10:20
→ flexd joined10:20
→ hynek joined10:20
← hynek left10:20
→ hynek joined10:20
→ rcu joined10:20
EnTeQuAk_ → EnTeQuAk10:20
→ Mohjive joined10:20
→ dvaske_ joined10:21
→ aperlstein joined10:21
→ jshsu joined10:21
→ batrick joined10:23
← bgy left10:24
← teweWork left10:26
ianmcorvidae|alt → ianmcorvidae10:27
→ fisted joined10:27
→ bgy joined10:28
→ murr4y joined10:28
← Mohjive left10:28
← tyteen4a03 left10:29
← Dr4g left10:29
→ Dr4g joined10:29
_W → _W_10:29
→ lut4rp joined10:29
→ tro joined10:29
← naquad_ left10:29
→ Mohjive joined10:31
→ blueyed joined10:31
→ naquad joined10:31
→ Yuuhi joined10:32
← darragh left10:34
→ rideh joined10:34
← levifig left10:34
← codejunky left10:34
← jaeckel left10:34
← kermit left10:34
→ jaeckel joined10:34
→ levifig joined10:34
← jaeckel left10:34
→ jaeckel joined10:34
→ codejunk1 joined10:34
← geekfactor left10:34
← BlindOracle left10:35
← starcoder2 left10:35
→ mastroWork joined10:35
→ geekfactor joined10:35
→ teweWork joined10:36
→ BlindOracle joined10:36
→ starcoder2 joined10:38
← urkud_ left10:39
← Adaptee left10:39
← mastroDani left10:39
→ khmarbaise joined10:39
← cutmail left10:41
→ joel_falcou joined10:42
→ marcob joined10:42
← Fullmoon left10:43
← bentkus left10:44
→ dr_bibble joined10:44
← dr_bibble left10:45
← tabakhase left10:45
→ tabakhase joined10:45
→ bentkus joined10:46
→ EdwardIII joined10:46
EdwardIII hey10:46
must have forgot to commit before i did a pull - i'm seeing # Your branch is ahead of 'origin/master' by 1 commit.10:46
well actually i'm not sure how that happened heh. how can i see the commit i'm ahead by?10:47
→ fivetwentysix_ joined10:47
→ adaptee joined10:48
wereHams1er EdwardIII: git log origin/master..10:49
and what you're seeing has nothing to do with the fact that you did or did not commit before pulling10:50
→ spaceonline joined10:51
EdwardIII wereHams1er, yeah i realised that after i made the dumb comment10:54
→ marciodias joined10:54
← marciodias left10:54
wereHams1er → wereHamster10:56
EdwardIII scratches his head10:56
EdwardIII i'm not sure how i got to be 1 commit ahead10:56
perhaps i should clone and work from that instead10:56
wereHamster EdwardIII: that log command I gave you will show you that commit10:57
why don't you have a look at it?10:57
← hobodave left10:57
→ rseifert joined10:58
← Samual left10:58
EdwardIII wereHamster, i'm checking it out now10:58
→ Yuuhi` joined10:59
← vandemar left10:59
← shachaf left11:00
← Yuuhi left11:00
← sraue left11:00
→ vandemar joined11:00
→ sraue joined11:00
← Elfe_ left11:00
→ shachaf joined11:00
jelmer_ → jelmer11:00
→ Elfe joined11:01
← linusoleander left11:01
← foocraft left11:01
→ hobodave joined11:01
← wtfness left11:01
← Alien_Freak left11:01
← nevyn_ left11:01
→ csgeek joined11:02
→ Samual joined11:02
→ stamina joined11:05
EdwardIII wereHamster, i'm looking at the different commit, i guess i should look at what went in with it11:05
→ kumbayo joined11:07
→ glitterfang joined11:08
→ Alien_Freak joined11:09
← csgeek left11:09
→ bluenovember_ joined11:09
→ NilsH joined11:10
→ jophish_ joined11:10
→ bartek joined11:11
NilsH Hey guys! I have a problem with submodules. I added "ignore = untracked" to my .gitmodules, but untracked files in submodules still showing up in "git status". What to do?11:11
→ sgh_ joined11:12
← sgh_ left11:12
→ kode92 joined11:12
→ shiba_yu_ joined11:12
← dhruvasagar_ left11:12
← shiba_yu36 left11:12
← kenneth_reitz left11:12
← danlentz left11:12
← ajt left11:12
← nimrod10 left11:12
← geekfactor left11:12
← kode9 left11:12
← jdav_gone left11:12
← rue left11:12
← ft left11:12
← NoobSaibot left11:12
← flexd left11:12
← jophish left11:12
← jpieper left11:12
← Tommy[D] left11:12
← bighoss left11:12
← tvw left11:12
← rmAdfinis left11:12
← Adys left11:12
← ericdc left11:12
← Elfe left11:12
← mastroWork left11:12
← cwillu_at_work left11:12
← sanguisleft left11:12
← bluenovember left11:12
← agreen left11:12
← joeytwiddle left11:12
← Merwin_ left11:12
← daum_ left11:12
← courtain left11:12
← larsl left11:12
← sgh left11:12
← ijuma left11:12
← Gitzilla left11:12
→ rmAdfinis joined11:12
← Guest21741 left11:12
← Predominant left11:13
→ NoobSaibot joined11:13
→ ajt_ joined11:13
← robert_david left11:13
← eijk left11:13
→ robert_david joined11:13
← dv310p3r left11:13
→ karstensrage joined11:13
→ danlentz joined11:13
→ flexd joined11:13
→ jdav_gone joined11:13
→ eijk joined11:13
→ jpieper joined11:13
→ mastroWork joined11:13
← jshsu left11:13
→ ft joined11:13
karstensrage → Guest5907011:13
→ joeytwiddle joined11:13
→ Gitzilla joined11:13
→ dhruvasagar joined11:13
→ agreen joined11:14
→ sanguisleft joined11:14
→ daum_ joined11:14
→ Merwin joined11:14
→ jshsu joined11:14
→ courtain joined11:14
→ nimrod10 joined11:14
→ dv310p3r joined11:14
→ larsl joined11:14
→ bbear joined11:14
bbear hello11:14
→ Adys joined11:15
bbear do you have an idea ?11:15
→ ericdc joined11:15
→ Tommy[D] joined11:15
bbear I started with a raw git rm on my source tree.11:15
How can I fetch to the last revision ?11:15
please ?11:15
I just need to know that.11:15
just to get back the last commited state11:16
rane_ depends11:16
→ ijuma joined11:16
rane_ git reset --hard might do it11:16
← teweWork left11:17
→ linusoleander joined11:17
NilsH Hey guys! I have a problem with submodules. I added "ignore = untracked" to my .gitmodules, but untracked files in submodules still showing up in "git status". What to do?11:18
→ avdg joined11:18
→ geekfactor joined11:18
→ TomyLobo joined11:19
→ rue joined11:19
→ cwillu_at_work joined11:19
→ Anubisss joined11:19
pasky_ → pasky11:20
→ teweWork joined11:20
→ robinsmidsrod joined11:22
→ wentasah joined11:23
→ engla joined11:24
→ Elfe joined11:24
→ kenneth_reitz joined11:24
← engla left11:25
→ engla joined11:25
→ josefrichter joined11:26
→ liquidproof joined11:27
→ albel727_2 joined11:27
→ nevyn joined11:27
← wafcio left11:28
← geekfactor left11:28
josefrichter guys, when I have uncommited changes and want to commit them on newly created branch, I do git checkout -b myranch and then git commit, right? (my changes not lost during the checkout command)11:30
→ marienz joined11:30
josefrichter *mybranch11:30
→ PabloM joined11:30
← codejunk1 left11:31
← fivetwentysix_ left11:31
→ mitziyahu joined11:33
mitziyahu im using a bare repo, and a regular repo11:33
i can pull/fetch from the bare but when i push it says the 'you need to pull first' first11:33
rane_ josefrichter: no, they're not11:33
→ Anubisss_ joined11:34
→ Miles8of9 joined11:34
josefrichter rane_ ok thanks11:34
→ Dylan16807 joined11:35
→ tharkun joined11:36
Miles8of9 hi guys... i would like to use git but i'm using windows.. is windows version of git usable?11:36
→ robert_david_ joined11:36
→ tcurdt joined11:37
← dhruvasagar left11:37
← ajt_ left11:37
← Dr4g left11:37
← tharkun_ left11:37
← Tommy[D] left11:37
← larsl left11:37
← Gitzilla left11:37
← joeytwiddle left11:37
← Dylan168071 left11:37
← Anubisss left11:37
← ijuma left11:37
← nimrod10 left11:37
← ft left11:37
← jshsu left11:37
← jpieper left11:37
← flexd left11:37
← pix_ left11:37
← Fullma left11:37
← sven^_ left11:37
← jhford_ left11:37
← giallu left11:37
← daum_ left11:37
← robert_david left11:37
→ Merwin_ joined11:37
← cwillu_at_work left11:37
← p3rror left11:37
→ ajt joined11:37
← Merwin left11:37
→ Gitzilla joined11:37
→ dhruvasagar joined11:37
← owst left11:37
→ cwillu_at_work joined11:38
→ Fullma joined11:38
→ daum_ joined11:38
← courtain left11:38
→ p3rror joined11:38
→ ijuma joined11:38
→ ft joined11:38
tcurdt git merge, conflict, then tried 'git co --theirs path/to/file' but it says "error: path 'path/to/file' does not have their version"11:38
→ jhford joined11:38
dhruvasagar → Guest7672311:38
→ flexd joined11:38
→ courtain joined11:38
tcurdt git ls-files -u shows the conflict though11:38
→ giallu joined11:39
→ joeytwiddle joined11:39
→ pix_ joined11:39
→ sven joined11:39
→ jpieper joined11:39
→ nimrod10 joined11:39
sven → Guest8898211:39
← RaceCondition left11:39
→ Tommy[D] joined11:40
→ jshsu joined11:40
josefrichter when I want my branches be available in the github repo, I shall commit those brances separately? i.e. git commit github mybranch ?11:42
← simplechat left11:42
← jspiros_ left11:42
rane_ you don't commit branches11:42
bremner josefrichter: perhaps you want man git push11:42
jargan josefrichter: the 'git' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git.html [automatic message]11:42
bremner oops11:42
→ xiong joined11:42
bremner that would be man git-push11:42
jargan the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html [automatic message]11:42
rane_ tcurdt: git reset --hard && git merge -X theirs <whatever you're merging>11:42
→ jspiros joined11:43
→ Titosemi joined11:43
josefrichter aah sry, I meant push, not commit, of course :-) just not sure whether it pushes "everything" or just master. will tajke a look in those docs. thanks.11:43
← Titosemi left11:43
bremner it just pushes the one branch if you pass it.11:43
→ Titosemi joined11:44
tcurdt rane_: could you elaborate what's wrong with my approach?11:44
rane_ tcurdt: i have no idea11:44
← angelsl left11:44
vals_ → tango_11:44
josefrichter bremner: so git push github mybranch will push mybranch to the repo so it's available as separate branch to whoever pulls from the repo, right?11:44
tcurdt rane_: so you agree that in theory my way should work, too?11:45
rane_ tcurdt: no, because i've never done that11:45
tcurdt k :)11:45
→ angelsl joined11:46
tcurdt rane_: does not work either11:47
still the same problem11:47
rane_ hmm11:48
tcurdt is preparing a pastebin11:48
rane_ I guess you have to manually pick "ours" version of that file11:48
← kronos left11:48
rane_ if the merged branch doesn't have that file11:48
← rchavik left11:49
tcurdt rane_: https://gist.github.com/5bbcd80b42887f9b29dd11:50
rane_ I don't know if it makes a difference but shouldn't -X theirs be before the branch name11:51
→ DiGitalX joined11:52
← rseifert left11:52
tcurdt doesn't make a difference11:52
but I checked the file is gone in master11:53
→ larsl joined11:53
tcurdt so if I use ours it should probably work ... trying11:53
→ lisak joined11:54
helgi → Guest9380911:54
→ SimonP86 joined11:55
→ Mark_Morcom joined11:56
loufoque → mgaunard_11:56
lisak jjuran, thank you, I cloned a repository, commited some changes and when "git pull ssh://user ....." from the original repository, it says Already up-to-date.11:56
← krosenvold_ left11:56
← iravid left11:57
→ iravid joined11:57
lisak ou I forgot to mention that I also tried to push the changes11:57
bremner josefrichter: right11:57
→ gitnewbie joined11:59
josefrichter thanks very much11:59
← glitterfang left12:02
→ karpar joined12:02
→ bitkiller joined12:03
→ anjen joined12:04
tcurdt rane_: the only thing that worked in the end was 'git co --ours' to keep the file12:04
→ winterweaver joined12:07
← bartek left12:08
← dv310p3r left12:08
→ leavittx joined12:09
→ RaceCondition joined12:10
→ jsick3 joined12:11
← winterweaver left12:14
→ Dr4g joined12:15
Guest93809 → helgikrs12:15
Miles8of9 hi guys... i would like to use git but i'm using windows.. is windows version of git usable? which version should i install? plain git or msys?12:15
msys netinstall12:15
Silex_ Miles8of9: msysgit is fine12:19
you might want to use it with tortoisegit too12:19
never heard of "plain git" under windows12:19
Miles8of9 Git-1.7.4-preview20110204.exe12:20
this12:20
← Dr4g left12:20
→ Dr4g joined12:20
Silex_ that's msysgit afaik12:20
Miles8of9 msysGit-netinstall-1.7.4-preview20110204.exe12:21
→ Spockz joined12:21
Silex_ ah, I see what you mean12:21
the last one is a "if you want to hack on git" install12:21
it contains the stuffs to compile it, etc12:22
use the first one12:22
Miles8of9 Further, msysGit does not install to C:\Program Files by default. But msysGit comes with gcc, the GNU C Compiler.12:23
https://git.wiki.kernel.org/index.php/MSysGit:InstallMSysGit12:23
← achadwick_ left12:23
Miles8of9 where does it install so?12:23
← tcurdt left12:24
→ achadwick joined12:24
→ sftp joined12:24
→ nd___ joined12:24
ChanServ set mode: +v12:25
← davzie_ left12:26
← nd__ left12:26
← opalka left12:26
← karpar left12:27
← JP-Dery left12:29
→ urkud_ joined12:30
Seta00_ → Seta0012:32
← NilsH left12:33
→ davzie joined12:33
← linusoleander left12:35
← RaceCondition left12:35
← ijuma left12:35
← uau` left12:36
← Titosemi left12:36
Silex_ Miles8of9: I don't get it, do you want to install git or install git-dev?12:37
→ bluj joined12:37
→ gusnan joined12:37
Miles8of9 well..... i just need something to keep tracks of changes in my code and upload on production server12:37
they suggested me this git because has also an integration with eclipse12:38
bluj i have a git repository with serveral nested git repo's inside. is there a way to make a clone of this configuration from a different workstation?12:38
← aminpy left12:38
Miles8of9 so, i need git or git-dev?12:38
→ hcl2 joined12:39
thiago bluj: git submodule?12:40
bluj thiago, they arent submodules actually.. and converting it isn't really an option.12:41
→ d0k joined12:41
thiago so what is it?12:41
just git repositories inside the working dir of another repository?12:41
→ Saur joined12:41
bluj thiago, thats correct12:42
→ dajhorn joined12:42
← Saur left12:42
← bbear left12:42
→ Saur joined12:43
← Saur left12:43
eregon_ → eregon12:44
→ mrevd joined12:45
← Guest88982 left12:46
→ sven joined12:46
← pgib left12:47
sven → Guest1565912:47
← Guest15659 left12:47
→ tstclair joined12:49
← Raging_Hog left12:49
← bgy left12:50
→ sven^ joined12:50
→ karpar joined12:50
→ IslandUsurper joined12:50
← troessner left12:50
← karpar left12:50
← q0rban|a_ left12:50
→ q0rban joined12:51
→ bgy joined12:51
→ xiangfu joined12:54
← mitziyahu left12:57
← dajhorn left12:58
→ RaceCondition joined12:59
→ karpar joined12:59
→ bartek_ joined13:00
→ mklappstuhl joined13:01
← BBonifiee left13:02
lisak what should I do after I push into remote repository, on the remote repository side ?13:03
← rideh left13:03
→ vikash joined13:03
lisak because the changes that I pushed there are not reflected13:03
→ BBonifield joined13:03
lisak only git status shows what has been changed13:03
vikash Say I clone a repo.. dependencies are never resolved13:04
SO is this true13:04
→ Titosemi joined13:04
lisak so I tried "git commit" on the remote side and now "git status" shows "nothing to commit", but files on filesystem are in the original state13:07
mrevd is there a way to draft a commit message before you actually commit13:07
Miles8of9 i need something to keep tracks of changes in my code and upload on production server, they suggested me this git because has also an integration with eclipse, do i need git or git-dev?13:08
→ sunblush joined13:08
→ dyer joined13:08
← dyer left13:08
→ dyer joined13:08
mrevd miles8of9: get git-core13:08
→ emptyflask joined13:08
Miles8of9 i'm using windows13:09
← bentkus left13:09
mrevd http://help.github.com/win-set-up-git/13:09
→ Dylan168071 joined13:09
← courtain left13:09
sgronblo Are there any special consideratoins when trying to checkout a deleted file from an earlier commit?13:10
→ courtain joined13:10
bluj what would i use to print the name of the upstream branch a current branch is tracking?13:10
sgronblo git claims my path did not match any paths known to it13:10
→ drubies|mbp joined13:10
← courtain left13:10
← bla left13:10
← karpar left13:10
← adaptee left13:10
patrikf lisak: are you pushing to a non-bare repo?13:11
thiago bluj: parse the variables from git config13:11
→ hcl2_ joined13:11
Zygo` → Zygo13:11
→ jnlsnl_ joined13:11
→ curtana joined13:11
patrikf lisak: in fact, are you pushing at all?13:11
Miles8of9 mrevd: fantastic thx13:11
→ Bass10 joined13:11
→ mbrumbelow joined13:11
bluj thiago, hmm ok i can do that, i just imagined there would be a cmd13:11
→ mastro joined13:11
thiago bluj: not that I know of13:11
bluj ok13:11
→ bla joined13:12
→ dvaske__ joined13:13
ChanServ set mode: +v13:13
patrikf "git rev-parse --symbolic-full-name @{u}" works for me13:13
sgronblo ah of course you have to check it out from the parent of the commit that deleted it13:13
jnlsnl_ Im noob!! Question: do i need to have a local repo? can't i just work on stuff and then push it to the cloud repo?13:13
patrikf that was for bluj13:13
→ Adam joined13:13
bluj patrikf, cheers13:13
→ ZyZ joined13:13
→ v0n joined13:13
patrikf bluj: git for-each-ref can do it too, apparently13:14
→ bentkus joined13:14
→ Predominant joined13:14
ChanServ set mode: +v13:14
ZyZ hi13:14
lisak patrikf, I cloned a repository (non-bare) from workstation1, done some changes, "$git commit", $git push origin master13:14
→ LiamH joined13:14
ZyZ how to revert to last comit version13:14
vikash Say I clone a repo.. dependencies are not automatically resolved, Is this true?13:14
ZyZ cos I trashed my code13:15
patrikf lisak: you should not push to non-bare repos13:15
Predominant ZyZ: git reset HEAD~113:15
← sanguisleft left13:15
→ varioust joined13:15
→ nothingHappens joined13:15
lisak I'm just working on my own project from 2 machines13:15
← mastroWork left13:15
lisak and I can't figure out how to do that :013:15
patrikf ZyZ: or HEAD, depending on what exactly you mean with "last comit version"13:15
lisak so that13:15
patrikf lisak: either constantly pull from each other repo13:15
vikash Is there a way to produce a list of required dependencies. So can this be a GSoC project?13:15
Predominant patrikf: Nice catch. Cheers.13:15
patrikf lisak: or set up a third, bare repo which you can push to and pull from13:15
← bla left13:15
→ bla joined13:15
lisak I can;t use the original one as remote, because it is not bare ?13:15
patrikf lisak: you can use it as a remote, just don't push to it, pull from the other side instead13:16
→ sIbOk joined13:16
ZyZ I did `git reset HEAD~1' but nothing happened13:16
→ q0rban_ joined13:16
ZyZ the files are still the same13:16
in the working dir13:16
lisak patrikf, do I have to specify branch name ? or just "$git pull host/location" ?13:17
→ tvw joined13:17
ZyZ when I say last commit I mean the last time I commited it13:17
← q0rban left13:17
← hcl2 left13:17
← achadwick left13:17
← anjen left13:17
← bitkiller left13:17
← giallu left13:17
← Dylan16807 left13:17
← spaceonline left13:17
← khmarbaise left13:17
← tro left13:17
← aperlstein left13:17
← dvaske_ left13:17
← rcu left13:17
← hynek left13:17
← Adam__ left13:17
← erichammond left13:17
← mrkodiak left13:17
← niko left13:17
lisak I hope I don't have to create a branch but use just master13:17
→ khmarbaise joined13:17
fr0sty_ ZyZ: 'git reset --keep'13:18
→ anjen joined13:18
→ dv310p3r joined13:18
bluj is there a way to print the top SHA of the origin branch my local one tracks? e.g. before any local commits13:18
cbreak_work because branch creation is so expensive? :)13:18
→ ningia joined13:18
patrikf lisak: when you've added it as a remote, you can set it as upstream with branch --set-upstream and just use "git pull". otherwise, git will require some more verbosity from you, the manpage has all the details.13:19
Alien_Freak → csgeek13:19
cbreak_work bluj: git rev-parse @{u} maybe13:19
→ niko joined13:19
ZyZ fr0sty_: OK, but it still didn't seem to do anything13:19
bluj cbreak_work, thats the one, cheers13:19
fr0sty_ ZyZ: what does git status say?13:19
cbreak_work git remote update first13:19
← angelsl left13:19
← liquidproof left13:19
→ rideh joined13:19
→ angelsl joined13:20
→ mrkodiak joined13:21
→ panike joined13:21
→ Zenith77 joined13:21
→ tro joined13:22
ZyZ fr0sty_ http://joelightning.com/pastie.txt13:22
fr0sty_ if you don't care about the modifications to those files do: 'git reset --hard'13:22
→ lessthanzero joined13:22
patrikf fr0sty_: nice, didn't know about --keep13:22
ZyZ yeah, that's what I'm trying to do; get rid of the modifications13:23
← q0rban_ left13:23
patrikf is always a little bit scared when using --hard13:23
→ q0rban joined13:23
→ bitkiller joined13:23
ZyZ thanks fr0sty_13:24
→ achadwick joined13:24
→ hynek joined13:24
→ giallu joined13:24
→ Ryback_ joined13:24
← Ryback_ left13:24
→ Ryback_ joined13:24
→ adaptee joined13:24
← panike left13:24
→ spaceonline joined13:24
← Zenith77 left13:25
→ panike joined13:25
← nixness left13:25
← nevyn left13:25
→ fivetwentysix_ joined13:25
panike window goto 113:26
→ erichammond joined13:26
ZyZ well it deleted the last commit and reverted to the one before, destroying like an hours work THAT I WANTED13:26
But i have hourly bakcups so it's fine13:26
fr0sty_ ZyZ: what did you want to get rid of oricinally?13:27
originally, even?13:27
→ superdmp joined13:27
→ nevyn joined13:27
ZyZ I just wanted to get th files how they were the last time I committed them13:27
fr0sty_ just the uncommitted changes.13:27
ZyZ yeah13:27
← bla left13:28
→ slyphon joined13:28
→ kassah joined13:28
fr0sty_ git reset --keep HEAD@{1} is probably what you want,13:28
but look at that line in the output of 'git reflog' to be sure...13:29
→ MrHeavy joined13:29
→ alberto56 joined13:29
ZyZ d13:29
← RaceCondition left13:30
← iravid left13:30
← cesconix left13:30
→ bla joined13:30
→ SirFunk joined13:30
ZyZ ah, that seems to have fixed it13:31
← superdmp left13:31
→ Bruce_Wayne joined13:31
ZyZ dyeah, thanks13:31
← vikash left13:32
→ xelister joined13:33
xelister how to show last 10 commit messages13:33
like svn log -l 1013:33
Dr4g I've heard good things about this - is it any good? http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/13:34
→ rayners joined13:35
SethRobertson bluj: Use gitslave, which is much simpler than git-submodules and doesn't require changing any of the repos if you don't want to (though you will have to do something just a little bit different than the documented setup procedure if you are unwilling to commit one new file at the top level)13:36
← albel727_2 left13:36
SethRobertson git log -n 10?13:36
→ boutcher joined13:37
bluj SethRobertson, i havent heard of this, ill look into it - thx13:37
SethRobertson http://gitslave.sf.net13:37
← ribasushi_ left13:37
bluj cheers13:37
→ ribasushi joined13:37
← Samual left13:38
→ Veejay joined13:38
→ iravid joined13:39
→ npmap joined13:39
→ nullvariable joined13:39
← mbrumbelow left13:40
Veejay Hi everyone. I'm planning to revert a series of commits by a given author since a given commit. I'm planning to take the most recent commit, revert it and so on until all of them have been reverted. I somehow have the feeling that this is kind of bruteforce and that git probably allows more finesse... If anyone has ever done that before and knows a better way to solve that problem, please do share13:40
← larsl left13:41
← Utkarsh_ left13:41
SethRobertson The those commits sequential or interspersed with other commits?13:41
← Tommy[D] left13:41
SethRobertson Are13:41
Veejay Interspersed13:41
→ Utkarsh joined13:41
Veejay Hadn't they been I would have been reverted a range13:41
I think it is possible to do so13:41
→ albel727 joined13:41
Veejay Or even reset13:42
Silex_ → Silex13:42
Veejay Though now that I think about it13:42
I could reset to before the first commit13:42
And play back the series commits by other authors on top of it13:42
If that even makes sense13:42
series of commits sorry13:43
SethRobertson Veejay, why not just pipe a `git log` filtering for that user with the right -n to xargs revert?13:43
→ RaceCondition joined13:43
→ JP-Dery joined13:44
SethRobertson Reset could work to (reset then log piped to cherry-pick) but if other people might have gotten than branch to, changing history is annoying to one and all13:44
Veejay I've never had luck with mixing git and bash commands in the past13:44
But you might be right13:44
SethRobertson I do it all of the time13:45
bremner git commands are bash commands13:45
Veejay No yeah, but you know what I mean13:45
Or not13:45
:)13:45
I'll try the log and xargs13:45
TO THE GOOGLES!13:46
SethRobertson I'm not sure google is going to help you there.13:46
First construct a `git log` command which will pull the SHA and only the SHA of the commits you want to revert.13:46
patrikf SethRobertson: that's called "git rev-list".13:47
SethRobertson Then add "| xargs git revert" to the end of the command. Then you are done.13:47
patrikf git rev-list --author=foo | xargs git revert -n13:47
→ dannas joined13:47
SethRobertson Not all commits by foo, only some13:47
patrikf right13:48
← lu_zero left13:50
→ lu_zero joined13:51
← rideh left13:52
→ deekayen joined13:52
← deekayen left13:53
← lu_zero left13:53
→ lu_zero joined13:53
→ deekayen joined13:54
← Miles8of9 left13:55
← urkud_ left13:56
→ ijuma joined13:56
← mrevd left13:58
← gitnewbie left13:59
Veejay Yeah git rev-list doesn't take a --since13:59
Too bad13:59
Though I can probably do a SHA..HEAD or something13:59
Yep13:59
Nice13:59
→ bartek__ joined13:59
← bartek_ left13:59
→ NoobSaibot1 joined14:00
→ dim_ joined14:00
← xiong left14:00
← Mark_Morcom left14:00
← bartek__ left14:00
← shiba_yu_ left14:01
fairuz Hi, how to delete a remote tag?14:01
:D14:01
← IslandUsurper left14:02
→ shiba_yu36 joined14:02
← NoobSaibot left14:02
patrikf fairuz: git push :refs/tags/tagname14:02
albel727 like any other ref. but this is highly discouraged.14:02
→ ixti joined14:02
← jsjgruber__ left14:03
bremner it is more of a policy/workflow issue than a technical one14:03
→ sanguisleft joined14:03
→ mrevd joined14:03
→ whaley_ joined14:04
bremner I'd say, no more heinous than push -f. Or only a little more heinous ;)14:04
albel727 =)14:04
patrikf the problem is that anyone using push --tags will revive it14:04
albel727 yeah14:04
patrikf or wait, shouldn't pull be able to detect this?14:05
→ beatak joined14:05
albel727 but it could be even worse - someone can recreate that tag with the same name but with different commit.14:05
→ jaql joined14:05
→ GodEater joined14:06
← GodEater left14:06
→ GodEater joined14:06
albel727 hmm, I doubt that pull can do that.14:06
patrikf albel727: I think that's less worse. but both cases are bad. ;-)14:06
bluj is it possible / does it even have any meaning, to git fetch (or pull) the currently checked out HEAD of a remote? e.g.. they differ probably by minimal commits, but i don't want to make any assumption about the name of the branch its on?14:06
← henrikbjorn left14:06
← whaley left14:06
← RJD22 left14:06
→ RJD22 joined14:06
← JP-Dery left14:06
← iravid left14:06
← Bruce_Wayne left14:06
← alberto56 left14:06
← achadwick left14:06
← varioust left14:06
← Dylan168071 left14:06
← Fullma left14:06
← p3rror left14:06
← tharkun left14:06
← hobodave left14:06
← naquad left14:06
← lisak left14:06
← muep left14:06
← scrooloose left14:06
← ketas-av left14:06
← meuh left14:06
← fahadsadah_ left14:06
← joelpet_ left14:06
← lamont` left14:06
← bjornbjo1n left14:06
← darsk1ez left14:06
← comawhite left14:06
← gbjk left14:06
← Pupeno left14:06
← denysonique_ left14:06
← Cap_J_L_Picard left14:06
← dhoss_ left14:06
← ciaranm left14:06
← Haarg left14:06
← guardian left14:06
← JEEB left14:06
← sunil left14:06
← jonmasters left14:06
← mdel left14:06
← mapreduce left14:06
← hegge left14:06
← coldboot_ left14:06
← phantomcircuit left14:06
← vsayer left14:06
← electrogeek left14:06
← NfNitLoop left14:06
← JonT left14:06
← adamm left14:06
← madduck left14:06
← Neo left14:06
← rphillips_ left14:06
← ryanakca_ left14:06
← luke-jr left14:06
← ketas- left14:06
← MacGyverNL_ left14:06
← nb left14:06
← durarara left14:06
← ptl left14:06
← VxJasonxV left14:06
← SethRobertson left14:06
← Lgb left14:06
← bob2 left14:06
← bmalee left14:06
← bartman` left14:06
← lahwran left14:06
← dwmw2_dad left14:06
← up_the_irons left14:06
← silfreed left14:06
← tansell left14:06
← Ratler left14:06
← GodEater_ left14:06
← dpino left14:06
bluj well, im sure no one saw that, so:14:06
is it possible / does it even have any meaning, to git fetch (or pull) the currently checked out HEAD of a remote? e.g.. they differ probably by minimal commits, but i don't want to make any assumption about the name of the branch its on?14:06
→ rideh joined14:06
patrikf albel727: i forgot that only refs/heads/ is mirrored. so no, git pull probably can't detect it14:07
RJD22 → Guest2559314:07
→ jsjgruber joined14:07
← felipe left14:07
→ JP-Dery joined14:07
→ iravid joined14:07
→ Bruce_Wayne joined14:07
→ alberto56 joined14:07
→ achadwick joined14:07
→ Dylan168071 joined14:07
→ lisak joined14:07
→ p3rror joined14:07
→ Fullma joined14:07
→ tharkun joined14:07
→ hobodave joined14:07
→ naquad joined14:07
→ muep joined14:07
→ fahadsadah_ joined14:07
→ scrooloose joined14:07
→ ketas-av joined14:07
→ meuh joined14:07
→ joelpet_ joined14:07
→ lamont` joined14:07
→ bjornbjo1n joined14:07
→ darsk1ez joined14:07
→ comawhite joined14:07
→ gbjk joined14:07
→ Pupeno joined14:07
→ denysonique_ joined14:07
→ Cap_J_L_Picard joined14:07
→ dhoss_ joined14:07
→ ciaranm joined14:07
→ Haarg joined14:07
→ guardian joined14:07
→ JEEB joined14:07
→ sunil joined14:07
→ jonmasters joined14:07
→ mdel joined14:07
→ mapreduce joined14:07
→ hegge joined14:07
→ coldboot_ joined14:07
→ phantomcircuit joined14:07
→ vsayer joined14:07
→ electrogeek joined14:07
→ Neo joined14:07
→ NfNitLoop joined14:07
→ JonT joined14:07
→ adamm joined14:07
→ madduck joined14:07
→ ryanakca_ joined14:07
→ rphillips_ joined14:07
→ luke-jr joined14:07
→ ketas- joined14:07
→ MacGyverNL_ joined14:07
→ nb joined14:07
→ durarara joined14:07
→ ptl joined14:07
→ VxJasonxV joined14:07
→ SethRobertson joined14:07
→ Lgb joined14:07
→ bob2 joined14:07
→ bmalee joined14:07
→ bartman` joined14:07
→ lahwran joined14:07
→ dwmw2_dad joined14:07
→ up_the_irons joined14:07
→ silfreed joined14:07
→ tansell joined14:07
→ Ratler joined14:07
albel727 yeah, my thoughts exactly.14:08
→ sebersole joined14:08
← nothingHappens left14:09
→ LuckyNeo joined14:10
→ poseid joined14:12
→ resno joined14:12
→ lxsameer joined14:12
← wentasah left14:12
resno ive got a question why would you do a git add <filename> as oppose to a git add .14:12
lxsameer is there any hook for post pushing but running on local repo ?14:13
→ aminpy joined14:13
sitaram lxsameer: you dont push to a local repo14:14
s/a/the/14:14
→ wentasah joined14:14
SethRobertson resno: There may be other files in your repo you do not want to add. Being specific is a good habit14:15
→ cannonball joined14:16
← cannonball left14:16
→ cannonball joined14:16
SethRobertson lxsameer: Not that I am aware of. What are you really trying to do?14:16
← jaql left14:16
← shiba_yu36 left14:17
→ liquidproof joined14:18
→ rgravener joined14:18
← liquidproof left14:18
fr0sty_ bluj: we saw it both times. what you describe will work. though I'm curious what your use-case is?14:19
pluj: fetching/pulling <whatever happens to be checked out over there> seems like an invitation to confusion and pain.14:19
← JP-Dery left14:19
← iravid left14:19
← Bruce_Wayne left14:19
← alberto56 left14:19
← achadwick left14:19
← Dylan168071 left14:19
← resno left14:19
← Fullma left14:19
← p3rror left14:19
← tharkun left14:19
← hobodave left14:19
← naquad left14:19
← lisak left14:19
← muep left14:19
← scrooloose left14:19
← ketas-av left14:20
← meuh left14:20
← fahadsadah_ left14:20
← joelpet_ left14:20
← lamont` left14:20
← bjornbjo1n left14:20
← darsk1ez left14:20
← comawhite left14:20
← gbjk left14:20
← Pupeno left14:20
← denysonique_ left14:20
← Cap_J_L_Picard left14:20
← dhoss_ left14:20
← ciaranm left14:20
← Haarg left14:20
← guardian left14:20
← JEEB left14:20
← sunil left14:20
← jonmasters left14:20
← mdel left14:20
← mapreduce left14:20
← hegge left14:20
← coldboot_ left14:20
← phantomcircuit left14:20
← vsayer left14:20
← electrogeek left14:20
← NfNitLoop left14:20
← JonT left14:20
← adamm left14:20
← madduck left14:20
← Neo left14:20
← rphillips_ left14:20
← ryanakca_ left14:20
← luke-jr left14:20
← ketas- left14:20
← MacGyverNL_ left14:20
← nb left14:20
← durarara left14:20
← ptl left14:20
← VxJasonxV left14:20
← SethRobertson left14:20
← Lgb left14:20
← bob2 left14:20
← bmalee left14:20
← bartman` left14:20
← lahwran left14:20
← dwmw2_dad left14:20
← up_the_irons left14:20
← silfreed left14:20
← tansell left14:20
← Ratler left14:20
→ resno joined14:20
→ JP-Dery joined14:20
→ iravid joined14:20
→ Bruce_Wayne joined14:20
→ alberto56 joined14:20
→ achadwick joined14:20
→ Dylan168071 joined14:20
→ lisak joined14:20
→ p3rror joined14:20
→ Fullma joined14:20
→ tharkun joined14:20
→ hobodave joined14:20
→ naquad joined14:20
→ muep joined14:20
→ fahadsadah_ joined14:20
→ scrooloose joined14:20
→ ketas-av joined14:20
→ meuh joined14:20
→ joelpet_ joined14:20
→ lamont` joined14:20
→ bjornbjo1n joined14:20
→ darsk1ez joined14:20
→ comawhite joined14:20
→ gbjk joined14:20
→ Pupeno joined14:20
→ denysonique_ joined14:20
→ Cap_J_L_Picard joined14:20
→ dhoss_ joined14:20
→ ciaranm joined14:20
→ Haarg joined14:20
→ guardian joined14:20
→ JEEB joined14:20
→ sunil joined14:20
→ jonmasters joined14:20
→ mdel joined14:20
→ mapreduce joined14:20
→ hegge joined14:20
→ coldboot_ joined14:20
→ phantomcircuit joined14:20
→ vsayer joined14:20
→ electrogeek joined14:20
→ Neo joined14:20
→ NfNitLoop joined14:20
→ JonT joined14:20
→ adamm joined14:20
→ madduck joined14:20
→ ryanakca_ joined14:20
→ rphillips_ joined14:20
→ luke-jr joined14:20
→ ketas- joined14:20
→ MacGyverNL_ joined14:20
→ nb joined14:20
→ durarara joined14:20
→ ptl joined14:20
→ VxJasonxV joined14:20
→ SethRobertson joined14:20
→ Lgb joined14:20
→ bob2 joined14:20
→ bmalee joined14:20
→ bartman` joined14:20
→ lahwran joined14:20
→ dwmw2_dad joined14:20
→ up_the_irons joined14:20
→ silfreed joined14:20
→ tansell joined14:20
→ Ratler joined14:20
bluj fr0sty_, the use case is distributed build-testing, where a repository has several sub-repositories. so i need to get further compile boxes to have the same copy of the source14:20
← bbergler left14:20
← Bruce_Wayne left14:20
→ Bruce_Wayne joined14:20
→ bbergler joined14:20
← jsjgruber left14:21
→ jsjgruber joined14:21
lxsameer SethRobertson: i want to produce some information on my each push but in the local repo not remite14:21
*remote14:21
→ ceej joined14:21
← engla left14:21
← Bruce_Wayne left14:21
fr0sty_ bluj: you will be better off fetching branches or tags...14:21
← jsjgruber left14:22
fr0sty_ lxsameer: there is no hook which will do that.14:22
→ jsjgruber joined14:22
→ TeckniX joined14:22
bluj fr0sty_, with the sub-repos, i have a tendency to only switch to a work branch on the subrepo which requires work... so if i specify a branch, i likely wont pick up the commits id like to use.14:22
← jsjgruber left14:23
← madsy_ left14:23
→ nishttal2 joined14:23
→ mando joined14:23
nishttal2 I have created a repository on a remote server.. how do I clone it to my dev box14:24
i have tried git clone git://amzn.rblt.com/repo14:24
→ jsjgruber joined14:24
→ wilmoore joined14:24
bluj nishttal2, do you have git daemon setup? try using ssh protocol instead, specifying full path to repo14:24
lxsameer sitaram: i see , so there is not way to execute some code when i do a git push in a local repo14:25
nishttal2 bluj, thanks ssh worked14:25
← misch23 left14:25
nishttal2 bluj, now when I try to push from my dev box to remote.. i get this error http://fpaste.org/Fckj/14:26
bluj nishttal2, your remote server should probably be setup as a bare repo14:27
nishttal2 bluj, how do i do that14:28
bluj nishttal2, check the manual, something like git init --bare, if i recall14:28
← guardian left14:28
nishttal2 bluj, will do thanks14:28
→ btx94 joined14:28
→ guardian joined14:29
← mklappstuhl left14:29
→ tearsong joined14:30
→ airborn joined14:31
→ dlonie joined14:31
← dlonie left14:32
→ pdelgallego joined14:32
→ krosenvold_ joined14:33
← psoo left14:33
→ TiBook joined14:33
jargan → jast14:34
→ agile joined14:35
→ kermit joined14:35
fr0sty_ bluj: sub-repos?14:35
bluj fr0sty_, nested git repos14:36
← RaceCondition left14:36
bluj any of which may have a commit differing from upstream, and which are not necessarily the same branch name as the other nested repos14:37
ChanServ set mode: +v14:37
btx94 hi all, i am looking for advice on using git with eclipse14:37
← TiBook left14:38
bremner use the command line ;)14:38
nishttal2 bluj, i am not able to set this up.14:38
bluj, this is a new project.. i need a remote git repo that i can pull and push from/to14:38
→ Yuffster joined14:38
bluj nishttal2, right.. so why cant your remote git repo be a bare repository?14:38
← gusnan left14:39
bluj nishttal2, if it is not bare, it sounds like git won't push your changes because it does not want to overwrite the current work-state of the files. bare repos don't contain the actual files itself (so that they can be worked on), but instead the pack data that describes the repository14:39
→ stliu joined14:39
← stliu left14:39
→ stliu joined14:39
← stliu left14:39
→ AAAQZ8E joined14:39
btx94 @bremner: I use the command line to sync w git and I use eclipse as my IDE14:40
fr0sty_ bluj: are you using submodules?14:40
bluj fr0sty_, no14:40
nishttal2 bluj, i setup a bare repo.. and then I cloned on my dev box.. git clone ssh://host/home/_git_/repo14:40
fr0sty_ what are you using?14:40
nishttal2 bluj, then i added a file on my dev box and tried to push to remote (after commit)14:41
bluj fr0sty_, exactly that.. nested real git repos.. .git's inside .git's14:41
→ stliu joined14:41
bluj with probably some .gitignore's to ignore the nested stuff -- the design choice was not mine14:41
→ _psychic_ joined14:41
bluj nishttal2, and what error are you receiving? the one you showed me before seemed because it was not a bare repository14:41
nishttal2 bluj, and it gives this error.. http://fpaste.org/E8DR/14:41
bluj nishttal2, i usually use this syntax, see if it works: git push ssh://yourusername@boxname/path/to/git/repo master:master14:42
mastro guys do you know if egit (git plugin for eclipse) is now a mature integration to git?14:42
← wilmoore left14:43
mastro (i tried it a couple of months ago and it has major issue with ignores and some other gothas)14:43
gotchas14:43
nishttal2 bluj, that worked.. but i do not have to do that for any of the other repos we have14:43
bluj, just git push works for the other repos14:44
bluj nishttal2, not my problem :-) probably has somethign to do with ssh vs. git14:44
at least it pushes.14:44
← hobodave left14:44
nishttal2 yeah.. thanks14:44
← nishttal2 left14:45
→ excess^ joined14:45
→ dr_ick joined14:45
sitaram lxsameer: post-commit hook14:46
← rolfb left14:46
← cannonball left14:46
← Yuffster left14:49
→ urkud_ joined14:49
← fivetwentysix_ left14:49
← kpreid left14:49
→ owst joined14:49
← radarek left14:50
← beatak left14:51
→ cannonball joined14:51
← cannonball left14:51
→ cannonball joined14:51
← cannonball left14:51
→ cannonball joined14:51
→ beatak joined14:51
mgaunard_ mastro: define mature14:52
← giallu left14:52
→ Fullmoon joined14:52
→ tyteen4a03 joined14:52
← Fullmoon left14:52
← Guest25593 left14:53
→ EXACFWPK joined14:53
fr0sty_ bluj: I have no advice for you. your project sounds setup is, by design, an unmaintainable jumble.14:53
← tyteen4a03 left14:53
→ tyteen4a03 joined14:53
bluj fr0sty_, thx anyways14:54
← tyteen4a03 left14:54
→ tyteen4a03 joined14:54
→ blaix joined14:55
→ psoo joined14:55
→ sooraj joined14:55
← tyteen4a03 left14:55
→ chrisdev joined14:55
← chrisdev left14:55
→ chrisdev joined14:55
→ tyteen4a03 joined14:55
→ kukks joined14:56
← tyteen4a03 left14:56
→ tyteen4a03 joined14:57
→ shelhamer joined14:58
chrisdev → 18VAAAV1V14:58
→ chrisdev joined14:58
← elb0w left14:58
mastro mgaunard_, mature means: i can do the same i do on the command line for besic work: ignore files, add / remove, status, commit, branch, checkout, fetch, pull, push ...14:59
basic work14:59
→ liquidproof joined15:00
← Bucciarati_ left15:00
→ fivetwentysix_ joined15:00
← chrisdev left15:00
→ Theravadan joined15:01
→ sahilsk joined15:02
mgaunard_ mastro: I think it works well enough for basic stuff, but I'm not aware of any particular recent improvements15:03
→ theoros joined15:03
← tyteen4a03 left15:04
→ tyteen4a03 joined15:04
mgaunard_ mastro: it's based on JGit, which is still not quite perfect15:04
← emptyflask left15:05
← tyteen4a03 left15:05
→ tyteen4a03 joined15:05
→ Samual joined15:05
← tyteen4a03 left15:05
→ RJD22 joined15:06
← dannas left15:06
→ tyteen4a03 joined15:06
→ mastroWork joined15:06
mastroWork mgaunard_, thanks, i'll try it out again15:06
→ asedeno_work joined15:07
← fivetwentysix_ left15:08
← rmAdfinis left15:09
← shelhamer left15:09
← mastro left15:09
→ coulix joined15:10
→ shelhamer joined15:11
← dr_ick left15:11
→ excess^_ joined15:12
→ drev1 joined15:12
← RJD22 left15:13
← excess^ left15:13
excess^_ → excess^15:13
→ smolyn joined15:13
← cbreak_work left15:14
→ RJD22 joined15:14
← eschnou left15:14
← _psychic_ left15:15
← cschneid left15:15
→ cschneid joined15:16
← coulix left15:16
← lisak left15:16
← joel_falcou left15:17
→ _psychic_ joined15:17
→ aperlstein joined15:17
← sftp left15:17
→ dag10 joined15:17
dag10 Hey guys15:18
I'm trying to do an intial push to a remote bare database runing through Gitolite, and I'm getting this error:15:18
error: unable to resolve reference refs/heads/master: Permission denied15:18
remote: error: failed to lock refs/heads/master15:18
...15:19
error: failed to push some refs to 'git@minipenguin.com:foo.git'15:19
Is this a permissions error? If so, what should the owner/permissoins be of refs/heads/master?15:19
permissions*15:19
← skoop left15:20
← ivey_off left15:22
→ tjholowaychuk joined15:22
dag10 Nevermind.15:23
I fixed it.15:23
← smolyn left15:23
resno dag10: yep a permissions problem15:25
← pielgrzy1 left15:26
fr0sty_ dag10: how?15:26
dag10 I changed the ownership of foo.git (on the server) back to git:git.15:26
← SNEI left15:27
dag10 I had forgotten that I changed the ownership to something else last night while I was testing. :P15:27
→ SJS joined15:27
← atdiehm left15:28
→ Tac joined15:28
→ wilmoore joined15:28
RJD22 → RJD22|away15:29
← shelhamer left15:31
→ CarlFK joined15:31
→ shelhamer joined15:32
CarlFK git --no-pager clone --depth 1 git://review.webmproject.org/libvpx.git = fatal: The remote end hung up unexpectedly15:33
fatal: early EOF; fatal: index-pack failed15:33
→ RaceCondition joined15:33
← RaceCondition left15:33
CarlFK I guess I need to tell someone it is broken - wondering if there is any advice I should pass on15:34
← shelhamer left15:36
← floppyea1s left15:37
→ shelhamer joined15:37
← urkud_ left15:37
← thiago left15:37
→ ivey joined15:37
← angelsl left15:37
fr0sty_ CarlFK: you are running git-daemon on the remote host?15:38
CarlFK no clue - not my box15:38
fr0sty_ can you connect to the git port successfully?15:38
CarlFK I got there from http://www.mltframework.org/twiki/bin/view/MLT/BuildScripts#Preparation .. http://www.mltframework.org/twiki/pub/MLT/BuildScripts/build-melted.sh15:39
fr0sty_ 9418, btw15:39
→ hobodave joined15:39
CarlFK I did just do a simple git clone, so I guess yes15:39
→ Titosemi1 joined15:39
fr0sty_ but the clone failed (remote end hung up), right?15:39
CarlFK git clone git://review.webmproject.org/libvpx.git15:40
Initialized empty Git repository in /home/juser/melted/src/libvpx/.git/ ;remote: Counting objects: 8493, done.; remote: Compressing objects: 100% (3085/3085), done.; remote: Total 8493 (delta 6518), reused 7097 (delta 5287)15:40
→ urkud_ joined15:40
fr0sty_ but --depth 1 fails ?15:41
CarlFK yep15:41
← jnlsnl_ left15:41
← sooraj left15:41
→ winterweaver joined15:41
fr0sty_ what branch is checked out in your successful clone?15:41
→ myrkraverk joined15:42
myrkraverk Hello.15:42
← excess^ left15:42
→ Heimidal joined15:42
→ guireisc joined15:42
→ kenichi joined15:42
myrkraverk For some reason I have a "deleted" file in my current working directory. Is there an easy way to get it back? It is marked as deleted in git status, so it should be present in my last commit.15:42
albel727 myrkraverk: git checkout HEAD -- <file>15:43
PabloM myrkraverk, git checkout -- file_name15:43
CarlFK (veyepar)juser@room-a:~/melted/src/libvpx$ git status; # On branch master # Your branch is ahead of 'origin/master' by 2 commits.15:43
← Titosemi left15:43
fr0sty_ doesn't look like a fresh clone to me...15:44
myrkraverk Thank you.15:44
CarlFK looking at what that script does now15:44
→ thiago joined15:45
← tharkun left15:45
→ tharkun joined15:45
CarlFK fr0sty_: i'll clone again, this script does 'stuff' ;)15:47
→ Heimidal_ joined15:47
CarlFK $ git status; # On branch master; nothing to commit (working directory clean)15:48
→ IceW joined15:48
← cesario left15:48
→ dermoth|work joined15:49
fr0sty_ hmm, perhaps you can't shallow clone with git://? ( <- wild guess )15:49
← Heimidal left15:50
← mastroWork left15:51
→ ymasory joined15:52
← bentob0x left15:52
→ karpar joined15:53
bitkiller i'm having conflicts in multiple (a lot of jpegs) files and i'm looking for a easy way to solve everything at once15:53
→ nalenb joined15:53
CarlFK worked: git --no-pager clone --depth 1 git://git.videolan.org/ffmpeg.git15:54
→ slonopotamus joined15:54
fr0sty_ CarlFK: why the --no-pager? does clone even use the pager?15:54
bitkiller i would like to solve the conflict favoring the remote version15:55
← winterweaver left15:55
bitkiller but i dont want to copy one by one15:55
← nalenb left15:55
← an0maly left15:55
← xiangfu left15:55
→ an0maly joined15:55
→ nalenb joined15:56
← nalenb left15:56
→ nadavoid joined15:56
sitaram bitkiller: look for --theirs option of git checkout15:56
CarlFK fr0sty_: no clue, I didn't write the script I am running: http://www.mltframework.org/twiki/pub/MLT/BuildScripts/build-melted.sh line 684: cmd git --no-pager clone $DEPTH $REPOLOC15:57
← slonopotamus left15:57
q0rban → q0rban|lunch15:57
→ pyrony joined15:57
CarlFK # Author: Dan Dennedy [email@hidden.address] - pretty smart guy... so ... um.. I am sure there is a good reason ;)15:58
→ mattly joined15:58
whaley_ → whaley15:58
→ jmorris_ joined15:59
→ boriskr joined15:59
jmorris_ → jmorris16:02
← drev1 left16:02
→ __name__ joined16:03
← __name__ left16:03
→ __name__ joined16:03
← dag10 left16:05
← wilmoore left16:05
→ adreghiciu joined16:05
← guireisc left16:05
→ amerine joined16:06
← tjholowaychuk left16:06
→ drev1 joined16:07
bitkiller sitaram, the problem is that i have other files (non-binary) conflicting in the same merge and need to solve those by hand16:07
→ joel_falcou joined16:07
fr0sty_ bitkiller: CarlFK might be the daemon is choking for some reason creating the pack (tiny virtual host, maybe?)16:07
← OOPMan left16:08
fr0sty_ not likely, given the repo size...16:08
Ingmar_ → Ingmar16:08
← sebersole left16:10
→ Defi joined16:12
→ jsquared joined16:13
→ robotarmy joined16:13
jsquared I'm on branch `A`. I want to merge branch `B` into `C`. Can that be done without leaving `A`?16:13
mgaunard_ jsquared: no16:13
FauxFaux Not easily. You can manually generate the merge commit with commit-tree -p-p and update-ref it, so long as it's a trivial merge.16:14
→ foocraft joined16:14
← sahilsk left16:14
→ sftp joined16:14
jsquared It's not a big deal, was just curious, since there isn't a `git merge foo bar` (that just merges `foo + bar` as an octopus merge).16:14
← nibblebot_ny left16:14
→ nibblebot joined16:15
← project2501a left16:15
← Defi left16:16
→ KillGuta joined16:16
sitaram bitkiller: git checkout allows you to do that only for certain files. You should read the man page16:17
→ reuss joined16:18
→ Defi joined16:19
← wentasah left16:21
← guardian left16:21
→ Titosemi joined16:22
← Titosemi1 left16:24
→ project2501a joined16:25
← rphillips_ left16:25
→ xerora joined16:27
→ smolyn joined16:27
← shelhamer left16:29
→ nothingHappens joined16:29
← teweWork left16:29
→ shelhamer joined16:30
← project2501a left16:30
→ linusoleander joined16:30
→ floppyears joined16:32
→ radarek joined16:32
→ larsl joined16:33
q0rban|lunch → q0rban16:33
floppyears I use git for code reviews, but when I do git show sha1, it just shows the diff. Is there a tool or git command that can show me the two files side by side so that I can compare the changes in context?16:33
← khmarbaise left16:34
PerlJam floppyears: you could probably use vimdiff for it.16:34
← amerine left16:34
→ project2501a joined16:34
floppyears thank you PerlJam16:35
← Casvah_AFK left16:35
→ Casvah_AFK joined16:35
→ dreiss joined16:35
← smolyn left16:35
lamont` → lamont16:35
bluj anyone know (by command, not inspection) how i would find the most up-to-date ancestor/commit between my HEAD and origin?16:36
← Defi left16:36
→ Defi joined16:36
→ smolyn joined16:37
← crhan left16:37
← sIbOk left16:37
fr0sty_ define: 'most up-to-date commit'16:37
bluj top commit? e.g. when i fetch, origin has 1-2 commits above mine16:37
but i dont want the commits of my local changes16:38
e.g. if theyve diverged, i just want the most common16:38
fr0sty_ if you want nearest-common-ancestor git merge-base is probably what you want.16:39
bluj thank you16:39
knitt1 → knittl16:39
fr0sty_ though you would have to specify which branch from origin to use.16:39
← project2501a left16:39
fr0sty_ (and also fetch origin to have the latest information)16:39
← blaix left16:40
← kenneth_reitz left16:40
bluj is there some pointer i can use for the tracking branch? e.g. git merge-base HEAD..<something-for-tracking-branch?>16:40
origin/<something-here-i-assume>16:40
← dreiss left16:40
← anji-- left16:40
→ dreiss joined16:41
fr0sty_ @{u}16:41
bluj ty16:41
← EricInBNE left16:41
→ anji- joined16:41
← tvw left16:41
fr0sty_ that is for the currently checked out branch.16:41
bluj that works16:42
→ excess^ joined16:42
← KillGuta left16:44
← Defi left16:46
← robotarmy left16:46
← panike left16:46
→ robotarmy joined16:47
→ henrikbjorn joined16:48
→ slonopotamus joined16:49
→ amerine joined16:49
← phantomcircuit left16:50
→ phantomcircuit joined16:50
→ MetaCosm_ joined16:51
← MetaCosm_ left16:51
→ MetaCosm_ joined16:51
← workmad3 left16:51
← Neurotiquette left16:51
← MetaCosm left16:53
← torotil left16:53
← empity left16:53
← achadwick left16:54
→ crhan joined16:54
← an0maly left16:54
→ an0maly joined16:55
← ijuma left16:55
→ dim__ joined16:55
← dim_ left16:57
→ noahcampbell joined16:58
→ towski joined16:58
→ ijuma joined16:59
adamholt → adamholt_away17:00
← radarek left17:00
adamholt_away → adamholt17:00
adamholt → adamholt_away17:01
→ wilmoore joined17:01
← davzie left17:03
adamholt_away → adamholt17:03
← crhan left17:05
→ StephenGWills joined17:05
→ giallu joined17:06
← marcamilly_ left17:06
→ bhosie joined17:06
← SirFunk left17:08
→ johnw joined17:09
← iravid left17:10
→ jstemmer joined17:10
← slonopotamus left17:11
→ iAmerikan joined17:12
→ ben225 joined17:12
→ evanmeagher joined17:13
← mr_blue left17:14
→ tgunr joined17:17
← tatsuya left17:18
→ ISF joined17:18
→ bernd joined17:18
→ dp_ joined17:18
dp_ what's the proper way to change the origin for a repo?17:18
← bbergler left17:19
← alberto56 left17:19
→ alberto56 joined17:19
PerlJam dp_: (not sure but ...) git remote set-url origin <new url>17:20
boutcher git remote set-url origin ssh://example.com/git/myrepo17:20
tgunr git remote -h17:20
boutcher jinx17:20
→ tjholowaychuk joined17:21
→ iravid joined17:21
tgunr look at set-url17:21
cbreak I'd look at rename17:21
PerlJam cbreak: it's not clear which he wants to me.17:21
tgunr he said he wanted to change the origin17:22
← curtana left17:22
tgunr i presume he meant the URL17:22
cbreak the best way to change the origin is to rename it17:22
and add a new one17:22
← karpar left17:22
cbreak that way you don't lose anything17:22
← bluenovember_ left17:23
dp_ tgunr/boutcher/PerlJam: thanks17:23
→ bkosborne joined17:24
← PigeonFriend left17:24
← amerine left17:25
cbreak PerlJam: he'll get to find out the hard way :)17:25
tgunr cbreak: not sure I follow you here, I would not want an old crusty URL in my set of remotes17:26
← wilmoore left17:27
cbreak that's no problem17:27
→ kipras joined17:28
dp_ cbreak: "won't lost anything" - what could I lose?17:28
→ sideone joined17:28
sideone hey all. i am putting together a project management site for a couple c devs under linux. However, i am not sure which project to use. I do not have all the requirements from the staff, however, i would like to have git management, and a project management (from a biz perspecitve) integrated into 1 portal. I have looked at redmine, trac, mantis, bugzilla, codendi, and a few others. I need the17:28
code to be stored locally, so a sass solution will not work. Any suggestions? thanks.17:28
cbreak dp_: what do you mean?17:29
you either replace something, or add something new17:30
SethRobertson bugzilla isn't really a project management tool from the business side. It works decently well, of course, and I use it as a project management tool, but biz people's eyes glaze over17:30
← adaptee left17:30
cbreak it should be clear where you lose something and where you don't17:30
SethRobertson Don't forget RT17:30
sideone req tracker?17:30
SethRobertson yes17:31
→ tvw joined17:31
→ vimtutor joined17:31
SethRobertson Also not a business management tool17:31
sideone isnt rt more of a ticketing system?17:31
→ dpino joined17:31
SethRobertson like bugzilla17:31
sideone i see17:31
seems like codendi comes close to what im looking for17:32
SethRobertson Check out FogBugz too17:33
Which is both a ticketing system and has business side stuff17:33
sideone when i say project mgmt, it is really a slimmed down version of project mgmt from a biz perspecitve. i need to focus on git with comments,updates, commits, etc.. but i would like to hold weekly meetings, and store the notes, todo, tasks, reports there17:33
SethRobertson; i am looking for an open sourced product, as i will be starting this company on a 0 budget idea :)17:34
← djencks left17:35
← dp_ left17:35
PerlJam sideone: just pick one of the ones you mentioned and start using it.17:35
→ radarek joined17:36
SethRobertson scm + ticketing + wiki should do it all17:36
sideone sounds like redmine17:36
PerlJam sideone: though, personally, I've found most tools overly complex (even the "simple"17:36
SethRobertson mailing list+irc/im+channels17:36
PerlJam ones)17:36
sideone or trac17:36
i just wish they had more than a wiki17:37
PerlJam sideone: nail down the requirements then use that as a metric to judge the contenders.17:37
sideone ok will do17:37
thanks for the help guys17:37
→ skelterjohn joined17:39
skelterjohn how do i roll back to the last commit?17:39
PerlJam skelterjohn: git reset17:40
← henrikbjorn left17:40
→ bitterman joined17:41
→ squiggy joined17:41
skelterjohn i was hoping to see some deleted files reappear after I did that17:41
→ amerine joined17:42
→ sahilsk joined17:42
skelterjohn but they didn't - they're still listed as "deleted" in git status17:42
→ beyondcreed joined17:42
fr0sty_ --hard17:43
skelterjohn i've read warning about that, when googling17:43
talks about losing work - if it's just the work since the last commit then it's ok17:44
just want to make sure17:44
fr0sty_ default for git reset is --mixed which doesn't touch the working-tree.17:44
→ dannas joined17:44
PerlJam skelterjohn: you won't lose anything you've committed17:44
skelterjohn ok, thanks17:44
PerlJam skelterjohn: but if you've got some uncommitted stuff, beware17:44
fr0sty_ skelterjohn: also, the output of git status tells you how to get deleted files back, too.17:44
→ project2501a joined17:44
skelterjohn oh does it? heh, tl;dr etc17:45
→ joel_falcou_ joined17:45
← joel_falcou left17:45
← nothingHappens left17:45
→ panike joined17:46
joel_falcou_ → joel_falcou17:47
← evanmeagher left17:48
← seivan left17:48
← DiGitalX left17:50
← jutaro left17:51
→ sterlo joined17:52
→ cesario joined17:52
← ningia left17:52
← menomc left17:53
← urkud_ left17:53
→ urkud_ joined17:54
→ Evious joined17:55
→ delinquentme joined17:55
delinquentme easy way to add whatever in the working tree to the last edit?17:55
edit = commit17:55
PerlJam git commit --amend # if I understand you correctly17:56
← bitkiller left17:56
PerlJam (you'd add it like normal first, of course)17:56
← Bass10 left17:57
→ explodes joined17:57
→ adaptee joined17:58
→ MikhX joined18:01
← _psychic_ left18:02
← bitterman left18:05
→ Zephyrus joined18:05
→ logik-bomb joined18:06
← logik-bomb left18:06
→ logik-bomb joined18:06
→ ki__ joined18:07
delinquentme PerlJam, so i could also do git commit --amend HEAD^18:09
→ ZeroCoder joined18:09
← Steap left18:09
← tjholowaychuk left18:09
PerlJam delinquentme: you can only --amend the most recent commit18:10
→ empity joined18:10
delinquentme ok ill check the docs .. thanks18:10
← spaceonline left18:11
→ spaceonline joined18:11
→ n3m joined18:11
← beyondcreed left18:11
← ZeroCoder left18:12
→ nothingHappens joined18:12
→ drizzd joined18:12
→ bitkiller joined18:12
→ HG` joined18:12
→ kelvie_ joined18:12
→ _psychic_ joined18:13
→ felipe joined18:13
→ paja joined18:13
→ paja1 joined18:13
→ drizzd_ joined18:13
← resno left18:14
← erichammond left18:15
← anjen left18:16
→ henrikbjorn joined18:16
→ dunpeal joined18:16
dunpeal Hi. Given two commits abc and def, what's the best and cheapest way to determine, from a script, whether abc is a parent of def?18:17
← quentusrex left18:17
→ Bass10 joined18:17
← alberto56 left18:20
← owst left18:20
PerlJam dunpeal: git branch --contains SHA118:20
← paja1 left18:21
→ alberto56 joined18:21
dunpeal PerlJam: 1) abc may not be a head (branch).18:21
PerlJam: 2) even if it is, that's not the cheapest way since *all* heads would be checked.18:22
← rideh left18:22
dunpeal whereas I only want to check abc.18:22
→ rideh joined18:22
PerlJam why does cheapest matter exactly? Sounds like premature optimization.18:22
and 1) is easy to rectify18:22
dunpeal PerlJam: this is for a commit hook for a server serving dozens of devs, so it should be fast :)18:23
delinquentme PerlJam, --contains is something that will run through the ancestry of a current commit and attempt to find a commit with that SHA1?18:23
→ opalka joined18:23
dunpeal delinquentme: no, it iterates over all local heads and determines for each whether it contains SHA118:23
→ Chaser joined18:23
dunpeal PerlJam: I suspect the solution would involve merge-base18:24
fr0sty_ rev-list abc..def will be non-empty18:24
PerlJam dunpeal: I was just thinking that18:24
fr0sty_ just check abc != def18:24
← drizzd_ left18:24
delinquentme dunpeal, and when we talk "containing sha1" this referrs to the CODESET associated with that SHA118:24
right?18:24
← ajt left18:25
← lxsameer left18:25
dunpeal fr0sty_: yes, that's a good solution.18:25
← kelvie_ left18:25
dunpeal delinquentme: no, all of this stuff is about the commit DAG, has nothing to do with deltas.18:25
← aminpy left18:27
→ beyondcreed joined18:27
delinquentme OOO i just found out that the SHA1 thats used in the head DOES NOT correspond to the contents .. but instead to that commits representation in GIT18:28
→ quentusrex joined18:28
→ KRTac joined18:29
→ papagno joined18:29
← urkud_ left18:29
KRTac mornin'18:29
dunpeal delinquentme: read some in-depth Git text, like progit18:29
KRTac i have some issues using git submodules18:29
← alberto56 left18:30
KRTac i have a submodule that has the following branches:18:30
KO3.0/master; remotes/origin/HEAD -> origin/KO3.0/master; remotes/origin/KO3.0/master; remotes/origin/KO3.1/develop18:31
→ alberto56 joined18:31
KRTac now...when I do git checkout remotes/origin/KO3.1/develop everithing is ok18:31
now I go in the main project directory and do git submodule update18:32
→ booginga joined18:32
→ tjholowaychuk joined18:32
→ Henrik_ joined18:32
KRTac and I get Submodule path 'kohana/modules/orm-mptt': checked out '696a318ce4f...'18:33
→ chrisshattuck joined18:33
KRTac a commit from the KO3.0/master branch18:33
bitkiller sitaram, i gave up. the project is too messed and i'll wait for management decisions. thank you anyway18:33
→ DiGitalX joined18:33
fr0sty_ KRTac: have your read man git-submodule?18:34
jast KRTac: the 'git-submodule' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html [automatic message]18:34
← khiroc left18:34
fr0sty_ specifically what 'git submodule update' does?18:34
KRTac fr0sty_: now I have18:35
→ cjz joined18:35
→ sylr joined18:36
← henrikbjorn left18:36
KRTac i guess i have seen people doing this and i just assumed submodule update is for updating the state of each submodule in the main repo18:36
← dunpeal left18:36
← cognominal left18:36
← skelterjohn left18:37
→ Chillance joined18:37
← Henrik_ left18:38
← alberto56 left18:40
← sylr left18:40
← papagno left18:41
← ymasory left18:43
← ggxymd left18:44
→ alberto56 joined18:45
→ cognominal joined18:45
→ uau joined18:45
← nadim left18:45
→ nadim joined18:47
→ sIbOk joined18:47
→ dunpeal joined18:47
→ djencks joined18:47
← quentusrex left18:47
dunpeal fr0sty_: unfortunately, the solution doesn't work18:47
← vimtutor left18:47
← ixti left18:48
dunpeal fr0sty_: err, sorry, it does :)18:48
I was writing an explanation why it doesn't, then realized my own error.18:48
← mattikus left18:48
← rayners left18:49
dunpeal basically, `git rev-list abc..def` would only be empty iff def is a parent of abc18:49
delinquentme how to get the common ancestor of 2 branches?18:53
← Zephyrus left18:54
→ guardian joined18:54
→ toabctl joined18:54
← toabctl left18:55
→ Zephyrus joined18:55
← dannas left18:56
fr0sty_ git merge-base18:56
→ sebersole joined18:56
→ erichammond joined18:57
→ nona joined18:57
← sebersole left18:57
← IceW left18:57
→ sebersole joined18:58
← DiGitalX left18:58
← _psychic_ left18:58
→ pedrobelo joined18:59
← dunpeal left18:59
→ _psychic_ joined19:00
→ quentusrex joined19:01
→ DiGitalX joined19:02
← dpino left19:04
← sahilsk left19:05
← rideh left19:05
→ sahilsk1 joined19:06
→ kumbayo_ joined19:06
→ Dynetrekk joined19:08
← djencks left19:10
adamholt → adamholt_away19:10
← kumbayo left19:10
adamholt_away → adamholt19:10
→ felipec joined19:13
felipec is it possible to revert a merge?19:13
rane_ at what point?19:13
git reset --hard HEAD^ should do it19:13
fr0sty_ rane_: that is 'pretending the merge never happened', which is not quite the same as 'reverting' it.19:14
felipec rane_: no, I mean revert, not undo19:14
fr0sty_ though to be fair, that may be what felipec wants...19:14
rane_ yeah okay19:14
fr0sty_ felipec: what do you mean by 'revert'?19:14
felipec fr0sty_: create a commit that reverts the changes made by such commit19:15
fr0sty_ http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt19:15
SethRobertson KRTac: You might find gitslave easier to use or a better match for your workflow than git-submodules. Or not.19:15
felipec fr0sty_: yeah, I read most of that... I don't see anything useful19:17
← milli left19:17
→ kylehayes_ joined19:17
AlexP_ → AlexP19:18
← linusoleander left19:18
felipec fr0sty_: it says: git revert -m 1 M19:19
but that doesn't do anything: nothing to commit (working directory clean)19:19
→ rideh joined19:20
fr0sty_ what is 'M' ?19:20
→ milli joined19:20
felipec fr0sty_: the merge commit19:21
← robotarmy left19:21
fr0sty_ where is M in relation to HEAD?19:22
→ phaedrix joined19:22
fr0sty_ what does git log --oneline --graph M..HEAD19:22
show you?19:22
← joel_falcou left19:23
→ joel_falcou joined19:23
→ djencks joined19:23
felipec fr0sty_: that doesn't matter; if it's 2, 10 or 100 commits ago, I just want to revert it19:25
fr0sty_ is M an ancestor of HEAD?19:26
→ ajt joined19:26
felipec I would just need to resolve the conflicts, but in this particular case I can resolve the conflicts as there aren't any (I can revert the individual commits)19:26
fr0sty_: of course it is, why would I want to revert it otherwise?19:27
fr0sty_ according to your previous revert attempts there doesn't appear to be anything to revert...19:28
is git diff M^1..M empty?19:28
felipec fr0sty_: which is the problem19:28
fr0sty_: yes, it's empty19:29
→ hobbeswalsh joined19:30
fr0sty_ then what are you expecting to revert?19:31
hobbeswalsh Hey everyone. I'm somewhat new to git. I've just made a new symbolic ref called "production," that points at the HEAD of some other branch. I'm wondering if there's a way to push this change to github so everyone else who works on the project will have the same symbolic ref19:31
← tvw left19:31
PerlJam hobbeswalsh: what's a "symbolic ref" exactly?19:32
fr0sty_ the tree at M^1 (before the merge) is identical to M, therefore the Merge introduced no changes.19:32
delinquentme do i need to install something to use " git gui "19:32
hobbeswalsh or if there's another way to accomplish the same thing19:32
fr0sty_ hobbeswalsh: how did you make a symbolic ref?19:32
PerlJam delinquentme: you may need to install git-gui to use it :)19:33
hobbeswalsh git symbolic-ref -m "comment" production some/other/branch19:33
felipec fr0sty_: it's not19:33
← marcob left19:33
felipec that seems to be the bug19:33
hobbeswalsh fr0sty_: was I wrong?19:33
delinquentme PerlJam, ^_^ tyvmz19:34
← CarlFK left19:34
← delinquentme left19:35
fr0sty_ hobbeswalsh: what are you trying to accomplish?19:35
→ ZeroCoder joined19:35
hobbeswalsh I'm trying to make it so that we have a symbolic branch called "production" that always points to whatever the latest production branch is19:35
a pseudo-branch19:35
if we change the porduction branch to "some-new-branch" then we just update "production" to point at that19:36
so, e.g. we can automate checking out, building, and packaging from the "production" branch and not have to replace "old-branch" with "new-branch" all over our CI system19:36
am I making sense?19:37
→ qubodup joined19:37
qubodup hi19:37
bremner hobbeswalsh: well, except for the part where you said you were new to git...19:37
qubodup is there a way to do git log URLTOGITREPO? (get log without clone)19:37
bremner qubodup: have to fetch first afaik19:37
→ khiroc joined19:38
PerlJam hobbeswalsh: so ... why not just have a branch called production that *is* the production branch? Always.19:38
ohcibi_ → ohcibi19:39
fr0sty_ felipec: then you have a novel definition of terms somewhere...19:39
how do you know anything changed in that merge?19:39
→ Ahtenus joined19:39
fr0sty_ hobbeswalsh: that might work...19:39
qubodup bremner: hm. what i'm looking for is a way to get the latest pushed commit's username, comment and date19:39
rane_ can reverting merges really be this hard?19:39
qubodup bremner: i'm not accustomed with fetch. reading now19:40
fr0sty_ hobbeswalsh: I've never seen that done, though...19:40
← chrisshattuck left19:40
→ rayners joined19:40
PerlJam hobbeswalsh: or ... why would you change which branch is "production"?19:41
→ madsy joined19:41
felipec fr0sty_: because I can see that with my eyes19:41
← zarac_ left19:41
fr0sty_ felipec: _what_ do you see.19:41
Ahtenus I manage my vim config with git, but the plugins which I've git cloned don't get included in my commit? How can I include them as well?19:42
fr0sty_ there is a difference between M^1 and M ?19:42
felipec fr0sty_: the changes19:42
fr0sty_ how do you see them?19:42
PerlJam Ahtenus: submodules?19:43
→ zarac joined19:43
felipec fr0sty_: gitk19:43
SethRobertson Ahtenus: gitslave?19:43
felipec fr0sty_: ahhh, the branch was merged before19:45
fr0sty_ I can't see your gitk. does: "git diff M^2..M show anything?19:45
felipec fr0sty_: yes, but nevermind... the branch was merged multiple times, so the changes in M^2 were already in M^1, that's why there's no diff19:47
← psoo left19:49
cehteh` → cehteh19:49
→ nibblebot_ny joined19:49
← alberto56 left19:50
← thiago left19:50
→ albel727_2 joined19:51
→ theoros_ joined19:51
← felipec left19:52
← theoros left19:52
→ NickASloan joined19:52
← nibblebot left19:52
← Guest59070 left19:52
NickASloan how do I un-git-rm a file? the change hasn't been committed yet19:52
→ tgunr_ joined19:52
← qubodup left19:52
→ robotarmy joined19:53
fr0sty_ NickASloan: what does 'git status' suggest ?19:53
PerlJam NickASloan: git status will tell you19:53
→ tizzo joined19:53
NickASloan oh crap. I've gotten so used to reading past that that I forgot all about it19:53
→ Sonderblade joined19:53
NickASloan sheesh, I feel like a buffoon19:53
tizzo in git, is there a way to do an interactive reset of the working tree?19:53
stash and then apply -i?19:54
← tgunr left19:54
← albel727 left19:55
theoros_ → theoros19:55
← kylehayes_ left19:56
← NickASloan left19:56
→ sylr joined19:57
zarac how can get just part from a remote repository? i only want the files from one directory..19:57
→ RaceCondition joined19:58
← LuckyNeo left19:58
← sylr left19:59
← rgravener left20:00
fr0sty_ zarac: clone the repository, copy the files.20:01
zarac ok, but then i clone the whole repository, right?20:01
Dynetrekk hi, is it possible to delete a branch?20:01
zarac that's what i don't want to do.. i just want to get a few files without getting the whole repository20:02
→ anjen joined20:02
zarac see git help branch20:02
search for 'delete'20:02
← Titosemi left20:02
← _psychic_ left20:03
→ MacGyverNL joined20:03
← MacGyverNL left20:03
→ jlehmann joined20:03
← jlehmann left20:03
Dynetrekk zarac: thanks20:04
→ felipec joined20:04
Dynetrekk also, is it possible to delete a commit? I inadvertently committed before branching20:04
zarac np20:04
Dynetrekk (git newbie, hence silly questions)20:05
zarac see git reset.. i'm not too good with git myself, i think the help might hel you more ; )20:05
i'm newbie as well =D20:05
tango_ Dynetrekk: branch first, then go back to the 'wrong' branch and reset it to the previous commit20:05
zarac i read about --amend .. might be handy if you want to recommit20:05
i haven't gotten a chance to try it yet20:05
fr0sty_ zarac: your options are: 1. clone the repository+copy the files. 2. ask someone who has cloned the repository to give you the files.20:05
zarac fr0sty_, ok, thanks!20:06
→ delinquentme joined20:06
delinquentme is it a bad practice to simply _remove_ files which are under git RC?20:06
fr0sty_ 3. abuse a web interface to have it show you all the files and cut+paste20:06
zarac hehe ; )20:06
← vsayer left20:06
Dynetrekk zarac: thanks, very helpful20:07
← johnw left20:07
→ gdoteof joined20:07
zarac np, mate20:07
gdoteof how can I find out 'what happened' for a certain commit?20:07
just what files were changed, etc20:07
Dynetrekk zarac: although 'git reset' and 'git reset .' didn't do quite what I expected20:07
zarac ah, ok20:08
→ kylehayes_ joined20:08
→ _psychic_ joined20:08
Dynetrekk zarac: git reset is the opposite of git add, not the opposite of git commit20:08
← HG` left20:08
← KRTac left20:08
zarac have a look at this, it's very padagogic.. http://marklodato.github.com/visual-git-guide/index-en.html20:09
→ L42y joined20:09
Dynetrekk zarac: in case you need it later: git reset --soft HEAD^20:10
zarac: thanks for the link20:10
zarac sweet ; )20:10
np20:10
what was wrong with git commit --amend, btw?20:11
← booginga left20:11
zarac you just wanted to "recommit", right?20:11
rane_ git show20:11
→ henrikbjorn joined20:13
→ urkud_ joined20:14
→ sylr joined20:14
← deekayen left20:15
→ steffkes joined20:15
← bindaas left20:15
→ hakunin joined20:16
← liquidproof left20:18
→ jutaro joined20:18
hobbeswalsh PerlJam, fr0sty_ : I'm approching this as an ops person who doesn't have full visibility into why certain development decisions were made. It sounds like I need to talk to the head of the dev team and see what's up20:19
thanks for your help20:19
steffkes guys, good evening - short question, if i have two cloned git-repos. is it possible to merge single commits of them?20:19
← n3m left20:19
← kumbayo_ left20:19
← sylr left20:19
ketas- → ketas20:20
← Davey left20:20
shelhamer steffkes, are you asking if you can take individual commits from each and apply them to the other? if so, you want git cherry-pick20:20
← bernd left20:20
shelhamer oh wait sorry, I read two branches, not repos!20:20
steffkes yes, different repos .. not only branches :)20:21
→ lemonchicken joined20:21
shelhamer in that case, you can cheat and do the following:20:21
← d0k left20:23
→ ShadowBelmolve joined20:23
shelhamer no, sorry again. I thought I had this on file but I just gave it a test on two of my repos and it failed20:23
→ mattikus joined20:24
steffkes okay .. so will try to get the guy forking on github .. that should help :>20:24
ty anyway shelhamer20:24
→ MyTallest joined20:25
← MyTallest left20:25
← nullvariable left20:25
→ Davey joined20:26
→ ereslibre joined20:26
→ booginga joined20:27
zarac what would the URL be if i wanted to clone the repository on ~/git-test on host example.com ?20:27
← delinquentme left20:27
zarac i tried example.com:git-test20:27
and some others ; )20:28
← priidu left20:28
← DiGitalX left20:30
← theoros left20:30
→ vsayer joined20:30
→ theoros joined20:30
→ yhager joined20:31
→ nchaimov joined20:32
→ karstensrage joined20:32
yhager I don't understand 'git rebase -m' - when would I want to use it?20:32
← pdelgallego left20:32
karstensrage → Guest1139520:32
→ pdelgallego joined20:33
→ seanius joined20:33
drizzd yhager: I think it force a merge for each patch. Normally, rebase would try to simply apply the patch first.20:34
And if it fails, it falls back to merging.20:34
But a merge should usually give the same result anyways.20:34
So apart from being slower, I do not expect it to give any different results. Maybe in some cases with renames or such.20:35
yhager so a 'git rebase -m' is the same of 'git merge' ?20:35
drizzd no, not at all20:35
let's say you're rebasing just one commit20:35
then rebasing that commit is almost the same as merging it from upstream20:36
(except for the fact that with rebase, the old branch is not recorded as an ancestor)20:36
← jsick3 left20:36
drizzd but contrary to applying a patch, merge will always "work", or at least give something useful like conflict markers.20:37
← cube left20:37
drizzd so in theory, you could do this: git checkout upstream; git merge --no-commit <commit>20:37
umh, git merge --squash <commit>20:38
if you do that for each commit in the branch you're trying to rebase20:38
then that's exactly what git-rebase -m does automatically20:38
← bauruine left20:38
drizzd but it's different from a regular merge for 2 reasons20:39
→ ddkilzer joined20:39
drizzd first, rebase works "the other way", i.e. it merges from your branch to upstream20:39
second, it does a merge recursively for each commit20:40
→ wildintellect joined20:41
← L42y left20:41
wildintellect so I started a repo on my laptop and now I want to put a copy on a server and turn that into the "server" I push to, what's the correct way to go about it20:41
→ emptyflask joined20:41
wildintellect I assume some form of git clone --bare, but I'm pushing the copy from my laptop to the server over ssh20:42
→ leavittx_ joined20:42
→ rgravener joined20:42
← Tac left20:43
← ShadowBelmolve left20:44
← shelhamer left20:44
← rayners left20:44
→ rayners joined20:45
yhager drizzd: thanks for the explanation.20:45
drizzd: what does "the other way" mean?20:46
← yhager left20:46
→ yhager joined20:46
→ bgerber joined20:47
← henrikbjorn left20:47
→ LuckyNeo joined20:47
← ISF left20:47
← rgravener left20:47
→ emptyfla_ joined20:48
← mr_daniel left20:49
← sebersole left20:49
← ZeroCoder left20:49
← djencks left20:49
→ rgravener joined20:49
→ ShadowBelmolve joined20:50
← hobbeswalsh left20:50
→ mr_daniel joined20:50
→ hobbeswalsh joined20:51
← stliu left20:51
ayust well that's annoying... apparently submodule update doesn't fetch tags20:53
← empity left20:53
albel727_2 → albel72720:53
← robotarmy left20:54
cjz ayust: you probably want to look at gitslave20:54
→ xiong joined20:54
← PabloM left20:56
← tpope_ left20:56
→ tpope joined20:56
→ mattyb joined20:56
← Ahtenus left20:57
→ Mannequin joined20:57
← p3rror left20:57
speakman how do one trace changes in a file with git(k)?20:57
git blame would only show you the latest changes20:57
xiong speakman, Erm?20:57
speakman erm?20:58
→ aidalgol joined20:58
xiong Not sure what you mean by "trace".20:58
→ hobodave_ joined20:58
xiong You can click on any node to see more info on it -- like, who made the commit.20:58
speakman xiong: sorry, tracing _a part_ of a file through the history20:58
← _psychic_ left20:58
xiong For that matter...20:58
aidalgol Shouldn't .gitignore be ignored by default?20:58
xiong aidalgol, What is the sound of one hand clapping?20:59
speakman aidalgol: you want .gitignore to be a part of the repo20:59
← hobodave left20:59
← Mannequin left20:59
← ddkilzer left20:59
← Sonderblade left20:59
← tgunr_ left20:59
← quentusrex left20:59
← sIbOk left20:59
← Chillance left20:59
← MikhX left20:59
← tearsong left20:59
← JP-Dery left20:59
← Dylan168071 left20:59
← Fullma left20:59
← tharkun left20:59
← naquad left20:59
← muep left20:59
← scrooloose left20:59
← ketas-av left20:59
← meuh left20:59
← fahadsadah_ left20:59
← joelpet_ left20:59
← lamont left20:59
← bjornbjo1n left20:59
← darsk1ez left20:59
← comawhite left20:59
← gbjk left20:59
← Pupeno left20:59
← denysonique_ left20:59
← Cap_J_L_Picard left20:59
← dhoss_ left20:59
← ciaranm left20:59
← Haarg left20:59
← JEEB left20:59
← sunil left20:59
← jonmasters left20:59
← mdel left20:59
← mapreduce left20:59
← hegge left20:59
← coldboot_ left20:59
← electrogeek left20:59
← NfNitLoop left20:59
← JonT left20:59
← adamm left20:59
← madduck left20:59
← Neo left20:59
← ryanakca_ left20:59
← luke-jr left20:59
← ketas left20:59
← MacGyverNL_ left20:59
← nb left20:59
← durarara left20:59
← ptl left20:59
← VxJasonxV left20:59
← SethRobertson left20:59
← Lgb left20:59
← bob2 left20:59
← bmalee left20:59
← bartman` left20:59
← lahwran left20:59
← dwmw2_dad left20:59
← up_the_irons left20:59
← silfreed left20:59
← tansell left20:59
← Ratler left20:59
← booginga left20:59
← felipec left20:59
← opalka left20:59
← cesario left20:59
← panike left20:59
← project2501a left20:59
← bkosborne left20:59
← bhosie left20:59
← adreghiciu left20:59
← tyteen4a03 left20:59
← Veejay left20:59
← LiamH left20:59
← blueyed left20:59
← sonnym left20:59
← EdwardIII left20:59
← deavid left20:59
← daethorian left20:59
← kloeri left20:59
← hachiya left20:59
← Juri_Agarin left20:59
← supervacuo left20:59
← sycofly left20:59
← rane_ left20:59
← da5id left20:59
← mjv left20:59
← zivester_ left20:59
← Vampire0 left20:59
← kuhrt left20:59
← jailbox left20:59
← d1b left20:59
← przemoc left20:59
← cbreak left20:59
← ijuma_ left20:59
← EqS left20:59
← ArjenL left20:59
← Arrowmaster left20:59
← coling left20:59
← nigelb left20:59
← krisbulman left20:59
← piti left20:59
← TLMonitor left20:59
← JPT left20:59
← redfox__ left20:59
← milli left20:59
← sahilsk1 left20:59
← nona left20:59
← guardian left20:59
← uau left20:59
← paja left20:59
← iravid left20:59
← phantomcircuit left20:59
← v0n left20:59
← jspiros left20:59
← Mohjive left20:59
← tehbaut left20:59
← bitslip_ left20:59
← bottiger left20:59
← yhager left20:59
← vsayer left20:59
← tjholowaychuk left20:59
← drizzd left20:59
← nothingHappens left20:59
← cjz left20:59
← felipe left20:59
← dreiss left20:59
← drev1 left20:59
← RJD22|away left20:59
← npmap left20:59
← nevyn left20:59
← BBonifield left20:59
← sideone left20:59
← nd___ left20:59
← TomyLobo left20:59
← xelister left20:59
← avdg left20:59
← vitor-br left20:59
← stuffcorpse left20:59
← wagle left20:59
← xrogaan left20:59
← Ramblurr left20:59
← selckin left20:59
← josefrichter left20:59
← tpope left20:59
← maleknet left20:59
← rmk left20:59
← ExtraSpice left20:59
← jds left20:59
← n8o left20:59
← frogonwheels_ left20:59
← Will| left20:59
← no_maam_ left20:59
← fr0sty_ left20:59
← akheron left20:59
← pasky left20:59
← nicomen_ left20:59
← m0 left20:59
← bnovc left20:59
← Risar left20:59
← ilab left20:59
← milki left20:59
← d1zzy_ left20:59
← rubydiamond_ left20:59
← intripoon left20:59
← Weiss left20:59
← s0ber left20:59
← andyl left20:59
← IRSeekBot left20:59
← huli left20:59
← Ingmar left20:59
← anji- left20:59
← wereHamster left20:59
← hjertnes_ left20:59
← elmargol left20:59
← lekefly_ left20:59
← sunn left20:59
← frerich2 left20:59
← Nikoli left20:59
← larsrh left20:59
← chayin left20:59
← awx left20:59
← jacobat left20:59
← ayust left20:59
← Gunnar left21:00
← foocraft left21:00
← drubies|mbp left21:00
aidalgol speakman: Oh, OK.21:00
← mattyb left21:00
← emptyflask left21:00
aidalgol That makes sense, actually. Sorry, bit of a duh moment. >_<21:00
speakman :D21:00
← emptyfla_ left21:01
xiong speakman, Sorry; it's not clear to me that gitk will do a series of arbitrary diffs. But then, I'm not an expert.21:01
I think, at that level of detail, I find Meld useful.21:02
→ owst joined21:02
→ evanmeagher joined21:02
→ Mannequin joined21:02
→ tpope joined21:02
→ yhager joined21:02
→ ddkilzer joined21:02
→ vsayer joined21:02
→ booginga joined21:02
→ felipec joined21:02
→ Sonderblade joined21:02
→ tgunr_ joined21:02
→ milli joined21:02
→ sahilsk1 joined21:02
→ quentusrex joined21:02
→ nona joined21:02
→ guardian joined21:02
→ sIbOk joined21:02
→ uau joined21:02
→ Chillance joined21:02
→ cjz joined21:02
→ tjholowaychuk joined21:02
→ opalka joined21:02
→ paja joined21:02
→ felipe joined21:02
→ drizzd joined21:02
→ nothingHappens joined21:02
→ MikhX joined21:02
→ cesario joined21:02
→ panike joined21:02
→ project2501a joined21:02
→ sideone joined21:02
→ bkosborne joined21:02
→ iravid joined21:02
→ bhosie joined21:02
→ phantomcircuit joined21:02
→ anji- joined21:02
→ dreiss joined21:02
→ drev1 joined21:02
→ adreghiciu joined21:02
→ RJD22|away joined21:02
→ tyteen4a03 joined21:02
→ tearsong joined21:02
→ Ratler joined21:02
→ tansell joined21:02
→ silfreed joined21:02
→ up_the_irons joined21:02
→ dwmw2_dad joined21:02
→ lahwran joined21:02
→ bartman` joined21:02
→ bmalee joined21:02
→ bob2 joined21:02
→ Lgb joined21:02
→ SethRobertson joined21:02
→ VxJasonxV joined21:02
→ ptl joined21:02
→ durarara joined21:02
→ nb joined21:02
→ MacGyverNL_ joined21:02
→ ketas joined21:02
→ luke-jr joined21:02
→ ryanakca_ joined21:02
→ madduck joined21:02
→ adamm joined21:02
→ JonT joined21:02
→ NfNitLoop joined21:02
→ Neo joined21:02
→ electrogeek joined21:02
→ coldboot_ joined21:02
→ hegge joined21:02
→ mapreduce joined21:02
→ mdel joined21:02
→ jonmasters joined21:02
→ sunil joined21:02
→ JEEB joined21:02
→ Haarg joined21:02
→ ciaranm joined21:02
→ dhoss_ joined21:02
→ Cap_J_L_Picard joined21:02
→ denysonique_ joined21:02
→ Pupeno joined21:02
→ gbjk joined21:02
→ comawhite joined21:02
→ darsk1ez joined21:02
→ bjornbjo1n joined21:02
→ lamont joined21:02
→ joelpet_ joined21:02
→ meuh joined21:02
→ ketas-av joined21:02
→ scrooloose joined21:02
→ fahadsadah_ joined21:02
→ muep joined21:02
→ naquad joined21:02
→ tharkun joined21:02
→ Fullma joined21:02
→ Dylan168071 joined21:02
→ JP-Dery joined21:02
→ npmap joined21:02
→ Veejay joined21:02
→ xelister joined21:02
→ nevyn joined21:02
→ LiamH joined21:02
→ v0n joined21:02
→ BBonifield joined21:02
→ nd___ joined21:02
→ jspiros joined21:02
→ josefrichter joined21:02
→ TomyLobo joined21:02
→ avdg joined21:02
→ EdwardIII joined21:02
→ blueyed joined21:02
→ Mohjive joined21:02
→ vitor-br joined21:02
→ stuffcorpse joined21:02
→ sonnym joined21:02
→ JPT joined21:02
→ TLMonitor joined21:02
→ piti joined21:02
→ krisbulman joined21:02
→ coling joined21:02
→ Arrowmaster joined21:02
→ EqS joined21:02
→ nigelb joined21:02
→ ArjenL joined21:02
→ redfox__ joined21:02
→ ijuma_ joined21:02
→ cbreak joined21:02
→ przemoc joined21:02
→ d1b joined21:02
→ jailbox joined21:02
→ kuhrt joined21:02
→ Vampire0 joined21:02
→ zivester_ joined21:02
→ mjv joined21:02
→ da5id joined21:02
→ rane_ joined21:02
→ sycofly joined21:02
→ supervacuo joined21:02
→ Juri_Agarin joined21:02
→ hachiya joined21:02
→ kloeri joined21:02
→ daethorian joined21:02
→ deavid joined21:02
→ wagle joined21:02
→ xrogaan joined21:02
→ Ramblurr joined21:02
→ selckin joined21:02
→ maleknet joined21:02
→ rmk joined21:02
→ ExtraSpice joined21:02
→ milki joined21:02
→ jds joined21:02
→ Will| joined21:02
→ n8o joined21:02
→ frogonwheels_ joined21:02
→ no_maam_ joined21:02
→ fr0sty_ joined21:02
→ akheron joined21:02
→ pasky joined21:02
→ nicomen_ joined21:02
→ m0 joined21:02
→ tehbaut joined21:02
→ bnovc joined21:02
→ Risar joined21:02
→ ilab joined21:02
→ bitslip_ joined21:02
→ bottiger joined21:02
→ d1zzy_ joined21:02
→ rubydiamond_ joined21:02
→ intripoon joined21:02
→ Weiss joined21:02
→ s0ber joined21:02
→ IRSeekBot joined21:02
→ andyl joined21:02
→ huli joined21:02
→ Ingmar joined21:02
→ wereHamster joined21:02
→ hjertnes_ joined21:02
→ elmargol joined21:02
→ lekefly_ joined21:02
→ sunn joined21:02
→ frerich2 joined21:02
→ Nikoli joined21:02
→ larsrh joined21:02
→ chayin joined21:02
→ awx joined21:02
→ jacobat joined21:02
→ ayust joined21:02
→ Gunnar joined21:02
→ hyperboreean joined21:02
→ dok joined21:02
→ pcc1 joined21:02
→ guybrush joined21:02
← Heimidal_ left21:02
speakman xiong: I believe there was a tool to "surf" the blame log somehow. Can't remember how...21:02
→ _psychic_ joined21:02
← ayust left21:03
← ilab left21:03
← MikhX left21:03
xiong Well, when you find it, let me know. Interesting addition.21:03
→ ilab joined21:03
→ ayust joined21:03
← kylehayes_ left21:03
→ DABGIF9 joined21:03
yhager drizzd: right, I got that.21:04
speakman xiong: indeed21:04
RichiH i have a series of linear commits. i'd like to put the most current one on a seperate branch and revert that one commit from my master branch. i would then like to push those changes to a remote and pull them to other repos21:05
← rgravener left21:05
← itdude left21:05
RichiH can anyone point me to a howto?21:05
mmattice rebase that one commit over to the other branch21:05
→ McMAGIC-- joined21:05
speakman RichiH: git checkout -b newbranch && git checkout master && git reset HEAD^21:05
→ Heimidal joined21:06
← Heimidal left21:06
← bburhans left21:06
→ bburhans_ joined21:06
speakman RichiH: or you could just "git reset HEAD^ && git stash" to put the commit "on hold"21:06
unless you've got other uncommitted changes...21:06
← TeckniX left21:07
→ delinquentme joined21:07
mmattice ooo, ignore me.21:07
← rendar left21:07
RichiH there are no uncommitted changes, but the stuff i need in a new branch is committed, already21:07
→ djencks joined21:08
speakman RichiH: will you keep that in a separate branch? then do the former.21:08
RichiH yes. i hope to merge it back into mainline once stuff works21:08
→ workmad3 joined21:08
← delinquentme left21:08
RichiH speakman: do i create the new branch from commit n or n-1?21:09
← Zephyrus left21:09
← comawhite left21:09
speakman RichiH: if you want the latest commit in your new branch, you'll "git checkout -b mynewbranch" and it'll be from commit n.21:09
← Dave^|| left21:10
→ emptyflask joined21:10
RichiH ah, duh, of course21:10
← emptyflask left21:10
speakman RichiH: but if you do not want to edit anything in your new branch, you could just "git branch mynewbranch" which just create the new branch at HEAD and still have master branched checked out.21:10
→ linusoleander joined21:11
speakman like; "git branch mynewbranch && git reset HEAD^" will keep your latest commit in "mynewbranch" but reverse your master (current) branch to HEAD-121:11
→ jhaddad joined21:11
speakman (there is no need to checkout unless you've got something to do in-there)21:11
→ eletuchy joined21:12
← bitkiller left21:12
← dv310p3r left21:13
→ bitkiller joined21:13
← eijk left21:14
→ comawhite joined21:16
← Nickeeh left21:16
→ Nickeeh joined21:16
← eregon left21:16
→ eregon_ joined21:17
← workmad3 left21:17
← bpgoldsb left21:17
← odin_ left21:17
→ odin_ joined21:18
→ workmad3 joined21:18
← blueyed left21:18
→ bpgoldsb joined21:18
← jstemmer left21:19
→ ymasory joined21:19
← ymasory left21:19
→ ymasory joined21:19
→ alberto56 joined21:21
→ qwester joined21:25
← sIbOk left21:25
← nona left21:26
→ robotarmy joined21:28
← aidalgol left21:28
← ZyZ left21:29
→ AkumaStreak joined21:30
→ ZeroCoder joined21:31
→ ZyZ joined21:31
← bkosborne left21:32
← jepler- left21:34
← leavittx_ left21:34
← ThomasLocke left21:35
← vandemar left21:36
→ vandemar joined21:36
← whaley left21:36
← TrineLocke_ left21:37
→ whaley joined21:37
→ bbergler joined21:38
→ dotCOMmie joined21:40
← dyer left21:43
dotCOMmie I want to find out if local repo is ahead of origin (at last fetch). Is there a nice way to do this? git diff origin/branch is close but I think it checks against the remote server and not the last fetch21:44
→ towski_ joined21:44
← jnylen left21:45
cmn dotCOMmie: origin/branch refers to what you fetched21:45
← towski left21:46
← ShadowBelmolve left21:46
← LiamH left21:46
← panike left21:46
→ thiago joined21:47
← pdelgallego left21:48
→ hagna joined21:49
→ ShadowBelmolve joined21:49
← milli left21:49
→ MikhX joined21:49
← spaceonline left21:50
→ pdelgallego joined21:51
→ jnylen joined21:51
→ delinquentme joined21:53
delinquentme so is there a good metric as to when a branch has gotten too complex?21:53
like i dont think i have a complex branch structure by any means .. but i DO think it may have gotten a bit out of hand for my skill21:53
→ Zenith77 joined21:54
drizzd delinquentme: how many public branches are there?21:54
delinquentme im about to snap a shot of my branches and post to twitpic21:54
drizzd, i have 3 public branches of my work21:55
← leavittx left21:55
drizzd 3 seems reasonable21:55
delinquentme the issue comes in ( i think ) with the fact that they've been merged multiple times21:55
← booginga left21:56
delinquentme and i've got this criss crossing going on that im not too sure about21:56
im used to looking at a nice convergent upstream tree21:56
→ milli joined21:56
hobodave_ → hobodave21:56
← s0ber left21:56
delinquentme upstream? am i using this incorrectly .. as in as time goes on .. and new commits are being made .. is that upstream? or down?21:56
← opalka left21:57
delinquentme http://twitpic.com/4h0gyp21:58
← ZeroCoder left21:58
→ s0ber joined21:58
dotCOMmie cmn: even on tracking branches?21:59
← kipras left21:59
delinquentme like i said its not complex but that y branch on "edits for error pages" and the "merge branch v7 of ... into errors"21:59
← lessthanzero left21:59
→ mabrand joined21:59
← _psychic_ left21:59
cmn dotCOMmie: it should be, the only communication between repos is though push/fetch22:00
← ajt left22:01
← q0rban left22:01
cmn origin/branch refers to .git/refs/remotes/origin/branch22:01
which is where fetch stored the information about the branch tip in origin at fetch22:01
dotCOMmie cool, cmn thanks22:02
→ _psychic_ joined22:02
← _psychic_ left22:02
← bhosie left22:04
← mgaunard_ left22:04
→ bhosie joined22:04
← milli left22:05
→ glitterfang joined22:06
← hakunin left22:08
← jutaro left22:09
← mabrand left22:09
← JP-Dery left22:10
← ShadowBelmolve left22:11
delinquentme so ive just gone through a restyling of our landing page ... basically i kept anything on use on the page .. and gutted anything else .. is there a way to have git preferentially overwrite values .. instead of merge them?22:11
IE when theres a conflict between these two branches .. dont merge them .. just overwrite whats in branch X with branch Y22:12
← gebi left22:13
← cesario left22:13
→ friskd joined22:14
← __name__ left22:15
→ ShadowBelmolve joined22:15
→ milli joined22:15
→ sIbOk joined22:15
← dim__ left22:16
cbreak delinquentme: man git-merge22:16
jast delinquentme: the 'git-merge' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-merge.html [automatic message]22:16
cbreak there are a few different strategies22:16
look at "ours"22:16
← ericdc left22:17
cbreak or recursive with ours resolving strategy22:17
→ ericdc joined22:17
← glitterfang left22:19
← xerora left22:19
← mando left22:20
adamholt → adamholt_away22:20
adamholt_away → adamholt22:20
← excess^ left22:21
delinquentme git merge -s recursive -X ours foo -s designates?22:21
→ lampe2 joined22:22
jmorris → jmorris|work22:22
delinquentme nm22:22
← pyrony left22:22
→ marcamilly joined22:22
→ arunce joined22:22
→ pyrony joined22:22
← lampe2 left22:23
→ lampe2 joined22:23
→ loufoque joined22:24
← sahilsk1 left22:25
← explodes left22:25
← workmad3 left22:27
← pyrony left22:27
← Sonderblade left22:27
→ pyrony joined22:28
→ workmad3 joined22:28
← steffkes left22:28
← delinquentme left22:29
← tchan1 left22:29
← ExtraSpice left22:29
→ tchan joined22:29
← sunblush left22:30
← ymasory left22:31
→ eyda|mon joined22:32
eyda|mon when i'm on branch X, I keep having to specify both repo and branch to pull from (but not push). is there anyway to get just git pull to work?22:33
← theoros left22:34
→ theoros joined22:34
→ dyer joined22:35
eyda|mon nm22:35
← djencks left22:35
→ deuterium joined22:35
→ spicyWith joined22:37
← ShadowBelmolve left22:37
← xelister left22:38
spicyWith I'm getting fatal: Out of memory, malloc failed22:39
fatal: index-pack failed22:39
when trying to clone a git repo. I ran git gc on the repo and still fails. Any ideas on what I may do?22:39
ayust allocate more memory?22:39
specifically, raise ulimits etc?22:39
spicyWith ayust: which ulimit should I raise?22:42
← workmad3 left22:42
← MetaCosm_ left22:43
tizzo → tizzo-afk22:43
→ EricInBNE joined22:43
frogonwheels_ spicyWith: is this with msysgit?22:44
→ ShadowBelmolve joined22:44
frogonwheels_ → frogonwheels22:44
← rayners left22:44
spicyWith frogonwheels: this is on ubuntu22:44
frogonwheels spicyWith: wow. ok. you got binary blobs or something in there?22:44
spicyWith frogonwheels: don't think so22:45
frogonwheels: but let me double check...22:45
← bhosie left22:45
spicyWith frogonwheels: it's actually less than 2 mb...22:47
→ ISF joined22:48
← iravid left22:49
frogonwheels spicyWith: that's weird.22:50
← hobbeswalsh left22:50
→ iravid joined22:50
→ glitterfang joined22:50
spicyWith frogonwheels: I know :)22:51
← airborn left22:51
spicyWith tried doing a git gc but no luck22:51
git, you're killing me22:51
..22:51
frogonwheels spicyWith: version of git?22:52
spicyWith just checked.. 1.6.0.422:52
need update?22:52
→ rakesh joined22:53
frogonwheels spicyWith: well to be honest, this seems totally out of character for git. .. but I'm on 1.7.1 (ubuntu)22:53
← rakesh left22:53
← chrischambers left22:54
spicyWith frogonwheels: tried doing a sudo apt-get install git-core and says it's up to date, (on ubuntu 9.04)22:54
frogonwheels: I know I need to update the whole installation22:54
← 18VAAAV1V left22:54
→ MetaCosm joined22:54
frogonwheels spicyWith: really, I would have thought 1.6.0.4 stable enough anyway.22:55
← eletuchy left22:55
spicyWith i know22:55
frogonwheels spicyWith: the only time I've had memory errors is under msysgit with a packsize of > 4gb22:55
← ereslibre left22:57
← yhager left22:57
← evanmeagher left23:01
→ yhager joined23:01
← cannonball left23:01
→ foocraft joined23:05
← Chaser left23:06
→ djencks joined23:06
← ShadowBelmolve left23:07
← sideone left23:07
→ Buglouse joined23:07
→ Tuller joined23:08
← MetaCosm left23:09
← slide left23:09
→ ShadowBelmolve joined23:10
→ jepler joined23:10
← nothingHappens left23:11
← xiong left23:11
spicyWith frogonwheels: let's try rebooting...23:11
← npmap left23:12
→ mando joined23:13
→ deekayen joined23:13
← radarek left23:15
spicyWith frogonwheels: ok, doesn't seem to be working, even with a fresh system with lots of memory...23:15
← sanguisleft left23:15
→ jarrod_ joined23:16
← jarrod_ left23:17
→ blueyed joined23:17
spicyWith frogonwheels: any ideas on what's the best way to upgrade git on my ubuntu installation?23:17
← Chillance left23:19
← v0n left23:19
← project2501a left23:19
spicyWith frogonwheels: some progress, the problem seems to be on the client, not the server.... wtf23:19
← StephenGWills left23:21
← Amorphous left23:21
← towski_ left23:21
→ towski joined23:22
→ eletuchy joined23:23
→ evanmeagher joined23:23
→ deuterium_ joined23:24
← mattly left23:25
← ddkilzer left23:25
← bitkiller left23:25
→ coreyw joined23:25
← deuterium_ left23:26
← urkud_ left23:26
coreyw Crap, I just deleted a files contents. And then saved it, and closed the file. How can I revert the file back to my last commit??23:26
→ urkud_ joined23:26
→ deuterium_ joined23:26
mmattice git checkout $file23:26
← deuterium left23:27
coreyw oh, that was easy. hah.23:27
thanks23:27
SethRobertson More indirectly, `git status` will show the command to undo any changes since the last commit23:27
bburhans_ → bburhans23:27
→ theoros_ joined23:28
→ dr_ick joined23:28
coreyw thanks23:28
← giallu left23:28
coreyw sucks bc my last commit didnt have a few changes in it. then i stupidly deleted the file. damnit23:29
← theoros left23:30
→ delinquentme joined23:30
← Ryback_ left23:30
← deuterium_ left23:30
→ alpha_ joined23:31
← jsquared left23:31
→ user__ joined23:32
→ jsquared joined23:32
user__ → theoros23:32
← larsl left23:33
delinquentme anyone :D .. picking specific files to "recursive ours" overwrite23:33
← coreyw left23:33
← theoros_ left23:34
← dr_ick left23:35
← sterlo left23:36
← anjen left23:36
→ Amorphous joined23:36
← tyteen4a03 left23:37
→ alester joined23:39
→ madewokherd joined23:40
← oc80z left23:41
← beatak left23:42
← tearsong left23:42
← Dr4g left23:42
→ oc80z joined23:42
→ theoros_ joined23:42
← loufoque left23:44
← theoros left23:45
← spicyWith left23:45
← ShadowBelmolve left23:46
→ sanguisleft joined23:47
← modulistic left23:48
← mrevd left23:51
← urkud_ left23:52
← aalex left23:54
→ aalex-home_ joined23:55
→ aalex joined23:55
← sanguisleft left23:55
← sIbOk left23:55
→ ymasory joined23:56
← nadavoid left23:56
← cjz left23:56
← alpha_ left23:56
FauxFaux How disasterous is gitolite from debian stable (1.5.4)?23:56
→ kkal joined23:57
→ alpha_ joined23:57
→ crhan joined23:57
← SimonP86 left23:57
← MikhX left23:57
→ MikhX joined23:58
kkal how can I reattempt the merging of a file from one branch to another?23:58
I messed up the first attempt.23:58
→ RichardBronosky joined23:58
→ sunblush joined23:59
← alberto56 left23:59
bob2 kkal: you mean you committed a broken merge?23:59
kkal no I havent committed yet23:59
bob2 if you didn't push you can just reset back before it and try again23:59
kkal how do I do that?23:59
git checkout doesnt work23:59
→ nadavoid joined23:59

Logs Search ←Prev date Next date→ Channels Documentation