IRCloggy #git 2014-07-13

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.

2014-07-13

→ duckydan joined00:00
→ clu_ joined00:00
→ Fandekasp joined00:00
→ mattymo joined00:01
← mattymo left00:01
→ fold joined00:01
← eliasr left00:01
← knownasilya left00:02
→ mattymo joined00:03
← mattymo left00:03
← bitkiller left00:05
← maestrojed left00:05
→ mattymo joined00:05
← mattymo left00:05
← clu_ left00:05
→ EminenceHC joined00:05
→ mattymo joined00:07
← mattymo left00:07
→ mattymo joined00:09
← mattymo left00:09
→ btree joined00:09
← EminenceHC left00:10
→ mkumm joined00:11
→ mattymo joined00:11
← mattymo left00:11
→ DigitallyBorn joined00:11
← DigitallyBorn left00:11
→ DigitallyBorn joined00:11
← xnrand left00:12
← DigitallyBorn left00:12
← sh4rm4 left00:13
→ xnrand joined00:13
→ mattymo joined00:13
← mattymo left00:13
→ sh4rm4 joined00:13
← AKK9 left00:14
← Mixologi_ left00:15
→ mattymo joined00:15
← mattymo left00:15
← sh4rm4 left00:15
← anEffingChamp left00:16
→ Mixologic joined00:16
← _ikke_ left00:17
→ mattymo joined00:17
← mattymo left00:17
← mkumm left00:17
→ _ikke_ joined00:18
→ mattymo joined00:19
← mattymo left00:19
→ mattymo joined00:22
← mattymo left00:22
← btree left00:22
→ hkon_ joined00:24
→ mattymo joined00:24
← mattymo left00:24
→ mattymo joined00:26
← mattymo left00:26
← paul424 left00:27
→ mattymo joined00:28
← mattymo left00:28
← Willow_ left00:28
← hkon_ left00:29
→ Willow_ joined00:29
→ mattymo joined00:30
← mattymo left00:30
→ JanC_ joined00:31
→ mattymo joined00:32
← mattymo left00:32
← jottr_ left00:32
JanC → Guest2430900:32
JanC_ → JanC00:32
← Guest24309 left00:33
→ Teckie joined00:33
→ mattymo joined00:34
← mattymo left00:34
← Willow_ left00:34
→ shurcooL joined00:34
← Brando753 left00:35
→ mattymo joined00:36
← mattymo left00:36
→ thorie joined00:36
← LnL left00:37
→ mattymo joined00:38
← mattymo left00:38
← damccull left00:39
→ GODDOG joined00:39
→ Brando753 joined00:40
→ mattymo joined00:40
← mattymo left00:40
← Yomi left00:41
← Baruch left00:41
→ mattymo joined00:42
← mattymo left00:42
← [HACKING-TWITTER left00:43
→ mattymo joined00:44
← mattymo left00:44
→ mattymo joined00:46
← mattymo left00:46
→ mattymo joined00:48
← mattymo left00:48
→ lite_ joined00:49
Teckie → tccki00:49
→ mattymo joined00:50
← mattymo left00:50
← kstuart left00:51
← looper left00:51
→ mattymo joined00:52
← mattymo left00:52
← Lyqyd left00:53
← lite_ left00:53
← bluesm left00:54
→ mattymo joined00:54
← mattymo left00:54
← mueslo left00:55
→ listochkin joined00:55
→ moritzs joined00:56
→ mattymo joined00:56
← mattymo left00:56
→ b-jazz joined00:57
← alezandro left00:57
→ mattymo joined00:58
← mattymo left00:58
→ Vivekananda_y510 joined00:58
← listochkin left00:59
← sdrfnord1 left00:59
→ [HACKING-TWITTER joined00:59
← [HACKING-TWITTER left01:00
→ mattymo joined01:00
← mattymo left01:00
→ jfran joined01:00
← m0ltar left01:00
→ [HACKING-TWITTER joined01:01
← [HACKING-TWITTER left01:01
← nfk left01:01
→ [HACKING-TWITTER joined01:02
← shurcooL left01:02
→ mattymo joined01:03
← mattymo left01:03
→ mattymo joined01:04
← mattymo left01:04
← jfran left01:05
→ mattymo joined01:07
← mattymo left01:07
← benonsoftware left01:07
→ Penelope21 joined01:08
← Penelope21 left01:08
→ EminenceHC joined01:09
→ mattymo joined01:09
← mattymo left01:09
→ mattymo joined01:11
← mattymo left01:11
→ Nizumzen joined01:12
→ mattymo joined01:13
← mattymo left01:13
← EminenceHC left01:13
← CheckDavid left01:14
→ kayloos joined01:15
→ mattymo joined01:15
← mattymo left01:15
← shingshang left01:15
→ mattymo joined01:17
← mattymo left01:17
← nour_ left01:17
djapo what do i do after i fix a merge conflict in a file?01:18
git add -A :/; git commit -m "merged branch" ?01:18
← kayloos left01:19
→ mattymo joined01:19
← mattymo left01:19
← King_Hual` left01:20
Hello71 !conflict01:20
gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II01:20
→ mattymo joined01:21
← mattymo left01:21
→ kukks joined01:21
← kukks left01:22
→ kukks joined01:22
→ mattymo joined01:23
← mattymo left01:23
djapo ah nice01:23
← tonyj left01:24
← lindenle left01:24
→ jens_ joined01:24
→ mattymo joined01:25
← mattymo left01:25
→ tgummerer joined01:25
← zematis left01:25
→ mattstratton joined01:26
← robustus left01:26
→ tonyj joined01:26
← moritzs left01:27
→ mattymo joined01:27
← mattymo left01:27
→ minid33 joined01:27
← freestyl3r left01:28
→ robustus joined01:29
→ mattymo joined01:29
← mattymo left01:29
→ hebz0rl_ joined01:31
→ mattymo joined01:31
← mattymo left01:31
← minid33 left01:32
← netameta left01:32
→ mattymo joined01:33
← mattymo left01:33
→ mizu_no_oto joined01:34
← tgummerer left01:34
← hebz0rl left01:35
→ mkumm joined01:35
→ mattymo joined01:35
← mattymo left01:35
← VictorBjelkholm left01:36
← ferreum158 left01:36
→ bezet joined01:36
→ VictorBjelkholm joined01:37
djapo if i delete a branch in the origin/branch and push the changes upstream, when someone pulls will their copy be deleted?01:37
→ netameta joined01:37
→ mattymo joined01:37
← mattymo left01:37
← Sleepy63 left01:38
→ mattymo joined01:40
← mattymo left01:40
← bezet left01:41
→ mattymo joined01:42
← mattymo left01:42
→ ojacobson joined01:42
→ dougsland joined01:43
offby1 Death is a part of life. When facing it, *don't panic*. Read "How to die peacefully" in man git-enditall.01:43
← Fandekasp left01:43
→ mattymo joined01:44
← mattymo left01:44
offby1 When I go, I want to die like my grandfather did: peacefully, in my sleep. Not screamining in pain and terror, like the passengers in his car.01:44
→ nkouevda joined01:45
thorie how can i save my git username and password for github when i do a push?01:45
offby1 thorie: depends on whether you're using ssh or https01:45
thorie: also depends on whether you're using the command line, versus the bespoke OS X or Windows clients01:46
preaction if you're using ssh, just use keys. much better01:46
→ mattymo joined01:46
← mattymo left01:46
thorie using command-line01:46
im using https i think, because i used the git clone https://... from my project page01:47
preaction you can change that if you want01:47
← mizu_no_oto left01:47
→ Fandekasp joined01:48
→ mattymo joined01:48
← mattymo left01:48
gitinfo set mode: +v01:48
← nkouevda left01:48
thorie preaction: is it hard to change?01:48
gsingh93_ I have two local branches A and B, where B is one commit ahead of A. I amend the head of A, and I want to update B with the amended commit. Currently, I've been making a new branch C from A and cherry-picking the head of B to C, but that's slow.01:48
preaction thorie: git remote set-url origin <new_url>01:49
gsingh93_: it sounds like you want to 'git checkout B; git rebase A'01:49
→ lite_ joined01:49
gsingh93_ oh, will rebasing do it?01:49
i thought it might think it diverged01:50
preaction did B start from A?01:50
gsingh93_ it did, but A was ammended01:50
so shouldn't the hash change?01:50
preaction was that amended commit the commit that B was branched from?01:50
→ mattymo joined01:50
← mattymo left01:50
gsingh93_ yea01:50
preaction and you do this often?01:50
gsingh93_ yea01:50
thorie cool thanks preaction01:50
gsingh93_ why?01:51
preaction that's what i'd like to know :p01:51
gsingh93_ well I have a diff in review on branch A01:51
i start working on the next thing on branch B01:51
A gets comments, so I update the commit, amend, and repush01:52
now B needs to be updated01:52
preaction ah, so A isn't master? if A gets amended, you probably shouldn't branch from it01:52
→ mattymo joined01:52
← mattymo left01:52
gsingh93_ it's not master, but it's my own feature branch01:52
preaction or keep applying commits on top of A and then when you merge back to master do a squash01:52
gsingh93_ and i want to work on tasks in parallel01:52
← darkbasic left01:53
preaction so branch both A and B from master instead, unless B depends on A, in which case the squashing is probably a better option01:53
← Nizumzen left01:53
← lite_ left01:54
→ darkbasic joined01:54
gsingh93_ B does depend on A01:54
← shinnya left01:54
gsingh93_ that's why I'm doing this01:54
← the8thbit left01:54
→ mattymo joined01:54
← mattymo left01:54
→ Vampire0 joined01:55
← dannixon left01:55
→ mattymo joined01:56
← mattymo left01:56
← cagedwisdom left01:57
← Vampire0_ left01:58
→ mattymo joined01:58
← mattymo left01:58
← GODDOG left01:58
→ dreiss joined01:59
→ kcj joined01:59
→ mattymo joined02:00
← mattymo left02:00
→ shinnya joined02:00
djapo do i have to manually delete branches that no longer exist in the upstream?02:02
→ mattymo joined02:02
← mattymo left02:02
preaction yes02:02
→ drboard joined02:03
ojacobson no02:04
offby1 maybe02:04
ojacobson man git-fetch, man git-remote02:04
gitinfo the git-fetch manpage is available at http://jk.gs/git-fetch.html02:04
the git-remote manpage is available at http://jk.gs/git-remote.html02:04
→ mizu_no_oto joined02:05
→ mattymo joined02:05
← mattymo left02:05
→ mattymo joined02:06
← mattymo left02:06
→ knownasilya joined02:07
→ ChrisC_ joined02:08
→ mattymo joined02:09
← mattymo left02:09
→ mattymo joined02:10
← mattymo left02:10
← teran left02:11
→ EminenceHC joined02:11
djapo after manually deleting the branch git branch -D branchname i can still git checkout branchname, how can i stop this02:11
?02:11
ojacobson !repro02:12
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.02:12
→ hkon_ joined02:12
→ mattymo joined02:13
← mattymo left02:13
→ francisfish joined02:14
← mizu_no_oto left02:14
→ mattymo joined02:14
← mattymo left02:14
← Zimsky left02:15
← idoit left02:15
← EminenceHC left02:16
→ mattymo joined02:17
← mattymo left02:17
→ Zimsky joined02:17
← hkon_ left02:17
djapo git branch; shows master, git branch -r; shows both branches, even after git branch -D branchname; in another computer where the same repo exist i did git push --delete origin branchname;02:17
→ nnyk_ joined02:17
← francisfish left02:18
→ mattymo joined02:19
← mattymo left02:19
→ northfurr joined02:19
djapo oh, i got it; git branch -r -D origin/branchname; does it02:19
← jovy88 left02:19
→ jovy88 joined02:21
→ mattymo joined02:21
← mattymo left02:21
→ HanClinto_ joined02:22
← freeroute left02:22
→ mattymo joined02:23
← mattymo left02:23
→ tmcmahon joined02:24
← dreiss left02:24
← HanClinto__ left02:25
→ freeroute joined02:25
→ mattymo joined02:25
← mattymo left02:25
freeroute RichiH: what would you say are the prerequisites of using vcsh to saving dotfiles? I'm currently learning to use git. Also, would you still recommend me vcsh if I wanted to keep only 1 branch (version tracking) of my dotfiles, or would you recommend something more simpler?02:27
→ mattymo joined02:27
← mattymo left02:27
→ mattymo joined02:29
← mattymo left02:29
→ pawelbx joined02:30
→ mattymo joined02:31
← mattymo left02:31
→ idoit joined02:31
→ idoit` joined02:32
← tmcmahon left02:33
→ mattymo joined02:33
← mattymo left02:33
→ mattymo joined02:36
← mattymo left02:36
← idoit left02:36
→ mattymo joined02:37
← mattymo left02:37
→ mattymo joined02:39
← mattymo left02:39
offby1 freeroute: Dropbox?02:39
→ mattymo joined02:41
← mattymo left02:41
→ teran joined02:41
← jens_ left02:41
freeroute offby1: I intend to use github / bitbucket. I don't really know how to _only_ get dotfiles in there since they're kind of all over my homedir02:42
→ mattymo joined02:43
← mattymo left02:43
← HanClinto_ left02:44
→ mattymo joined02:45
← mattymo left02:45
→ dreiss joined02:46
← teran left02:46
← bgerber left02:46
→ mattymo joined02:47
← mattymo left02:47
Dougie187 freeroute: there are a bunch of examples. Here is mine: https://github.com/douglasjacobsen/dotfiles02:49
→ mattymo joined02:49
← mattymo left02:49
Dougie187 Here are more general links: http://dotfiles.github.io/02:49
→ lite_ joined02:50
← Blaguvest left02:51
→ mattymo joined02:51
← mattymo left02:51
freeroute hmm, more ways of doing stuff :p02:51
thanks, I'll try to go over all of them02:52
← LoganG left02:52
← therealGent left02:52
→ mattymo joined02:54
← mattymo left02:54
← Fandekasp left02:55
← lite_ left02:55
→ listochkin joined02:55
← drboard left02:56
→ mattymo joined02:56
← mattymo left02:56
← Rastus_Vernon left02:56
→ Fandekasp joined02:56
→ bgerber joined02:57
→ mattymo joined02:58
← mattymo left02:58
yr-gitchain_org_ → yrashk02:58
→ drboard joined03:00
← listochkin left03:00
→ mattymo joined03:00
← mattymo left03:00
← dreiss left03:02
→ maktig joined03:02
→ mattymo joined03:02
← mattymo left03:02
← drjeats left03:02
→ teran joined03:03
→ mattymo joined03:04
← mattymo left03:04
→ d5sx43 joined03:04
← Fandekasp left03:04
→ teran_ joined03:05
→ mattymo joined03:06
← mattymo left03:06
→ Fandekasp joined03:07
← teran left03:07
← goldstar left03:08
← hebz0rl_ left03:08
→ mattymo joined03:08
← mattymo left03:08
→ Carena21 joined03:09
← Carena21 left03:09
← d5sx43 left03:09
← teran_ left03:09
→ mattymo joined03:10
← mattymo left03:10
→ HanClinto_ joined03:11
→ d5sx43 joined03:12
← dmauney left03:12
→ mattymo joined03:12
← mattymo left03:12
← dougsland left03:12
→ xjiujiu joined03:12
← n4irc2 left03:12
→ Logan joined03:13
← n4irc left03:13
Logan → LoganG03:13
offby1 freeroute: I could tell you how I do it if you're interested.03:13
→ sdouglas joined03:13
← mattstratton left03:14
→ mattymo joined03:14
← mattymo left03:14
freeroute offby1: by using dropbox? Not sure if I can trust dropbox with my dotfiles though. Also isn't it hard to keep versioning with dropbox in comparison with something like git?03:14
→ EminenceHC joined03:15
offby1 no, I use git03:15
→ n4irc2 joined03:15
→ n4irc joined03:15
freeroute is it by having all dotfiles in a subdir and then symlinking them outside? If so, that requires a script with sanity checks, right?03:16
→ mattymo joined03:16
← mattymo left03:16
offby1 exactly03:16
no sanity checks, though: I just make symlinks for everythin in my git repo03:16
https://gist.github.com/1e6830c083deb5e90ce503:17
→ mattymo joined03:18
← mattymo left03:18
→ lindenle joined03:18
freeroute so how does this work with dotfiles which are in (sub)dirs like .config/subdir/.dotfile ?03:19
offby1 you put the dotfile in ~/path/to/your/homedir/git/repository/.config/subdir/.dotfile03:20
← EminenceHC left03:20
offby1 then every time you "pull" to that repository, if you notice a new file, you re-reun the set-up-links.sh script, and it creates the file in the right place03:20
I've been using this for about three years and I can't think of anything wrong with it.03:20
← Fandekasp left03:21
offby1 alas my homedir repository is priviate, or else I'd show you ...03:21
→ mattymo joined03:21
← mattymo left03:21
freeroute yeah I want to keep it private too, so hence I'll be using something like bitbucket for that03:21
← xjiujiu left03:21
preaction i make my dotfiles repo match the structure of my homedir, so i only have to symlink the top left of my repo: for $THING in $HOME/dot-files/*; do ln -s $THING $HOME/$(basename $THING); done03:21
→ xjiujiu joined03:22
preaction mine is not private. i don't know why you'd need to... http://github.com/preaction/dot-files03:22
offby1 freeroute: https://gist.github.com/1f17759edddb1a08fb8303:22
preaction: that's pretty much what I'm doing too.03:22
← madewokherd left03:22
preaction i make hooks so that $work-specific crap doesn't go in the repo, since they wouldn't appreciate their stuff leaving their systems03:22
offby1 we all reinvent this wheel over and over :)03:22
preaction it's not reinventing if it's just the easiest way to do it03:23
→ mattymo joined03:23
← mattymo left03:23
← Noldorin left03:23
→ mattymo joined03:24
← mattymo left03:24
freeroute with the symlink + script approach I have to learn shell scripting first though03:26
→ mattymo joined03:27
← mattymo left03:27
offby1 freeroute: or _some_ programming language, yes.03:27
freeroute: unless you find some script that works perfectly for you.03:27
→ therealGent joined03:28
← therealGent left03:28
→ therealGent joined03:28
→ mattymo joined03:29
← mattymo left03:29
preaction eh, shell scripting is amazingly useful, especially when you start getting depth of knowledge of even the things you use every day03:30
← xjiujiu left03:30
→ xjiujiu joined03:31
freeroute of course, but it takes additional time to learn, and takes precedent before learning something like git03:31
→ mattymo joined03:31
← mattymo left03:31
preaction hell, the main reason i hate working on windows boxes is that i don't have a decent shell environment03:31
→ Nicholas_Rishel joined03:31
preaction eh. basic command-line usage isn't what i would call shell scripting03:31
← Nicholas_Rishel left03:32
offby1 shell scripting is horrible.03:32
preaction once you start using xargs and shell conditionals/loops, then we can call it scripting03:32
freeroute of course, but something like this - https://gist.github.com/offby1/1e6830c083deb5e90ce5 - is certainly is a script03:32
offby1 I mean I'm glad I know how to do it, but geez03:32
→ mattymo joined03:33
← mattymo left03:33
← PaulCapestany left03:33
preaction it's a terse language for stringing together multiple external programs. there comes a point where a real language is better, but there also is a set of problems where it's better to write a bunch of little programs and combine them using the shell03:34
→ PaulCapestany joined03:34
→ Nicholas_Rishel joined03:34
preaction that said, i refuse to learn bash's "array" syntax. if i need an array, i'll use a real language03:34
→ mattymo joined03:35
← mattymo left03:35
preaction there's an article out there about "Object Oriented Shell", which is hilarious, interesting, and should never be used for anything ever03:35
the author should get an Ig Nobel Prize for that03:35
← PaulCapestany left03:36
→ CKyle joined03:37
→ mattymo joined03:37
← mattymo left03:37
→ bezet joined03:37
← Mitchbones left03:37
→ PaulCapestany joined03:37
freeroute so now my choice is basically the following: git -> github -> vcsh OR (bash) scripting -> git -> github03:39
→ mattymo joined03:39
← mattymo left03:39
freeroute which one takes less time to achieve would you say?03:39
← Vivekananda_y510 left03:40
← watabou left03:40
← bezet left03:41
→ mattymo joined03:41
← mattymo left03:41
pekster Clearly needs more Perl :P03:41
→ pikaren joined03:42
freeroute pekster: I'll keep that in mind when I develop a sudden fetish for barb wire bondage :p03:42
offby1 preaction: I never _refused_ to learn the array syntax; I just never got around to it. I took choose a real language when I want hash tables03:42
→ mattymo joined03:43
← mattymo left03:43
pekster I played with bash v4 associative arrays briefly, and they're neat, but at that point you're reached the upper-bounds on what you can do, and it's obviously got portability issues (breaks without bash, or with too-old-bash)03:43
bremner nobody seriously considering bash scripting gets to make fun of perl.03:44
→ mattymo joined03:45
← mattymo left03:45
← therealGent left03:45
offby1 let's sit around and grouse about tech that nobody uses03:46
pekster freeroute: Also, barb-wire? Try scarves. Unlike the rigid typing of C, or the indent requirements of Python, Perl gives you freedom to do things in all sorts of weird/crazy ways, even if you probably shouldn't. "Freedom!"03:47
(notably: the freedom to Do It All Wrong)03:47
→ the8thbit joined03:47
→ mattymo joined03:47
← mattymo left03:47
→ damccull_ joined03:48
freeroute and also the freedom to make undocumented regex... the code that makes my brain turn into a bunch of rocks03:49
pekster Nah, regex can be easy to read if you comment it with the /x feature03:49
If you don't, that's just lousy programming03:49
preaction nobody uses bash or nobody uses perl? because both are wrong. tech never dies03:49
→ mattymo joined03:49
← mattymo left03:49
preaction and also, regex is everywhere, so i don't see how that makes perl bad03:49
freeroute isn't perl the regex language?03:49
pekster Perl specifically lets you split regex across lines and add comments to each one. That actually makes perl easier to read than most shell 'grep' lines I've ever read03:49
→ nickpresta joined03:50
pekster Kind of, but Perl RE is different than POSIX RE03:50
freeroute ah yes, of course03:50
is it that fundamentally different though?03:50
preaction perl makes it easier than most languages to use regex, if that's what you mean by "the regex language"03:50
← dsdeiz left03:50
pekster Nah, not really that different03:50
A few new concepts, but if you're an expert in POSIX RE already, Perl RE will be pretty easy to pick up03:50
→ lite_ joined03:51
pekster https://sslimgs.xkcd.com/comics/regular_expressions.png03:51
← ojacobson left03:51
→ mattymo joined03:51
← mattymo left03:51
→ Balliad joined03:51
← ilmgb left03:53
preaction i can't come up with a regex that will find an address that isn't atrocious...03:53
freeroute address validation, eh? http://www.ex-parrot.com/pdw/Mail-RFC822-Address.html03:53
→ ilmgb joined03:53
→ mattymo joined03:53
← mattymo left03:53
preaction even just trying to find "123 wallaby way"03:53
freeroute the moment I looked at that link I knew regex wasn't something I would have fun in learning :(03:54
preaction that's e-mail address, and RFC822 has been superceded thank yhwh03:54
← moparisthebest left03:54
← avocado left03:54
preaction that regex was generated by a program. no sane human would try to write that03:54
it doesn't even validate e-mail addresses. the only way to know if an e-mail is valid is to try sending to it03:55
← lite_ left03:55
← nnyk_ left03:55
pekster Works for spam-bots all the time by including a 1x1 image at a uniqe URL and seeing if any hits come in for the many-thousands they send out03:56
unique*03:56
→ nnyk_ joined03:56
→ mattymo joined03:56
← mattymo left03:56
pekster Thankfully webmail and desktop clients are getting smarter by not showing images by default03:56
→ arup_r joined03:57
→ Vivekananda_y510 joined03:57
preaction http://www.ioccc.org/2013/birken/birken.c the moment i saw that, i knew C wasn't something i would have fun in learning03:57
freeroute lol C tetris03:58
→ mattymo joined03:58
← mattymo left03:58
freeroute yeah C isn't something on my "first language to learn" list either03:58
← ilmgb left03:58
freeroute although, probably I'd learn that first if I had infinite time03:59
because so many languages stem from C03:59
thiago if it weren't for C...03:59
preaction C is pretty easy, as far as languages go. a lot of languages choose syntax elements based on what C chose, yes03:59
→ mattymo joined03:59
← mattymo left04:00
freeroute C itself might be easy, but interacting with hardware? eh...04:00
thiago ...we'd be programming in BASI, PASAL and OBOL04:00
pekster Much FOSS is still based in C, despite the popularity of more modern alternatives04:00
← hobodave left04:00
→ CraigyDavi` joined04:00
freeroute well I would assume it's because of performance reasons04:00
C is still quite fast IIRC04:00
preaction it frequently isn't04:00
pekster C isn't that bad, it's all the APIs that take forever to learn :P04:00
thiago there's nothing faster than C, but that's not the reason04:00
freeroute thiago: ASM? :p04:01
thiago freeroute: frequently, it isn't04:01
preaction the compiler most likely writes better ASM than you do04:01
thiago freeroute: not for large sections of code04:01
freeroute but isn't it possible to modularize sections of code, write a bit of stuff in ASM to optimize it further and further?04:02
← CraigyDavi left04:02
→ mattymo joined04:02
← mattymo left04:02
freeroute although that also depends if you want such (insignificant) performance increases04:02
→ watabou joined04:03
pekster Right, and that's fairly rare that you can "beat" the compiler in such a significant way. You will see some inline ASM like that, but it's not common04:03
Kernel sources will use is, for example04:03
s/is/it/04:03
→ mattymo joined04:04
← mattymo left04:04
→ teran joined04:04
→ curiousmansi_ joined04:04
gitinfo set mode: +v04:05
→ punchagan joined04:06
← lindenle left04:06
→ mattymo joined04:06
← mattymo left04:06
curiousmansi_ what is the difference between clone and checkout in git04:07
pekster curiousmansi_: A clone is what you use to get an initial complete copy of a remote repository, while a checkout puts a specific branch or revision into your working copy for use04:07
thiago curiousmansi_: one downloads, the other checks the files out, with no network access04:08
← arup_r left04:08
→ mattymo joined04:08
← mattymo left04:08
← teran left04:09
← Balliad left04:09
← drboard left04:09
curiousmansi_ i want to start working on some repository in github... i know someone told me to do clone first and from next time do pull or checkout i am not sure. But in svn it use to be just checkout from the svn server04:10
offby1 well, git is different from svn.04:10
→ mattymo joined04:10
← mattymo left04:10
→ arup_r joined04:11
curiousmansi_ k let me know how to get started , quickly ;)04:11
offby1 read some docs04:11
it's what we did.04:12
← hellopat_ left04:12
offby1 !book04:12
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable04:12
→ mattymo joined04:12
← mattymo left04:12
curiousmansi_ i will clone the repository , and then next time if i need to update i will just do pull04:12
gitinfo: thanx i will do that04:12
but i m bit slow in reading04:12
for timebeing please tell me or guide me04:13
offby1 unlikely04:13
i m a bit slow in advising04:13
curiousmansi_ haha04:13
← punchagan left04:14
→ mattymo joined04:14
← mattymo left04:14
curiousmansi_ i will clone the repository , and then next time if i need to update i will just do pull - (when did checkout will come in picture)04:14
offby1: just answer that if u can04:14
→ francisfish joined04:14
← falstaff_ left04:15
pekster Read about the differences between !pull and fetch (again with the docs thing)04:15
gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/04:15
pekster Here it usually helps to have read some docs first and ask a more concrete question04:15
→ alezandro joined04:15
→ punchagan joined04:16
→ mattymo joined04:16
← mattymo left04:16
→ sunny_ joined04:17
→ mattymo joined04:18
← mattymo left04:18
→ EminenceHC joined04:18
← L0uk3 left04:19
← francisfish left04:19
← PCChris_ left04:19
→ nardev joined04:20
curiousmansi_ thiago: the other checks the files out, with no network access. this means if i have no internet at home i can still checkout. sorry for asking silly question. next time i will read the books and come back04:21
→ mattymo joined04:22
← mattymo left04:22
SamB hmm, how do I make a second working directory for a repo?04:22
→ mattymo joined04:22
← mattymo left04:22
thiago curiousmansi_: yes, you can check out any commit you already have04:22
← EminenceHC left04:23
curiousmansi_ thiago: if someone has commited that also i can checkout without any internet access?04:23
thiago curiousmansi_: if you downloaded before disconnected, yes04:23
← Dougie187 left04:24
→ mattymo joined04:24
← mattymo left04:24
→ n-st_ joined04:25
curiousmansi_ thiago: i am going to download jquery reposity with git clone command now , then next time may be tomorrow i might not have internet at home, but i can do checkout to get the head of the repository and start working on it04:25
thiago: sorry if i am asking the same thing again n again for u. but i m like this :(04:26
thiago curiousmansi_: yes04:26
→ cigarshark joined04:26
curiousmansi_ thiago: thanks a lot04:26
→ mattymo joined04:26
← mattymo left04:26
← sdouglas left04:27
→ mennea joined04:27
← Gamecubic left04:27
curiousmansi_ thanks everyone from last few months i was using clone, pull, checkout push , commit , but was confused somewhere in my head. I was refraining from reading the docs as i know svn .04:28
thanks again i got the clarification now04:28
SamB found it; git/contrib/workdir/git-new-workdir04:28
← n-st left04:28
← cigarshark left04:28
← Nicholas_Rishel left04:29
→ cigarshark joined04:29
← kcj left04:29
← meatcar left04:29
→ mattymo joined04:29
← Megaf left04:30
→ kcj joined04:30
← mattymo left04:31
gitinfo set mode: +v04:31
→ mattymo joined04:31
← mattymo left04:31
→ n-st__ joined04:32
→ CraigyDavi joined04:32
→ meatcar_ joined04:32
→ mattymo joined04:33
← mattymo left04:33
tango_ why the heck isn't git-new-workdir a standard tool yet, I'll never understand04:33
← CraigyDavi` left04:34
→ mattymo joined04:35
← mattymo left04:35
← n-st_ left04:35
→ Consuela joined04:35
← arup_r left04:36
thiago tango_: doesn't work with the .git files (as opposed to dir)04:36
← n-st__ left04:36
→ hobodave joined04:36
tango_ thiago: the what?04:37
→ mattymo joined04:37
← mattymo left04:37
thiago when you don't have a .git dir, just a file pointing to another repository04:37
→ arup_r joined04:37
tango_ hm interesting04:37
I was thinking more about the lines that the .git directory structure could be adjusted to completely split work-dir related from repo-related stuff, to make git new-workdir life easier (and then make it official)04:38
and the .git file could then have two pointers, so that git new-workdir could work easily with that too04:38
← CKyle left04:39
← GarethAdams left04:39
→ Fandekasp joined04:39
tango_ but now that I write this, it sounds like 3.x material04:39
→ mattymo joined04:39
← mattymo left04:39
← sunny_ left04:40
→ ravi joined04:40
→ mattymo joined04:41
← mattymo left04:41
← ESphynx left04:42
→ Tommy[D]_ joined04:43
→ mattymo joined04:43
← mattymo left04:43
→ Mark_ joined04:43
← Mark_ left04:43
→ Mark_ joined04:43
→ GarethAdams joined04:45
→ ESphynx joined04:45
← arup_r left04:45
← Consuela left04:45
→ Textmode joined04:45
→ mattymo joined04:45
← mattymo left04:45
← Tommy[D] left04:46
→ mattymo joined04:47
← mattymo left04:47
← mkumm left04:47
→ sunny_ joined04:49
→ mattymo joined04:49
← mattymo left04:49
← m0viefreak left04:49
← netameta left04:49
→ arup_r joined04:50
→ Motoko joined04:51
→ mattymo joined04:51
← mattymo left04:51
→ mattymo joined04:53
← mattymo left04:53
→ TheSojourner joined04:54
← TheSojourner left04:54
→ TheSojourner joined04:54
← punchagan left04:55
→ mattymo joined04:56
← mattymo left04:56
← Blaster left04:56
→ netameta joined04:57
→ mennea_ joined04:57
→ punchagan joined04:57
→ mattymo joined04:57
← mattymo left04:57
← mennea left04:57
→ mattymo joined04:59
← mattymo left04:59
→ mattymo joined05:01
← mattymo left05:01
← zz_unglid left05:03
→ mattymo joined05:03
← mattymo left05:03
→ teran joined05:04
← hobodave left05:04
← sunny_ left05:05
→ mattymo joined05:05
← mattymo left05:05
← ravi left05:06
← curiousmansi_ left05:07
→ mattymo joined05:07
← mattymo left05:07
→ Dayana21 joined05:08
→ curiousmansi_ joined05:08
← Dayana21 left05:08
← teran left05:09
→ unglid joined05:09
→ mattymo joined05:09
← mattymo left05:09
→ mattymo joined05:12
← mattymo left05:12
← the_cybersphinx left05:12
→ mattymo joined05:14
← mattymo left05:14
→ hobodave joined05:14
→ sdouglas joined05:14
← [HACKING-TWITTER left05:15
← northfurr left05:15
→ cagedwisdom joined05:16
→ mattymo joined05:16
← mattymo left05:16
→ kayloos joined05:17
← punchagan left05:18
→ mattymo joined05:18
← mattymo left05:18
→ [HACKING-TWITTER joined05:19
→ punchagan joined05:19
← lolmaus left05:20
→ mattymo joined05:20
← mattymo left05:20
→ mkumm joined05:20
← kayloos left05:21
← VictorBjelkholm left05:22
→ mattymo joined05:22
← mattymo left05:22
← kukks left05:22
→ zzl joined05:23
← zzl left05:24
→ EminenceHC joined05:24
→ mattymo joined05:24
← mattymo left05:24
→ mattymo joined05:26
← mattymo left05:26
← punchagan left05:26
→ punchagan joined05:27
← punchagan left05:27
→ VictorBjelkholm joined05:27
→ mattymo joined05:28
← mattymo left05:28
→ duderonomy joined05:28
← EminenceHC left05:28
→ punchagan joined05:29
→ minid33 joined05:29
→ mattymo joined05:30
← mattymo left05:30
→ mattymo joined05:32
← mattymo left05:32
← Garen left05:33
→ sword joined05:34
← minid33 left05:34
→ mattymo joined05:34
← mattymo left05:34
→ MagePsycho joined05:35
→ mattymo joined05:36
← mattymo left05:36
→ mattymo joined05:38
← mattymo left05:38
→ mattymo joined05:40
← mattymo left05:40
→ mattymo joined05:42
← mattymo left05:42
→ mattymo joined05:44
← mattymo left05:44
→ mattymo joined05:46
← mattymo left05:46
→ Garen joined05:48
→ mattymo joined05:48
← mattymo left05:48
← nnyk_ left05:49
→ mattymo joined05:50
← mattymo left05:50
→ zzl1 joined05:51
← zzl1 left05:51
→ mattymo joined05:52
← mattymo left05:52
→ mattymo joined05:54
← mattymo left05:54
→ zacts joined05:55
→ mattymo joined05:56
← mattymo left05:57
← zacts left05:57
→ GodEater` joined05:58
→ mattymo joined05:59
← mattymo left05:59
← curiousmansi_ left05:59
→ khisanth__ joined05:59
← khisanth_ left06:01
← GodEater left06:01
→ mattymo joined06:01
← mattymo left06:01
→ hkon_ joined06:01
→ mattymo joined06:03
← mattymo left06:03
← sdouglas left06:04
→ pantsman- joined06:04
→ mattymo joined06:05
← mattymo left06:05
← mennea_ left06:05
← hkon_ left06:05
→ sdouglas_ joined06:06
← arup_r left06:06
→ mattymo joined06:07
← mattymo left06:07
→ arup_r joined06:08
→ vel0h joined06:08
→ mattymo joined06:09
← mattymo left06:09
← vel0h left06:09
← SethM left06:10
→ mattymo joined06:11
← mattymo left06:11
→ ehmatthes joined06:12
→ mattymo joined06:13
← mattymo left06:13
← zz_jrhorn424 left06:14
→ zz_jrhorn424 joined06:14
← maktig left06:15
→ mattymo joined06:15
← mattymo left06:15
→ francisfish joined06:15
→ mattymo joined06:17
← mattymo left06:17
→ ajvpot joined06:18
→ GirlTalk joined06:19
→ KlAb joined06:19
→ mattymo joined06:19
← mattymo left06:19
← KlAb left06:19
→ nafg___ joined06:20
← francisfish left06:20
← zz_jrhorn424 left06:20
← sgambino left06:21
→ mattymo joined06:21
← mattymo left06:21
← pantsman- left06:22
→ zz_jrhorn424 joined06:23
→ mattymo joined06:23
← mattymo left06:23
← punchagan left06:24
→ mattymo joined06:25
← mattymo left06:25
← potteratt left06:26
← ajvpot left06:26
→ ajvpot joined06:27
← ajvpot left06:27
→ mattymo joined06:27
← mattymo left06:27
→ ajvpot joined06:28
← ajvpot left06:28
→ ajvpot joined06:28
← thiago left06:28
← ajvpot left06:28
← GodEater` left06:28
→ GodEater` joined06:28
→ valentin joined06:28
valentin → Guest9549506:29
→ mattymo joined06:30
← mattymo left06:30
→ EminenceHC joined06:30
→ mattymo joined06:32
← mattymo left06:32
← Motoko left06:33
← FreezingCold left06:34
→ mattymo joined06:34
← mattymo left06:34
← EminenceHC left06:35
→ Oxelist joined06:35
← mkumm left06:35
→ mattymo joined06:36
← mattymo left06:36
← ChrisC_ left06:36
← starkhalo left06:37
→ mattymo joined06:38
← mattymo left06:38
→ mattymo joined06:40
← mattymo left06:40
→ kermit joined06:41
← ashnur left06:41
→ mattymo joined06:42
← mattymo left06:42
← aismail left06:42
← d5sx43 left06:43
→ d5sx43 joined06:43
→ mattymo joined06:44
← mattymo left06:44
← CraigyDavi left06:45
← GirlTalk left06:45
→ mattymo joined06:46
← mattymo left06:46
→ teran joined06:47
→ B1x1t0 joined06:48
→ teran_ joined06:48
→ mattymo joined06:49
← mattymo left06:49
← alezandro left06:49
← arup_r left06:49
→ aismail joined06:49
→ arup_r joined06:50
← VictorBjelkholm left06:50
→ polyzen joined06:50
→ mattymo joined06:51
← mattymo left06:51
← teran left06:51
→ VictorBjelkholm joined06:52
→ mariuscc joined06:52
→ mattymo joined06:53
← mattymo left06:53
← Jontem_ left06:53
→ Jontem_ joined06:53
→ mattymo joined06:54
← mattymo left06:54
→ Oxnard_Dogg joined06:55
← pawelbx left06:56
gitinfo set mode: +v06:56
→ mattymo joined06:57
← mattymo left06:57
Oxnard_Dogg I ruined my vim by installing the vimrc project...now I can't get syntax :on to work I reinstalled git for windows. I wish i could get vim to work ok in git-bash06:57
vimrc project Drupal project06:57
→ mattymo joined06:58
← mattymo left06:58
Oxnard_Dogg → Nohofoo06:59
→ mattymo joined07:01
← mattymo left07:01
→ shingshang joined07:01
→ tgkokk joined07:02
→ mattymo joined07:03
← mattymo left07:03
→ dreiss joined07:03
→ _leb joined07:05
→ CraigyDavi joined07:05
→ mattymo joined07:05
← mattymo left07:05
→ mennea joined07:06
← blorbx` left07:07
← Oxelist left07:07
→ mattymo joined07:07
← mattymo left07:07
→ blorbx` joined07:07
→ zematis joined07:07
→ Diana21 joined07:08
← shingshang left07:08
← Diana21 left07:08
→ mattymo joined07:09
← mattymo left07:09
→ irqq joined07:09
← HanClinto_ left07:09
→ dsdeiz joined07:10
→ mattymo joined07:11
← mattymo left07:11
← d5sx43 left07:12
→ mattymo joined07:13
← mattymo left07:13
→ d5sx43 joined07:14
→ drjeats joined07:14
→ mattymo joined07:15
← mattymo left07:15
→ mattymo joined07:17
← mattymo left07:17
→ kayloos joined07:17
→ mattymo joined07:19
← mattymo left07:19
→ KamalKaur joined07:20
← KamalKaur left07:21
→ bluesm joined07:21
→ mattymo joined07:21
← mattymo left07:21
← sarkis left07:21
→ stamina joined07:21
→ shingshang joined07:22
← kayloos left07:22
← megawac1 left07:22
← knownasilya left07:22
→ mattymo joined07:23
← mattymo left07:23
→ mattymo joined07:25
← mattymo left07:25
→ mattymo joined07:27
← mattymo left07:27
← nickpresta left07:29
→ mattymo joined07:30
← mattymo left07:30
→ minid33 joined07:30
→ EminenceHC joined07:31
→ mattymo joined07:31
← mattymo left07:31
→ tvw joined07:32
→ mattymo joined07:34
← mattymo left07:34
← minid33 left07:35
→ mattymo joined07:36
← mattymo left07:36
← EminenceHC left07:36
→ lolmaus joined07:36
→ mattymo joined07:38
← mattymo left07:38
← shingshang left07:39
← stamina left07:39
→ mattymo joined07:40
← mattymo left07:40
→ mattymo joined07:42
← mattymo left07:42
→ ilmgb joined07:43
→ mattymo joined07:44
← mattymo left07:44
→ mattymo joined07:46
← mattymo left07:46
← Nohofoo left07:46
→ mattymo joined07:48
← mattymo left07:48
→ Nizumzen joined07:48
→ thevishy joined07:49
→ zacts joined07:50
← d5sx43 left07:50
→ mattymo joined07:50
← mattymo left07:50
→ jceb joined07:51
→ ilmgb_ joined07:51
→ d5sx43 joined07:51
← jovy88 left07:52
→ shingshang joined07:52
→ mattymo joined07:53
← mattymo left07:53
← ilmgb left07:53
→ jovy88 joined07:53
→ mattymo joined07:54
← mattymo left07:54
→ lite_ joined07:54
→ mattymo joined07:56
← mattymo left07:56
← ehmatthes left07:56
→ netcarver joined07:57
→ eliasr joined07:57
→ phil joined07:57
→ mattymo joined07:58
← mattymo left07:58
← lite_ left07:59
→ mattymo joined08:01
← mattymo left08:01
→ sarkis joined08:01
→ mattymo joined08:03
← mattymo left08:03
← babilen left08:03
→ mattymo joined08:05
← mattymo left08:05
← sarkis left08:05
→ mattymo joined08:07
← mattymo left08:07
← d5sx43 left08:08
→ mattymo joined08:09
← mattymo left08:09
→ msankhala joined08:10
→ d5sx43 joined08:11
→ mattymo joined08:11
← mattymo left08:11
→ mattymo joined08:13
← mattymo left08:13
→ mattymo joined08:15
← mattymo left08:15
→ francisfish joined08:16
→ mattymo joined08:17
← mattymo left08:17
→ lolmaus_ joined08:18
← lolmaus left08:19
→ mattymo joined08:19
← mattymo left08:19
← zematis left08:20
← francisfish left08:21
→ jagob joined08:21
→ jackneill joined08:21
→ mattymo joined08:21
← mattymo left08:21
→ zematis joined08:22
← xjiujiu left08:23
← watabou left08:23
→ xjiujiu joined08:23
→ mattymo joined08:23
← mattymo left08:23
→ TTomiK joined08:25
→ mattymo joined08:25
← mattymo left08:25
→ Macaveli joined08:26
← _leb left08:26
TTomiK hey... how can I fix this? I have and old version in branch "master", current (working) version in branch "new1". I was working in new1 and committed changes. Then checked out to master, but it didn't work and left me with unworking site.08:26
How can I force myself back to working branch new1 ?08:26
→ babilen joined08:26
→ jatt joined08:26
→ mattymo joined08:27
← mattymo left08:27
luto TTomiK: "unworking state"?08:27
TTomiK: which branch are you on now? git branch08:28
← d5sx43 left08:28
TTomiK new108:28
→ drobban joined08:28
luto well, then switching did work08:28
TTomiK but I've lost all the changes I've made in it after checkout to master08:28
luto are you using some gui tool?08:28
TTomiK source tree08:28
luto well, that's the problem.. git does never let you lose something via checkout08:29
→ kriks joined08:29
luto source tree apparently does.08:29
TTomiK no, I checked out via cli08:29
→ mattymo joined08:29
← mattymo left08:29
← jatt left08:29
→ jatt joined08:29
luto no error message..?08:29
TTomiK I only use source tree to investigate stuff, not for changes08:29
luto checkout normally complains if there are changes. See !float08:30
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.08:30
← Nizumzen left08:30
→ dangerousdave joined08:31
→ mattymo joined08:31
← mattymo left08:31
→ GODDOG joined08:31
TTomiK hmm... I've new to git so "normal conflict resolution" doesn't say anything to me (except copying the backup)08:31
... which I just did so I can now try again that checkout ;)08:32
luto well, did you use git stash at all?08:32
TTomiK no, not yet08:32
luto if not, that sentence doesn't apply to you anyways08:32
TTomiK I'm not at the point before checkout08:32
now*08:32
luto I really don't know where your changes have gone, if they are not still there08:32
TTomiK so... what do I do now?08:33
← xjiujiu left08:33
→ mattymo joined08:33
← mattymo left08:33
→ xjiujiu joined08:33
TTomiK I'm now at the point before "checkout master" and have a working site08:33
→ zapb joined08:33
luto so the changes *are* still there..?08:34
I am confused.08:34
TTomiK they are, because I copied my backup over the current files08:34
luto ah08:34
→ vurma joined08:34
luto so there are two branches, master and new1. You are currently on new1.08:34
TTomiK because I'm new to git I want still want to have an old school backup08:34
luto what do you want to do?08:34
TTomiK yes08:35
I want to commit all the changes to master08:35
luto also, there are uncommited changes in your working directory (based on the new1-state).08:35
← msankhala left08:35
→ mattymo joined08:35
← mattymo left08:35
luto try the git stash stuff from earlier: !float08:35
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.08:35
luto "in that case,..."08:36
TTomiK I've never used stash08:36
→ Sceorem joined08:36
→ EminenceHC joined08:36
← zematis left08:37
luto well, then read up on it. :) it basically saves your working state somewhere else and makes your working dir clean08:37
you can get that saved state back later08:37
TTomiK ok08:37
luto !stash *hopethatthisexists*08:37
nope.08:37
→ mattymo joined08:37
← mattymo left08:37
luto man git stash ;)08:37
gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html08:37
TTomiK so I do stash in new1 -branch08:38
luto 1. stash; 2. checkout; 3. stash apply08:38
1. save changes; 2. switch branch; 3. get changes back08:38
← GODDOG left08:39
← descala left08:39
TTomiK checkout master you mean... that should work just fine now?08:39
luto checkout whatever, yes08:39
→ mattymo joined08:39
← mattymo left08:39
TTomiK ok08:40
luto it should, yes. If it doesn't, you're smart and have a backup ;)08:40
→ d5sx43 joined08:40
TTomiK :D08:40
I'm confused, but will try that after a bit08:40
← jceb left08:41
luto what part is confusing you?08:41
TTomiK I'm sure GIT's a great tool after you get a hang of it08:41
→ msankhala joined08:41
← xjiujiu left08:41
→ mattymo joined08:41
← mattymo left08:41
← EminenceHC left08:41
TTomiK the part why I couldn't change to master...08:42
→ xjiujiu joined08:42
luto because there are changes you have not yet commitet08:42
and they are not compatible with masters state08:42
TTomiK but I had committed all the changes in new108:42
not sure what I had committed in master, though08:43
luto oooooooh08:43
→ Sendoushi joined08:43
luto are you still on new1?08:43
TTomiK yes08:43
luto give me a git status08:43
if it's long, pasterbin it08:43
→ mattymo joined08:43
← mattymo left08:43
TTomiK well, it's like 100 rows :D08:44
→ descala joined08:44
luto your changes, under which heading are they listed?08:44
ShenLong git status | wgetpaste or similar ;)08:44
TTomiK just a sec... just copying the backup files again :D08:45
← nfroidure left08:45
→ ilmgb joined08:46
→ mattymo joined08:46
← mattymo left08:46
← ilmgb_ left08:46
→ longbeach joined08:47
TTomiK for some reason copying takes forever yet I'm on 1GB lan...08:47
→ mattymo joined08:48
← mattymo left08:48
TTomiK well, great... now even my backup doesn't work08:48
fffff.....08:48
→ LnL joined08:50
LnL → Guest9062208:50
→ mattymo joined08:50
← mattymo left08:50
TTomiK phew... that was because of composer, fixed that08:50
damn, a lot of work because of one checkout ;)08:51
> git stash08:51
No local changes to save08:51
→ mattymo joined08:52
← mattymo left08:52
luto uhm08:52
where is our git status?08:52
TTomiK ah... NOW I got it !08:52
luto I sense that I fucked up the communication a bit ealier.08:52
TTomiK it was a permission error :D08:52
luto lol wtf08:52
TTomiK exactly08:52
for some reason git couldn't make those changes earlier08:53
now... git checkout master --- git merge new1 worked just fine08:53
what the hell ?08:53
nobody could change those permissions (my server) and I haven't done that either08:53
so why didn't it work the last time ?08:54
luto git doesn't save permissions08:54
except for the x-flag08:54
← dreiss left08:54
→ mattymo joined08:54
← mattymo left08:54
TTomiK yes, file permissions I mean08:54
hmm... weird stuff08:55
anyway, I'm now in branch master and have merged new1 into it08:55
← xjiujiu left08:56
→ mattymo joined08:56
← mattymo left08:56
→ xjiujiu joined08:56
← drjeats left08:56
→ jluc joined08:58
→ mattymo joined08:58
← mattymo left08:58
← d5sx43 left08:58
← msankhala left09:00
→ mattymo joined09:00
← mattymo left09:00
← BlackCobra left09:00
→ d5sx43 joined09:00
← drobban left09:00
← MagePsycho left09:01
← arup_r left09:01
← dangerousdave left09:01
→ arup_r joined09:01
→ sarkis joined09:02
← shruggar left09:02
→ dangerousdave joined09:02
→ mattymo joined09:03
← mattymo left09:03
→ Sound joined09:03
← TTomiK left09:03
← Someguy123 left09:03
→ kyb3r_ joined09:03
→ tgummerer joined09:04
→ endiruna joined09:04
→ Someguy123 joined09:04
→ mattymo joined09:05
← mattymo left09:05
← netcarver left09:05
→ mattymo joined09:06
← mattymo left09:06
← sarkis left09:07
→ beastd joined09:07
← cagedwisdom left09:07
→ mattymo joined09:08
← mattymo left09:08
→ cagedwisdom joined09:10
→ mattymo joined09:10
← mattymo left09:10
→ MagePsycho joined09:12
→ eletuchy_ joined09:13
← jatt left09:13
→ mattymo joined09:13
← mattymo left09:13
→ francisfish joined09:13
← francisfish left09:14
→ francisfish joined09:14
← sdouglas_ left09:14
→ mattymo joined09:14
← mattymo left09:14
← irqq left09:15
→ sdouglas joined09:15
→ mattymo joined09:16
→ lite_ joined09:16
← mattymo left09:16
← eletuchy left09:16
← eletuchy_ left09:17
→ CraigyDavi` joined09:18
← d5sx43 left09:18
→ kayloos joined09:18
→ mattymo joined09:19
← mattymo left09:19
← sdouglas left09:19
← CraigyDavi left09:20
→ d5sx43 joined09:20
← catsup left09:20
→ mattymo joined09:20
← mattymo left09:20
← jeffreylevesque left09:21
→ catsup joined09:21
→ mattymo joined09:22
← mattymo left09:22
← kayloos left09:23
→ upene joined09:25
→ mattymo joined09:25
← mattymo left09:25
→ devoldmx joined09:26
→ mueslo joined09:26
→ mattymo joined09:27
← mattymo left09:27
→ a-l-e joined09:27
← githogori left09:28
→ mattymo joined09:29
← mattymo left09:29
← yacks left09:29
← gsingh93_ left09:29
→ mattymo joined09:31
← mattymo left09:31
→ Blaguvest joined09:31
→ pantsman- joined09:32
→ jeffreylevesque joined09:32
→ mattymo joined09:33
← mattymo left09:33
← Someguy123 left09:33
→ mikecmpbll joined09:34
→ mattymo joined09:35
← mattymo left09:35
← Fandekasp left09:35
→ Someguy123 joined09:35
← dys left09:36
→ Fandekasp joined09:37
→ mattymo joined09:37
← mattymo left09:37
→ WaReZ joined09:38
← d5sx43 left09:38
→ bezet joined09:38
→ supreme__ joined09:38
→ mattymo joined09:39
← mattymo left09:39
→ eletuchy joined09:40
→ d5sx43 joined09:40
→ EminenceHC joined09:41
→ mattymo joined09:41
← mattymo left09:41
← lolmaus_ left09:41
→ moritzs joined09:42
← moritzs left09:42
← bezet left09:43
→ moritzs joined09:43
→ mattymo joined09:43
← mattymo left09:43
← moritzs left09:44
→ lolmaus joined09:44
→ mattymo joined09:45
← mattymo left09:45
→ moritzs joined09:45
← EminenceHC left09:46
→ Bartek51_ joined09:46
← ilmgb left09:46
→ diegoviola joined09:46
← kyb3r_ left09:46
← moritzs left09:46
→ moritzs joined09:47
← tgkokk left09:47
← Bartek51_ left09:47
→ mattymo joined09:48
← mattymo left09:48
→ mattymo joined09:50
← mattymo left09:50
→ mattymo joined09:51
← mattymo left09:51
→ shruggar joined09:52
← moritzs left09:53
→ ilmgb joined09:53
→ mattymo joined09:53
← mattymo left09:53
← Fandekasp left09:54
→ jottr_ joined09:55
→ tgkokk joined09:55
→ Fandekasp joined09:56
→ mattymo joined09:56
← mattymo left09:56
← ilmgb left09:56
← tvw left09:57
→ ilmgb joined09:57
← d5sx43 left09:57
→ mattymo joined09:57
← mattymo left09:57
→ tvw joined09:57
← VictorBjelkholm left09:59
→ mattymo joined10:00
← mattymo left10:00
→ d5sx43 joined10:00
→ jceb joined10:01
→ mattymo joined10:01
← mattymo left10:01
→ sarkis joined10:03
→ nfk joined10:03
→ VictorBjelkholm joined10:03
→ mattymo joined10:03
← mattymo left10:03
→ Willow joined10:05
→ mattymo joined10:06
← mattymo left10:06
xender What is -5 supposed to do with git log?10:06
Nowhere documented D:10:06
→ alexyursha joined10:07
← sarkis left10:07
qsuscs -<number>, -n <number>, --max-count=<number>10:08
Limit the number of commits to output.10:08
xender Ouch10:08
qsuscs taken from man git log10:08
gitinfo the git-log manpage is available at http://jk.gs/git-log.html10:08
→ mattymo joined10:08
← mattymo left10:08
xender Then it's totally fucked up since -0 to -3 seems to have another meaning10:08
← Sendoushi left10:09
xender At least zsh compl says that10:09
→ Sendoushi joined10:09
← lite_ left10:10
xender -0 -- omit diff output for unmerged entries10:10
→ mattymo joined10:10
← mattymo left10:10
xender -1 -- diff against "base" version10:10
qsuscs then it’s wrong: http://pastie.org/private/ikrlacudpmgdblbumdxfq10:10
← Fandekasp left10:11
xender -2 is suppesed to be --ours and -3 to be --theirs10:11
Indeed strange10:11
qsuscs these options seem to be correct, but not for log10:12
← d5sx43 left10:12
xender Did that change in some version?10:12
→ mattymo joined10:12
← mattymo left10:12
qsuscs don’t think so10:12
xender I should update the compl anyway then10:12
Thanks qsuscs10:12
← alexyursha left10:12
→ Fandekasp joined10:13
→ mattymo joined10:14
← mattymo left10:14
→ stamina joined10:16
→ mattymo joined10:16
← mattymo left10:16
Seveas mattymo is having fun...10:18
→ mattymo joined10:18
← mattymo left10:18
→ afhammad joined10:18
→ alexyursha joined10:18
→ d5sx43 joined10:19
→ mattymo joined10:20
← mattymo left10:20
→ mattymo joined10:22
← mattymo left10:22
→ Zariel_ joined10:23
← bluesm left10:24
← afhammad left10:24
→ mattymo joined10:24
← mattymo left10:24
→ joe-w-bimedina joined10:25
← VictorBjelkholm left10:25
→ VictorBjelkholm joined10:26
← Zariel_ left10:26
→ mattymo joined10:26
← mattymo left10:26
← d5sx43 left10:27
→ mattymo joined10:28
← mattymo left10:28
← Sendoushi left10:29
→ paul424 joined10:29
→ d5sx43 joined10:29
→ msm joined10:30
← paul424 left10:30
→ mattymo joined10:30
← mattymo left10:30
→ EminenceHC joined10:31
← vlovgr left10:31
→ ferreum joined10:31
← zapb left10:32
← msm` left10:32
→ mattymo joined10:33
← mattymo left10:33
← ilmgb left10:34
→ mattymo joined10:34
← mattymo left10:34
→ vlovgr joined10:34
← jceb left10:34
→ ilmgb joined10:35
← shingshang left10:35
← EminenceHC left10:35
→ listochkin joined10:36
→ Hounddog joined10:36
→ freestyl3r joined10:36
→ nour_ joined10:36
← rethus left10:36
← niax left10:36
→ mattymo joined10:36
← mattymo left10:36
← Kulrak left10:38
← Tabmow left10:38
← merlin83_ left10:38
← aucecil left10:38
→ mattymo joined10:39
← mattymo left10:39
→ King_Hual joined10:40
← jottr_ left10:40
→ Kulrak joined10:40
→ Tabmow joined10:40
→ merlin83_ joined10:40
→ aucecil joined10:40
morgan.freenode.net set mode: +vv10:40
← listochkin left10:40
→ mattymo joined10:41
← mattymo left10:41
→ mattymo joined10:43
← mattymo left10:43
→ moritzs joined10:43
← moritzs left10:43
→ zapb joined10:44
→ mattymo joined10:45
← mattymo left10:45
← d5sx43 left10:47
→ mattymo joined10:47
← mattymo left10:47
→ drobban joined10:47
← VictorBjelkholm left10:48
→ mattymo joined10:49
← mattymo left10:49
← upene left10:49
→ d5sx43 joined10:49
→ mattymo joined10:51
← mattymo left10:51
← merlin83_ left10:52
← tgkokk left10:52
→ mattymo joined10:53
← mattymo left10:53
→ dannixon joined10:54
dannixon → Guest9212310:54
Guest92123 → dannixon_10:55
→ mattymo joined10:55
← mattymo left10:55
→ dmitry_ joined10:55
← aucecil left10:56
← Kulrak left10:56
← Tabmow left10:57
→ aucecil joined10:57
→ Tabmow joined10:57
→ mattymo joined10:57
← mattymo left10:57
→ hebz0rl joined10:58
→ fstd_ joined10:59
→ mattymo joined10:59
← mattymo left10:59
→ Kulrak joined11:00
← Kulrak left11:00
→ Kulrak joined11:00
→ jottr_ joined11:01
→ mattymo joined11:01
← mattymo left11:01
← ilmgb left11:02
→ k11 joined11:02
← fstd left11:03
fstd_ → fstd11:03
→ VictorBjelkholm joined11:03
→ mattymo joined11:03
← mattymo left11:03
→ sarkis joined11:04
→ kayloos joined11:05
← kcj left11:05
→ mattymo joined11:05
← mattymo left11:05
← jottr_ left11:06
← d5sx43 left11:06
→ mattymo joined11:07
← mattymo left11:07
← sarkis left11:08
→ Jeanette21 joined11:08
→ d5sx43 joined11:08
→ mkumm joined11:09
← Jeanette21 left11:09
→ mattymo joined11:09
← mattymo left11:09
← juvenal left11:10
→ CheckDavid joined11:10
→ MattMaker joined11:10
→ lite_ joined11:11
→ mattymo joined11:11
← mattymo left11:11
← Hounddog left11:12
← mkumm left11:13
← cagedwisdom left11:13
→ mattymo joined11:13
← mattymo left11:13
→ matthiaskrgr joined11:14
← drobban left11:14
→ tgkokk joined11:14
matthiaskrgr is there a way to tell git to not auto-gc when on battery ?11:14
← k11 left11:14
_ikke_ No, git has no way to know when you are on battery11:15
← lite_ left11:15
matthiaskrgr o.O11:15
_ikke_ Not in a portable way, anyway11:16
→ mattymo joined11:16
← mattymo left11:16
_ikke_ In any case, git has no support for it11:16
← tgkokk left11:16
matthiaskrgr ok :(11:16
matthiaskrgr turns off auto gc11:17
← matthiaskrgr left11:17
→ mattymo joined11:17
← mattymo left11:17
← darkbasic left11:18
→ darkbasic joined11:18
← jluc left11:18
→ Balliad joined11:19
→ mattymo joined11:19
← mattymo left11:19
← mikecmpbll left11:20
← VictorBjelkholm left11:21
→ mattymo joined11:21
← mattymo left11:21
→ mattymo joined11:23
← mattymo left11:23
→ moritzs joined11:24
→ AKK9 joined11:25
→ mattymo joined11:26
← mattymo left11:26
← Xiti left11:27
← d5sx43 left11:27
← nour_ left11:27
→ mattymo joined11:27
← mattymo left11:27
cbreak auto gc happens so rarely, it should not matter11:28
← francisfish left11:28
xender Eh, he left...11:29
_ikke_: I've seen at least one solution of that somewhere11:29
→ d5sx43 joined11:29
xender At least when invoking git form shell11:29
→ mattymo joined11:30
← mattymo left11:30
→ mikecmpbll joined11:30
← dannixon_ left11:31
→ mattymo joined11:32
← mattymo left11:32
→ nour_ joined11:32
→ minid33 joined11:32
→ sdrfnord1 joined11:32
→ EminenceHC joined11:32
← Balliad left11:32
→ wlemuel joined11:33
→ VictorBjelkholm joined11:33
→ mattymo joined11:34
← mattymo left11:34
→ Balliad joined11:35
← Macaveli left11:35
→ mattymo joined11:36
← mattymo left11:36
→ yacks joined11:36
→ n-st joined11:36
→ Pam21 joined11:36
→ bluesm joined11:36
← minid33 left11:37
→ m0viefreak joined11:37
← Pam21 left11:37
← EminenceHC left11:37
→ mattymo joined11:38
← mattymo left11:38
→ falstaff joined11:40
→ mattymo joined11:40
← mattymo left11:40
← Sound left11:40
→ tgkokk joined11:41
← tgkokk left11:41
→ mattymo joined11:42
← mattymo left11:42
→ tgkokk joined11:42
→ francisfish joined11:44
→ mattymo joined11:44
← mattymo left11:44
→ goldstar joined11:46
← d5sx43 left11:46
→ mattymo joined11:46
← mattymo left11:46
→ d5sx43 joined11:48
→ mattymo joined11:48
← mattymo left11:48
← VictorBjelkholm left11:49
→ mattymo joined11:50
← mattymo left11:50
← Fandekasp left11:51
→ hkon_ joined11:51
→ msankhala joined11:52
← Balliad left11:52
→ mattymo joined11:52
← mattymo left11:52
← poimen left11:52
→ mewm joined11:53
← ninsei left11:54
→ Balliad joined11:54
→ ninsei joined11:54
→ niax joined11:54
→ mattymo joined11:54
← mattymo left11:54
← hkon_ left11:55
→ mattymo joined11:56
← mattymo left11:56
← diget_ left11:57
→ diget joined11:57
← mewm left11:58
← alexyursha left11:58
→ rethus joined11:58
→ mattymo joined11:58
← mattymo left11:58
→ poimen joined11:59
← JSharpe left12:00
← shinnya left12:00
→ mattymo joined12:00
← mattymo left12:00
→ VictorBjelkholm joined12:01
Nevik xender: ikke's emphasis was on "portable way"12:02
→ mattymo joined12:02
← mattymo left12:02
Nevik there's a way on p.much every platform, but it's very different on each one12:03
← moritzs left12:03
→ JSharpe joined12:03
→ ColdKeyboard joined12:03
Nevik well, there is a pre-auto-gc hook12:03
which can abort the auto-gc12:04
so if only that user were still here :D12:04
but _ikke_ ^12:04
for future reference12:04
xender Well, ok, but he didn't asked for portable way. I know that it's not pure git question, but he interpreted that as "no good way" and left :/12:04
Nevik yup12:04
→ sarkis joined12:04
bremner impatience is it's own reward.12:04
→ mattymo joined12:05
← mattymo left12:05
Nevik bremner++12:05
bremner err. its. damnit.12:05
Nevik we know what you meant12:05
be calm :D12:05
← d5sx43 left12:05
→ sdouglas joined12:06
→ mattymo joined12:07
← mattymo left12:07
→ d5sx43 joined12:07
→ DaisyTheCow joined12:08
← DaisyTheCow left12:08
← sarkis left12:08
→ mattymo joined12:09
← mattymo left12:09
→ alexyursha joined12:09
← Willow left12:09
→ Willow joined12:10
← Sceorem left12:10
→ mattymo joined12:11
← mattymo left12:11
← Entomo left12:11
← sdouglas left12:11
Pieter___ → Pieter12:12
→ Fandekasp joined12:13
→ mattymo joined12:13
← mattymo left12:13
→ teobo joined12:13
← Willow left12:14
→ Or1 joined12:15
→ mattymo joined12:15
← mattymo left12:15
→ mattymo joined12:17
← mattymo left12:17
← Fandekasp left12:17
← eletuchy left12:18
→ moritzs joined12:18
→ mattymo joined12:19
← mattymo left12:19
← msankhala left12:19
← alexyursha left12:20
← d5sx43 left12:20
→ alexyursha joined12:20
→ jottr_ joined12:21
→ mattymo joined12:21
← mattymo left12:21
→ msankhala joined12:21
→ mattymo joined12:23
← mattymo left12:23
← tvw left12:24
→ mattymo joined12:25
← mattymo left12:25
→ mattymo joined12:27
← mattymo left12:27
→ d5sx43 joined12:28
← longbeach left12:28
→ gan joined12:28
→ Mitchbones joined12:29
→ mattymo joined12:29
← mattymo left12:29
→ mattymo joined12:31
← mattymo left12:31
→ nnyk_ joined12:31
→ daedeloth joined12:32
← jottr_ left12:32
← joe-w-bimedina left12:32
→ Wiz_KeeD joined12:32
→ mattymo joined12:33
← mattymo left12:33
→ mattymo joined12:36
← mattymo left12:36
→ sarkis joined12:36
← d5sx43 left12:36
→ EminenceHC joined12:36
→ Fandekasp joined12:36
→ mattymo joined12:38
← mattymo left12:38
→ d5sx43 joined12:38
→ mattymo joined12:40
← mattymo left12:40
← sarkis left12:41
→ k11 joined12:41
← EminenceHC left12:41
→ mattymo joined12:42
← mattymo left12:42
← k11 left12:42
→ kukks joined12:43
→ lite_ joined12:43
→ k11 joined12:44
→ mattymo joined12:44
← mattymo left12:44
→ dannixon_ joined12:45
→ mattymo joined12:46
← msankhala left12:46
← mattymo left12:46
→ BlackCobra joined12:46
dannixon_ → Guest6743112:46
→ msankhala joined12:46
← Guest67431 left12:47
→ dannixon joined12:47
← jovy88 left12:48
→ mattymo joined12:48
← mattymo left12:48
→ jovy88 joined12:48
← darkxploit left12:49
→ mattymo joined12:50
← mattymo left12:50
xender Hmm, why does `git reflog' show only entries of HEAD reflog since last disjoinded branch checkout?12:50
Hmm, not that12:50
orphan checkout12:51
So it doesn't show anything prior to orphan checkout12:51
But the entries are in .git/logs/HEAD file12:51
→ mattymo joined12:52
← mattymo left12:52
xender And when I don git reflog HEAD@{2} it shows all entries past that orphan checkout12:54
← sdrfnord1 left12:54
→ mattymo joined12:54
← mattymo left12:54
← MagePsycho left12:54
xender OUCH WTF12:55
← Balliad left12:55
← d5sx43 left12:55
canton7 !repro12:55
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.12:55
→ W0rmDr1nk joined12:55
xender Looks like git checkout --orphan writes invalid entry to reflog12:56
→ mattymo joined12:56
← mattymo left12:56
→ jens_ joined12:56
← dangerousdave left12:56
→ dangerousdave joined12:57
← tgkokk left12:57
→ d5sx43 joined12:57
← dangerousdave left12:57
→ dangerousdave joined12:58
→ mattymo joined12:58
← mattymo left12:58
← MattMaker left12:58
→ tgkokk joined12:59
→ Gamecubic joined12:59
← tgkokk left12:59
→ mattymo joined13:00
← mattymo left13:00
→ tgkokk joined13:00
← Rix left13:01
→ mattymo joined13:02
← mattymo left13:02
← msankhala left13:02
← k11 left13:02
→ ChrisC_ joined13:03
→ msankhala joined13:03
→ darkxploit joined13:03
→ mattymo joined13:04
← mattymo left13:04
→ mattymo joined13:06
← mattymo left13:06
← phil left13:07
→ Alyssa21 joined13:08
→ mattymo joined13:08
← mattymo left13:08
← netj left13:08
← Alyssa21 left13:08
→ netj joined13:09
← Wiz_KeeD left13:10
→ mattymo joined13:10
← mattymo left13:10
→ sdrfnord1 joined13:10
← goldstar left13:11
→ goldstar joined13:11
→ Mattsan joined13:12
→ mattymo joined13:12
← mattymo left13:12
← Mattsan left13:13
← Samual left13:13
→ Samual joined13:13
→ mattymo joined13:14
← mattymo left13:14
← d5sx43 left13:15
→ jorj joined13:16
→ mattymo joined13:16
← mattymo left13:16
→ Wiz_KeeD joined13:17
→ d5sx43 joined13:18
→ mattymo joined13:18
← mattymo left13:18
→ mattymo joined13:20
← mattymo left13:20
→ starkhalo joined13:22
→ mattymo joined13:22
← mattymo left13:22
→ mizu_no_oto joined13:23
→ pte_petey joined13:23
← netj left13:24
← moritzs left13:24
→ netj joined13:24
← farn left13:24
→ moritzs joined13:24
→ mattymo joined13:25
← mattymo left13:25
← Textmode left13:25
→ fr33domlover joined13:25
← xjiujiu left13:26
→ mattymo joined13:27
← mattymo left13:27
→ xjiujiu joined13:27
→ looper joined13:27
← Fandekasp left13:28
→ mattymo joined13:29
← mattymo left13:29
→ deniz1a joined13:29
→ mattymo joined13:31
← mattymo left13:31
← mizu_no_oto left13:31
← ohcibi left13:32
Eugene <3 sitaram13:32
→ Shusshu joined13:33
→ mattymo joined13:33
← mattymo left13:33
→ Megaf joined13:33
→ vitkovsky joined13:34
← Shusshu left13:34
← d5sx43 left13:35
→ mattymo joined13:35
← mattymo left13:35
→ jatt joined13:35
← jatt left13:35
→ jatt joined13:35
→ farn joined13:35
← deniz1a left13:35
→ moparisthebest joined13:35
← pantsman- left13:36
← Megaf left13:36
qsuscs when i import a CVS repo into git, does every single file commit become a whole git commit (i.e. a full tree snapshot), or is there a way to group multiple CVS commits into one git commit?13:37
→ sarkis joined13:37
→ mattymo joined13:37
← mattymo left13:37
→ d5sx43 joined13:37
→ ohcibi joined13:37
tobiasvl qsuscs: depending on how you convert it, it groups commits that were done within a customizable time interval13:38
for example commits within the same five minutes become one commit13:38
→ deniz1a joined13:38
← tgummerer left13:38
qsuscs sounds reasonable13:38
→ tgummerer joined13:39
→ bezet joined13:39
→ EminenceHC joined13:39
→ mattymo joined13:39
← mattymo left13:39
→ Megaf joined13:40
← Megaf left13:41
→ mattymo joined13:41
← mattymo left13:41
← sarkis left13:41
← farn left13:42
→ farn joined13:43
← kevinb left13:43
→ mattymo joined13:43
← mattymo left13:43
← bezet left13:43
← msankhala left13:43
→ kevinb joined13:44
← EminenceHC left13:44
← thevishy left13:44
→ Megaf joined13:45
→ mattymo joined13:45
← mattymo left13:45
→ mattymo joined13:47
← mattymo left13:47
→ felixjet joined13:48
← tgummerer left13:48
→ tgummerer_ joined13:49
← Vivekananda_y510 left13:49
→ sarkis joined13:49
→ mattymo joined13:49
← mattymo left13:49
← Megaf left13:50
← jatt left13:50
→ mattymo joined13:51
← mattymo left13:51
← deniz1a left13:52
→ netcarver joined13:52
← dangerousdave left13:53
→ dangerousdave joined13:53
→ mattymo joined13:53
← mattymo left13:53
→ Megaf joined13:54
← Megaf left13:54
← d5sx43 left13:54
→ mattymo joined13:55
← mattymo left13:55
→ d5sx43 joined13:56
→ thevishy joined13:57
→ mattymo joined13:57
← mattymo left13:57
→ Megaf joined13:58
→ mattymo joined13:59
← mattymo left13:59
→ jottr_ joined14:01
→ mattymo joined14:01
← mattymo left14:01
← teran_ left14:01
qsuscs how the hell can people still work with CVS?! and i thought SVN was already heaven (remember, hell is good.)14:02
→ MrShell joined14:02
HedgeMage qsuscs: I remember when all we had was vanilla RCS...compared to that, CVS was a vast improvement.14:02
← Arkaniad left14:02
HedgeMage qsuscs: It's all relative. :)14:02
qsuscs ok, in 1990 maybe14:03
but it's 2014, and people are still using it14:03
HedgeMage is pretty sure she just dated herself14:03
HedgeMage qsuscs: Right, those people are crazy.14:03
qsuscs and they use PVCS (think of it as CVS in even worse) at a friend’s company14:03
→ ojacobson joined14:03
→ mattymo joined14:03
← mattymo left14:03
qsuscs and i told her about git, and she just got eyes that big when i started telling her about git bisect14:03
HedgeMage qsuscs: re: importing CVS to git, look at a tool called reposurgeon, which gives you far more control in exchange for a bit more work on making the conversion nice.14:04
← AKK9 left14:05
HedgeMage Also, re: the /topic....14:05
← MrShell left14:05
HedgeMage Eugene: where's my BACON???14:05
qsuscs and by the way, i was born in 1997, my first VCS was git, and i even complain about mercurial sometimes.14:05
ChanServ set mode: +o14:05
→ mattymo joined14:05
← mattymo left14:05
← jottr_ left14:05
tobiasvl qsuscs: you're born in 97?! okay, now I feel old too, HedgeMage14:06
Eugene changed the topic to: Welcome to #git, the place for git help and false promises | Current stable version: 2.0.1 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-nom --omnom: eats all your tasty code14:06
Eugene That was yesterday.14:06
← staafl left14:06
Eugene set mode: -o14:06
HedgeMage qsuscs: My son is a bit younger than you and complains that I make him use revision control at all. I'm keeping my mouth shut until he breaks something and learns the joys of "git reset --hard"14:06
:)14:06
qsuscs tobiasvl: i always say “everybody older than 20 is old” :>14:06
HedgeMage Eugene: You, sir, are a tease.14:06
HedgeMage invites tobiasvl to sit on the porch swing with her and shout at young'uns to get off the lawn14:07
qsuscs HedgeMage: i recently convinced a development team of roughly my age to use git (instead of google drive)… my programming teacher still to go14:07
HedgeMage qsuscs: Good luck!14:07
→ mattymo joined14:07
← mattymo left14:07
qsuscs but considering that she _still_ uses lazarus (free delphi clone aka horrible pascal IDE)14:08
HedgeMage shudders14:08
qsuscs or that she seems not to know the difference between Cardinal and Integer (aka unsigned int and signed int), or even to care about it (“it’s a dice with 6 sides, what the hell do you need signed for?!”)14:09
HedgeMage Actually, it's a "die" with 6 sides. "Dice" is plural.14:09
← tgummerer_ left14:09
Eugene Here I thought he was talking about chopped veggies14:09
HedgeMage Maybe it's your English teacher you should be lecturing about quality of instruction. ;)14:09
→ mattymo joined14:09
← mattymo left14:09
→ tgummerer_ joined14:10
HedgeMage Eugene: Do you normally sign veggies after you dice them?14:10
That sounds labor-intensive.14:10
I mean, I've heard of a chef having a signature dish, but that's ridiculous ;)14:10
← dangerousdave left14:10
HedgeMage qsuscs: BTW, in case you were curious, getting mocked in here is a sign of acceptance and affection :)14:11
qsuscs HedgeMage: my english teachers all said that both are possible. but maybe it’s british vs. american english *shrug*14:11
→ dangerousdave joined14:11
→ mkumm joined14:11
HedgeMage qsuscs: What I said is correct in American English...no clue about the Brits14:11
→ mattymo joined14:11
← mattymo left14:11
qsuscs i remember, back in year 5 (i.e. at the age of 10 or 11), i had a (british) english vocab test a day after learning about how to color things in delphi in programming club14:12
it was marked as a mistake, i should have written “colour”.14:12
→ rhalff joined14:12
qsuscs and i was completely puzzled, because either the compiler or the english teacher complained, and i did not know whom to trust D:14:13
→ mattymo joined14:14
← mattymo left14:14
← Gitzilla left14:14
→ ehmatthes joined14:14
← d5sx43 left14:15
← supreme__ left14:15
→ mattymo joined14:16
← mattymo left14:16
HedgeMage hehe14:16
← mkumm left14:16
HedgeMage poor qsuscs14:16
→ d5sx43 joined14:17
→ mattymo joined14:18
← mattymo left14:18
tobiasvl imagine having been born in 9714:18
→ mattymo joined14:20
← mattymo left14:20
← endiruna left14:20
← B1x1t0 left14:20
HedgeMage tobiasvl: But...but...I'd have missed so much cool stuff!14:20
→ punchagan joined14:21
qsuscs but you’ll miss the cool stuff that i’ll see when you are dead.14:21
HedgeMage Plus, I'm 31, one of my partners is 51...I think if I rolled back to being 17 I'd pass his "cradle robber" threshold and creep him out :P14:21
qsuscs: Meh, I have offspring; he'll cover that time frame for me.14:21
→ mattymo joined14:22
← mattymo left14:22
← vitkovsky left14:23
→ vitkovsky joined14:23
← punchagan left14:24
→ mattymo joined14:24
← mattymo left14:24
tobiasvl qsuscs: we'll soon all be immortal anyway14:24
← tgkokk left14:25
→ mattymo joined14:26
← mattymo left14:26
qsuscs HedgeMage: you don’t happen to understand german? there’s a very, er, interesting interview with our chancellor about offsprings…14:26
→ supreme__ joined14:26
qsuscs tobiasvl: you mean i’ll stay an old man complaining about the youth forever? D:14:26
Eugene `git reflog HedgeMage`14:27
← vitkovsky left14:27
→ vitkovsky joined14:27
→ mattymo joined14:28
← mattymo left14:28
→ pantsman- joined14:29
← moritzs left14:30
→ mattymo joined14:30
← mattymo left14:30
→ brent_ joined14:31
→ mattymo joined14:32
← mattymo left14:32
→ sgambino joined14:34
← brent left14:34
← d5sx43 left14:34
→ mattymo joined14:34
← mattymo left14:34
→ Gitzilla joined14:34
← brent_ left14:35
→ d5sx43 joined14:36
→ mattymo joined14:36
← mattymo left14:36
HedgeMage qsuscs: All the words I know in German are rather not-nice...learned from when my German grandfather was pissed off at tripping over my grandmother's dog :P14:37
→ mattymo joined14:38
← mattymo left14:38
qsuscs k, i translate it, then14:38
→ jftf joined14:38
← tgummerer_ left14:38
bremner HedgeMage: Pflaumenkuchen. Now you know one nice German word.14:38
→ tgummerer_ joined14:39
HedgeMage bremner: what is it?14:39
← mikecmpbll left14:40
→ mattymo joined14:40
← mattymo left14:40
qsuscs plum pie14:40
← mennea left14:40
→ drobban joined14:42
→ mattymo joined14:42
← mattymo left14:42
← dsdeiz left14:43
← jftf left14:43
→ EminenceHC joined14:43
→ punchagan joined14:43
→ Dougie187 joined14:44
→ tgkokk joined14:44
→ mattymo joined14:44
← mattymo left14:44
→ the_cybersphinx joined14:45
← bbloom left14:45
→ mattymo joined14:46
← mattymo left14:46
← bgerber left14:46
← joki left14:46
← EminenceHC left14:47
← stamina left14:48
→ mattymo joined14:48
← mattymo left14:48
→ jottr_ joined14:48
→ stamina joined14:48
← tgkokk left14:49
← jottr_ left14:49
qsuscs so. HedgeMage: this is from a satirical TV show https://www.youtube.com/watch?v=hyszSBcrXko#t=110 and this is my translation http://pastie.org/private/i1a2lv5vcnpvyf7fq6efg (you might have to watch the movie to get their reaction right)14:50
→ mikecmpbll joined14:50
→ mattymo joined14:50
← mattymo left14:50
← pte_petey left14:51
→ pte_petey joined14:51
qsuscs oh, something wrent wrong on copy-pasting the translation. it starts again in the middle lol14:51
← francisfish left14:52
→ mattymo joined14:52
← mattymo left14:52
→ joki joined14:53
→ EminenceHC joined14:53
← pte_petey left14:54
→ Willow joined14:54
→ drboard joined14:54
→ mattymo joined14:54
← mattymo left14:54
→ pte_petey joined14:54
← d5sx43 left14:55
→ d5sx43 joined14:56
→ mattymo joined14:56
← mattymo left14:56
→ mkumm joined14:57
→ bgerber joined14:57
← VictorBjelkholm left14:58
← EminenceHC left14:58
→ mattymo joined14:58
← mattymo left14:58
→ Nizumzen joined14:59
← ology left14:59
← stamina left14:59
→ mattymo joined15:00
← mattymo left15:00
← mkumm left15:02
→ mattymo joined15:03
← mattymo left15:03
→ mechanicalduck_ joined15:03
→ dougsland joined15:03
→ mattymo joined15:05
← mattymo left15:05
← mechanicalduck left15:06
← DrNick left15:06
← ChrisC_ left15:07
→ mattymo joined15:07
← mattymo left15:07
→ Iana21 joined15:07
← Iana21 left15:08
→ mattymo joined15:09
← mattymo left15:09
← supreme__ left15:09
→ tgkokk joined15:09
→ VictorBjelkholm joined15:10
→ Ankhers joined15:10
← tgummerer_ left15:10
→ tgummerer_ joined15:10
→ jehb joined15:11
← NightQuest left15:11
→ mattymo joined15:11
← mattymo left15:11
→ mattymo joined15:13
← mattymo left15:13
← d5sx43 left15:14
← drboard left15:14
← xjiujiu left15:15
→ mattymo joined15:15
← mattymo left15:15
→ d5sx43 joined15:15
← vitkovsky left15:15
→ mattymo joined15:17
← mattymo left15:17
← Wiz_KeeD left15:18
→ mattymo joined15:19
← mattymo left15:19
→ ology joined15:19
→ Xethron joined15:20
← Xethron left15:20
→ Xethron joined15:20
→ mattymo joined15:21
← mattymo left15:21
→ mattymo joined15:23
← mattymo left15:23
← VictorBjelkholm left15:23
offby1 "flaming cookie"?15:24
← dougsland left15:24
→ CalimeroTeknik joined15:25
→ mattymo joined15:25
← mattymo left15:25
→ mattymo joined15:27
← mattymo left15:27
→ listochkin joined15:28
← listochkin left15:29
→ mattymo joined15:29
← mattymo left15:29
→ listochkin joined15:29
← Mitchbones left15:30
→ deniz1a joined15:30
← alexyursha left15:30
→ mattymo joined15:31
← mattymo left15:31
→ supreme__ joined15:32
→ m0ltar joined15:33
→ mattymo joined15:33
← mattymo left15:33
← d5sx43 left15:33
← listochkin left15:34
→ mattymo joined15:35
← mattymo left15:35
→ thiago joined15:36
→ d5sx43 joined15:36
→ leeN joined15:36
→ moritzs joined15:36
→ VictorBjelkholm joined15:36
← drobban left15:37
→ mattymo joined15:37
← mattymo left15:37
→ davispuh joined15:37
→ francisfish joined15:37
→ gheraint joined15:38
→ jftf joined15:39
→ mattymo joined15:39
← mattymo left15:39
Seveas hi gheraint :)15:39
gheraint hi15:40
Seveas my scrollback goes back about a day, and this has been happening every 2 minutes. It's getting annoying15:40
← cnj left15:40
← wlemuel left15:40
ChanServ set mode: +o15:40
→ Noldorin joined15:41
ChanServ set mode: +o15:41
ChanServ set mode: +o15:41
→ mattymo joined15:41
← mattymo left15:41
→ cnj joined15:42
→ khmarbaise joined15:42
→ AKK9 joined15:42
→ xjiujiu joined15:42
← looper left15:42
← ojacobson left15:42
qsuscs Seveas: what do you mean?15:43
← tgummerer_ left15:43
→ tgummerer_ joined15:43
→ mattymo joined15:43
Seveas qsuscs: mattymo15:43
← mattymo left15:43
← jftf left15:43
gheraint set mode: +b-o15:44
← ehmatthes left15:44
Seveas thanks gheraint15:44
← nfk left15:44
← beastd left15:44
→ irqq joined15:44
qsuscs you mean annoying join and quit/part messages that my client hides unless the user was active the last few minutes? :)15:44
i’d become crazy in channels as large as this one otherwise15:45
Seveas qsuscs: yeah, his client is f*ed and floods upon connecting, so constantly connecting/disconnecting15:45
gheraint it took a while, but I got there15:45
Seveas gheraint: well, it lasted at last a day, so the few seconds extra wait were no problem :)15:46
gheraint :)15:46
← Dougie187 left15:47
← philp left15:47
→ philp joined15:47
bremner ah, my client also hides those, or I would have done something ere now.15:48
← VictorBjelkholm left15:48
gheraint still not sure why my handy dandy scriptlet failed15:48
anyhoo, have fun15:49
Seveas thanks again15:49
→ pandeiro joined15:49
← gheraint left15:49
qsuscs ahh. now i get the context15:49
→ nfk joined15:49
→ EminenceHC joined15:50
qsuscs speaking about that, time for /znc unloadmod buffextras. my phone irc client shows them upon connecting in the backlog otherwise15:50
→ Asiajey joined15:50
qsuscs (i could mosh to the server and tmux attach to the weechat there, but it’s not that funny on 4.7″. andchat seems the better solution)15:50
← dannixon left15:51
Seveas I find IRC from the phone annoying no matter which client15:51
qsuscs yes, and i usually carry my notebook. it’s still useful sometimes15:51
→ Balliad joined15:52
→ DaisyTheCow joined15:52
Seveas I only use it in emergencies15:52
→ hkon_ joined15:53
← d5sx43 left15:53
Seveas I use work jabber via bitlbee and znc in a screen session. When detached, messages forward to my phone via nma and I can decide whether I need to ssh and attach.15:53
← diegoviola left15:53
→ k11 joined15:54
→ alezandro joined15:54
← EminenceHC left15:55
← raven-au left15:55
qsuscs sounds like my setup, but s/nma/pushbullet/ (it’s free and also works the other way round, i.e. seeing my phone’s notifications on my pc)15:55
→ d5sx43 joined15:55
← nfk left15:56
Seveas yeah, I found nma before pushbullet, got both now.15:56
→ raven-au joined15:56
Seveas What I really want is a way to respond to those notifications, those could be sent to some api on my server that can send things through to irssi. irc-over-android_notifications :)15:56
→ ilteris joined15:56
← ilteris left15:56
qsuscs would be nice yes… but i’m usually faster fetching my notebook15:57
← hkon_ left15:57
masak so, if I want to bring a file from some other commit into the staging area, I use `git checkout <SHA-1> -- <file>`. what do I use if I want to bring the file, but not stage it?15:57
← k11 left15:58
← khmarbaise left15:58
→ ChrisC_ joined15:59
→ ilteris joined15:59
→ kayloos_ joined16:00
← ilteris left16:00
→ gordian joined16:01
→ VictorBjelkholm joined16:01
← kayloos left16:02
Seveas masak: git show sha1:path > path16:03
← tgkokk left16:03
→ rkazak joined16:04
Seveas I'm surprised checkout doesn't have a flag for this16:04
← khisanth__ left16:04
→ khisanth__ joined16:04
khisanth__ → Khisanth16:04
→ ncd|leeN joined16:05
→ k11 joined16:05
→ B1x1t0 joined16:06
masak Seveas: oh, that'd work, I guess.16:07
← cnj left16:07
→ tmcmahon joined16:08
← tgummerer_ left16:08
→ tgummerer_ joined16:08
← leeN left16:08
← ncd|leeN left16:09
→ therealGent joined16:09
→ cnj joined16:10
→ FreezingCold joined16:10
← harish__ left16:11
→ harish joined16:12
← rkazak left16:13
← d5sx43 left16:13
← tmcmahon left16:14
→ d5sx43 joined16:16
→ misterpink joined16:16
← k11 left16:17
← punchagan left16:17
→ tgkokk joined16:18
→ MattMaker joined16:20
← ChrisC_ left16:21
→ bbloom joined16:21
← tgkokk left16:22
← bbloom left16:22
→ tgkokk joined16:22
→ upene joined16:23
← upene left16:23
→ upene joined16:23
→ punchagan joined16:24
→ ehmatthes joined16:25
→ jtri joined16:28
jtri hello, i have a question about checking out another branch, or a commit number... if i have a local file which has unsaved changes and so so,what will happen to thta file?16:28
← tgkokk left16:28
← hahuang65 left16:28
jtri in my case, i have a notes file, which is my persona file, and i just noitced (to my surprise?) that it seemed to have retained some old edits, even though i have done these checkouts to review some work in other branches16:29
then, to find where a layout bug was introduced i was checking out various commits, too16:29
how could it be that my notes file, which was not committed, would be preserved?16:30
← davispuh left16:30
Vampire0 jtri, !flow16:30
gitinfo jtri: [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references16:30
Vampire0 jtri, !flowt16:30
no hm16:30
jtri, !float16:31
gitinfo jtri: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.16:31
→ dreiss joined16:31
Vampire0 ah, that it was :-)16:31
← Xethron left16:32
jtri i see, but i know checkout will overwrite individual files if yous specifiy them, correct?16:32
→ davispuh joined16:32
jtri so if you call checkout on a reference, it will not automatically overwrite files?16:33
but if you call it on a file, it will?16:33
← d5sx43 left16:33
→ d5sx43 joined16:35
← King_Hual left16:35
→ King_Hual joined16:36
→ megawac1 joined16:38
Vampire0 jtri, possible, I'm not 100% sure though.16:39
But would be logical16:39
If you explicitly request Gradle to overwrite a file to overwrite it#16:39
But it could also be that it warns you if it is a tracked file with changes and you would loose those changes16:39
jtri, I'd say !tias16:39
gitinfo jtri: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.16:39
→ jftf joined16:40
← tgummerer_ left16:40
→ tgummerer_ joined16:40
→ fragamus joined16:41
← frankdogg left16:43
← Ankhers left16:44
← ehmatthes left16:44
← jftf left16:44
→ hahuang65 joined16:46
jtri well, the checkout for a file works as i mentioned, but when i tested checking out a commit number after editing a file not in the commit, it warns me, however i just did this in th eother project and it didn't warn me... so i don't get it16:47
and so i did actually float changes between checking out commits, but can't do it in my tias project16:48
→ khmarbaise joined16:50
← khmarbaise left16:50
→ khmarbaise joined16:50
← nardev left16:50
← therealGent left16:51
→ EminenceHC joined16:51
← jackneill left16:51
→ Ravensdale joined16:51
← Ravensdale left16:51
← d5sx43 left16:52
→ King_Hual` joined16:52
← MattMaker left16:52
← King_Hual left16:53
→ d5sx43 joined16:54
→ kikimeter joined16:54
← DaisyTheCow left16:55
← hebz0rl left16:55
← EminenceHC left16:55
← misterpink left16:55
→ misterpink joined16:55
← misterpink left16:55
← VictorBjelkholm left16:56
→ nfk joined16:56
→ MagePsycho joined16:56
→ bbloom joined16:57
← W0rmDr1nk left16:57
→ VictorBjelkholm joined16:57
→ teran joined16:58
← cigarshark left16:58
← freeroute left16:58
← TDJACR left16:59
→ TDJACR joined17:00
→ Kicer86 joined17:00
← punchagan left17:01
← teran left17:02
← xjiujiu left17:02
→ drobban joined17:03
← AKK9 left17:03
← bbloom left17:04
← kevinb left17:04
→ denisMone joined17:04
← MagePsycho left17:05
← tgummerer_ left17:05
→ tgummerer_ joined17:05
→ _leb joined17:05
← jtri left17:06
← damccull_ left17:07
→ kevinb joined17:07
→ Jamy21 joined17:08
← Jamy21 left17:08
← jehb left17:09
→ sdouglas joined17:10
← deniz1a left17:10
→ alexyursha joined17:10
← kevinb left17:11
← d5sx43 left17:12
← m0ltar left17:12
→ Gizburdt joined17:13
→ bbloom joined17:13
→ d5sx43 joined17:14
→ madewokherd joined17:16
← fold left17:17
→ kevinb joined17:17
← Gizburdt left17:18
→ Gizburdt joined17:20
← gordian left17:23
→ endiruna joined17:24
← supreme__ left17:25
← d5sx43 left17:27
→ mennea joined17:28
→ nicoulaj joined17:28
→ nicoulaj_ joined17:28
→ shinnya joined17:29
← freestyl3r left17:29
← dreiss left17:29
→ tgkokk joined17:31
→ fold joined17:31
← khmarbaise left17:31
← Gizburdt left17:32
← Balliad left17:32
→ listochkin joined17:32
→ mattstratton joined17:32
→ Gizburdt joined17:32
→ dannixon joined17:32
← Gizburdt left17:32
→ Gizburdt joined17:33
→ MagePsycho joined17:34
→ d5sx43 joined17:34
→ Balliad joined17:34
← francisfish left17:36
← listochkin left17:36
Obamango → Transfusion17:36
→ tgummerer__ joined17:38
← tgummerer_ left17:38
← alexyursha left17:38
← bbloom left17:39
← Balliad left17:39
→ bezet joined17:39
← VictorBjelkholm left17:40
→ ter0 joined17:40
← jovy88 left17:40
← shruggar left17:41
→ jftf joined17:41
→ hkon_ joined17:41
← mtk left17:41
← d5sx43 left17:41
→ jovy88 joined17:42
→ jluc joined17:42
→ jatt joined17:42
→ Balliad joined17:42
← jatt left17:42
→ jatt joined17:42
→ shruggar joined17:42
← tgkokk left17:43
→ punchagan joined17:43
→ frankdogg joined17:43
← bezet left17:43
→ d5sx43 joined17:43
→ tgkokk joined17:44
→ jackneill joined17:44
→ mtk joined17:44
→ khmarbaise joined17:45
← hkon_ left17:45
← deepa left17:45
→ deepa joined17:45
→ Sleepy63 joined17:45
← jftf left17:45
← Balliad left17:47
← ericeatsbrains left17:47
← denisMone left17:49
← nicoulaj left17:49
→ CKyle joined17:49
→ denisMone joined17:49
← mattstratton left17:50
← tgkokk left17:50
→ kazuri joined17:50
→ Rastus_Vernon joined17:51
→ supreme__ joined17:52
← d5sx43 left17:52
→ d5sx43_ joined17:52
→ damnya777 joined17:53
← kevinb left17:53
→ VictorBjelkholm joined17:53
→ EminenceHC joined17:54
→ AKK9 joined17:54
← ntio left17:54
← damnya777 left17:54
→ nkouevda joined17:55
← kikimeter left17:56
← kukks left17:56
← supreme__ left17:56
→ ntio joined17:56
→ kevinb joined17:56
← jeffreylevesque left17:58
← irqq left17:59
← Sleepy63 left17:59
← netcarver left17:59
→ irqq joined17:59
← EminenceHC left17:59
← dangerousdave left18:02
← kazuri left18:02
→ dangerousdave joined18:02
← dangerousdave left18:03
→ dangerousdave joined18:04
← St_Marx left18:05
← CKyle left18:06
→ St_Marx joined18:06
← Noldorin left18:07
→ lindenle joined18:07
← harish left18:07
← Nizumzen left18:08
← pikaren left18:08
← ColdKeyboard left18:09
→ harish joined18:09
← Gizburdt left18:09
→ tgkokk joined18:10
→ Gizburdt joined18:10
→ Sleepy63 joined18:11
← netj left18:11
→ netj joined18:11
← hahuang65 left18:12
← tgummerer__ left18:12
→ tgummerer__ joined18:12
→ drjeats joined18:12
→ CorySimmons joined18:13
← moritzs left18:13
← Willow left18:13
→ Willow joined18:14
← Gizburdt left18:14
← endiruna left18:14
→ m0nkmaster joined18:16
→ shingshang joined18:16
← zacts left18:17
→ Atrumx joined18:18
← Willow left18:18
← ntio left18:19
← St_Marx left18:19
← ninsei left18:19
← skorgon left18:19
← causa_sui left18:19
← asakura1 left18:19
→ githogori joined18:19
← jatt left18:20
→ skorgon joined18:20
→ St_Marx joined18:20
← _leb left18:20
→ causa_sui joined18:21
← m0nkmaster left18:21
→ asakura1 joined18:21
→ Dougie187 joined18:22
→ supreme__ joined18:22
→ ninsei joined18:22
→ Naeblis joined18:22
← CorySimmons left18:24
→ ntio joined18:24
← tgummerer__ left18:24
→ tgummerer__ joined18:25
→ Sceorem joined18:26
← supreme__ left18:27
→ skynxnex joined18:27
← lite_ left18:27
← sgambino left18:28
← tgkokk left18:29
← bgerber left18:29
← nkouevda left18:30
→ gordian joined18:32
→ Gizburdt joined18:32
← Naeblis left18:33
→ bgerber joined18:34
← pantsman- left18:35
→ Baruch joined18:36
→ m0nkmaster joined18:36
→ jeffreylevesque joined18:37
← arup_r left18:37
→ hahuang65 joined18:38
→ pantsman- joined18:39
← duderonomy left18:41
← nnyk_ left18:41
→ jftf joined18:42
→ macrover joined18:42
← frankdogg left18:43
→ jday_ joined18:44
← AKK9 left18:44
← skynxnex left18:45
→ pr0ton joined18:46
→ skynxnex joined18:46
← jftf left18:46
← gordian left18:47
→ Foldager joined18:47
→ txomon|home joined18:47
← skynxnex left18:50
→ paul424 joined18:51
→ maestrojed joined18:52
← tgummerer__ left18:52
→ tgummerer__ joined18:52
← hahuang65 left18:53
→ tgkokk joined18:53
← wrouesnel2 left18:53
← tgkokk left18:53
→ tgkokk joined18:54
← mariuscc left18:54
→ Noldorin joined18:54
→ Motoko joined18:55
→ jreyno40 joined18:55
jreyno40 Hey guys! I’m new to git, just starting to learn18:55
I have a commit about 60 commits ago of some files that I no longer need in my git repo18:55
but I need to keep the modern versions of everything else18:56
do I revert? Or will that lose all of my modern stuff18:56
canton7 the point of version control is to keep old versions of stuff18:56
if it forms part of the history of your project, it stays18:56
jreyno40 canton7: I understand that, but I’m saying I committed files I never needed to commit18:56
for any purpose18:56
and I need to get them out of the repo18:57
← WaReZ left18:57
canton7 !fixup18:57
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!18:57
← nemesit|znc left18:57
← Sceorem left18:57
→ EminenceHC joined18:59
→ nemesit|znc joined19:00
muep_ jreyno40: if the files do not make the repository significantly large and they do not contain confidential stuff, you might just as well leave them in the history19:00
→ frankdogg joined19:00
← dangerousdave left19:00
→ dangerousdave joined19:01
← preaction left19:01
→ AKK9 joined19:03
→ zematis joined19:03
→ preaction joined19:04
← EminenceHC left19:04
← MagePsycho left19:05
→ gsingh93_ joined19:07
← lindenle left19:07
← kayloos_ left19:07
→ snuffeluffegus joined19:07
→ lindenle joined19:07
→ snuffels joined19:08
→ Dottimolly joined19:08
zumba_addict hi folks, I created a feature branch. Now I'd like to merge it to my master. Do I need to push the feature branch?19:08
→ cagedwisdom joined19:09
zumba_addict I'm on login-screen branch right now and I've already git commit -m19:09
tango_ zumba_addict: git checkout master ; git merge login-screen19:09
← snuffels left19:09
_ikke_ zumba_addict: Pushing has nothing to do with merging19:09
zumba_addict then git push origin master?19:09
_ikke_ If you want to publish the merge, then yes19:10
zumba_addict cool19:10
checkout worked, no issue19:10
← snuffeluffegus left19:10
zumba_addict git merge worked too :)19:10
got to document this :)19:10
it's pushed folks. Thank you so much! :)19:11
← kevinb left19:11
→ EmmEight joined19:11
→ m0ltar joined19:12
→ snuffeluffegus joined19:13
← the8thbit left19:13
→ kevinb joined19:13
← B1x1t0 left19:18
← tgkokk left19:18
← Guest95495 left19:20
→ tgkokk joined19:20
→ SimonNa joined19:20
→ hmsimha joined19:20
→ gregsmith joined19:21
← snuffeluffegus left19:21
→ nour__ joined19:22
→ j416_ joined19:22
→ curiousmansi_ joined19:22
← D-Boy left19:22
← j416 left19:22
← ShenLong left19:23
→ nickpresta joined19:24
← Kabaka left19:25
← tgummerer__ left19:25
← skasturi left19:25
→ tgummerer__ joined19:25
→ listochkin joined19:25
← nour_ left19:26
→ reaverb joined19:26
→ Willow joined19:26
← cwillu_at_work left19:26
→ hahuang65 joined19:28
← sdouglas left19:29
→ cwillu_at_work joined19:29
← listochkin left19:29
← nfk left19:31
← yano left19:31
← AKK9 left19:31
→ RofricTheBearded joined19:32
→ glebm joined19:32
← m0nkmaster left19:32
← RofricTheBearded left19:33
→ D-Boy joined19:33
→ skasturi joined19:33
→ specious joined19:33
→ nickpres_ joined19:34
→ absolutejam joined19:35
← nickpresta left19:35
← absolutejam left19:35
→ minid33 joined19:35
→ Vivekananda_y510 joined19:36
→ LucasTT joined19:37
→ francisfish joined19:37
→ Oxelist joined19:38
← m0ltar left19:38
→ m0ltar joined19:39
→ Xethron joined19:40
← minid33 left19:40
→ valentin joined19:40
← nickpres_ left19:40
valentin → Guest6654119:40
← d5sx43_ left19:41
→ hkon_ joined19:42
← francisfish left19:42
→ jftf joined19:42
← hahuang65 left19:44
← goldstar left19:45
← Tuna-Fish left19:45
← gil left19:45
← Oxelist left19:46
← gattuso left19:46
← sdrfnord1 left19:46
← hkon_ left19:46
← jftf left19:47
→ d5sx43 joined19:48
← VictorBjelkholm left19:48
jreyno40 muep_: So you’re saying there is no easy way to remove files from a repo?19:49
← denisMone left19:49
← macrover left19:49
→ alexyursha joined19:49
_ikke_ jreyno40: Not without rewriting history19:49
→ gattuso joined19:49
jreyno40 Okay, but I’m okay with that, I want these files to be out of the repo’s history entirely19:50
however I want to keep the other files I have and I still want them up to date19:50
It seems to me I could just git revert bad_commit19:50
even though bad_commit was around 60 commits ago19:51
and it would remove the files I introduced there & keep everything else completely up to date19:51
is this true?19:51
Motoko It would make a new commit reversing the changes.19:51
Both would be present.19:51
jreyno40 Motoko: Both as in my up to date other files?19:52
Motoko If you don't have a public copy or can tell everyone with access to re-download all of yours, then you can rewrite history.19:52
← glebm left19:52
jreyno40 Motoko: Right, it’s a private project19:52
Motoko Both as in you'd still have the commit introducing the unwanted files and they would exist until the revert.19:52
← Gizburdt left19:52
Motoko In that case, !fixup19:52
gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!19:52
→ nickpresta joined19:53
Motoko You can remove the unwanted commit, but it will rewrite all commits afterwards, obviously.19:53
See the link.19:53
jreyno40 Motoko: Okay, someone else linked me to that page. It was still unclear though. Say I introduced files I don’t want in commit #2. Then commit #3, #4,… - #60 didn’t touch the files in commit #2. I simply want to get rid of commit #2 but still keep everything from commit #3- # 6019:53
Motoko: ^^ that is specifically what I need19:54
Motoko Yeah, see that page.19:54
The whole rewriting everything after is because the commit hash is based on the repo status.19:54
So all the changes would be fine, but each one would get a new hash, because you changed history.19:55
→ Tuna-Fish joined19:55
→ VictorBjelkholm joined19:56
jreyno40 Motoko: Okay, what do I need to see on that page19:56
→ Sendoushi joined19:56
Motoko Read from top bottom and follow the links.19:56
They'll jump you through the steps in the document you need to take.19:56
Of course, ***always*** make a backup before doing this.19:57
You can really break things if you make a mistake.19:57
→ Mitchbones joined19:57
gitinfo set mode: +v19:57
→ nnyk_ joined19:57
← gsingh93_ left19:57
→ gsingh93 joined19:58
cbreak may the reflog be on your side19:58
Motoko You probably want this direct link: https://sethrobertson.github.io/GitFixUm/fixup.html#remove_deep19:58
→ sdouglas joined20:00
→ Kabaka joined20:00
→ Gizburdt joined20:02
→ tgummerer_ joined20:02
← tgummerer__ left20:02
← jpierre03 left20:04
→ francisfish joined20:04
TheSojourner → mjulian20:06
← Sendoushi left20:06
← curiousmansi_ left20:06
→ jpierre03 joined20:06
← a-l-e left20:07
→ eletuchy joined20:10
← d5sx43 left20:12
← alexyursha left20:15
← fragamus left20:15
← jpierre03 left20:15
→ otter768 joined20:16
→ RofricTheBearded joined20:17
← Dreamer3 left20:17
→ Moestradamus joined20:17
← jluc left20:17
→ jpierre03 joined20:17
← Moestradamus left20:18
qsuscs the “linus on git” talk is great20:18
← kushal3 left20:18
qsuscs i really love how linus expresses his opinion: “you may not share my opinion, but you are ugly and stupid then”20:19
← whitby left20:19
→ AKK9 joined20:20
_ikke_ :D20:20
← gregsmith left20:20
qsuscs “i think that you are all incompetent”20:20
→ witquicked|L joined20:22
→ whitby joined20:22
→ teran joined20:22
→ _leb joined20:22
← teobo left20:22
→ fragamus joined20:23
→ yano joined20:23
milki lol20:24
xender Welp20:24
Fragment about how mailing loose patches and tarballs is much better system than SVN was nice :P20:25
← RofricTheBearded left20:25
← specious left20:25
qsuscs he said it was better than CVS20:25
Motoko SVN isn't bad, it just isn't good.20:25
Still better than CVS.20:25
And anything is better than VSS.20:25
xender qsuscs: Are you sure? Well, not mush difference for Linus I think20:25
→ nfk joined20:26
qsuscs it’s good for being a CVS replacement and a centralized system20:26
thiago and SCCS20:26
qsuscs but it inherits all those design failures20:26
→ gregsmith joined20:26
qsuscs and PVCS, as far as i have heard20:26
xender: yes, i am.20:26
xender Yeah, he said CVS20:27
But a sentence before he said his opinion about SVN :P20:28
"the most pointless project ever started"20:28
thiago it wasn t pointless when it started20:28
← jens_ left20:28
→ RofricTheBearded joined20:28
thiago the world needed something better than CVS20:28
qsuscs yes, but SVN is 100 mil better than CVS, while git is three miles better20:29
← RofricTheBearded left20:29
thiago svn was much better than CVS20:30
directory-wide commits, O(1) tagging, some semblance of branching20:30
no network access for svn add20:30
no network access for svn diff against the current commit20:31
Motoko No attic.20:31
Subversion was basically a better CVS.20:31
thiago yes20:31
qsuscs no `cvs login`20:32
Motoko We used it at my work, and still do on some projects. It works well.20:32
thiago which is what the world needed back then. Decentralised VCS wasn't in vogue.20:32
← gwb3 left20:32
Motoko Yeah.20:32
thiago and it wasn't helped by Arch and Tom Lord20:32
→ jpo joined20:32
← Relsak left20:33
→ gwb3 joined20:33
xender Well, I'm quoting his opinin, not presenting mine20:34
→ mariuscc joined20:34
xender Never used CVS/SVN/P420:34
But all of those seem to have any sense only in LAN20:34
→ Hennek joined20:34
thiago p4 is better than svn20:34
xender Or "clone once and forget"20:34
Motoko I've used Subversion across continents. It's not the easiest, but it can work.20:35
The big problem is connectivity to the central server.20:35
xender Ok, using e-mails also works20:35
Using netcat could work too :P20:35
But why use nc when you have svn20:35
And why svn when you have git20:35
← Dougie187 left20:37
Motoko Because the Indian team doesn't claim to know git and demands training while you pay them unless you use Subversion?20:38
← daedeloth left20:38
xender Well, shit20:40
← tgummerer_ left20:40
xender git-svn for the rescue :P20:40
→ tgummerer_ joined20:40
← eliasr left20:41
→ digital-shokunin joined20:43
→ jftf joined20:43
→ d5sx43 joined20:43
→ netcarver joined20:44
→ Ploppz joined20:46
Ploppz git push origin master: Updates were rejected because a pushed branch tip is behind its remote counterpart. Check out this branch and integrate the remote changes (e.g. 'git pull ...') before pushing again.20:46
git fetch origin master; git merge FETCH_HEAD: Already up to date.20:47
← nickpresta left20:47
Ploppz ??20:47
_ikke_ !fetchfour20:47
gitinfo [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).20:47
→ jluc joined20:47
← jftf left20:47
_ikke_ Ploppz: And that you've fetched the branch, doesn't mean that your local branch is up-to-date20:48
← digital-shokunin left20:48
Ploppz what about after I have merged with HEAD?20:48
_ikke_ merge with HEAD doesn't say anything20:49
merge with HEAD is a no-op20:49
Ploppz Well, heck, it started merging master with another branch.. that's not what I wanted.20:49
thiago Ploppz: make sure that you're doing it to the right branch. Didn't the remote tell you which branch the problem is with?20:49
Ploppz I was talkinga bout FETCH_HEAD - merging it with HEAD20:49
master but I didn't suppose it would get another branch when fetching..20:50
How do I reset it?20:50
xender Hmm... What is principle of having voice here?20:50
thiago I'm talking about pushing20:50
_ikke_ git reset --keep @{1}20:50
xender And does it have any purpose?20:50
Ploppz I checkout'd to the last commit by force20:50
thiago xender: the channel requires either +v or registered nickname to talk20:50
_ikke_ spam prevention20:51
thiago Ploppz: are you in a detached head? Check the output of git status20:51
xender Ok, but whence +v comes?20:51
Seveas !voice20:51
gitinfo The sound produced by the vocal organs of a vertebrate, especially a human. (American Heritage® Dictionary of the English Language, 4th Edition) – Or did you want to talk in #git? Try: .voice20:51
← jpierre03 left20:51
Seveas also, see /topic20:51
_ikke_ But Eugene is sometimes on a voice giving raid too20:51
xender But I haven;t requested it yet I have it from some time20:52
Seveas #git works in mysterious ways20:52
_ikke_ yeah, like I said, Eugene sometimes feels for giving it to people20:52
Eugene is a generous man20:52
xender Heh20:52
ChanServ set mode: +v20:52
Ploppz I'm completely lost. I realized that while checking out the last commit, I was still on the branch I didn't want any interference with. git branch said I was at (detatched from 6b33290). I did git checkout master -f and git status: Now it says under Unmerged paths a lot of points with "added by us: "20:53
but it seems like all of them are merged20:53
thiago Ploppz: git reset --hard20:53
xender Unmerged paths after foce checkout?20:53
thiago Ploppz: this will throw away any changes20:53
Ploppz Thanks20:53
Ploppz dries away some sweat20:54
xender But shouldn't force checkout clean them anyway?20:54
→ mkumm joined20:54
→ darkbasic_ joined20:55
Ploppz So I'm back on track. I'm on master locally, and want to fetch and merge master from the online repo. Apparently simply git fetch, fetched another branch instead..20:55
or at least merging with FETCH_HEAD meant merging with the other branch20:55
← d5sx43 left20:55
← darkbasic left20:56
thiago Ploppz: git fetch && git merge @{upstream}20:56
Ploppz: @{upstream} there is literal20:56
Ploppz I'm wondering why it would automatically merge with an unrelated branch though20:57
so every time I want to merge, I have to git merge @{upstream}?20:58
← txomon|home left20:58
→ HanClinto_ joined20:58
Motoko Maybe you have the wrong branch being tracked?20:58
→ tpollard joined20:58
thiago git pull should do that for you20:59
but the point is that you may be pulling one branch and pushing to another20:59
xender I think I've found a bug in git. Where I should report it?20:59
Maillist?20:59
thiago xender: mailing list20:59
xender I have to be registered first?20:59
To post / follow that thread?21:00
thiago registered?21:00
Ploppz Motoko: How do I check that?21:00
← VictorBjelkholm left21:00
xender thiago: subscribed21:00
thiago xender: only one way to find out21:00
Motoko .git/config21:00
You'll see sections like [branch "master"]21:01
→ digital-shokunin joined21:01
Motoko The config line of "merge" is the branch it is marked as tracking.21:01
Ploppz under [branch "master"] it says "merge = refs/heads/master"21:01
thiago Ploppz: looks correct21:01
Ploppz: the thing is that we don't know what you did wrong21:01
← Tuna-Fish left21:02
Ploppz Okay, I'll just hope it doens't happen again21:02
btw what exactly does @{upstream} mean?21:02
→ Tuna-Fish joined21:02
thiago the upstream branch21:02
← punchagan left21:02
Ploppz but why that fancy syntax?21:03
thiago there isn't another21:03
there's a shorter version: @{u}21:03
Ploppz yeah but what does @{} mean?21:03
→ veebers joined21:03
thiago nothing21:03
this is a fixed syntax: @{u} or @{upstream}21:03
← jackneill left21:04
thiago if you write @{nn} (a number), it means something different21:04
← Gizburdt left21:04
Ploppz okay21:04
← drobban left21:04
→ ericeatsbrains joined21:05
→ jpierre03 joined21:06
← poimen left21:07
← Dottimolly left21:07
→ kayloos joined21:08
→ ghostlin_ joined21:08
→ punchagan joined21:09
Ploppz .git takes 9 MB for a small repo with only 10 commits. Is that normal?21:09
→ KLVTZ joined21:09
Ploppz it's all inside .git/objects/pack21:09
→ poimen joined21:10
thiago git gc21:10
xender What is the size of working tree?21:10
Ploppz 400 KB21:10
qsuscs did you accidentally commit a big file (like compiler output) and commit it once?21:11
Ploppz thiago: git gc added 100 KB ._.21:11
← poimen left21:11
thiago git repack -a -d -f21:11
Ploppz ooh, I accidentally commited all my weechat logs lol21:11
How can I undo that?21:12
thiago there you go21:12
Seveas !undo21:12
gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!21:12
← punchagan left21:12
← kayloos left21:13
KLVTZ I'm currently migrating a SVN project to git, I want to maintain SVN capability with my team. I'm running the following command: git svn clone -s --prefix=origin/ -r16365 http://svn.automotive.com/microsites/PlayworldSystems.com --However, I get the following error: fatal: refs/remotes/origin/trunk: not a valid SHA1. I run this command within the folder that has two dirs, trunks and tags. Any ideas on what I'm doing wrong?21:13
→ VictorBjelkholm joined21:13
← nour__ left21:14
→ poimen joined21:14
← poimen left21:14
→ poimen joined21:14
→ Nicholas_Rishel joined21:14
→ meLon joined21:15
offby1 nope :-|21:15
→ nickpresta joined21:15
← otter768 left21:16
→ PersonX joined21:16
← tgummerer_ left21:16
→ tgummerer_ joined21:16
→ otter768 joined21:17
← Guest90622 left21:18
← tgkokk left21:20
→ tgkokk joined21:20
← meLon left21:20
→ meLon joined21:20
← jovy88 left21:20
→ Px12 joined21:20
→ jovy88 joined21:21
KLVTZ Any ideas?21:22
→ jfran joined21:22
← ghostlin_ left21:22
← Nicholas_Rishel left21:22
← PersonX left21:22
← meLon left21:23
← EmmEight left21:23
→ ghostlin_ joined21:25
→ Nicholas_Rishel joined21:25
offby1 nope ... haven't touched git-svn in years (praise Allah)21:26
Motoko If you want to move to git directly and stop use of svn, svn2git works well.21:27
← nickpresta left21:27
→ jonmorehouse joined21:27
Motoko https://github.com/nirvdrum/svn2git21:27
← otter768 left21:27
Motoko I've used that at work to convert about 6-8 repos cleanly.21:27
← vurma left21:27
→ iaaah joined21:28
← _leb left21:28
KLVTZ Well i want to switch but the git-svn options leaves my other teammates the opportunity to use SVN21:28
this project I'm on is primarily on SVN21:28
I21:28
→ d5sx43 joined21:28
Motoko Ah.21:28
KLVTZ I've suggested moving to git, which is encouraged, but perhaps too much of a hassle on a team that has some developers in other countries.21:28
qsuscs these are the benefits of having no social life :P21:29
grawity Why is Git more of a hassle in this case?21:29
Motoko I haven't really dealt with using git like that.21:29
KLVTZ It's no biggie if I can't with this project, it's just a pull from a SVN repo is terribly long and untuitive,21:29
→ CKyle joined21:29
Motoko Yeah.21:29
→ drobban joined21:29
Motoko git is actually better for distributed projects, but the learning curve and at a distance is certainly a problem.21:30
KLVTZ grawity: Git is not a hassle. It has to do with the fact that if I switch the project entirely to git, then that wil be days lost in converting everyone to that repo paradigm.21:30
grawity: i wanted to use the git-svn option for bidirectional reflection on both paradigms of svn and git.21:30
xender Ploppz: amend/rebase the commit in which you commited them, then go aggresive gc (possibly with pruning, expiring unreachable reflog entries and repacking)21:30
Motoko For the most part, you can still act like subversion, just with a few extra commands per step.21:30
→ meLon joined21:31
qsuscs using git from ground up is perfectly fine21:31
KLVTZ xender: was that for me?21:31
grawity hmm21:31
qsuscs but people that are used to quite everything else tend to continue their workflows, and especially with SVN and CVS, this is bad.21:31
KLVTZ xender: nvm21:31
grawity well, Github lets you use SVN on its repositories21:31
xender KLVTZ: No, Ploppz has problem with having commited random files21:32
← Kicer86 left21:32
← d5sx43 left21:32
qsuscs hmm21:33
KLVTZ qsuscs: it happens that some developers on my team follow an old way of doing things. Well not all, this recent project happen to be on SVN. I just joined this team about a week ago. When we got this project, I overrheard that the developers had a choice in repo systems. They chose git for whatever reason. What upsets me the most is I think SVN is terrible for large scale projects. Or projects that have tons and tons of files21:33
xender grawity: Isn't that fetch-only?21:33
KLVTZ like *cough* magento.21:33
qsuscs this is a ssh problem, not git… this is going to be funny21:33
grawity xender: not anymore https://github.com/blog/966-improved-subversion-client-support21:33
Motoko svn isn't bad for them, just slow.21:33
xender grawity: Interesting21:33
KLVTZ ..very slow21:33
← drobban left21:33
Motoko I've heard it's being improved.21:34
KLVTZ seriously, I did the mistake of just svn clone and it took FOREVER!21:34
16,000 tags...21:34
← jonmorehouse left21:34
KLVTZ thank goodnes for the -r option21:34
qsuscs KLVTZ: try a git cvsimport on the gentoo portage tree. it actually crashed my server (not really, but i couldn’t really stop it, so i forcefully restarted)21:35
→ jonmorehouse joined21:35
← meLon left21:35
← ghostlin_ left21:35
KLVTZ qsuscs: what do you mean by gentoo portage tree?21:35
grawity its manpage does say "WARNING: git cvsimport uses cvsps version 2, which is considered deprecated"21:36
qsuscs KLVTZ: well, the gentoo portage tree. the collection of ebuilds.21:36
KLVTZ qsuscs: Is CVS used by SVN?21:36
→ nkouevda joined21:36
thiago KLVTZ: no21:37
← mariuscc left21:37
qsuscs KLVTZ: no, CVS is an older system, inferior even to SVN21:37
KLVTZ: SVN was designed to be a CVS replacement21:37
thiago CVS does use RCS, though21:37
qsuscs (oh very well. germany, i.e. my country, just won the fifa world cup. now there is noise everywhere)21:38
← Xethron left21:38
thiago I imagine21:38
Motoko Wasn't it that CVS was a better RCS which was a better SCCS?21:38
thiago lots of hoking outside21:38
Motoko: CVS was a way to access remote RCS files21:38
KLVTZ qsuscs: is the game over?21:38
qsuscs and easier access to a bunch of RCS files21:38
KLVTZ: yes21:38
Motoko I should continue with Brynhildr21:39
Wrong channel...21:39
KLVTZ damn I was really hopin to just use the git svn option :(21:40
→ bezet joined21:40
KLVTZ In many ways, if that doesn't work, I may just leave it alone until I have the option of suggesting that we move the entire project to Git. Not just this one instance on my machine.21:40
← KLVTZ left21:41
→ macrover joined21:42
← mennea left21:42
← tgkokk left21:42
→ tplaner joined21:42
← gan left21:43
← alezandro left21:43
→ m0nkmaster joined21:43
→ jftf joined21:44
← bezet left21:44
← jfran left21:44
← pr0ton left21:45
← m0nkmaster left21:46
← Tuna-Fish left21:46
← jftf left21:49
← jluc left21:51
→ tgummerer__ joined21:52
← tgummerer_ left21:52
→ goldstar joined21:53
← n-st left21:54
ndimitrij → ndim21:55
→ Tuna-Fish joined21:57
→ Nohofoo joined21:57
← jonmorehouse left21:59
Nohofoo I just installed latest Git-1.9.4-preview ... didn't change any settings but Vim shows NO syntax highlighting..I wish it did21:59
I'm using Git-Bash on Windows22:00
← gregsmith left22:00
SamB % git status22:01
HEAD detached at HEAD22:01
how astute22:01
xender SamB: wow22:01
Nohofoo I see Vim syntax highlighting after a 'git add' just fine but after a vim something.php NO highlighting22:02
→ meLon joined22:02
← Hennek left22:02
← meLon left22:03
Nohofoo oops i mean .. after a git commit22:04
→ leb joined22:04
→ B1x1t0 joined22:04
← sdouglas left22:05
← zapb left22:05
← zmuser3 left22:06
Nohofoo If I'm in git-bash and I type vim ~/.vimrc is tht then same vim running as the vim i get when I type .. git commit ?22:07
← fr33domlover left22:07
→ JTAABZB6 joined22:08
xender Nohofoo: Do you have any other vim installed?22:08
Standalone or from MinGW/Cygwin?22:08
If there is another one in %PATH%, it's possible that they're different22:08
← veebers left22:09
Nohofoo thanks I'll check the path22:09
Ploppz This happened again.. http://bpaste.net/show/3XUjqMjfYjdEPLttFMUd/ I'm working on the same computer as always, The latest commit on my computer matches the latest commit on the repository, but still this happens.. why22:09
→ veebers joined22:09
→ hebz0rl joined22:09
Ploppz yet, git fetch, and git merge FETCH_HEAD did the job it seems. But why does it act so weeeeird22:09
Like earlier when I got just the same error (the latest commits matched both locally and repo), and it even merged the wrong branches22:10
Nohofoo =X I had standalone but I renamed it22:10
← Px12 left22:11
→ Fandekasp joined22:11
Ploppz When I say the commits match; I mean the latest commit before the commit I'm about to push, and the latest commit on the remote22:11
and when I say repo I mean remote22:11
xender Ploppz: fetching and !visualize could help more22:11
gitinfo Ploppz: You can visualize whole repo graph with gitk GUI viewer (gitk --all HEAD) or !lol for terminal view (git log --oneline --graph --decorate --all)22:11
← khmarbaise left22:12
Nohofoo which vim only gives one answer22:12
Ploppz I need tk for that? Anything more?22:12
← darkbasic_ left22:12
→ darkbasic joined22:13
xender Nohofoo: what about which -av vim (not sure if it works in bash)22:13
← leb left22:13
xender Ploppz: You need tk for gitk/git gui. Not for git log22:13
Those commands should produce equivalent output in GUI/text forms22:14
[ respectively]22:14
Nohofoo $ which -av vim /bin/which: line 8: type: -v: invalid optio type: usage: type [-afptP] name [name ...]22:14
Ploppz hm, git log --oneline --graph --decorate --all is nice, that should be default. will make alias22:15
← iaaah left22:15
xender Nohofoo: sorry, I'm not used to bash22:15
→ ahuemer joined22:15
ahuemer hi all. what is ambiguous here? i don't get it http://ahuemer.xx.vu/volatile/2014-07-14-ms8yJ1BZjXU/git22:16
→ Nizumzen joined22:16
← nicoulaj_ left22:17
xender Nohofoo: maybe which -a will do. Or maybe I'm completely off with bash's which flags22:17
(In zsh which -av means "all, verbose")22:18
ahuemer: You have a branch named like that?22:19
Because it looks like commit SHA22:19
← pantsman- left22:19
xender And if you do have commit with SHA which starts from 26c3, you're out of luck22:20
ahuemer let's check22:21
xender Anyway, you can try refs/heads/26c3..origin/26c322:21
→ kloeri_ joined22:21
ahuemer how can i list _all_ hashes?22:21
xender And if possible, such branch names would be better avoided22:21
ahuemer: goog question, considering dangling objects...22:22
git fsck?22:22
→ d5sx43 joined22:23
xender No, it seems o output only unreachable ones22:23
→ Px12 joined22:23
← thevishy left22:24
ahuemer commit 26c3a358d62f32bd1bc4db774b9db0d9a20dd0e122:24
>.<22:24
→ drobban joined22:24
← Px12 left22:24
xender What about refs/heads/26c3 ?22:24
ahuemer yes, that exists22:24
→ Px12 joined22:24
→ meLon joined22:24
← Ploppz left22:25
← hmsimha left22:25
← nkouevda left22:25
ahuemer i'll just do log refs/heads/26c3../refs/remotes/origin/26c322:25
← Px12 left22:25
→ Px12 joined22:25
xender No need to refs/remotes/ I think22:26
Unless you love symmentry that much ;)22:26
→ freestyl3r joined22:26
→ jonmorehouse joined22:26
← Px12 left22:26
→ Px12 joined22:27
ahuemer i do :)22:27
xender SamB: Whence did you get that HEAD detached at HEAD?22:27
ahuemer and i do that in a script, so22:27
xender I see22:27
→ trewe joined22:27
xender Is 26c3 some version naming scheme?22:28
← Px12 left22:28
← drobban left22:28
← St_Marx left22:28
ahuemer 26c3 was the 26th chaos communication congress22:28
SamB % git --version22:28
git version 2.0.122:28
→ Px12 joined22:28
→ ColdKeyboard joined22:29
xender SamB: But how did you get there?22:29
Into that state22:29
← Px12 left22:29
→ Px12 joined22:29
SamB xender: .git/HEAD had a hash in, not particularly sure which one, but very possibly the commit was not referenced by any ref22:29
← Px12 left22:30
ahuemer xender: thanks for the excellent help, cu22:30
← ahuemer left22:30
→ Px12 joined22:31
← kriks left22:31
← Px12 left22:31
→ Px12 joined22:32
→ St_Marx joined22:33
← tgummerer__ left22:33
← Px12 left22:33
→ tgummerer__ joined22:33
← ferreum left22:33
← teran left22:33
→ Px12 joined22:33
← paul424 left22:33
← Px12 left22:34
← AKK9 left22:34
→ Px12 joined22:34
← Px12 left22:35
← d5sx43 left22:35
→ Px12 joined22:36
← Px12 left22:37
← cagedwisdom left22:37
→ Px12 joined22:37
← Px12 left22:38
← jonmorehouse left22:38
→ jon_r joined22:38
→ Px12 joined22:38
→ ghostlin_ joined22:39
← Px12 left22:39
→ Px12 joined22:39
← mkumm left22:40
← Px12 left22:40
← jpo left22:40
→ Px12 joined22:41
→ snuffeluffegus joined22:41
← Px12 left22:41
→ Px12 joined22:42
← Px12 left22:43
→ Px12 joined22:43
← bluesm left22:44
← upene left22:44
→ jftf joined22:45
→ Anon126 joined22:46
← meLon left22:46
→ the8thbit joined22:49
← jovy88 left22:49
← jftf left22:50
← visceral left22:50
→ visceral joined22:51
← netcarver left22:52
← pte_petey left22:52
→ topprospect joined22:52
← dmitry_ left22:52
→ leb joined22:53
j416_ → j41622:53
← CKyle left22:56
→ cagedwisdom joined22:56
← HanClinto_ left22:58
← B1x1t0 left22:59
→ CKyle joined23:00
→ MattMaker joined23:01
→ jovy88 joined23:02
← dangerousdave left23:02
→ dmarkham joined23:02
← ghostlin_ left23:02
→ BBBThunda joined23:03
← darkbasic left23:03
→ teran joined23:04
← VictorBjelkholm left23:04
← shingshang left23:05
→ Consuela joined23:05
→ watabou joined23:06
← francisfish left23:06
→ jonmorehouse joined23:07
→ fstd_ joined23:07
→ mkumm joined23:07
← tgummerer__ left23:07
→ tgummerer__ joined23:07
← dmarkham left23:07
← snuffeluffegus left23:07
→ VictorBjelkholm joined23:07
→ drobban joined23:07
→ pte_petey joined23:08
→ kayloos joined23:09
← teran left23:09
← Nizumzen left23:09
→ darkbasic joined23:09
← Guest66541 left23:10
← fstd left23:10
fstd_ → fstd23:10
← leb left23:10
← witquicked|L left23:10
← megawac1 left23:11
→ nerdfiles joined23:11
← drobban left23:11
← dannixon left23:12
← pte_petey left23:12
← kayloos left23:13
← ColdKeyboard left23:13
← Nicholas_Rishel left23:14
→ anEffingChamp joined23:14
→ megawac1 joined23:15
← CKyle left23:15
← reaverb left23:15
→ Nicholas_Rishel joined23:15
→ hahuang65 joined23:16
← Px12 left23:17
→ shingshang joined23:17
→ CKyle joined23:18
← mkumm left23:18
← maestrojed left23:18
→ hkon_ joined23:18
→ reaverb joined23:18
← tplaner left23:19
→ mkumm joined23:19
← darkbasic left23:19
← mkumm left23:20
→ mkumm joined23:20
→ darkbasic joined23:21
→ drobban joined23:22
← hkon_ left23:23
→ nkouevda joined23:23
← dccc left23:24
← jreyno40 left23:25
→ witquicked|L joined23:26
← drobban left23:26
← darkbasic left23:27
→ darkbasic joined23:28
← VictorBjelkholm left23:30
← msm left23:32
← Consuela left23:32
→ msm joined23:32
← Nohofoo left23:32
← jonmorehouse left23:33
→ Consuela joined23:33
→ xiong_ joined23:33
thorie is there a way to label a branch?23:33
← anEffingChamp left23:34
luto it already has a name.. :D23:34
→ damccull_ joined23:34
xiong_ Hi. Ah, $git status says tree clean, nothing to commit; git-gui rescan shows nothing, tracked or otherwise. But gitk shows untracked changes, even after quit and restart. What now?23:35
→ teran joined23:35
Anon126 @thorie what do you mean by a "label" exactly?23:35
→ otter768 joined23:35
xiong_ → xiong23:35
thorie Anon126: like a long sentence description of many words, that i don't want to type out every time when switching branches23:35
← sarkis left23:35
thorie Anon126: descriptive enough for me to remember what the branch was about23:36
xiong You'd call that a 'tag'.23:36
bremner nah. that won't follow the branch23:36
Anon126 @xiong I've encountered this quirk before. git reset --hard HEAD usually fixes it23:36
→ VictorBjelkholm joined23:36
xiong No, it won't. If I thought I'd want that, I'd tag the first commit on the branch, maybe.23:36
→ casvah joined23:37
luto thorie: "git branch description" yields interesting results in google.23:37
xiong thorie, most branches have short lifetimes for most git users.23:37
luto thorie: have you tried searching before asking here? :)23:37
Anon126 xiong, is your message beginning with "No, it won't" for me?23:37
→ jonmorehouse joined23:37
luto Anon126: no23:38
bremner thorie: http://stackoverflow.com/questions/2108405/branch-descriptions-in-git/8858853#885885323:38
xiong Sorry. No, a tag won't follow a branch head.23:38
thorie ah hmm interesting23:38
thiago thorie: git branch --edit-description23:38
luto bremner: because they can't google themselves? :P23:38
→ darkbasic_ joined23:38
xiong A branch is, in some way, a tag that follows HEAD.23:38
bremner luto: it was faster to past the link than to berate the questioner23:38
luto xiong: well, they are both 'ref's23:38
← darkbasic left23:39
luto bremner: faster for now. But searching is an important skill23:39
bremner luto: the berating is implicit ;)23:39
Vampire0 thorie, man git config and search for branch.<name>.description23:39
gitinfo thorie: the git-config manpage is available at http://jk.gs/git-config.html23:39
xiong Anon126, maybe I should try reset. I guess --hard HEAD should not do anything, if everything is okay.23:39
← teran left23:39
Vampire0 thorie, or man git branch and search for --edit-description23:39
gitinfo thorie: the git-branch manpage is available at http://jk.gs/git-branch.html23:39
← damccull_ left23:39
Vampire0 the latter will most probably set the first23:40
→ bezet joined23:41
→ gregsmith joined23:41
← gregsmith left23:42
thorie damn, my mac only has 1.7.5.4 :( i need 1.7.9 for --edit-description23:42
← jonmorehouse left23:42
Vampire0 thorie, then update it, where is the problem? :-)23:43
thiago thorie: git config branch.<name>.description "Description goes here"23:43
← mkumm left23:43
bremner note that this information is purely local23:43
thiago sure23:43
and used nowhere23:43
xiong Maybe, thorie, that's why you asked about that. Maybe you checked manpages before asking.23:43
thorie yup, i looked at git help branch, couldn't see anything there23:44
thiago 1.7.5.4 is over 3 years old. Upgrade.23:44
← tgummerer__ left23:44
→ tgummerer_ joined23:44
thorie so i lose my branch description even if i push my changes to the server?23:45
← bezet left23:45
thiago you don't lose. They stay in your local config.23:45
Vampire0 probably, that is remotely23:45
→ therealGent joined23:45
thorie what if my drive crashed and i clone the repo again?23:45
thiago then you need to set up again23:45
thorie got it23:45
thiago none of your local config, including what's upstream of what, is kept23:45
→ hmsimha joined23:46
thorie thanks good sir23:46
→ dreiss joined23:46
→ jftf joined23:46
→ teran joined23:46
← CKyle left23:46
thorie Vampire0: oh looks like i can upgrade it23:47
← Nicholas_Rishel left23:47
thorie i kept getting all the recent mac software updates, but i guess that's different from ports updates23:47
now i have 2.0.1 :)23:48
Vampire0 probably, yes :-)23:49
good for you23:49
→ darkbasic joined23:49
← darkbasic_ left23:49
→ sgambino joined23:51
← teran left23:51
thiago thorie: not the XCode updates?23:51
← jftf left23:51
→ _leb joined23:51
thorie XCode? not sure... i downloaded XCode a long time ago23:51
i don't really know what it does23:51
thiago it's Apple's IDE23:52
← hebz0rl left23:52
thiago it's the thing that installs Git, if you don't use ports or homebrew23:53
→ Lyqyd joined23:55
→ molten_tar joined23:55
→ minid33 joined23:56
← m0ltar left23:57
← VictorBjelkholm left23:58
← jovy88 left23:59

Logs Search ←Prev date Next date→ Channels Documentation