IRCloggy #git 2013-10-21

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.

2013-10-21

← milli left00:00
→ cmpera joined00:02
← penguin42 left00:02
→ hashpuppy joined00:04
→ avolz joined00:06
← DonRichie left00:07
← avolz left00:07
→ DonRichie joined00:07
→ eaj joined00:07
→ maestrojed joined00:09
← pfFred left00:10
← bklane left00:10
← kukks left00:10
→ bklane joined00:10
← bonhoeffer_ left00:10
→ juvenal joined00:11
← eaj left00:12
→ bklane_ joined00:12
← bklane left00:13
← SeySayux left00:14
← maestrojed left00:15
→ jeskola joined00:15
→ SeySayux joined00:16
← jeskola left00:16
→ varlog joined00:17
→ eaj joined00:17
→ maestrojed joined00:18
→ elb0w joined00:19
→ petey_ joined00:20
← calucian left00:21
← eaj left00:22
← rafaqueque left00:23
→ rhl joined00:26
juvenal → juvenal_away00:27
← Davey left00:28
→ dyng joined00:28
← Ozch left00:30
← raf left00:30
← hyperair left00:30
← dyng left00:33
← elb0w left00:34
→ [1]JPeterson joined00:34
← JPeterson left00:36
→ dyng joined00:36
→ milli joined00:36
← mdiers left00:36
→ mz` joined00:37
→ v0n joined00:37
← ZaFrost left00:38
← hashpuppy left00:38
→ raf joined00:38
← mz` left00:41
→ mz` joined00:41
← bklane_ left00:42
→ Davey joined00:44
→ CKyle joined00:45
← pinage404 left00:46
→ asQuirreL joined00:47
← harish left00:49
← petey_ left00:49
← ksool left00:50
→ petey_ joined00:50
→ sinusss joined00:50
→ curvedmark joined00:51
← Risto- left00:51
beingbrown gebbione: sorry, I was away for a second.00:54
you still around?00:54
← therealGent left00:54
gebbione yep00:56
i didnt try with that key problem anymore00:56
i had to use a password to git clone00:57
→ sswv joined00:57
→ mizu_no_oto joined00:57
← CKyle left00:58
→ rchavik joined00:58
→ AWinterman joined00:58
← asQuirreL left00:59
← sswv left00:59
← varlog left01:01
beingbrown hm.01:02
ssh server info and see if git is in your profile.01:02
← shinnya left01:02
← s00pcan left01:05
→ s00pcan joined01:05
→ dhruvasagar joined01:05
← sinusss left01:07
→ InvidFlower joined01:07
← Freeder left01:08
→ mribeirodantas joined01:08
→ lembacon joined01:08
← BSaboia left01:10
gebbione i stopped the instance ... i ll check tomorrow, thanks01:11
← herdingcat left01:13
← beingbrown left01:13
→ Vampire0_ joined01:14
→ vkz joined01:15
← gebbione left01:15
→ hyperair joined01:16
← Vampire0 left01:17
→ dsdeiz joined01:19
→ eaj joined01:19
→ harish joined01:21
← stamina left01:22
← LuxuryMode left01:22
← eaj left01:23
← Dougie187 left01:24
→ LuxuryMode joined01:24
→ ruskie joined01:25
← LuxuryMode left01:25
← cenuij left01:28
juvenal_away → juvenal01:28
→ tmcmahon joined01:29
→ intripoon_ joined01:29
← AndreSomers left01:30
→ AndreSomers joined01:32
← dhruvasagar left01:32
→ dhruvasagar joined01:32
→ devoldmx3 joined01:33
← intripoon left01:33
← raf left01:33
← devoldmx left01:37
← Zarthus left01:38
← terminalRepeat left01:38
← chrisss404 left01:40
→ CKyle joined01:41
→ chrisss404 joined01:42
→ daito joined01:45
→ weiyang joined01:45
→ Xiti` joined01:45
→ nicedice_ joined01:45
→ decimad2 joined01:46
→ xxpor_ joined01:46
→ diegoviola joined01:46
← pandeiro left01:47
← harish left01:48
← xxpor left01:48
← pierremb left01:48
← decimad left01:48
← Xiti left01:48
← nicedice left01:48
← staafl left01:48
→ staafl joined01:49
← tmcmahon left01:50
juvenal → juvenal_away01:52
← rhl left01:53
← g0bl1n left01:55
→ luc__ joined02:00
→ kcj joined02:00
→ magu|q joined02:01
→ CorySimmons joined02:02
← maqr left02:02
CorySimmons Hey guys, I just ran `git rm -r` thinking it would remove items from my staging area that had been deleted from my project, but instead it actually removed everything from my project… :(02:02
I haven't done anything since then. Is there a way to take an immediate step back?02:03
I have a lot of unsaved work.02:03
← eletuchy left02:03
→ eletuchy joined02:03
CorySimmons Er I did `git rm -r *`02:04
is there a way to immediately undo that?02:04
→ fuzzybun_ joined02:04
CorySimmons I haven't pushed or anything, but I had a bunch of work I hadn't pushed as well. I'm afraid if I just reset or something it will just pull down the github repo and all my edits will be gone02:05
Thoroughly freaking out here. :(02:05
← the_cybersphinx left02:05
← redr0ket|DEN left02:06
→ the_cybersphinx joined02:06
→ therealGent joined02:07
← fuzzybunny69y left02:07
SamB CorySimmons: don't worry!02:07
CorySimmons :*(02:08
→ LuxuryMode joined02:08
CorySimmons SamB: Is there hope? :[02:08
→ avolz joined02:08
SamB "git reset --hard HEAD" will set your index and working tree to match your latest local commit02:08
CorySimmons Crap. Tried that and it reset back to where I hadn't made any changes.02:10
SamB I guess you forgot to actually commit any of the changes02:10
CorySimmons Yeah02:10
But it's weird because it's showing the commit message02:11
SamB but there might still be hope ...02:11
CorySimmons Wait02:11
I did `git add .` when I made the changes02:11
Then it showed all the deleted stuff02:11
So before I pushed I ran `git rm -r *`02:11
Which deleted everything02:11
SamB hold on a moment02:11
CorySimmons Then I just ran your `git reset —hard HEAD` which says the commit message I made, BUT it reset my local branch to the version before any edits02:12
← mtk left02:12
→ jon_r joined02:12
CorySimmons Could I rebase or something?02:14
→ tmcmahon joined02:14
SamB try "git fsck --unreachable"?02:14
← tmcmahon left02:14
← LuxuryMode left02:15
← avolz left02:15
← vkz left02:15
CorySimmons Wait02:15
Wait02:15
I think your git reset thing worked02:15
Nevermind I suck02:15
It worked right02:16
I didn't rm the files I rm so they're back02:16
But I can just rm them and it's fine02:16
→ yhager joined02:17
← v0n left02:17
← joshsmith left02:18
→ eaj joined02:19
CorySimmons SamB: Awesome. Got it! Thank you. :)02:20
← CorySimmons left02:21
← mizu_no_oto left02:21
→ LuxuryMode joined02:21
→ beingbrown joined02:22
← ruskie left02:23
→ ruskie joined02:23
← beingbrown left02:23
→ PaulCapestany joined02:24
← eaj left02:24
→ fairuz1 joined02:24
→ LuxuryMo_ joined02:25
← fairuz left02:25
← LuxuryMode left02:26
→ redrocket joined02:27
→ harish joined02:28
→ eaj joined02:29
→ vkz joined02:31
← PeterBooker left02:32
← luke_ left02:33
← eaj left02:35
→ xxpor__ joined02:35
← petey_ left02:35
← LuxuryMo_ left02:35
→ lavaman joined02:36
← mobileblue left02:37
→ Cassiel joined02:38
← xxpor_ left02:38
→ mobileblue joined02:39
← jday_ left02:40
← Gooder left02:42
→ Chris____ joined02:43
→ pasky joined02:46
→ MoHaX joined02:46
← vkz left02:48
→ darinm joined02:50
darinm → darinm_away02:51
← Davey left02:51
← lavaman left02:52
← breck7 left02:53
→ breck7 joined02:53
→ midi joined02:53
midi → abdostar02:54
← MoHaX left02:56
abdostar hello, I am new to git and I need some help. I created a folder, init it, add., commit, but when I try to push it I get an error message02:56
← dhruvasagar left02:57
← breck7 left02:58
Chris____ abdostar, what is the error?03:00
← raonyguimaraes left03:00
abdostar Chris____: The current branch master has no upstream branch.03:01
← mribeirodantas left03:01
← DonRichie left03:02
Chris____ abdostar, Does this help? http://stackoverflow.com/questions/16493396/git-master-branch-has-no-upstream-branch03:02
abdostar Chris____: gave me a second to try it03:03
→ rurufufuss joined03:04
← Spyro left03:06
→ defaultro joined03:06
← InvidFlower left03:07
→ Spyro joined03:07
← Pyrogerg left03:07
→ MoHaX joined03:08
→ varlog joined03:10
abdostar Chris____: no luck with this solution03:11
→ fobius joined03:12
← cannonball left03:13
← germanoak left03:17
→ sqlnoob joined03:17
← maestrojed left03:21
→ titou__ joined03:23
→ j416_ joined03:23
← mitsuhiko left03:23
← _br_ left03:23
← jds left03:24
← twisted` left03:24
← titusjose left03:24
→ titusjose joined03:24
← j416 left03:24
← Bucciarati left03:24
→ tdguy joined03:24
← AndreSomers left03:25
← Moult left03:25
→ Moult joined03:25
→ Orphis joined03:25
← BombStrike left03:25
← ciaranm left03:25
← chrisirc left03:25
→ wereHamster joined03:25
→ Bucciarati joined03:25
→ charTay joined03:25
→ jds joined03:25
charTay Hello!03:26
gitinfo charTay: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.03:26
→ chrisirc joined03:26
← MoHaX left03:26
← titou left03:26
→ _br_ joined03:26
→ BombStrike joined03:26
→ twisted` joined03:26
→ AndreSomers joined03:27
charTay Within IRC how do I disable showing me who logged off and on?03:27
← fobius left03:27
→ mitsuhiko joined03:28
charTay How's everyone doing tonight!?03:28
← pasky left03:28
→ kiffer84 joined03:29
→ ralf-x joined03:29
← RegEx left03:29
→ rryoumaa joined03:29
gitinfo set mode: +v03:29
← kiffer84 left03:29
→ eaj joined03:31
rryoumaa is git designed mainly for large projects like the linux tree? i find that i have to do "git gc" frequently to make it fast and not take up too much space. setting the gc threshold to a low number doesn't really seem to work well either ime.03:31
→ Davey joined03:32
SamB rryoumaa: do you have a slow filesystem? (is your disk even fuller than mine?)03:33
rryoumaa perhaps i am doing something wrong, but i looked up how that works and apparently it looks in one of the subdirectories (like "17" or something) for whether it should gc and is therefore stochastic. so my conclusion is that it's considered normal to have many unpacked files, and that perhaps auto gc works well for large projects.03:33
← oojacoboo left03:33
rryoumaa i expected the gc threshold to be deterministic03:34
SamB: well, it's a space concern too03:34
→ mizu_no_oto joined03:34
SamB rryoumaa: how much space are your unpacked objects taking?03:34
← dyng left03:35
← eaj left03:35
rryoumaa SamB: i don't know, i'm doing a ridiculously silly script that does gc on everything now. but on other systems it has been huge.03:35
dsockwell could you float a number?03:36
EugeneKay sitaram - d'oh!03:36
← CKyle left03:36
rryoumaa dsockwell: hmm, well, etckeeper is up to 5 mb already for objects/, and i did gc shortly ago.03:38
tar files get huge if git is not packed, i found03:38
← preflex left03:38
← Chris____ left03:38
→ MoHaX joined03:39
→ pasky joined03:39
rryoumaa it seems most people don't really care about this topic, and find a low gc threshold to be "too low03:39
"03:39
→ preflex joined03:40
dsockwell storage is cheap03:40
← aarwine left03:40
rryoumaa dsockwell: not everywhere03:40
but if that's the philosophy of git, then i will have to accept it03:40
it's just that i expected a different philosophy03:41
dsockwell i'm no authority, please wait to hear it from someone else03:41
rryoumaa ok :)03:41
→ aarwine joined03:41
→ maqr joined03:41
← dorkmafia left03:41
dsockwell what's limiting your storage, if i might ask?03:41
rryoumaa well, there are edge cases where you want to just tar up a dir and mail it to people, etc.03:42
i know i could be argued down on various cases, but that's not really the point03:42
the point is that to a user, git could in principle do gc auto so that it keeps things reasonably packed03:43
i'm guessing that git is mostly just used for huge projects, so his problem is not a problem for most people03:44
← raininja left03:44
dsockwell well that and people operate through git if they want git content, so the transfer is minimized03:44
tarring up and trading parts of the git backend is not something i've seen done03:45
rryoumaa dsockwell: i could change the edge case. suppose you wanted to store your git on dropbox, and don't feel like paying more for more storage there.03:45
or your tar03:46
← pasky left03:46
← aarwine left03:46
rryoumaa it took me a while to realize that auto gc did nothing03:46
dsockwell i really wish i knew more about git03:46
← lbf left03:47
← Gamecubic left03:47
→ pasky joined03:47
→ fobius joined03:47
→ aarwine joined03:48
← Davey left03:50
← Spyro left03:50
sitaram EugeneKay: d'oh indeed. But then most of them are ... after the fact!03:51
SamB rryoumaa: that is not a usual collaboration method03:53
rryoumaa: using bitbucket is probably a better plan03:53
rryoumaa SamB: again that's not the point03:53
→ fridim_ joined03:53
→ Error404NotFound joined03:54
SamB if you want a minimal repository, clone into a bare repo03:54
the day-to-day ones are meant to balance space against time03:55
← FrodoTheHobbit left03:55
→ FrodoTheHobbit joined03:55
rryoumaa SamB: collaboration is not the point03:56
using git is not the point03:56
← the_cybersphinx left03:56
rryoumaa the point is that any directory of any application can be desired to be small03:56
SamB using minimal space requires a more time, and that's that03:57
rryoumaa and if git is allowing objects/ to grow huge, it's not necessarily "not a problem"03:57
SamB hmm, yes, you may have a point about the method used there03:57
rryoumaa with a large repo, the gc threshold will actually work as the user expects most of the time. so that is why i think git has a large repo bias.03:58
SamB rryoumaa: also see man git-bundle if you do want to move stuff around by archive03:58
gitinfo rryoumaa: the git-bundle manpage is available at http://jk.gs/git-bundle.html03:58
← maqr left03:58
→ maestrojed joined03:59
SamB rryoumaa: I'm not sure how the size of the repository is relevant here; isn't it only the volume of changes?03:59
← darinm_away left03:59
← mizu_no_oto left03:59
rryoumaa SamB: interesting, but again, not the point. suppose somebody wants to not use git for this? suppose somebody wants to use find and xargs and grep and all sorts of other things and not have to special-case subtrees that are under git control? it's trying to micromanage something that is standard unix.03:59
← aarwine left03:59
← yano left03:59
rryoumaa you're still trying to argue me down by saying it's not a problem that objects/ grows huge04:00
← donmichelangelo left04:00
→ Spyro joined04:00
rryoumaa i don't know how you are going to show that a large objects/ is not a problem, because you have to argue down all possible use cases04:00
SamB rryoumaa: how big are the blocks on your FS?04:00
→ aarwine joined04:00
→ donmichelangelo joined04:00
rryoumaa i don't know, or care. i appreciate your willingness to help, but this is going nowhere. i will just conclude that git is designed for huge repos.04:01
← pasky left04:02
← juvenal_away left04:02
← maestrojed left04:02
→ eaj joined04:02
→ yano joined04:02
→ CKyle joined04:03
SamB rryoumaa: if "git gc --auto" doesn't actually keep looking at object directories until either it's seen them all or it has reached gc.auto, that seems like a bug?04:03
← Error404NotFound left04:03
rryoumaa SamB: it is a design flaw, not a bug04:03
→ Sigma joined04:03
rryoumaa SamB: look up how it works04:04
SamB well, the documentation doesn't say anything about that "look in a random subdirectory" thing you mentioned04:04
rryoumaa yeah i had to go looking in the mailing list archives or some place for that :(04:04
SamB so it is at least a bug in the documentation04:04
rryoumaa good point04:05
→ juvenal joined04:05
← sohail left04:05
SamB hmm, the documentation in git-config does say approximately04:06
→ richgilbank joined04:06
← richgilbank left04:06
SamB er, git-config(1)04:06
rryoumaa The default value is 6700. that is HUGE04:07
→ richgilbank joined04:08
thiago 6.7 MB?04:08
rryoumaa 6700 objects i think04:09
thiago that's half the number of objects as my small project has in total04:10
← dougsland left04:11
thiago I'm halfway there on repacking: 3361 objects loose04:11
← el3ctron left04:11
← CKyle left04:12
SamB rryoumaa: why are your objects so big, anyway04:13
→ Error404NotFound joined04:14
→ pasky joined04:15
→ breck7 joined04:16
→ mitz joined04:19
juvenal → juvenal_away04:20
→ archdori_ joined04:20
← breck7 left04:20
← eaj left04:21
→ eaj joined04:21
← Algorithm left04:21
← Spyro left04:22
← Fandekasp left04:22
→ dougsland joined04:23
→ Spyro joined04:25
← jnewt left04:26
← Error404NotFound left04:27
← yhager left04:27
→ SoftwareMechanic joined04:27
→ Tommy[D] joined04:27
← Tommy[D]_ left04:28
→ shoshin joined04:29
→ dyng joined04:29
rryoumaa SamB: i don't recall saying my objects were big04:30
plenty of projects have 20 files04:31
milki omg, your objects are tiny?04:31
→ alsu joined04:31
rryoumaa or 5 files04:31
← fairuz1 left04:31
rryoumaa or even 104:31
alsu somehow, every single file in the current directory got added to git. nothing has been committed yet. how do I undo that?04:31
rryoumaa and having 6700 objects there is ridiculous imo04:31
milki: they are?04:32
or are we playing entendre?04:32
← MoHaX left04:32
SamB hmm, actually I guess that does get kind of big with normal-sized files ...04:32
milki alsu: you could try a soft reset with the path to the dir04:33
alsu: or a soft reset to your current HEAD04:33
alsu there are other legitimately changed files, which were added in previous commits04:33
I don't want to undo those changes04:33
rryoumaa so you're deciding to just tar up a large tree, and you have a few small projects, and guess what -- you're tarring up 6700 objects for each one04:34
juvenal_away → juvenal04:34
← ska-fan left04:34
→ Davey_ joined04:34
→ ska-fan joined04:34
rryoumaa alsu: you want to change them from being in your index to not being in your index, right?04:34
← jon_r left04:35
alsu rryoumaa: but leave them on disk, yes04:35
← abdostar left04:35
← fridim_ left04:35
rryoumaa if you do git status what do you see wrt the two classes of files?04:35
→ Derega joined04:35
SamB rryoumaa: so change gc.auto to something reasonable and think about how to make the hueristic more accurate for small values of gc.auto?04:36
→ gzg joined04:36
alsu rryoumaa: all the files which were mistakenly added are listed as "new file: "04:36
→ yhager joined04:37
alsu rryoumaa: all the changes I want to keep are listed as "modified: "04:37
thiago rryoumaa: your use-case is not reasonable04:37
rryoumaa: if you tar up a git repository, you're *expecting* it to be big04:37
rryoumaa: it's not reasonable to use tar and expect it to be small04:38
SamB rryoumaa: also, how big is the REST of each repo?04:38
thiago rryoumaa: every checked out file in that tarball would be present at least three times, in the smallest, most packed repository.04:38
SamB thiago: three times?04:38
thiago SamB: checkout, index, object DB04:38
rryoumaa SamB: it is inherently not going to work because of hte way it is designed, if i understand corectly . auto gc does not auto gc unless the repo is large.04:38
thiago in different levels of compression, sure, but present three times.04:39
→ Error404NotFound joined04:39
SamB rryoumaa: presumably it would be possible for it to look in more directories to increase accuracy when the limit is smaller?04:39
rryoumaa thiago: the difference is orders of magnitude, and after a manual git gc the size is reasonable04:40
thiago rryoumaa: but not the smallest04:40
rryoumaa thiago: huh?04:40
thiago rryoumaa: git was designed with a large space-time trading: lots of space so it reduces time spent in regular operations04:40
rryoumaa clearly04:40
← ska-fan left04:40
→ ska-fan joined04:41
rryoumaa but i just said the difference is between packed and non-packed and is reasonable when packed04:41
thiago rryoumaa: and I said that your use-case called for the smallest possible. You haven't achieved that.04:41
← ska-fan left04:41
rryoumaa no, that's not true. it doesn't have to be the smallest possible. just closer to manual gc.04:41
thiago rryoumaa: if you have a better algorithm, the devs are all ears04:42
rryoumaa: the problem you face is how to determine when to pack: when is the saving large enough to warrant the time spent doing it?04:42
rryoumaa i haven't got a clue. but i think i have failed to disconfirm that git is optimized for large repos in its auto gc algorithm.04:42
afk04:43
thiago it's optimised for medium-sized repos04:43
for small repos, the delta between packed and non-packed will be huge, but the absolute size of the repository will still not be large04:43
the number puts a cap on the size of medium-sized projects, which is when gc runs most often04:44
SamB thiago: multiply it by N, though04:44
thiago for really large repos, it becomes annoying and people might disable it altogether.04:44
SamB though I wonder why he puts N repos in one tarball04:44
→ hahuang65 joined04:45
→ ska-fan joined04:46
thiago I can imagine this usecase: "I have a VPS and it has limited storage space available to me"04:46
so yeah, 100 tiny repositories might actually occupy more disk space than 5 medium-sized ones04:46
SamB wonders if there are any tools to help find and pack not-lately-used repos in your homedir that could benefit from this ...04:49
→ _goTAN joined04:49
← gitpicker left04:51
→ SoftwareMechani1 joined04:52
← mithro-work left04:52
← SoftwareMechanic left04:53
← johnca|home left04:53
→ jaseemabid joined04:54
← sqlnoob left04:55
→ sqlnoob joined04:56
← sqlnoob left04:57
→ gitpicker joined04:57
→ sqlnoob joined04:57
← bwreilly left04:59
→ jfoy joined05:01
← cmpera left05:01
→ Pyrogerg joined05:04
← therealGent left05:06
← irqq left05:07
← Pyrogerg left05:08
← diegoviola left05:09
→ tough_griff joined05:10
← tough_griff left05:12
← Davey_ left05:12
→ tough_griff joined05:12
← nicedice_ left05:14
→ maqr joined05:14
← cite left05:14
rjhunter alsu: did you get your files unstaged?05:15
→ Pyrogerg joined05:15
→ YoMomma joined05:15
← maqr left05:16
← redrocket left05:16
→ jon_r joined05:16
alsu rjhunter: not really unstaged.. now they're listed as "deleted" (I did "git rm --cached")05:16
except I think it deleted everything..05:18
so this isn't right either.05:18
← tough_griff left05:18
rjhunter alsu: `git rm --cached` leaves the files on disk (in your working true), but otherwise acts as if you'd deleted them and then staged that deletion05:18
alsu well, it's a mess now. stuff on disk is right and the remote repo is right and I haven't added any commits, but the state of all my files is deleted05:19
rjhunter alsu: what state are you in now and where would you like to be?05:19
ah05:19
← _goTAN left05:19
alsu if I did a fresh checkout and copied over all the files I would be where I would like to be05:19
← Error404NotFound left05:20
→ dmitrygusev joined05:20
alsu is there a way to tell git to do that?05:20
rjhunter alsu: OK, then a simple `git reset` should do what you want05:21
← ska-fan left05:21
→ ska-fan joined05:21
← ska-fan left05:21
juvenal → juvenal_away05:21
alsu yay! that worked great.05:22
I should have done that earlier instead of the git rm --cached thing05:22
← dyng left05:22
alsu "reset" just sounds so destructive05:22
rjhunter alsu: `git reset` can be used for several different things, but unstaging is a common use05:22
it does sound destructive (and it can be, depending on the options you pass)05:23
alsu they should break it out into different commands or something then05:23
← Luke-Jr left05:25
→ ciampix joined05:25
→ tough_griff joined05:25
← kerrick left05:26
→ ska-fan joined05:26
→ kerrick joined05:26
← eletuchy left05:27
rjhunter yeah, probably -- you can also unstage with `git checkout` which doesn't sound as destructive :-)05:28
→ eletuchy joined05:28
→ Luke-Jr joined05:29
← varlog left05:29
← curvedmark left05:29
→ longbeach joined05:31
→ curvedmark joined05:31
← curvedmark left05:32
→ Error404NotFound joined05:32
→ dyng joined05:32
→ eletuchy_ joined05:33
← eletuchy left05:33
→ koki joined05:35
← freestyl3r left05:36
← Error404NotFound left05:37
→ cff joined05:37
← eletuchy_ left05:38
→ Jordan_U joined05:39
← sqlnoob left05:39
→ kbart joined05:39
→ ThomasLocke joined05:40
← tough_griff left05:40
→ objectiveous joined05:40
→ subhojit777 joined05:41
→ sqlnoob joined05:41
→ wafflejock joined05:41
← sqlnoob left05:41
subhojit777 is there any way to log time in git?05:42
→ sqlnoob joined05:42
→ zarubin joined05:43
→ pr0ton joined05:43
← sqlnoob left05:43
→ client joined05:43
wafflejock subhojit777: you mean like time tracking?05:44
gitinfo set mode: +v05:44
→ sqlnoob joined05:44
subhojit777 wafflejock, yes05:44
wafflejock subhojit777: I don't think so, git doesn't attempt to be a bug management system05:44
subhojit777: I use bugzilla, it's not my favorite thing though... Jira is a bit nicer but a bit pricy05:44
SamB or a personal organizer or what-have-you05:45
wafflejock http://www.slimtimer.com is nice05:45
→ ewnd9 joined05:45
client say you want a simple git setup. would having a daily repo and a final branch work?05:45
← sqlnoob left05:45
client i know its subjective. but simple would be on a beginner level of simple.05:46
→ Guest51606 joined05:46
← devoldmx3 left05:46
→ sqlnoob joined05:46
← frgtn left05:46
subhojit777 wafflejock, so its kind of an application? Is it available for Linux Ubuntu?05:46
wafflejock subhojit777: slimtimer.com is a web app, you just sign up and it's all in browser so OS agnostic05:46
→ frgtn joined05:47
subhojit777 ok..05:47
→ Dudalus joined05:47
wafflejock subhojit777: bugzilla you need to install and is a bit of a pain, it uses MySQL to store the bugs (in my case at least) and needs some Perl stuff to get it going05:47
← sqlnoob left05:47
→ ezekielnoob joined05:47
wafflejock subhojit777: with bugzilla it's more of a full system for multiple developers tracking bugs and multiple projects and other people testing05:48
→ sqlnoob joined05:48
wafflejock subhojit777: I've started a small business and am using it and it's been good for interacting with clients but is a bit of a hurdle to show them the ropes sometimes05:48
subhojit777 wafflejock, I have created a private repo on github for a project. Now I want to track time for tasks in that project05:48
← tpollard left05:48
→ Error404NotFound joined05:49
← sqlnoob left05:49
wafflejock subhojit777: yeah I hear yah... I'm actually working on a CRM of sorts for dealing with this in part... basically want to take the best of about 6 tools I currently use and integrate05:49
← dmitrygusev left05:49
subhojit777 wafflejock, sorry what is CRM?05:49
→ TomyLobo joined05:49
→ sqlnoob joined05:49
client customer relationship management05:49
wafflejock client: +1 subhojit77705:50
salesforce.com is one of the more popular ones05:50
← jon_r left05:50
client i've noticed that git in itself could be made more useful05:50
← sqlnoob left05:50
client but i'm sure there are integrated tools for it already05:50
wafflejock it's okay and based on the same service layer I'll use PHP/MySQL but want tighter integration with other stuff05:50
iveqy wafflejock: hmm there's an interesting topic on this on stackoverflow05:50
subhojit777 wafflejock, slimtimer is alright but it would be nice if I can directly use time tracking using github05:51
→ sqlnoob joined05:51
alsu rjhunter: git checkout doesn't seem to unstage05:51
wafflejock client: yeah there's lots of good tools around git it's just hard to grok initially05:51
← frgtn left05:51
alsu git add foo; git checkout foo; git status | grep foo #=> "new file: foo"05:51
← jaseemabid left05:51
client subhojit777 what do you by time tracking?05:51
wafflejock client: gitk, git merge (kdiff, or some other diff tools), git-gui05:51
client i'm on xubuntu. any recommendations?05:52
wafflejock client: I think you're just having a hard time understanding some of the terminology05:52
← sqlnoob left05:52
subhojit777 client, I have created a private repo on github for a project. Now I want to track time for tasks in that project05:52
iveqy wafflejock: I don't find it right now, but basically the opinion of the answers is that a bug tracking system is an inhouse tool and nothing you should need to teach your clients05:52
wafflejock iveqy: I hear yah and I've thought about that, but I'm working as 2 man shop05:52
client subhojit777 you want to see how long people are taking to make commits to the private repo?05:53
→ sqlnoob joined05:53
← Vile left05:53
wafflejock iveqy: if we had dedicated testers I certainly wouldn't do that05:53
subhojit777 client, yes05:53
SamB iveqy: that depends on how transparent you want to be, doesn't it?05:53
iveqy wafflejock: http://programmers.stackexchange.com/questions/15528/herding-your-users-to-your-bugtracker/15542#1554205:53
wafflejock iveqy: luckily one of my big clients now is an ex-fortran guy and is super nice05:53
client I believe that is built-in to git subhojit77705:53
iveqy wafflejock: lucky you =)05:53
SamB: no it doesn't. It has nothing to do with openess, read the link I just posted05:53
wafflejock good advice05:54
client maybe I need to watch a git youtube video intro05:54
→ pantsman joined05:54
← pantsman left05:54
→ pantsman joined05:54
iveqy client: !talks05:54
gitinfo client: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)05:54
iveqy client: I recommend Jesica Kerrs05:54
← sqlnoob left05:54
subhojit777 client, really? there should be some kind of documentation. could you please point them out05:54
→ rob_w joined05:54
SamB iveqy: if that's so, then why do most open source projects use public, not private, bug trackers?05:54
client subhojit777 this is what I am using: http://git-scm.com/book/en/05:54
wafflejock well open source is for programmers05:54
→ sqlnoob joined05:54
wafflejock it's true you don't want your clients to feel shoved off on the bug tracker05:55
→ beautifulmind joined05:55
wafflejock I explained to them that it just helps me coordinate e-mails and we can keep conversations going about bugs through the comments on it05:55
client what the world needs is more cookbooks. I will try writing one for this once I figure it out myself.05:55
iveqy SamB: you're confusing openess with who the bugtracker is for. It's fine to have a public bugtracker, but you shouldn't demand you client to learn how to use a bugtracker for reporting a bug.05:55
wafflejock but the option to do it for them should definitely be made clear05:55
SamB iveqy: oh, sure05:56
→ Raging_Hog joined05:56
← sqlnoob left05:56
→ gverri joined05:56
subhojit777 client, nothing related to time tracking there. are you saying that we write a git hook for that?05:56
wafflejock yeah I'm not pushy about it, but it's nice when they use it05:56
← objectiveous left05:56
client → Joe_1234505:56
SamB not unless the minimum level of knowledge needed is sufficiently low, anyway05:56
iveqy SamB: that's why a bugtracker is an internal tool. Because it helps you as a developer. Anyone not a developer should not be forced to use it, but be able to report bugs in whatever way is most convinient (email, phone, angry letters, etc.)05:56
→ sqlnoob joined05:56
SamB well, okay, yeah05:56
wafflejock iveqy: on the flip side too though I think it shows a certain amount of transparency when they see the bugs I entered in there as well to address and they can see progress05:57
Joe_12345 it's weird how the development curve forces you to learn a lot more than just what the "learn ruby in 10 minutes" people advertise05:57
← sqlnoob left05:58
Joe_12345 iveqy couldn't you automate bug tracking via the phone too?05:58
→ sqlnoob joined05:58
← beautifulmind left05:58
iveqy wafflejock: I don't see anything wrong with that at all. That's just good, and I think it's good to allow customers report via a bugtracker too. However forcing it as the only channel of accepting bugs is wrong05:58
wafflejock def05:58
iveqy Joe_12345: yes you could, and it would be fairly easy to do. But not very service oriented I'm afraid. Most telephone self-serving system sucks05:59
← m0viefreak left05:59
← sqlnoob left06:00
→ beautifulmind joined06:00
Joe_12345 iveqy i once phoned my ISP to report an issue, and I could hear the windows "error" sound above their terrible music06:00
← rchavik left06:00
iveqy Joe_12345: that's horrible =(06:00
→ sqlnoob joined06:00
Joe_12345 let me go watch that video now. thanks guys. ill be back in a little while.06:00
← Joe_12345 left06:01
iveqy Joe_12345: the time tracking stuff you're talking about is fairly simple to implement with hooks, but I'm not sure it's a good idea to do06:01
:(06:01
SamB iveqy: okay, I can buy that forcing customers to use the bugtracker is a bad thing06:01
iveqy SamB: yeah, as a customer I would want the developer just to be a phonecall away... However as a developer I want the customer to be as far away as possible... It's a hard combination...06:02
wafflejock iveqy: haha truth!06:02
→ Xethron joined06:03
← Xethron left06:03
→ Xethron joined06:03
wafflejock watching this video too now thx, I feel like I know git but then I don't06:03
→ ZujkisNx joined06:03
SamB I was more thinking about cases where I wish there was a public bug tracker but there isn't06:03
→ eletuchy joined06:04
iveqy git, there's actually cases that falls through the cracks...06:04
on the other hand, bugs that just are reported once by one user tends to be really unimportant06:04
← Goplat left06:05
← richgilbank left06:08
→ _goTAN joined06:08
← _goTAN left06:08
→ rath joined06:08
→ lb1a joined06:09
→ mishok13 joined06:10
→ Jackneill joined06:10
← onethfour left06:10
← Sigma left06:11
→ h0bbit_ joined06:13
→ takamichi joined06:13
→ rchavik joined06:14
← _Norm_ left06:14
→ ThomasCle joined06:15
← ezekielnoob left06:15
← dyng left06:16
→ dyng joined06:18
← pantsman left06:18
→ Search12 joined06:19
→ cbreak-work joined06:20
→ _nova joined06:21
→ jargon joined06:21
→ nova_ joined06:23
→ ezekielnoob joined06:23
→ matanya joined06:23
← omnipotent1_ left06:24
← hahuang65 left06:24
→ omnipotent1 joined06:25
← mishok13 left06:25
→ ayaz joined06:25
→ vurma joined06:25
← Xethron left06:26
← dougsland left06:26
← _nova left06:26
← ewnd9 left06:27
j416_ → j41606:27
← kcj left06:27
→ JustinMac joined06:29
→ echo-area joined06:30
← PaulCapestany left06:30
→ wrouesnel joined06:31
← ska-fan left06:31
→ ska-fan joined06:31
→ lite_ joined06:33
→ JustinMa_ joined06:33
→ saurabh joined06:33
→ nardev joined06:35
← thiago left06:35
← rjhunter left06:35
← eaj left06:36
→ dmitrygusev joined06:36
→ eaj joined06:37
← ezekielnoob left06:37
→ Zarthus joined06:38
← gzg left06:40
→ ping__ joined06:41
← ping__ left06:41
← eaj left06:41
→ devoldmx joined06:42
→ papegaaij joined06:43
→ waaadim385 joined06:43
→ ezekielnoob joined06:43
← JustinMac left06:43
waaadim385 hello everybody06:43
gitinfo waaadim385: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.06:43
→ thiago joined06:43
waaadim385 is there a way to get the last hash_id of a branch ?06:43
← TomyLobo left06:44
iveqy waaadim385: the latest hash is the branch06:44
waaadim385: but: git rev-parse <branchname>06:44
← ItSANgo left06:44
waaadim385 I need the exact id, I'd like to use it with "cherry-pick"06:44
something like git cherry-pick <and something to return the hash>06:45
iveqy waaadim385: however, cherry-pick in a regular workflow is probably wrong06:45
← pr0ton left06:45
waaadim385 Is there a better way of doing this ?06:46
iveqy waaadim385: I don't know what "this" is...06:46
waaadim385 I have multiple branches merged into one. and after commiting something to the "original branches" I need to pull merge those changes together06:47
← defaultro left06:47
waaadim385 something like: br3 = br1+br206:47
→ kcj joined06:47
waaadim385 and i change something in br106:47
iveqy waaadim385: just merge br1 into br3 again06:48
→ pfFredd joined06:48
→ JohnBat26 joined06:49
waaadim385 just tried it06:49
→ mishok13 joined06:49
waaadim385 it gives me some conflicts06:49
iveqy waaadim385: then you would have conflicts with the cherry-pick tooo06:50
waaadim385 but cherry pick would work fine06:50
let me try it06:50
← ezekielnoob left06:50
→ hahuang65 joined06:51
→ dEPz joined06:51
→ hoschi joined06:51
waaadim385 no it didn't give conflicts06:52
← jfoy left06:52
→ jnavila joined06:52
waaadim385 maybe it's because of the way I "merged" the branches06:52
iveqy waaadim385: this is really strange...06:52
how did you merge the branches?06:52
waaadim385 when i was on br1 i did: "git checkout -b BrName"06:53
then git rebase br206:53
iveqy are BrName the same as br3?06:54
waaadim385 and now when i do: "git merge br1 or br2" I'm getting conflicts06:54
yes06:54
gut cherry-pick works nice06:54
→ jnavila_ joined06:54
iveqy okay. well it makes more sense06:54
waaadim385 so it's not done like this ?06:55
iveqy if you haven't merged a merge will not be of just two commits but the whole history that differs06:55
usually not, see !flow06:55
gitinfo [!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/references06:55
waaadim385 hmm. so what's the right way to do this ?06:55
iveqy you usually rebase br2 on brName and then merge br2 into brName06:55
waaadim385 i can remove br3 now06:55
← paulweb515 left06:55
→ ndim joined06:56
iveqy you should define a baseline, start your topic branches from that one, rebase them if the baseline changes and then merge them into the baseline (your baseline would be BrName in this case)06:56
← ThomasCle left06:57
← ndim left06:57
← jnavila left06:57
→ dsdeiz_ joined06:57
iveqy the problem with cherry-pick is just that that you won't get any history. So you can't really use the full power of git branches/merges etc. But you're using git more like a couple of patch-files06:57
→ germanoak joined06:57
iveqy it's fine to do that too, the linux kernel did that before bitkeeper (so I guess it was prior year 2000).06:58
← dsdeiz left06:58
→ ThomasCle joined06:58
→ ezekielnoob joined06:58
iveqy However, if you want to use the power of git and the advences of SCM the last 13 years I suggest you look at !flow06:58
gitinfo [!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/references06:58
→ juril joined06:59
← hahuang65 left07:00
→ qt-x joined07:00
→ harobed joined07:00
← ZujkisNx left07:00
waaadim385 well, I'm using that model in a way or another07:00
we have some branches where we keep "modules" that are developed separately07:01
← echo-area left07:01
waaadim385 and all the modules will be merged into "development"07:01
← Guest51606 left07:01
waaadim385 let me make sure that I got it.07:02
I can remove the br3 now because all the code is on br1 / br207:02
so I'd have to create a new branch and rebase br1+br2 ?07:03
and then if something has changed on br1/br2 I'd make a "merge"07:03
and I will not get conflicts that way ?07:03
→ aschepis joined07:04
← aschepis left07:04
← AWinterman left07:04
→ AWinterman joined07:04
→ ndim joined07:05
← rue_XIV left07:05
← ezekielnoob left07:06
→ rue joined07:06
→ rue_XIV joined07:07
← dmitrygusev left07:07
→ kewah joined07:08
→ d3pwnd joined07:08
← d3pwnd left07:08
← AWinterman left07:09
← thiago left07:09
→ snql joined07:09
→ SergeyPenkin joined07:10
→ ItSANgo joined07:10
← rue left07:10
→ paulweb515 joined07:12
→ echo-area joined07:13
→ north joined07:13
→ h_kon joined07:14
← JohnBat26 left07:14
→ gua_ould joined07:14
→ dsdeiz joined07:15
← ska-fan left07:15
→ ska-fan joined07:15
north Hello all. I'm using git behind a proxy on Ubuntu 12.04. I'm able to clone repositories from Github or with http(s) protocol. Problem is git throws fatal error when I try to clone from the git servers. I've configured my environment variables properly but any guesses why this problem persists and how to overcome this problem ?07:15
← trusktr left07:15
→ subfunq joined07:15
_ikke_ north: What do you mean with git servers?07:16
SamB like, git:// ?07:16
north I mean git clone git://url throws a fatal error where as http(s):// doesn't07:16
iveqy waaadim385: sounds correct, but still you can get conflicts if there's conflicts. See !conflict07:16
gitinfo waaadim385: [!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!07:16
→ MoHaX joined07:17
SamB north: talk to the network administrators?07:17
← dsdeiz_ left07:17
iveqy north: which ports do your proxy allow you to use?07:17
→ luke_ joined07:17
← MoHaX left07:17
iveqy north: and how did you configure ubuntu to use your proxy?07:17
north iveqy: I'm not aware of which ports are allowed to use, but my guess is git ports are definitely not opened07:18
iveqy: apt.conf and wgetrc and I've changed the curlrc and bashrc too07:18
SamB we cannot open the ports for you07:18
north haha true, SamB but isn't there any option ?07:19
→ ping__ joined07:19
SamB hmm, but you might try using a more global method of configuring your proxy07:19
→ JohnBat26 joined07:19
iveqy north: you're probably not even told git to use your proxy...07:19
SamB !proxy07:20
iveqy north: however, what's wrong with http?07:20
north Well, there are few projects which doesn't use http07:20
example osmocomBB07:20
→ doev joined07:20
north SamB can you throw some light on what global method of configuring please ? :)07:21
→ dsdeiz_ joined07:21
← dsdeiz left07:21
→ jstemmer joined07:21
north also, iveqy how to tell git about the proxy ?07:22
→ Guest75579 joined07:23
→ Misan joined07:23
→ chrob joined07:24
→ Silex joined07:24
_ikke_ the git:// protocol doesn't run over a proxy07:26
← LimeBlast left07:26
← SicoWork left07:27
← gua_ould left07:27
north :O well, don't I have any option but to ask the admin ?07:27
SamB wonders if all_proxy would help?07:27
← JohnBat26 left07:28
→ mdiers joined07:29
→ gua_ould joined07:29
← Guest75579 left07:30
→ cenuij joined07:30
← dharrigan left07:30
← mdiers left07:30
→ dharrigan joined07:30
_ikke_ If you know how, you can try to create a tunnel through the proxy07:32
→ JohnBat26 joined07:32
→ irqq joined07:32
→ dmitrygusev joined07:32
iveqy north: sorry, I don't have any experience with git:// over proxy. I know however that git:// don't look at the places you've configured for settings07:33
→ alorence joined07:33
→ jceb joined07:33
← pfFredd left07:33
← ska-fan left07:33
→ ska-fan joined07:33
north iveqy: Thank you :) well, I'll post once I find a solution :)07:33
jceb → Guest4384807:33
← harish left07:34
→ AWinterman joined07:35
→ raf joined07:35
← gverri left07:36
← rat_thing left07:36
iveqy north: well, in the case of osmocom-BB just use http...07:37
git clone http://git.osmocom.org/osmocom-bb/07:37
→ SicoWork joined07:37
north iveqy: thats the problem it won't work with http07:37
iveqy north: I just cloned it...07:37
← lite_ left07:38
iveqy use the link above07:38
north 'm not able to clone it...07:38
iveqy north: what command are you using?07:39
← identity left07:39
→ lite_ joined07:39
north iveqy: same I just copy pasted07:39
← lite_ left07:39
north but I'm able to clone other repos07:39
using http protocol07:39
→ lite_ joined07:39
← cenuij left07:40
iveqy north: http://pastebin.com/9isVgaH107:40
→ dsdeiz joined07:40
iveqy north: guess you've something wrong with your curl-settings07:41
north iveqy: got it07:41
:)07:41
iveqy what was the error?07:41
← fobius left07:41
north I changed curlrc07:41
file07:41
→ _Norm_ joined07:42
iveqy ah =)07:42
← dsdeiz_ left07:42
iveqy well, note that that link probably isn't official supported, but it at least works for now (and will probably continue to work as long as they are using cgit)07:42
→ k_sze[work] joined07:43
→ Jenser joined07:43
← simesy left07:43
→ simesy joined07:44
k_sze[work] Hello. I know I can make git diff ignore permission changes. How about the other way around. I want to list only files that have changed permissions.07:44
← bandroidx left07:44
→ dfanjul joined07:44
← AWinterman left07:44
k_sze[work] (And I think it would be crazy to set a config option to do that.)07:44
← luke_ left07:44
iveqy k_sze[work]: git doesn't know about permissions, just about the executeable bit07:44
← ahri left07:45
k_sze[work] iveqy: yes, the mode bits. You know what I mena.07:45
s/mena/mean/07:45
SamB k_sze[work]: no, really, it only tracks that one bit07:45
iveqy k_sze[work]: the way to do this would be to use git diff without ignore-permission, or do I miss something here?07:45
k_sze[work] iveqy: but then all the other kinds of changes would be listed as well.07:46
I don't want to see file content change, just for once.07:46
→ bandroidx joined07:46
SamB k_sze[work]: the way it stores that is kind of deceptive; it was probably originally expected to store more eventually ...07:46
← subhojit777 left07:46
→ subhojit777 joined07:47
→ intellix joined07:47
← raf left07:48
→ psoo joined07:48
→ Ozch joined07:48
→ raf joined07:48
← simesy left07:48
iveqy k_sze[work]: don't know with git but I would just had done: git diff | grep "mode" -B207:48
→ Balliad joined07:50
→ simesy joined07:50
→ harish joined07:51
→ MrV joined07:51
← psoo left07:51
→ psoo joined07:52
→ mastro joined07:52
← germanoak left07:52
→ gverri_ joined07:53
← dmitrygusev left07:53
← gverri_ left07:53
← raf left07:53
→ tvw joined07:55
→ hahuang65 joined07:56
→ luke_ joined07:58
→ ezekielnoob joined07:58
→ ZujkisNx joined07:59
→ cenuij joined07:59
→ ciaranm joined08:00
→ mastroWork joined08:01
→ jaseemabid joined08:01
← JEEB left08:02
← MrV left08:02
→ dmitrygusev joined08:02
→ eaj joined08:02
→ rendar joined08:02
← dmitrygusev left08:03
← Robert_L left08:03
← fuzzybun_ left08:03
→ fuzzybunny69y joined08:03
← mastro left08:04
← hahuang65 left08:05
→ MafooUK joined08:06
→ Robert_L joined08:06
→ joel_falcou joined08:06
← SoftwareMechani1 left08:09
→ terminalRepeat joined08:09
← luke_ left08:09
→ mastro__ joined08:09
← Georg3 left08:09
→ AWinterman joined08:11
← joel_falcou left08:11
→ joel_falcou_ joined08:11
← mastroWork left08:12
→ Asenar joined08:14
← geomyidae left08:14
→ bartzy joined08:14
→ hendry joined08:15
hendry is there a way to determine what version a git server is running? for example github.com's?08:15
_ikke_ hendry: github uses their own implementation08:16
→ JEEB joined08:16
iveqy hendry: yes and no, you can't get the git version, but the git protocoll version should be possible to get08:17
hendry: however I can't see any use for it, other than for internal git08:17
→ rat_thing joined08:17
← Jenser left08:17
iveqy hendry: what's your goal?08:17
→ Jenser joined08:18
→ Stygia joined08:18
→ reskp joined08:19
→ nnyk_ joined08:19
← eletuchy left08:19
← harish left08:19
_ikke_ The servers git version should not matter, as long as the git protocol version used is the same (And I don't think there have been any changes recently)08:19
→ eletuchy joined08:20
→ sebrock joined08:20
← ezekielnoob left08:21
→ frgtn joined08:21
← AWinterman left08:21
← graingert left08:21
→ sq-one joined08:24
→ luke_ joined08:24
→ mastroWork joined08:24
← Dudalus left08:26
← kcj left08:26
← tvw left08:26
← MafooUK left08:26
← mastro__ left08:27
← frgtn left08:28
→ frgtn joined08:28
→ ezekielnoob joined08:28
→ Streward joined08:29
← rat_thing left08:29
→ Dudalus joined08:29
→ rat_thing joined08:29
→ mastro__ joined08:31
← luke_ left08:31
→ marhaban joined08:32
→ menace joined08:32
← frgtn left08:33
→ howlymowly joined08:33
→ LimeBlast joined08:33
← simesy left08:33
← mastroWork left08:33
→ mdiers joined08:33
→ simesy joined08:34
← rat_thing left08:34
→ kylef joined08:35
→ rat_thing joined08:35
→ harish joined08:35
→ nuclearkitten joined08:37
← waaadim385 left08:38
→ suy joined08:38
← simesy left08:39
→ dhilipsiva joined08:39
dhilipsiva Whoa! Cool. I just found out that Some Vim shortcuts works with git diff. Like, G, g search and stuff. Handy! :D08:39
← reskp left08:40
_ikke_ dhilipsiva: You mean less?08:40
→ quazimodo joined08:40
→ reskp_ joined08:40
dhilipsiva less???08:40
_ikke_ less is a so called pager08:41
git uses less to display it's output08:41
dhilipsiva Oh, I see. I did not know that :P08:41
Thanks to letting me know :)08:42
← mastro__ left08:43
← takamichi left08:43
← beautifulmind left08:43
jast technically you could set it to use view, vim's pager mode (basically vim in readonly mode ;))08:44
then you can use *all* vim shortcuts!08:44
→ eletuchy_ joined08:44
← reskp_ left08:44
dhilipsiva jast: An other awesome tip. :) Thanks :D08:45
← selckin left08:46
← rat_thing left08:46
→ takamichi joined08:46
→ gverri_ joined08:46
→ yaw joined08:46
← gverri_ left08:46
→ achadwick joined08:47
→ rat_thing joined08:47
→ AWinterman joined08:48
← eletuchy left08:48
← YoMomma left08:48
→ kris joined08:49
→ dhruvasagar joined08:52
← yacks left08:52
→ mlechner joined08:52
→ simesy joined08:54
← ZujkisNx left08:55
→ reskp joined08:56
→ GT4066 joined08:59
← yhager left08:59
→ mastro__ joined08:59
← rat_thing left08:59
→ HenryG_ joined08:59
← ezekielnoob left09:00
← charTay left09:01
→ HicksD joined09:01
← HenryG left09:01
← nnyk_ left09:02
← AWinterman left09:02
→ glosoli joined09:02
→ noname001__ joined09:04
→ ChrisAnn joined09:05
← yaw left09:05
← marhaban left09:05
→ nnyk_ joined09:06
→ rat_thing joined09:06
← joel_falcou_ left09:06
← jaseemabid left09:07
→ Tommy[D]_ joined09:08
→ ezekielnoob joined09:08
← Tommy[D] left09:09
→ mastroWork joined09:10
→ joel_falcou joined09:10
→ tatsuya_o joined09:11
← rat_thing left09:12
← mastro__ left09:12
← Error404NotFound left09:12
→ rgr joined09:14
→ netzmonster joined09:14
→ calucian joined09:14
→ Octalot joined09:15
→ sr78ger joined09:16
← calucian left09:16
→ joel_falcou_ joined09:16
→ MrV joined09:18
← joel_falcou left09:20
← simesy left09:20
→ yaw joined09:20
→ simesy joined09:21
→ mastro__ joined09:21
← kris left09:22
← decimad2 left09:22
← mastroWork left09:23
← JustinMa_ left09:23
→ kris joined09:23
→ decimad joined09:24
→ Error404NotFound joined09:24
← amcsi_work_ left09:25
← uhu01 left09:25
→ amcsi_work joined09:25
netsroht_ → netsroht09:26
→ ewnd9 joined09:26
← simesy left09:26
← shoshin left09:26
→ geomyidae joined09:27
← takamichi left09:27
← eletuchy_ left09:27
→ eletuchy joined09:28
→ mastroWork joined09:28
→ svector joined09:29
→ AWinterman joined09:29
← weiyang left09:30
→ takamichi joined09:30
← kirin` left09:30
← kolarski left09:31
← mastro__ left09:31
→ gverri joined09:31
← gverri left09:31
→ kolarski joined09:31
← CodeShark left09:32
← bgerber left09:33
← mastroWork left09:35
→ mastro__ joined09:35
→ VictorCL joined09:37
→ penguin42 joined09:37
→ threesome joined09:38
→ mastroWork joined09:41
→ kcj joined09:42
→ thierryp joined09:44
← mastro__ left09:44
← AWinterman left09:45
← thierryp left09:45
→ thierryp joined09:46
← harish left09:46
← germanstudent left09:47
→ jarr0dsz joined09:47
← GT4066 left09:49
← thierryp left09:51
→ simesy joined09:51
→ thierryp joined09:52
→ babilen joined09:52
→ kirin` joined09:53
← thierryp left09:53
→ mastro__ joined09:53
→ thierryp joined09:53
→ ZujkisNx joined09:54
← ping__ left09:55
← kolarski left09:55
← thierryp left09:56
← mastroWork left09:56
→ vince_prignano joined09:57
→ thierryp joined09:57
← quazimodo left09:57
← vince_prignano left09:57
← grahamsavage left09:57
← thierryp left09:57
→ mastroWork joined09:58
→ thierryp joined09:58
← terminalRepeat left10:00
← glosoli left10:00
← simesy left10:00
← thierryp left10:00
← mastro__ left10:01
→ the_cybersphinx joined10:01
→ thierryp joined10:01
→ vince_prignano joined10:02
← thierryp left10:02
→ eletuchy_ joined10:03
→ shashin joined10:03
← mitz left10:03
→ jon_r joined10:03
→ mastro__ joined10:04
← reskp left10:04
→ mklappstuhl joined10:04
→ reskp joined10:05
← reskp left10:05
→ reskp__ joined10:05
← eletuchy left10:06
← mastroWork left10:07
→ joelmo joined10:07
→ ddr2 joined10:07
→ germanoak joined10:07
joelmo i like the short status version better, however this does not thell me if im ahead or behind remote? anoyne know if i also can display this info10:08
← yaw left10:08
← staafl left10:09
← bjescs left10:09
→ staafl joined10:09
→ shuaib joined10:09
← reskp__ left10:10
→ reskp_ joined10:10
→ khushildep joined10:11
← mattcen left10:11
← mobileblue left10:11
→ spaceonline joined10:12
← lite_ left10:12
→ AWinterman joined10:12
→ mobileblue joined10:12
→ lite_ joined10:12
→ raijin joined10:13
→ mattcen joined10:14
→ beautifulmind joined10:14
← reskp_ left10:15
→ curvedmark joined10:16
← beautifulmind left10:16
← h_kon left10:17
← lite_ left10:17
→ Tabstar joined10:19
← harobed left10:20
→ mastroWork joined10:20
iveqy joelmo: man git status -- no10:20
gitinfo joelmo: the git-status manpage is available at http://jk.gs/git-status.html10:20
→ lite_ joined10:20
← Pyrogerg left10:20
→ Guest77625 joined10:21
← qt-x left10:21
→ reskp_ joined10:21
← eletuchy_ left10:23
→ eletuchy joined10:23
← mastro__ left10:23
→ rat_thing joined10:23
← curvedmark left10:24
→ abdses joined10:24
→ asQuirreL joined10:25
← Tabmow left10:25
→ beautifulmind joined10:25
← kcj left10:26
← rat_thing left10:28
→ aChatir joined10:28
← AWinterman left10:29
→ harish_ joined10:29
← aChatir left10:30
→ jaseemabid joined10:30
← reskp_ left10:30
→ reskp_ joined10:31
→ Pyrogerg joined10:32
← Spockz left10:33
→ harobed_ joined10:33
← Gizmokid2005 left10:33
→ alessand2o joined10:33
→ Gizmokid2005 joined10:33
→ stamina joined10:34
→ reskp joined10:34
→ s0beit joined10:35
← reskp_ left10:35
→ jkremser joined10:38
← jkremser left10:38
→ jkremser joined10:38
← babilen left10:38
← hyperair left10:39
→ _ryxai joined10:39
→ marhaban joined10:39
← jon_r left10:40
← lembacon left10:40
← HenryG_ left10:45
← mastroWork left10:46
→ __ryxai joined10:46
← Ozch left10:46
→ HenryG joined10:46
→ yaw joined10:47
→ Ozch joined10:47
→ thiago_ joined10:48
← thevishy left10:49
← ZujkisNx left10:49
thiago_ → thiago10:51
← alsu left10:51
← joelmo left10:52
← dEPz left10:53
juvenal_away → juvenal10:54
← sq-one left10:55
→ AWinterman joined10:56
→ dougsland joined10:56
← shuaib left10:57
→ objectiveous joined10:57
← yaw left10:58
← objectiveous left11:00
→ Gardner joined11:01
→ glosoli joined11:01
← dhruvasagar left11:01
→ curvedmark joined11:01
← paulweb515 left11:02
← nardev left11:02
→ mastroWork joined11:02
→ raf joined11:02
→ dhruvasagar joined11:02
← phantomcircuit left11:02
← k_sze[work] left11:03
→ objectiveous joined11:05
← atrigent left11:05
← AWinterman left11:05
→ phantomcircuit joined11:05
→ jazz264 joined11:06
← donmichelangelo left11:06
→ angelsl joined11:06
← mlechner left11:06
→ donmichelangelo joined11:07
← angelsl left11:07
→ angelsl joined11:07
← objectiveous left11:07
← jaseemabid left11:08
→ atrigent joined11:08
→ ncopa joined11:12
← HicksD left11:12
→ bgerber joined11:12
ncopa hi, i'd like to do some basic sanity check in a git hook on git server to prevent people push garbage11:13
i'd like the git push to abort in case some of the files pushed does not pass a simple sanity check11:14
which hook should be used for that?11:14
_ikke_ pre-receive11:14
→ nilg joined11:15
ncopa can i access the contents of the files from pre-receive?11:16
→ dort joined11:16
← bgerber left11:16
← mbjorling left11:16
iveqy pre-recieve hook?11:16
ncopa: man githooks11:17
gitinfo ncopa: the githooks manpage is available at http://jk.gs/githooks.html11:17
→ bgerber joined11:17
← dyng left11:17
→ dyng joined11:18
→ mlechner joined11:18
mischief what about pre-commit :)11:18
ncopa mischief: pre-commit is the proper location yes11:20
cmn no, it's not11:20
that won't prevent anybody from doing anything11:20
ncopa the dev shouldnt commit the garbage in first place11:20
but i need to do it on serverside for those devs that does not have it in pre-commit11:20
→ Sonderblade joined11:21
cmn but if they want to, they will11:21
← Sonderblade left11:21
→ Sonderblade joined11:21
cmn either you do trust the devs not to do it, in which case you don't need anything; or you don't, in which case you need to check it at the point it tries to enter the server's repo11:21
→ user258467 joined11:22
→ PeterBooker joined11:22
cmn again, a pre-commit isn't going to stop anybody from committing11:22
ncopa pre-receive11:22
← dyng left11:22
ncopa but i'd like to analyze a checked out file of what they are pushing11:22
cmn pre-receive or update would handle this, yes11:22
grab that blob and look at it, then11:23
iveqy ncopa: have you even read the link I gave you?11:23
← luc__ left11:23
ncopa ivan: actually i have (before i came here=11:23
iveqy ncopa: there's described exactly all the information you get in a pre-recieve hook11:23
← ivan left11:24
juvenal → juvenal_away11:24
iveqy ncopa: good11:24
← Jenser left11:25
ncopa i am unsure which is best to use pre-receive or update11:25
or if i should just kick out the dev...11:25
← decimad left11:25
← thiago left11:25
→ _goTAN joined11:26
→ decimad joined11:26
← magu|q left11:26
← ddr2 left11:26
ncopa re trusting devs, i dont even trust myself 100% as i know i can do mistakes - so *I* actually have a pre-commit hook11:26
but i cannot force others to have it11:27
→ magu|q joined11:27
← Internet13 left11:28
iveqy ncopa: I think booth hooks will work for you11:28
ncopa: I'm kind of against preventing pushes, this should be handled by code review IMHO11:28
ncopa so basically i should kick out the dev as he didnt reviewed the code before pushing11:29
_ikke_ ncopa: github flow!11:30
!github_flow11:30
gitinfo This is the workflow followed by github: http://scottchacon.com/2011/08/31/github-flow.html11:30
← Error404NotFound left11:30
ncopa i kinda dont want do that either because he normally do good, and i dont have time for review/sanitycheck all his stuff11:30
but mistakes happens11:30
iveqy ncopa: no, he should not review his code, an other developer should do it11:31
echo-area So the SHA-1 keys of "remote branches" are also stored locally, only in refs/remotes instead of just refs, aren't they?11:31
iveqy ncopa: sure you can check for code style errors in a hook, but you can't check for logical errors, and those are much worse11:31
← mklappstuhl left11:31
iveqy echo-area: yes11:31
→ Internet13 joined11:31
ncopa iveqy: this particular incident would a very very simple pre check caught11:32
iveqy ncopa: this one yes... but the next one?11:32
ncopa those are caught by other parts of the process11:33
iveqy sure a post recieve hook can do some good, but don't feel safe with it, it shouldn't be instead of proper code review11:33
ncopa agree11:33
its not instead of11:33
so from 'update' i'd like to checkout the branch, get a list of the files that are modified and send some of them through a check filter, and exit the update with error if it does not pass11:35
are there any examples for something like that?11:35
→ jobbmon joined11:36
← skered- left11:36
→ thiago joined11:36
← jobbmon left11:36
cmn look at the examples that come with git11:36
→ skered- joined11:36
→ Artpicre joined11:36
cmn your .git/hooks/ samples should point you to where they are installed on your system11:37
ncopa ok thanks11:37
← ewnd9 left11:37
← abdses left11:38
← north left11:39
← reim left11:39
→ ewnd9 joined11:39
← user258467 left11:40
← jnavila_ left11:41
→ baees joined11:41
→ ddr2 joined11:41
juvenal_away → juvenal11:42
← mastroWork left11:42
← ewnd9 left11:44
→ xobb joined11:44
← tatsuya_o left11:44
← thiago left11:45
→ tatsuya_o joined11:45
→ ewnd9 joined11:45
← baees left11:45
← Octalot left11:46
→ ZujkisNx joined11:46
← dfanjul left11:46
→ babilen joined11:47
← marhaban left11:47
→ stodan joined11:47
→ dhilipsi_ joined11:48
→ asdcse joined11:48
← tatsuya_o left11:50
← ewnd9 left11:50
← reskp left11:50
→ ewnd9 joined11:50
← ciampix left11:50
← dhilipsiva left11:51
← ezekielnoob left11:51
← doev left11:52
← angelsl left11:52
← svector left11:52
← ewnd9 left11:52
→ doev joined11:52
→ ewnd9 joined11:53
→ angelsl joined11:53
← twoface88 left11:53
→ cannonball joined11:53
← ewnd9 left11:54
→ ezekielnoob joined11:54
→ ewnd9 joined11:54
→ svector joined11:54
← drager left11:55
→ drager joined11:55
← svector left11:55
→ cmpera joined11:56
→ svector joined11:56
← svector left11:56
→ psynor joined11:57
→ svector joined11:57
← svector left11:58
← Artpicre left11:58
→ svector joined11:58
← svector left11:59
→ mastroWork joined11:59
→ svector joined11:59
← asQuirreL left12:00
→ m0ltar joined12:00
← harobed_ left12:01
← FrodoTheHobbit left12:01
→ levine joined12:03
→ mklappstuhl joined12:03
← levine left12:04
← r0bby_ left12:05
→ reskp_ joined12:06
→ rudak joined12:07
← Cassiel left12:08
→ Artpicre joined12:08
← psynor left12:09
← echo-area left12:10
← janislaw left12:11
→ h_kon joined12:11
→ davividal joined12:11
← reskp_ left12:11
← m0ltar left12:11
← mklappstuhl left12:12
→ m0ltar joined12:12
← cads left12:13
← nnyk_ left12:13
→ mastro__ joined12:13
→ nnyk_ joined12:14
← mastroWork left12:14
→ demiurgo joined12:15
→ reim joined12:15
← Internet13 left12:15
← ezekielnoob left12:15
→ grilix joined12:16
→ harobed joined12:16
← germanoak left12:17
← grilix left12:17
→ Roots47 joined12:18
→ Internet13 joined12:18
← dhruvasagar left12:19
→ cads joined12:20
← svector left12:22
→ reskp joined12:22
← Guest43848 left12:22
→ hyperair joined12:23
→ ezekielnoob joined12:23
→ mklappstuhl joined12:24
← MrV left12:25
← m0ltar left12:25
← dsdeiz left12:25
→ mastroWork joined12:26
→ chuckharmston joined12:26
→ rudak1 joined12:26
→ dhruvasagar joined12:27
→ breakingthings joined12:27
← eregon left12:27
← lite_ left12:28
→ deuterium joined12:28
→ eregon joined12:28
→ lite_ joined12:28
→ jnavila joined12:28
→ asQuirreL joined12:29
← mastro__ left12:29
← rudak left12:29
→ mtk joined12:29
← cads left12:30
← snql left12:31
→ cmpera_ joined12:31
→ bulletmark joined12:31
← hyperair left12:32
→ ojacobson_ joined12:32
→ dEPz_ joined12:32
← ojacobson_ left12:32
← lite_ left12:33
← Roots47 left12:33
← bulletmark left12:33
← Pyrogerg left12:33
← dvide left12:33
← cmpera left12:34
cmpera_ → cmpera12:34
← ezekielnoob left12:35
← ojacobson left12:36
← rgr left12:38
nitrix Hi, how do I revert last commit ?12:38
← ewnd9 left12:38
→ hyperair joined12:38
ciaranm define revert12:38
jast !revert12:38
gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?12:38
nitrix Wait, actually, if I just do a revent, that'd be a problem.12:38
I staged files I didn't intend to.12:39
ciaranm option c) then12:39
nitrix And comited. It's not on the remote yet though.12:39
amazing, thanks12:39
jast if you leave out the --soft, it won't keep those versions of the files staged12:39
← dhruvasagar left12:39
nitrix I copy-pasted, worked like a charm :>12:40
jast so you can start over, staging only the things you want to commit :)12:40
nitrix ciaranm: hero of the day (:12:40
← eletuchy left12:40
→ Pyrogerg joined12:40
nitrix $ git reset HEAD client/assets12:40
→ eletuchy joined12:40
nitrix ahah :P that was pretty bad.12:40
→ svector joined12:41
nitrix 2.5GB :(12:41
← svector left12:41
→ ezekielnoob joined12:41
→ decotii joined12:41
→ Pullphinger joined12:42
← irqq left12:42
→ JeremyWei joined12:42
→ snearch joined12:42
→ svector joined12:43
→ mastro__ joined12:43
→ pouete joined12:44
← snearch left12:44
← eletuchy left12:45
← mastroWork left12:46
→ dhruvasagar joined12:46
→ cads joined12:47
→ iamjarvo_ joined12:47
→ badboy4471 joined12:47
← mobileblue left12:48
← badboy4471 left12:49
→ mobileblue joined12:49
→ badboy4471 joined12:49
→ mizu_no_oto joined12:50
← badboy4471 left12:50
← h12o left12:51
→ h12o joined12:51
← dhruvasagar left12:52
← dort left12:52
→ pfFredd joined12:52
→ TheBrainWork joined12:52
→ dhruvasagar joined12:52
← takamichi left12:53
→ m0ltar joined12:53
→ abrkn joined12:54
→ Sigma joined12:54
← pouete left12:54
→ takamichi joined12:54
→ tatsuya_o joined12:55
← dEPz_ left12:55
→ paulweb515 joined12:55
→ mastroWork joined12:56
← demiurgo left12:56
→ freeed joined12:56
← Dudalus left12:57
→ demiurgo joined12:57
→ Roots47 joined12:58
→ rgr joined12:58
← mastro__ left12:58
← svector left12:58
← mklappstuhl left12:58
→ dvor joined12:59
← glebihan_ left12:59
← glosoli left12:59
→ glebihan_ joined12:59
→ mklappstuhl joined13:00
← Sigma left13:00
← paulweb515 left13:00
← __ryxai left13:01
← _ryxai left13:01
→ tmcmahon joined13:01
← babilen left13:02
← reskp left13:02
→ svector joined13:02
→ xeon_ joined13:02
→ reskp joined13:02
← xeon_ left13:03
← VictorCL left13:03
→ Sigma joined13:03
→ marthinal joined13:03
→ edin joined13:03
→ FrodoTheHobbit joined13:03
→ mastro__ joined13:04
← liquidmetal left13:05
→ liquidmetal joined13:06
← tmcmahon left13:06
← reskp left13:07
→ HicksD joined13:07
← mastroWork left13:07
← shashin left13:07
← Nibato left13:09
maloik I just tried to push a single commit to master and forgot to pull. My colleague had done some commits so they had to be pulled in, but something in my config is making me merge the remote master in local master before I can push. Anyone know what that could be? Config is at https://gist.github.com/hannesfostie/28a434229ab5daf7cc7a13:09
My colleague has [branch] autosetupmerge = true in his config, could that be it ? Old behaviour (before reinstalling my laptop) was just an error making me pull first before I could push13:09
→ reskp_ joined13:09
→ eletuchy joined13:11
← rgr left13:11
→ MrV joined13:12
→ shashin joined13:13
→ psynor joined13:13
→ ewnd9 joined13:13
→ deadeyes joined13:14
→ Guest43848 joined13:14
→ scampbell joined13:14
→ paulweb515 joined13:14
deadeyes hi all. having a question. I want to have 1 main repo in which all changes come together. And 2 node that connect to this main repo for gettig updates and pushing updates done on themself.13:15
should I create branches on the "leafs"? and then push those (for each leave another branch)13:15
← archdori_ left13:15
deadeyes the code already exists and I commited it in the main repo13:16
← svector left13:16
← iamjarvo_ left13:17
deadeyes or do I create git branches on the master, pull these (how? I only get master if I pull), make modifications to those branches and afterwards pushing them to the main repo?13:17
→ iamjarvo_ joined13:17
grawity !pull13:17
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/13:17
deadeyes can I just use the master repo at the leaf? and push to the master on the main node?13:17
grawity make sure you understand what gitinfo just said, first13:17
and, it does not matter which repo gets the branch first13:18
→ apipkin joined13:18
← takamichi left13:18
→ mastroWork joined13:18
grawity Git only cares about commits in the branches13:18
→ svector joined13:19
← cads left13:20
← sr78ger left13:20
→ takamichi joined13:20
→ mj12albert joined13:21
← mastro__ left13:21
← mj12albert left13:21
← apipkin left13:22
→ lite_ joined13:22
← iamjarvo_ left13:22
→ cmpera_ joined13:23
→ mj12albert joined13:23
← mj12albert left13:23
→ hashpuppy joined13:23
← cmpera left13:24
cmpera_ → cmpera13:24
→ tvw joined13:25
→ marhaban joined13:25
[emmajane] → emmajane13:26
→ mastro__ joined13:27
← mastroWork left13:29
→ tham joined13:30
→ qt-x joined13:30
→ ojacobson joined13:30
→ AaronMT joined13:30
→ jerius joined13:31
→ mklappst_ joined13:31
← tvw left13:32
← ddr2 left13:33
← demiurgo left13:33
← Roots47 left13:33
← stodan left13:34
deadeyes I read the blogpost. I have my remote branch listed in git branch -r. However not in git branch. So how can I check out this remote branch locally(git fetch done), make modifications to it and then git push.13:35
← mklappstuhl left13:35
← dccc left13:35
← h_kon left13:36
cannonball Hi. If I have a github identity, that github id defined in a git remote, and I have created a repo with some content locally on my workstation, can I simply push to github to create the public repo?13:36
moritz deadeyes: git checkout -b localbrach origin/remotebranch13:37
cannonball Or do I have to create it on github website first and then push content to it? (Dunno if that woudl even work)13:37
moritz deadeyes: and then commit your stuff, and push13:37
→ vkz joined13:37
← mizu_no_oto left13:37
moritz cannonball: you have to create it on github website first13:37
cannonball: and it gives you instructions like the push URL13:37
deadeyes moritz: thanks! I'll look into it13:38
→ mastroWork joined13:38
cannonball moritz: thanks.13:38
→ varlog joined13:38
→ shuaib joined13:38
→ Destos joined13:39
→ Dougie187 joined13:39
← lite_ left13:40
deadeyes moritz so I don't have to use git checkout -b --track? (am reading the man page but it isn't totally clear to me :s)13:40
→ phile joined13:40
→ lite_ joined13:40
→ g0bl1n joined13:41
← mastro__ left13:41
moritz deadeyes: on moderatly modern git versions, --track is the default for that operation13:41
deadeyes: and if you name your local branch like the remote branch, and there's just one remote with that brach, you can also just say 'git checkout <thbranch>'13:42
iveqy maloik: I don't understand, before you got an error and needed to pull before you push and now you get an error when you push before you pull?13:42
moritz (and your version of git isn't ancient)13:42
← hholtmann left13:42
→ ValicekB joined13:42
maloik iveqy: no, when I push now it just seems to pull and do a merge commit13:43
→ frankstallone joined13:43
maloik I don't want the commit if I just have to rebase a little bit13:43
← subhojit777 left13:44
iveqy maloik: so when you type: git push, it actually does a git pull?13:44
← lite_ left13:45
→ babilen joined13:45
← Parnic left13:45
→ Parnic joined13:46
→ Roots47 joined13:46
← Roots47 left13:47
→ mastro__ joined13:47
← kermit left13:47
cannonball moritz: I created the repo with the GPL License. When I push to it, it rejects it because it's non-fast-forward. I'm thinking I need to delete and recreate it without the License?13:47
Or add the remote and pull to merge the remote and then push back...13:48
← jazz264 left13:48
→ mizu_no_oto joined13:49
← mastroWork left13:49
maloik iveqy: to be honest, it all went a bit fast, I just reacted without thinking... it's possible that I pulled manually first, but as soon as I did it opened $EDITOR to commit a merge13:49
(as opposed to just rebasing and putting my commit on top or whatever)13:50
deadeyes moritz: ok, that default is not clearly stated in the git-checkout man-page. Thanks for pointing that out. The latter thing you said don't see to work for me. I tried checking out the remote branch with doing "git checkout excludes". excludes is the remote branch name (shown in git branch -r as "origin/excludes"). I see the branch created, however how can I sure that this is not a local one, and not linked with the remote one?13:50
iveqy maloik: if you want it to be rebased you should use git pull --rebase13:50
maloik yea but that used to be the default before I threw away my config and started from scratch13:50
iveqy cannonball: you probably want to pull and then push13:50
maloik: then add it as the default again?13:51
maloik yea but that's what I'm asking, I'm not sure what used to cause that behaviour13:51
my colleague thinks its the 'autosetupmerge = true'13:51
→ dccc joined13:51
→ LuxuryMode joined13:52
iveqy maloik: read man git config or a blog like this: http://stevenharman.net/git-pull-with-automatic-rebase13:52
gitinfo maloik: the git-config manpage is available at http://jk.gs/git-config.html13:52
→ rat_thing joined13:53
maloik iveqy: the autosetuprebase it mentions there is already in my config... so what could be going on ?13:53
← asQuirreL left13:53
← ezekielnoob left13:55
→ sgambino joined13:55
deadeyes moritz: did some test and seems like it's working as expected so I'll leave it with that:) thanks for your help! much appreciated!13:56
moritz deadeyes: you're welcome13:56
→ ezekielnoob joined13:56
→ Roots47 joined13:57
← ZujkisNx left13:57
← mastro__ left13:57
iveqy maloik: autosetuprebase only applies for when you creating a tracking branch, if your branch already existed when you did that setting nothing will happen13:59
← donmichelangelo left14:00
iveqy maloik: read man git rebase14:00
gitinfo maloik: the git-rebase manpage is available at http://jk.gs/git-rebase.html14:00
← qt-x left14:00
cannonball iveqy, moritz: Thanks for the guidance. All good now.14:00
→ donmichelangelo joined14:01
← reskp_ left14:01
← ezekielnoob left14:01
→ joaoh82 joined14:01
iveqy maloik: I mean man git config14:01
gitinfo maloik: the git-config manpage is available at http://jk.gs/git-config.html14:01
→ reskp joined14:01
← Artpicre left14:01
dsockwell Is Scott Chacon's 'Pro Git' still current?14:02
← shashin left14:02
→ jumperswitch joined14:02
iveqy dsockwell: afaik yes14:02
← jason237 left14:02
iveqy dsockwell: !book !talks14:02
gitinfo dsockwell: 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 !parable14:02
dsockwell: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)14:02
← raf left14:02
→ thiago_ joined14:02
→ jason237 joined14:03
dsockwell oh, fantastic.14:03
thank you14:03
→ sohail joined14:03
← sohail left14:03
→ sohail joined14:03
→ juniorsilva7 joined14:03
← mizu_no_oto left14:03
← mlechner left14:04
→ bitness64 joined14:04
→ GODDOG joined14:04
← vince_prignano left14:05
← ska-fan left14:05
← reskp left14:05
← ThomasCle left14:05
→ reskp__ joined14:06
→ ska-fan joined14:06
← decimad left14:06
← grn left14:06
← Pyrogerg left14:07
→ shashin joined14:07
maloik iveqy: I suppose that was the problem (the branch already existing)... I set it up for the projet now14:07
thanks14:07
← dvor left14:08
← marhaban left14:08
→ ezekielnoob joined14:08
→ epicowl joined14:09
→ kermit joined14:10
← ValicekB left14:10
← fling left14:11
← juril left14:11
→ glosoli joined14:11
→ fling joined14:12
→ hholtmann joined14:12
← noname001__ left14:12
← Roots47 left14:13
→ joshbetz joined14:13
→ mastro__ joined14:14
← chuckharmston left14:15
← kbart left14:15
→ kesha joined14:15
→ krixkrax joined14:16
→ stodan joined14:16
→ Cromulent joined14:17
← mklappst_ left14:17
→ dyng joined14:18
← juniorsilva7 left14:18
← mdiers left14:18
→ Roots47 joined14:19
→ ValicekB joined14:21
← j416 left14:21
→ j416_ joined14:21
← ezekielnoob left14:21
← conan left14:21
← dyng left14:22
→ raf joined14:23
← papegaaij left14:23
← todd_dsm left14:23
→ eugenejen joined14:23
→ conan joined14:24
→ mmitchell joined14:24
→ mklappstuhl joined14:24
→ oojacoboo joined14:24
→ apipkin joined14:25
→ mastroWork joined14:25
← tatsuya_o left14:26
← beautifulmind left14:27
→ tatsuya_o joined14:27
→ lite_ joined14:28
← mastro__ left14:28
→ snql joined14:28
→ ezekielnoob joined14:28
→ echo-area joined14:29
→ Swayz joined14:29
→ ag4veNoob joined14:30
thiago_ → thiago14:30
← ncopa left14:30
← freeed left14:31
← tatsuya_o left14:31
→ natechan joined14:31
→ herdingcat joined14:33
← ag4veNoob left14:33
→ user258467 joined14:34
→ mastro__ joined14:34
← lite_ left14:35
← atrigent left14:35
→ lite_ joined14:35
← cmpera left14:35
← herdingcat left14:35
← rat_thing left14:35
→ diverdude joined14:36
→ delianides joined14:36
→ Nibato joined14:36
diverdude Hello, is it possible to see all changes made to a certain file during the repository lifespan?14:36
grawity yeah, git log -p <path>14:37
← mastroWork left14:37
→ troyt joined14:37
grawity maybe also --follow, to make it follow renames14:37
→ guns joined14:37
← bdavenport left14:39
← cwillu_at_work left14:39
← lite_ left14:40
← joaoh82 left14:40
diverdude grawity, thx14:40
→ joaoh82 joined14:41
← sqlnoob left14:41
→ D4v33 joined14:42
→ Tumulte joined14:42
→ tang^ joined14:42
← ValicekB left14:43
← lazers left14:43
Tumulte hey ! I got to configure phing's gitpush. In "git push origin branch" is origin <repository> and branch <refspec> ?14:43
https://www.kernel.org/pub/software/scm/git/docs/git-push.html14:43
← aem34i left14:43
grawity Tumulte: yes14:43
Tumulte (referring to this ^)14:43
→ lazers joined14:43
→ cwillu_at_work joined14:43
← psoo left14:44
Tumulte grawity: ok thanks a lot !14:44
→ bdavenport joined14:44
→ cmpera joined14:45
← raf left14:45
→ raf joined14:45
→ shinnya joined14:46
← mastro__ left14:46
→ r0bby_ joined14:46
→ mastroWork joined14:46
→ johnnyfuchs joined14:47
→ robbyoconnor joined14:47
← r0bby_ left14:47
→ iamjarvo joined14:48
→ ValicekB joined14:48
← _Norm_ left14:48
→ paolooo joined14:50
← raf left14:50
→ acharlieh joined14:50
→ frgtn joined14:50
← guns left14:50
→ mizu_no_oto joined14:51
→ jjasinski joined14:51
← mz` left14:52
→ Berta45_45 joined14:52
→ mz` joined14:52
← shashin left14:53
← acharlieh left14:53
→ ReachingFarr joined14:53
→ rat_thing joined14:54
→ YoMomma joined14:55
→ maleknet joined14:55
→ shashin joined14:55
← maleknet left14:55
← Misan left14:55
← Tumulte left14:55
→ acharlieh joined14:55
← dwmw2_gone left14:56
→ mastro__ joined14:57
→ chuckharmston joined14:57
← ValicekB left14:57
← Search12 left14:57
→ tatsuya_o joined14:57
← cmpera left14:58
→ bwreilly joined14:58
← thiago left14:58
← epicowl left14:58
→ kenperkins joined14:59
→ Pyrogerg joined14:59
← mastroWork left14:59
→ freeed joined14:59
→ joshsmith joined15:00
← curvedmark left15:00
ReachingFarr I have used the `git svn clone` command to import the trunk of an SVN project into Git. I would now like to import two SVN branches, with history. After they are imported, I don't want to push changes to these branches back up to the SVN repo. What should my next step be?15:01
← robbyoconnor left15:02
grawity Doesn't `git svn clone` already import everything by default?15:02
← xxpor__ left15:02
→ King_Hual joined15:02
→ gverri_ joined15:02
← gverri_ left15:02
→ robbyoconnor joined15:02
→ ValicekB joined15:02
← robbyoconnor left15:03
ReachingFarr grawity: If you give it a path to the SVN directory that contains the branches. But there are a bunch of branches in there and I only care about two. I also don't want to leave a bunch of old, stale references hanging around once I'm done importing them.15:03
← dhruvasagar left15:03
ReachingFarr After they are imported I want to use the exclusively as Git branches.15:03
→ thiago joined15:03
← rob_w left15:04
→ herdingcat joined15:04
← saurabh left15:06
← tatsuya_o left15:06
→ mastroWork joined15:06
→ dhruvasagar joined15:07
← oojacoboo left15:07
→ Xethron joined15:07
← Xethron left15:07
→ Xethron joined15:07
← svector left15:08
→ kevwil joined15:08
← mastro__ left15:09
→ ZujkisNx joined15:09
← JohnBat26 left15:10
→ Tumulte joined15:10
→ pbujok joined15:10
Tumulte hey again : do symlinks end up on the remote repo ?15:10
← TheBrainWork left15:10
MrDHat|offline → MrDHat15:11
lov if you add a symlink, yes. a symlink is just a little file that the filesystem interprets as "point to this other thing"15:12
→ Vinnie_win_w joined15:13
← rath left15:13
← Vinnie_win left15:13
→ asQuirreL joined15:13
← Cromulent left15:13
← iamjarvo left15:13
→ dsdeiz joined15:14
→ iamjarvo joined15:14
← takamichi left15:14
Tumulte lov: will it end up as an "hard" file ?15:14
← ThomasLocke left15:14
← cbreak-work left15:15
→ mastro__ joined15:16
← iamjarvo left15:16
→ breck7 joined15:16
← ezekielnoob left15:16
← SJS left15:16
→ titosemi3 joined15:17
← rchavik left15:17
titosemi3 Hi there!15:18
gitinfo titosemi3: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.15:18
→ takamichi joined15:18
← mastroWork left15:18
← ayaz left15:18
titosemi3 is there any way to show the conflicted/staged files after running git mergetool? git status doesn't show them15:18
← robinsmidsrod left15:19
titosemi3 and git ls-files -u neither15:19
← Xethron left15:19
→ SJS joined15:19
← SJS left15:19
→ SJS joined15:19
→ robinsmidsrod joined15:20
← howlymowly left15:20
→ TheBrainWork joined15:20
← TheBrainWork left15:20
→ TheBrainWork joined15:20
iveqy titosemi3: have you commited them?15:21
→ dfanjul joined15:22
→ DonRichie joined15:22
← daito left15:23
→ dort joined15:24
← deadeyes left15:24
← nova_ left15:24
→ daito joined15:24
titosemi3 still not. Usually before committing i like to review what i modified, eventually i do a diff.15:24
→ joelm joined15:25
titosemi3 well i suppose that since i choose ours, there is actually no modifications on the file, so git status/diff don't show anything15:26
→ v0n joined15:26
→ howlymowly joined15:26
→ cods joined15:27
← cods left15:27
→ cods joined15:27
titosemi3 right, i just tested it by resolving the conflict using theirs and now it's showing the file as modified and staged15:27
thank you15:27
← mastro__ left15:27
→ harish joined15:27
→ ngladitz joined15:27
← Soliton left15:27
← harish_ left15:28
← howlymowly left15:28
← daito left15:28
← phile left15:29
→ curvedmark joined15:29
→ phile joined15:29
← curvedmark left15:29
← hyperair left15:29
→ kaisyu joined15:29
← kaisyu left15:29
→ lavaman joined15:30
→ cigarshark joined15:30
← jnavila left15:30
← krixkrax left15:30
← TheBrainWork left15:30
→ TheBrainWork joined15:31
→ travisstaton joined15:31
→ hyperair joined15:32
→ lite_ joined15:32
→ Soliton joined15:33
← Streward left15:33
→ halu joined15:33
← dhruvasagar left15:34
← scampbell left15:34
← SergeyPenkin left15:34
← rc111 left15:35
← subfunq left15:35
→ ddr2 joined15:35
← takamichi left15:36
← Balliad left15:36
← ZujkisNx left15:37
← dhilipsi_ left15:37
→ jumperswitch_ joined15:38
← gua_ould left15:38
→ dhilipsiva joined15:39
← jumperswitch left15:39
→ takamichi joined15:39
→ defaultro joined15:40
← linelevel left15:40
← Raging_Hog left15:40
→ cmpera joined15:41
← reskp__ left15:41
→ epicowl joined15:41
→ reskp_ joined15:41
→ maestrojed joined15:41
→ _iron joined15:41
→ m0viefreak joined15:42
→ linelevel joined15:42
← breck7 left15:44
→ breck7 joined15:44
juvenal → juvenal_away15:45
← lb1a left15:45
← dhilipsiva left15:46
← reskp_ left15:46
← maestrojed left15:46
→ m7w joined15:47
← GODDOG left15:47
← joaoh82 left15:47
→ joaoh82 joined15:47
← wrouesnel left15:48
→ gverri_ joined15:48
← gverri_ left15:48
→ whunt joined15:48
juvenal_away → juvenal15:49
← thiago left15:49
← breck7 left15:49
← ehmatthes left15:49
← Roots47 left15:50
→ reskp_ joined15:50
→ maestrojed joined15:50
→ Roots47 joined15:51
→ iamjarvo joined15:51
→ ZujkisNx joined15:51
← pfFredd left15:52
→ twoface88 joined15:52
→ zhost joined15:53
← hyperair left15:53
← herdingcat left15:53
→ nilg` joined15:53
→ huli_ joined15:54
← joshsmith left15:54
← bwreilly left15:55
→ breck7 joined15:56
← Guest43848 left15:56
→ mribeirodantas joined15:59
← stodan left16:00
← joaoh82 left16:00
← menace left16:02
← w0ng left16:03
→ GODDOG joined16:03
← dsdeiz left16:03
← jargon left16:06
→ iamjarvo_ joined16:06
← rurufufuss left16:06
→ BiggFREE joined16:07
→ _Norm_ joined16:07
qsusOFFcs → qsuscs16:08
← frgtn left16:09
← iamjarvo left16:09
← alorence left16:09
← iamjarvo_ left16:09
→ iamjarvo joined16:10
→ freestyl3r joined16:10
← chrob left16:10
← huli_ left16:10
→ SoftwareMechanic joined16:11
→ infynyxx joined16:11
→ fobius joined16:12
← iamjarvo left16:12
→ iamjarvo joined16:13
← lazers left16:13
fobius Doesn't "git checkout filename" check out the most recent version of a file? Git is telling me it doesn't know about filename but if I specify a commit number then it lets me check it out.16:13
iveqy fobius: man git checkout16:14
gitinfo fobius: the git-checkout manpage is available at http://jk.gs/git-checkout.html16:14
← rudak1 left16:14
iveqy it should default to the commit in HEAD16:14
→ pachet joined16:14
← m0ltar left16:15
ojacobson fobius: 'git checkout -- filename' (probably equivalent to what you passed, unless there's a branch named 'filename') will check out the *staged* version of a file. If the file isn't staged at all (not added, or with removal staged), then it'll fail.16:15
← harobed left16:16
→ rudak joined16:17
pachet hi all. i have two repos, one on my local machine, one on a vm. they're both up to date. then i create a file on my local machine (we'll call it foo.js).16:17
→ boombatower joined16:17
fobius It should checkout the most recent version in the history though, right? It's started working now. I might have been on the wrong branch or something. But in any case, it's not checking out from HEAD since the file isn't tracked from HEAD.16:17
pachet git status on local > 1 untracked file (foo.js)16:17
→ Guest51606 joined16:17
→ BSaboia joined16:17
pachet when i rsync the repo contents from local to the vm and run git status on the vm, i suddenly have a lot more untracked files16:17
files that were tracked previously :[16:17
← iamjarvo left16:17
pachet any idea what's going on in the interplay between git + rsync that's causing those files to become untracked?16:18
← natechan left16:18
ojacobson fobius: no, you *either* get the staged one (if you ask for it) or a specific commit's copy of the file (if you ask for that)16:18
it never falls through from one to the other16:18
→ bwreilly joined16:18
← babilen left16:18
ojacobson if a file exists in HEAD but you've git rm'd the file (so it is no longer in the staging area) then 'git checkout -- that-file' will not find anything16:18
→ gverri_ joined16:19
→ antoks joined16:19
← gverri_ left16:19
ojacobson pachet: did you exclude .git from rsync?16:20
pachet ojacobson: yes16:20
← ezrafree left16:20
← ag4ve left16:20
fobius ojacobson: I see what you're saying. So, if I checkout a file from a previous revision does it automatically stage that file as well? It seems that that's the case since I can checkout the file now that I've checked it out once with a specific commit id.16:20
ojacobson yes16:21
man git-checkout16:21
gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html16:21
← takamichi left16:21
→ ezekielnoob joined16:22
→ jfoy joined16:22
→ chrob joined16:22
← mishok13 left16:23
← Tumulte left16:23
← melee left16:24
→ melee joined16:24
← Guest51606 left16:25
→ jceb joined16:25
jceb → Guest3764816:26
← melee left16:26
→ melee joined16:26
← Sonderblade left16:26
→ lazers joined16:26
→ chimay joined16:27
← hashpuppy left16:28
← achadwick left16:28
→ gzg joined16:29
← donmichelangelo left16:30
→ yhager joined16:30
→ donmichelangelo joined16:30
← khushildep left16:32
→ Cromulent joined16:32
→ ag4ve joined16:33
fobius Is there a way to checkout a file without adding it to the index? For instance, if I wanted to base a file on another file.16:33
→ CodeShark joined16:33
_ikke_ fobius: I guess git cat-object16:33
git cat-file*(16:33
man git cat-file16:33
gitinfo the git-cat-file manpage is available at http://jk.gs/git-cat-file.html16:33
fobius Okay, thanks16:34
_ikke_ But that's quite a low level operation16:34
You'd first need to get the hash of the file16:34
fobius I mean I could just check out the commit and copy some text out of the file. But that seems a little bit heavy.16:34
_ikke_ fobius: another possibility: git show :file > other-file16:35
fobius Okay, thanks.16:35
_ikke_ If you want it form a commit, use git show <commit>:file > other-file16:35
→ AWinterman joined16:36
→ ehmatthes joined16:37
→ dhruvasagar joined16:37
ojacobson _ikke_: I spell it 'some-branch:path/to/file' ;)16:38
oh you got there already16:38
→ imachuchu joined16:38
ojacobson carry on :)16:38
fobius: !xy16:38
gitinfo fobius: Woah, slow down for a bit. Are you sure that you need to jump to that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...16:38
← JeremyWei left16:39
← lite_ left16:40
← MrV left16:41
← apipkin left16:41
→ lite_ joined16:41
→ jasonp joined16:42
fobius Sure, I have a file that existed once. I need to extract a method from it but I don't want the whole file.16:42
← mklappstuhl left16:43
← shashin left16:43
← YoMomma left16:44
→ dorkmafia joined16:44
← GODDOG left16:45
srcerer_ → srcerer16:45
→ iamjarvo joined16:45
← lite_ left16:46
← dhruvasagar left16:46
← ehmatthes left16:46
← cenuij left16:46
→ mishok13 joined16:47
→ a-l-e joined16:47
→ bsilver joined16:47
← jasonp left16:47
→ dhruvasagar joined16:48
← reskp_ left16:48
← cff left16:49
→ reskp joined16:49
← doev left16:50
← mizu_no_oto left16:50
← sjmikem left16:50
→ grilix joined16:53
← reskp left16:53
← bitkid_ left16:54
← raijin left16:54
→ TomyLobo joined16:54
← netzmonster left16:55
→ howlymowly joined16:56
← titou__ left16:56
← mishok13 left16:56
← maestrojed left16:56
← sonOfRa left16:57
← BtbN left16:57
→ mishok13 joined16:57
→ BtbN joined16:57
→ sonOfRa joined16:57
→ tatsuya_o joined16:58
← jkremser left16:58
→ hyperair joined16:59
← intellix left17:00
→ SoftwareMechani1 joined17:00
→ Tumulte joined17:00
Tumulte hey again again17:00
← SoftwareMechanic left17:02
← acharlieh left17:02
Tumulte I got some troubles figuring out "gitignore". There a " *.jpeg" in a subfolder, but every files and folder are ignored17:02
← rat_thing left17:03
← iderik left17:03
→ aard_ joined17:05
← marthinal left17:05
← Droolio left17:05
← Stygia left17:05
← ZujkisNx left17:06
← ChrisAnn left17:06
← eaj left17:07
← Vinnie_win_w left17:07
← melee left17:07
→ Vinnie_win joined17:07
→ eaj joined17:07
← h0bbit_ left17:08
← ezekielnoob left17:08
→ raijin joined17:09
← s0ber left17:09
→ mmlac-bv joined17:10
← cmpera left17:10
← chuckharmston left17:10
← dhruvasagar left17:10
← bgerber left17:10
→ marhaban joined17:11
→ maestrojed joined17:11
→ frgtn joined17:12
← eaj left17:12
→ DrShoggoth joined17:12
← iamjarvo left17:12
ldlework After fetching, how can I find the difference between my local branch the the to-be-merged remote?17:13
→ iamjarvo joined17:13
→ marthinal joined17:13
← _goTAN left17:14
osse ldlework: git diff HEAD FETCH_HEAD for example17:14
← infynyxx left17:14
← ngladitz left17:15
ldlework osse: oh neat17:15
osse ldlework: but something like git diff master origin/master probably looks more familiar. depends on on your branch and remote names17:15
→ cmpera joined17:16
→ hashpuppy joined17:16
→ infynyxx joined17:16
→ tengelic joined17:16
← iamjarvo left17:17
← mribeirodantas left17:18
→ ZujkisNx joined17:18
→ lite_ joined17:18
→ acharlieh joined17:19
→ bgerber joined17:19
← boblee left17:19
← nnyk_ left17:20
→ boblee joined17:20
→ ngladitz joined17:20
← ngladitz left17:20
→ ngladitz joined17:20
Tumulte can you help me understand why gitignore ignores the entire folder and not the provided pattern ? https://github.com/MusiqueLibre/DogmaGoblin/blob/dogmagoblin/mediagoblin/plugins/dogma/static/images/uploaded/.gitignore17:22
→ dhruvasagar joined17:22
→ iamjarvo joined17:23
→ sdrfnord1 joined17:23
→ maqr joined17:23
tang^ do you have any non jp[e]g files in that folder?17:24
← iamjarvo left17:24
Tumulte tang^: no, but the folders IN that folder are ignored17:24
rohieb does git reaqd .gitignores in subfolders, or only in the repo root dir?17:24
tang^ Tumulte: yes. git does not track folders.17:24
→ iamjarvo joined17:25
Tumulte tang^: I gotta create a dummy file ?17:25
tang^ Tumulte: yes17:25
rohieb git does not track _empty_ folders17:25
→ wrouesnel joined17:25
Tumulte that's a bummer...17:25
→ cads joined17:25
tang^ Tumulte: yes it is, if you need the folders to remain17:26
rohieb: git does not track folders. the only time you see folders is if they contain files that git is tracking17:27
← Vinnie_win left17:27
← cmpera left17:27
← howlymowly left17:28
→ danman joined17:28
← dort left17:29
→ leeN joined17:30
→ d8bhatta joined17:31
d8bhatta hi guys17:31
i have installed into new server17:31
Tumulte thanks tang^ and rohieb17:31
d8bhatta but when I try to run git command it gives me error like: fatal: unable to access '/usr/local/etc/gitconfig': Permission denied17:32
→ JustinMac joined17:32
← fobius left17:32
→ cmpera joined17:33
tang^ do you have permission to read that file?17:33
d8bhatta when i check /usr/local/etc/gitconfig , there is no such gitconfig file/folder17:33
→ aChatir joined17:33
← Vampire0_ left17:33
→ LukeKetley joined17:34
→ Vampire0_ joined17:34
← LukeKetley left17:34
→ LukeKetley joined17:35
d8bhatta tang^ the file doesn't exist there17:35
← matanya left17:35
osse d8bhatta: do you have permission to read all the parent directories?17:35
← penguin42 left17:35
← LukeKetley left17:35
→ matanya joined17:35
→ LukeKetley joined17:36
d8bhatta osse: no..but i can use root17:36
← gerard0- left17:36
→ gerard0 joined17:36
rohieb in any case, sudo touch /usr/local/etc/gitconfig should do it17:37
osse d8bhatta: then you'll get that error. Git probably tries to find /usr/local/etc/gitconfig but isn't even allowed to see whether it is there or not17:37
← voiceofgrog left17:37
→ thegladiator_ joined17:37
thegladiator_ Can I cherry-pick to another branch ?17:37
osse yes17:37
thegladiator_ I mean another repo :)17:38
→ ehmatthes joined17:38
← yhager left17:38
→ hahuang65 joined17:38
d8bhatta when do sudo ls /usr/local/etc/ ...there doesn't exist gitconfig file17:38
strange17:38
→ dreiss joined17:38
osse thegladiator_: if you fetch from it first, yes17:38
← asQuirreL left17:38
joelm If I clone a repo and then checkout via a SHA, I end up in a detached HEAD state. That's cool. Let's say the SHA was abcd123. Now, I want to pull code from another repo (https://github.com/other/repo. But when I pull this, I don't want the SHA to change. I want it to stay abcd1234. I have been trying all sorts of combinations of pull/merge/etc, but can't get the right one. Any help?17:38
osse d8bhatta: what does 'ls -l /usr /usr/local /usr/local/etc' say?17:38
→ yhager joined17:39
thegladiator_ I see ... Its possible that repo can nothing to do with the present repo - still ? Ofcourse file structure is a bit similar17:39
osse thegladiator_: technically possible, yes. Doesn't sound very useful though.17:39
d8bhatta it list out files and finally gives error : /bin/ls: /usr/local/etc: Permission denied17:39
osse17:39
thegladiator_ right , nah its just some legacy vs new thing17:39
osse d8bhatta: Yep, that is what I expected. You don't have access to /usr/local/etc, hence Git doesn't have it either17:40
→ asQuirreL joined17:40
→ sq-one joined17:40
← asQuirreL left17:40
← aChatir left17:40
← matanya left17:40
← Guest37648 left17:40
osse d8bhatta: the permissions for /usr/local/etc should probably be '755' but are in fact '700', but it depends.17:41
→ nicedice_ joined17:41
→ chuckharmston joined17:41
osse That's my guess at least17:41
← rendar left17:41
→ apipkin joined17:42
→ jceb joined17:42
jceb → Guest7410617:43
→ ZaFrost joined17:43
← rudak left17:45
← nuclearkitten left17:46
→ diegoviola joined17:46
← ojacobson left17:46
thegladiator_ right osse17:47
thats ok I can try it out17:47
→ tough_griff joined17:47
→ spike joined17:47
← Guest74106 left17:48
d8bhatta osse: its works ..tx17:48
← Guest77625 left17:48
← breck7 left17:48
→ shoshin joined17:49
osse thegladiator_: you can get the equivalent by going to the repo you want to cherrypick from use format-patch there and then apply that patch in your own repo17:49
→ breck7 joined17:49
thegladiator_ Right format_patch is interesting17:49
→ fobius joined17:50
thegladiator_ I would keep that in mind17:50
← koki left17:50
← BiggFREE left17:50
iveqy joelm: !pull17:52
gitinfo joelm: 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/17:52
iveqy joelm: you probably want to fetch17:52
← jfoy left17:52
→ ojacobson joined17:53
→ jkremser joined17:53
← jkremser left17:53
→ jkremser joined17:53
← breck7 left17:53
→ gebbione joined17:54
→ mklappstuhl joined17:54
→ JohnBat26 joined17:55
← dhruvasagar left17:55
→ homo_vitruvius joined17:55
spike hi, someone else an I branched off of master, then I merged back and when he merged back botched the merge and kept a lot of stuff in his branch I had changed in mine. As a result master now has old/wrong code, but if I try to merge back in my branch of course it says those commits are already there17:57
← mklappstuhl left17:57
→ jfoy joined17:58
spike if I diff my branch with master bits that are wrong are all showing with fixes in my brnach17:58
what's a clean why to get out of this? git patch/apply?17:58
← kesha left17:58
← PeterBooker left17:59
iveqy spike: the best way would be to use git rebase to remove the merge commit since it obviously wrong. However !public17:59
→ juniorsilva7 joined17:59
gitinfo spike: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum17:59
→ ncd|leeN joined17:59
iveqy spike: try to rebase you branch against master and merge again17:59
← paulweb515 left18:00
iveqy spike: but I sense a deeper problem here... how come your partner choosed his changes instead of yours when he did the merge?18:00
joelm iveqy: Let's say I do git fetch http://github/other/repo. I will get something like this: * branch HEAD -> FETCH_HEAD18:00
← leeN left18:00
joelm Now I need to add that FETCH_HEAD to the main repo without changing the SHA of the main repo.18:01
I don't need to commit this code or anything. It is for a script I am writing. I just need that other repo code to be in the directory of the main repo.18:01
spike iveqy: first time git user, an ocean between us and 8hrs, working at 2am on his end - pretty much a classic18:01
← mmlac-bv left18:02
→ natechan joined18:02
→ iamjarvo_ joined18:03
← eletuchy left18:03
iveqy joelm: do you know how the sha1 is calculated18:04
joelm iveqy: In theory :)18:04
← DolphinDream left18:04
→ PeterBooker joined18:04
→ jnavila joined18:05
iveqy joelm: good, then you know that you can't add things and keep the sha1...18:05
joelm iveqy: Basically my other option is to just git clone the other repo into a temp directory and move the code into the main repo.18:05
iveqy: A linux mv; not a git mv18:06
iveqy: Submodules almost worked. But it added one more directory layer underneath the main repo root than I wanted.18:06
← twoface88 left18:07
← iamjarvo left18:07
cbreak joelm: impossible.18:07
→ joevandyk joined18:07
cbreak joelm: linux is WAY too IMPOTENT to do something as tremendously difficult as breaking sha118:08
→ pweaver joined18:08
iveqy joelm: I think you're doing this harder than it is. What's your goal?18:08
joevandyk hi, all. say i have 10 files with different file names but with the same content. will git store that file content 10 times? or 1 time?18:08
cbreak joelm: why do you want to add it to the "main repo" (I assume you mean main history line)?18:08
← SamB left18:08
cbreak joelm: once per repository, probably less.18:09
joelm iveqy: cbreak: Let me lay out the scenario.18:09
← pweaver left18:09
→ pheaver joined18:09
→ alazare619 joined18:09
← ewnd9 left18:10
alazare619 i'm looking for a linux client that also has terminal functionality that when i ssh in i can git pull18:10
cbreak alazare619: openssh18:10
alazare619 basically a gui with dif etc when im at the desktop but basic git functionality for pull when im ssh'd18:10
← chimay left18:10
iveqy joelm: one time18:10
joelm I am trying to automate phpunit testing of a framework, call it RepoA. I want this testing done against a specific sha1. To do the testing, however, I need code from another repo, call it RepoB.18:10
iveqy alazare619: how about git?18:10
alazare619 does the standard git package have git functionality (still new to git on nix) but i've been using it awhile on windows18:11
iveqy alazare619: the "standard git package" _is_ git and is the only client afaik that has _full functionality_18:11
→ h0bbit_ joined18:11
cbreak joelm: just check it out then.18:11
you can check out arbitrary commits18:11
joelm So I git clone RepoA; git checkout sha1; git <pull/fetch/rebase/merge> RepoB into the root dir of RepoA. That changes the sha1. I don't want that to change.18:11
→ Jacob2000 joined18:12
→ hi_ joined18:12
joelm Sounds like the sha will change, no matter what I do.18:12
cbreak joelm: why waste time with that?18:12
← luxgeek left18:12
iveqy joelm: but if you checkout repoB you won't look at repoA anymore, you'll look at repoB18:12
cbreak joelm: and why do you care about the hash?18:13
← Dougie187 left18:13
→ reskp joined18:13
← reskp left18:13
→ reskp joined18:13
joelm cbreak: Because the next time I run the script, I don't want to have to download everything again. I match the hash in my script, with the hash I have downloaded previously.18:13
← daze left18:14
MrDHat → MrDHat|offline18:14
joelm cbreak: The hash serves as a baseline for my testing.18:14
cbreak joelm: so?18:14
joelm: what do those two things have in common?18:14
→ rat_thing joined18:14
cbreak NOTHING18:14
after testing you can reset the merge away again.18:14
→ NAART4C joined18:14
← SoftwareMechani1 left18:14
cbreak but it sounds as if your scripts are a bad imitation of submodules18:15
ojacobson or subtree merge, or "have two directories"18:15
← spike left18:15
ojacobson (stitching two repos together to run tests sounds like a consequence of some pretty dysfunctional engineering further upstream, to me, but I'm not there and you are -- you judge.)18:15
joelm cbreak: I am not sure I am explaining myself well. It's a bit difficult to describe. It's fine, there is a brute force way to do this.18:16
cbreak joelm: yes. just do what I told you18:16
and when you're done, reset the stuff out of history18:16
no need to re-fetch anything.18:16
ojacobson If you're going to use HEAD's sha1 to identify things, then stop running commands that either check out (git checkout) or create (git pull/git rebase/git merge) new commits into HEAD, too18:16
If you have two repos and want to use both, then have two repos18:17
Don't try to frankenrepo them together and do anything too meaningful with the result18:17
→ blz joined18:17
→ shellbackpacific joined18:18
← juniorsilva7 left18:18
ojacobson It really does sound like the test scaffolding should either wrap around the outside of the project under test (and expect the test code to be in a subdir, and include glue to clone/check out a specific repo + commit into the right place) or be part of the project under test, though18:18
joelm cbreak: git ignorance from me, probably, but -- if I "reset the stuff out of history" at the end, I will lose the RepoB code and have to get that again at least when I run the script again.18:18
ojacobson having two completely independent repos that need to be in a coherent combined state to run your tests is eventually going to bite you18:19
← Devastator left18:19
cbreak joelm: so? Who cares.18:19
→ Dougie187 joined18:19
cbreak it's just a merge.18:19
← rat_thing left18:19
cbreak you don't even need the big bad internet for that.18:19
shellbackpacific anyone know off the top how to get all files committed in a branch (not merge commits) ?18:19
cbreak just make sure you add the other repository as remote before fetching18:20
← kevwil left18:20
→ melee joined18:20
cbreak shellbackpacific: just git diff between the last and the parent of the first commit18:20
use --name-status or so18:20
→ Algorithm joined18:20
shellbackpacific cbreak: there are a ton of commits….know how to quickly get the first one from a branch ? :)18:21
← acharlieh left18:21
cbreak git merge-base parentbranch18:21
→ nickpresta joined18:21
cbreak also give it your branch18:21
← dreiss left18:22
← Dougie187 left18:23
→ Dougie187 joined18:23
→ SamB joined18:24
→ jkyle joined18:25
jkyle In my repositories, git remote prune origin is not removing hte local branches. git remote prune origin -n lists them, and the command says it's removing them. But it doesn't actually remove them18:26
→ mfulz joined18:27
← boombatower left18:27
← scelis left18:28
← Dougie187 left18:29
cbreak jkyle: git branch -a18:29
and git ls-remote origin18:29
please pastebin both18:29
jkyle crap, I just manually cleaned up the locals18:30
→ primitive joined18:30
→ eletuchy joined18:30
← rasto left18:30
jkyle cbreak: may I ask what you were going to compare?18:31
cbreak jkyle: the contents.18:31
← titosemi3 left18:31
→ Dougie187 joined18:31
cbreak jkyle: I'd likely have told "there are no remote tracking branches that need cleaning, everything's already fine"18:31
blz If I'm using an SSH config file to talk to git, should I use my public or private key? I assumed public, but a cursor google search seems to indicate that the private keys should be used... I just wanted to double-check with you guys18:31
*cursory18:31
cbreak or "yeah, branch refs/remotes/origin/foobar should vanish... weird..."18:31
→ paulweb515 joined18:32
cbreak blz: neither18:32
jkyle let me see if I can replicate with a dummy branch18:32
cbreak blz: you can just use your normal shell18:32
blz cbreak, how so?18:32
cbreak you don't need network connection or ssh at all18:32
git is local18:32
blz cbreak, this isn't a local repository18:32
cbreak why do you think that?18:32
→ nardev joined18:33
blz cbreak, because it's hosted on another machine18:33
cbreak that's irrelevant.18:33
→ rafaqueque joined18:33
blz cbreak, then I don't follow...18:33
cbreak you clone it, so the clone is local18:33
you can communicate with it without a config file18:33
blz cbreak, okay, but when I want to push to origin it's no longer local...18:33
cbreak yeah.18:33
ToxicFrog blz: this goes for ssh in general, not just git-over-ssh - you need a matched public/private keypair (generated by ssh-keygen). Once you have that, the remote system gets a copy of your *public* key and the *private* key stays on the machine you're connecting from.18:33
cbreak you still don't need to communicate with a config file18:33
ToxicFrog It's right there in the name: the public key you publish, the private key you keep.18:34
cbreak you use the same protocol as when you cloned18:34
(typically at least)18:34
→ Vinnie_win joined18:34
blz cbreak, so then I'd like to avoid typing in my passphrase each and every time I push to origin. My understanding was that this involved SSH key pairs18:34
ToxicFrog blz: erm18:34
cbreak sure, if you use ssh18:34
emmajane → emmajane|food18:34
cbreak you can put your public key into ~/.ssh/authorized_keys18:35
ToxicFrog blz: if SSH is asking you for a "passphrase", you may already be using a keypair; it's asking you for the passphrase for your private key18:35
cbreak (on the remote of course)18:35
blz cbreak, right, I've done that18:35
→ dreiss joined18:35
blz ToxicFrog, aaah that makes sense18:35
that would explain why I'm still getting the passphrase prompt =/18:36
ToxicFrog If it's asking you for your password on the remote machine, do as I said - ssh-keygen to generate the key, ssh-copy-id to install it in ~/.ssh/authorized_keys on the remote machine.18:36
→ germanoak joined18:36
ToxicFrog blz: so, you have two options there18:36
blz ToxicFrog, yeah that part is already done18:36
← germanoak left18:36
ToxicFrog You can remove the passprase from your private key; this means anyone who gets a copy of the keyfile can use it freely, though.18:36
cbreak blz: type ssh-add18:36
blz cbreak, also done18:36
ToxicFrog Or you can use something like ssh-agent to remember the passphrase for the duration of your login.18:36
→ germanoak joined18:37
ToxicFrog (I have no idea how to use ssh-agent, this is the extent of my knowledge on the subject)18:37
← germanoak left18:37
← paolooo left18:37
cbreak blz: now you won't need to unlock your private key again (until the agent discards it)18:37
blz ToxicFrog, haha well this is already very helpful. Do you happen to know how to remove a passphrase from a key?18:37
→ germanoak joined18:37
blz I'm not too worried about losing it... the drive is encrypted so it's not like physically losing the machine would be the end of the world18:37
← Tumulte left18:38
ToxicFrog blz: ssh-keygen is used to edit keys as well as create them. ssh-keygen -p18:38
← davividal left18:38
blz ToxicFrog, many thanks18:38
← juvenal left18:38
→ rat_thing joined18:38
tengelic hello! is there any difference between git clone --mirror and a simple shell cp?18:38
ToxicFrog It'll ask for the keyfile, old passphrase, and new. Just hit enter to skip the new prompt and you'll get a passphraseless key.18:38
cbreak tengelic: many18:39
tengelic cbreak: I mean cp on a bare repo18:39
cbreak still many.18:40
tengelic can you help me explaining it?18:40
cbreak git clone --mirror only clones reachable history18:40
it does not clone configuration such as remotes or hooks18:40
it does not clone unreachable history, not even the history reachable by the reflog18:41
blz ToxicFrog, hmm it's still prompting me for my passphrase. Let me run this by you again... I generated an ssh public/private key pair on my client machine and then copied the contents of id_rsa.pub into the server's ~/.ssh/authorized_keys file18:41
ojacobson It happens to repack the repo in the process, whereas rsync/cp/tar do not, too18:41
and produces a new, empty reflog18:41
cbreak it does not clone non-history files that are also in a git repository18:41
→ thiago joined18:41
← lahwran left18:42
ToxicFrog blz: sounds good so far18:42
blz ToxicFrog, and that's it... sounds like I missed a step18:42
tengelic cbreak: clear, o.k., thanks18:42
← nardev left18:42
← diegoviola left18:42
→ lahwran joined18:43
← germanoak left18:43
ToxicFrog blz: I thought you also removed the passphrase from the private key a moment ago with ssh-keygen -p?18:43
blz ToxicFrog, I did18:43
yes, sorry, I wasn't being very clear18:43
ToxicFrog You're sure you're connecting to the server with the key you think you are?18:43
→ germanoak joined18:43
← germanoak left18:43
blz ToxicFrog, server yes, key not at all18:43
→ Burer joined18:44
← Burer left18:44
→ Burer joined18:44
blz ToxicFrog, well I'm sure that I copied the correct key into authorized_keys on the server18:44
but I'm not at all sure if the client is attempting to use the right key (then again, there's only one...)18:44
→ VictorCL joined18:44
→ rasto joined18:44
→ germanoak joined18:44
ToxicFrog If there's only one there's not a lot of places for it to go wrong18:44
→ mizu_no_oto joined18:45
cbreak blz: ssh -v, it'll show18:46
blz cbreak, on the client I assume? It's just dumping some version and usage information18:46
→ yaw joined18:46
cbreak blz: ssh to the server.18:46
ToxicFrog Add more vs18:47
→ pandeiro joined18:47
ToxicFrog ssh -vvv user@host, for example18:47
At some point it'll start giving you way more information than you want about the key files~18:47
melee haha, why do people do that?18:47
→ kevwil joined18:47
← _davide left18:47
blz ToxicFrog, cbreak let me pastebin the output real quick18:48
← shoshin left18:48
blz http://paste.ubuntu.com/6278577/18:48
is it me or is it offering my private key?18:49
← marhaban left18:49
→ marhaban joined18:49
→ guillaum joined18:50
← guillaum left18:50
blz Hmm this might be the problem... I did ssh-add on my *private* key. I just tried ssh-add /path/to/key.pub and now I'm getting a very loud warning about how my private key file is uprotected and will be ignored18:50
cbreak looks like it's not accepted.18:50
blz For clarity: I initially did ssh-add on the private key and just now re-did it on the public key and got the warning18:50
blz is not very good at explaining things tonight...18:51
cbreak ssh-add is supposed to be used on the private key.18:51
blz cbreak, okay18:51
so I just reverted that18:51
cbreak blz: check the file system permissions of authorized_keys18:51
→ dwmw2_gone joined18:51
→ Shiva joined18:51
blz cbreak, -rw-rw-r--18:51
cbreak bad.18:52
→ Guest74106 joined18:52
cbreak make it -rw------18:52
blz what is that in octal again... 500 ?18:52
← Algorithm left18:52
→ breck7 joined18:52
cbreak I have no idea. why do you care?18:53
blz cbreak, for chmod18:53
← Shiva left18:53
cbreak chmod go= ~/.ssh/authorized_keys18:53
→ raf_ joined18:53
→ Algorithm joined18:53
→ diegoviola joined18:53
← Luke-Jr left18:54
ToxicFrog blz: chmod supports symbolic perms - e.g. chmod go-rwx authorized_keys18:54
→ nardev joined18:54
← omnipotent1 left18:54
blz ToxicFrog, huh... the things you learn...18:54
→ Luke-Jr joined18:55
← Luke-Jr left18:55
→ Luke-Jr joined18:55
→ joelmo joined18:55
ToxicFrog You can use ugo for user/group/other, rwxs for the actual bits, + to add perms, - to remove perms, = to set exactly those perms18:55
← kevwil left18:56
cbreak yes... and you have to go= ... to remove all group and other perms...18:56
ToxicFrog And yeah, ssh/sshd will generally refuse entirely to look at files with "bad" permissions.18:56
blz hmm this go= flag doesn't seem to be working for me18:56
← Luke-Jr left18:56
blz I'm not getting any errors but the perms aren't changing...18:57
cbreak ToxicFrog: that's reasonable, because such files could be compromized.18:57
→ Luke-Jr joined18:57
blz ok got it18:57
it's 600, not 50018:57
anyway, let's try again18:57
still asking for my password on git pull origin master18:58
this is what's weirding me out, though: debug1: Offering RSA public key: /home/louist/.ssh/id_rsa18:58
shouldn't that be id_rsa.pub?18:58
cbreak no18:58
← pandeiro left18:59
cbreak you can't prove that you're you with your public key...18:59
for obvious reasons...18:59
blz ah... derp...18:59
← rat_thing left18:59
→ burzum joined18:59
blz in any case the output of ssh -v hasn't changed18:59
burzum hi18:59
cbreak blz: you could check the remote's sshd log19:00
or add more -v :)19:00
→ ezekielnoob joined19:00
→ JosephFerano joined19:00
← harish left19:00
burzum is there a command to update the remote branches? branches were deleted remotely but they still show up for me when i do "git branch -a" even after a fetch. So how can I update that list?19:00
ToxicFrog blz: "id_rsa" is both the name of the key and the name of the file containing the private half.19:00
blz I see, ok19:00
alright, more v's it is19:00
→ Vinnie_win_p joined19:00
→ m0ltar joined19:01
ToxicFrog And yeah, you may need to look at sshd's log as well.19:01
← spudz left19:01
← stamina left19:01
← hi_ left19:01
← Jacob2000 left19:01
cbreak burzum: git fetch --prune will prune them19:01
→ cmpera_ joined19:01
burzum cbreak thanks! sounds like what i was looking for19:02
→ buibex joined19:02
→ harish joined19:02
→ spudz joined19:02
← sq-one left19:02
blz any idea where the sshd log is found on an ubuntu system?19:02
← ZujkisNx left19:02
← Algorithm left19:03
blz my google fu is failing me...19:03
← Vinnie_win left19:03
← hoschi left19:03
→ ZujkisNx joined19:03
← cmpera left19:03
cmpera_ → cmpera19:03
iveqy blz: where are all logs put on a linux system?19:03
blz: hint: /var/log19:03
← tham left19:03
blz iveqy, I checked var/log19:03
→ MoHaX joined19:03
← Cromulent left19:03
iveqy blz: great, and what's the name of your sshd?19:04
→ pantsman joined19:04
blz iveqy, i assumed sshd?19:04
but I guess not?19:04
ToxicFrog It might go in messages, or syslog19:04
← JustinMac left19:04
← ezekielnoob left19:05
ToxicFrog On some systems it's in /var/log/secure19:05
cmn it typically dumps its info into the auth log19:05
iveqy blz: I guessmore opensshd or something. But if you can't find a file or path with that name, it probably just log into the systems general logs19:05
→ geekbri joined19:05
Vinnie_win_p → Vinnie_win19:05
→ _goTAN joined19:06
← m0ltar left19:06
blz hmm I'm not seeing anything ssh related in auth or syslog19:07
→ acharlieh joined19:08
blz alright I'm going to go eat and try to figure this out later... I'm starting to get frustrated, which is inevitably a bad thing19:08
Thanks for putting up with me =)19:08
→ reskp__ joined19:08
→ m0ltar joined19:08
← bartzy left19:08
→ beastd joined19:09
← _goTAN left19:09
→ lpapp joined19:10
→ shashin joined19:10
→ JGarrido joined19:10
← shashin left19:10
→ shashin joined19:10
→ mmlac-bv joined19:11
← buibex left19:11
→ molten_tar joined19:11
→ mdiers joined19:11
→ buibex joined19:11
← reskp left19:11
→ girishr joined19:12
lpapp hi, I am getting this: git log v2.0.0..HEAD19:12
fatal: ambiguous argument 'v2.0.0..HEAD': unknown revision or path not in the working tree.19:12
Use '--' to separate paths from revisions19:12
intention was: get all the commit messages since our latest tag X.Y.Z19:12
← m0ltar left19:13
cmn and does that tag exist?19:13
→ cenuij joined19:13
← cenuij left19:13
→ cenuij joined19:13
lpapp yes19:14
→ normanrichards joined19:14
lpapp git tag19:14
V2.0.019:14
ah, V, not v19:14
thanks, and sorry.19:14
→ pandeiro joined19:14
→ abdostar joined19:14
→ Sonderblade joined19:15
→ BiggFREE joined19:16
abdostar is it possible, to start a project locally then push it to github as a new repo?19:16
← shuaib left19:16
← lpapp left19:16
← sohail left19:16
← buibex left19:16
cmn that's the typical use-case19:16
← kewah left19:17
cmn GitHub doesn't have auto-initialisation, so you'd have to do it over the web interface (or hub)19:17
← iamjarvo_ left19:17
abdostar cmn: so I have to go to github.com and create a repo?19:18
→ iamjarvo joined19:18
cmn yeah, or use the hub tool19:18
→ alvaro_o joined19:18
abdostar which tool?19:18
cmn hub19:18
→ sohail joined19:19
→ eaj joined19:19
← eletuchy left19:19
grawity abdostar: https://github.com/defunkt/hub19:20
← raf_ left19:20
→ btree joined19:20
← ZujkisNx left19:21
→ kevwil joined19:21
→ ZujkisNx joined19:21
→ JohnBat26|2 joined19:22
cmn it's at github/hub nowadays19:22
← btree left19:22
← molten_tar left19:23
abdostar grawity: thanks I installed it,19:23
← thiago left19:23
← eaj left19:23
→ aydin joined19:23
→ thiago joined19:23
abdostar do I need to use "git remote add"19:23
cmn yes19:24
← flaguy48 left19:24
→ raf_ joined19:24
aydin Anyone know of any articles on how to integreate docs in to git release cycle? When should they be generated? Manually on release branch? Should I store in git repo?, etc etc19:24
cmn hub has some shortcuts, but you need to tell git where the other repo will be19:24
← chuckharmston left19:24
iveqy aydin: !deploy19:25
gitinfo aydin: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html19:25
cmn aydin: auto-generated stuff shouldn't be in the repo; how often depends on what you need as a project19:25
→ JohnBat26|3 joined19:25
→ flaguy48 joined19:26
← JohnBat26 left19:26
cmn you should be able to adapt the ideas in the link to suit whatever you do for the docs19:26
← flaguy48 left19:26
→ pen joined19:26
→ btree joined19:27
→ flaguy48 joined19:27
aydin cmn: thanks, it's for a small internal Magento extension. However, I'm trying to implement some solid build/deploy processes to hopefully make our codebase more professional. Unluckily no one here knows much of it19:27
← flaguy48 left19:27
← d8bhatta left19:27
← btree left19:28
abdostar cmn: if i have a directory called dev123, but no repo in github. what command should I use to push this directory as a repo?19:28
→ flaguy48 joined19:28
luto git init19:28
cmn the local name is irrelevant19:28
luto git remote add ...19:28
← flaguy48 left19:28
luto git push19:28
← JohnBat26|2 left19:28
cmn git remote add origin [email@hidden.address]19:29
iveqy luto: you forgott git remote add ?19:29
luto and commit19:29
and add19:29
cmn git push -u origin master19:29
iveqy abdostar: !book19:29
gitinfo abdostar: 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 !parable19:29
→ flaguy48 joined19:29
← flaguy48 left19:29
abdostar thank you guys, I will try this and report back19:30
→ flaguy48 joined19:30
← flaguy48 left19:30
← jfoy left19:31
→ flaguy48 joined19:32
← flaguy48 left19:32
← breck7 left19:32
→ breck7 joined19:32
→ pfFredd joined19:32
→ flaguy48 joined19:32
← flaguy48 left19:33
← diegoviola left19:33
→ flaguy48 joined19:34
← flaguy48 left19:34
← natechan left19:34
→ flaguy48 joined19:34
← flaguy48 left19:35
→ flaguy48 joined19:35
← flaguy48 left19:35
→ flaguy48 joined19:36
← flaguy48 left19:36
← tough_griff left19:36
→ flaguy48 joined19:37
← flaguy48 left19:37
→ omnipotent1 joined19:37
→ diegoviola joined19:37
→ flaguy48 joined19:37
← snql left19:37
← BiggFREE left19:37
← flaguy48 left19:37
← breck7 left19:38
← germanoak left19:38
← Luke-Jr left19:38
→ natechan joined19:38
← reskp__ left19:38
→ flaguy48 joined19:38
← flaguy48 left19:38
→ Luke-Jr joined19:39
→ reskp_ joined19:39
→ flaguy48 joined19:39
→ titosemi3 joined19:39
← flaguy48 left19:39
← Vinnie_win left19:39
← sebrock left19:40
← marhaban left19:40
→ flaguy48 joined19:40
← flaguy48 left19:41
→ reskp___ joined19:41
← reskp_ left19:41
→ flaguy48 joined19:41
← flaguy48 left19:41
← Sigma left19:42
→ peti joined19:42
← ZaFrost left19:42
→ flaguy48 joined19:42
← flaguy48 left19:42
→ SHyx0rmZ joined19:43
peti Hello, after cloning a repository, how can I get a branch normally, not with remote tracking or any other gimmick?19:43
→ flaguy48 joined19:43
← sohail left19:43
← spaceonline left19:43
← flaguy48 left19:43
← titosemi3 left19:44
→ marhaban joined19:44
→ nnyk_ joined19:44
→ flaguy48 joined19:44
← flaguy48 left19:44
→ chuckharmston joined19:44
→ flaguy48 joined19:45
← flaguy48 left19:46
← DrNick left19:46
jrnieder peti "git branch --no-track"?19:46
→ devbug joined19:46
→ flaguy48 joined19:47
→ sohail joined19:48
→ harobed_ joined19:50
← harobed_ left19:50
→ buibex joined19:51
→ harobed_ joined19:51
→ kcj joined19:52
← abdostar left19:52
→ jasonp joined19:52
→ abdostar joined19:53
← deuterium left19:53
→ tplaner joined19:53
← abdostar left19:53
→ abdostar joined19:53
peti why doesnt $ git fetch origin get all the branches from a remote repo?19:54
ojacobson What makes you think it doesn't?19:54
→ takamichi joined19:54
← buibex left19:54
→ petey_ joined19:54
peti well $git branch only shows master19:55
ojacobson Unless you've done something v interesting, 'git fetch' does not create local branches19:55
→ buibex joined19:55
ojacobson it creates local caches of remote branches ("remote-tracking" branches, like 'origin/master', where the local branch would be 'master')19:55
→ JustinMac joined19:55
ojacobson Have a look at 'git branch --remote' or 'git branch --all'19:55
You can create local branches for each remote branch if you want, but there aren't a lot of good reasons to do so19:56
peti ojacobson: hmmm19:56
thanks for the detailed answer19:56
so what is the most classical way to get a remote branch ?19:56
ojacobson Depends on what you want to do with it once you have it.19:57
peti make commits on it and push back to github19:57
ojacobson Create a local branch from it, make your commits on that, and push that to github.19:57
← Berta45_45 left19:57
ojacobson 'git checkout <branch name>' will create a local branch automatically if there's a remote branch of the same name, and the name is unambiguous19:58
(if you only have one remote, it's never ambiguous)19:58
otherwise, 'git checkout <some remote branch> -b <some local name>' will do it, where <some remote branch> comes from 'git branch --remote' and <some local name> is whatever you want (but keeping the name the same as the remote branch's name is wise)19:58
emmajane|food → emmajane19:58
← takamichi left19:59
peti aokay, i have set up a track-remote branch19:59
is that ok?19:59
do I need to do anything else?19:59
← yaw left19:59
← buibex left19:59
← bitness64 left20:01
→ yaw joined20:02
→ m0ltar joined20:02
← nickpresta left20:02
→ DrNick joined20:03
← acharlieh left20:03
→ Cassiel joined20:03
← wafflejock left20:03
jrnieder peti: branches are simple when you get used to them :)20:03
peti: they're just pointers into history20:03
peti: "git fetch origin" updates your remote-tracking branches, which point to the tip of those branches according to the remote20:04
peti: your own local branches can point wherever you want20:04
peti: usually you what to start with them pointing where the remote ones started, hence "git checkout -b <foo> origin/<foo>"20:04
peti ah, i think i got it20:05
→ germanoak joined20:05
peti thanks so much guys20:05
jrnieder np20:05
→ stamina joined20:05
← dreiss left20:06
← zarubin left20:06
→ Georg3 joined20:06
→ davividal joined20:07
← yaw left20:08
← infynyxx left20:09
← ehmatthes left20:09
← joki left20:10
← kcj left20:10
→ carbohydrate joined20:11
→ acharlieh joined20:11
← tengelic left20:13
← reskp___ left20:14
→ lbf joined20:14
→ n0rm joined20:14
← fobius left20:14
→ reskp joined20:14
→ reskp___ joined20:15
→ valgrind joined20:16
→ joki joined20:16
← apipkin left20:16
→ breck7 joined20:17
← cebor left20:18
← joelmo left20:19
← tplaner left20:19
→ dort joined20:19
← h0bbit_ left20:19
← reskp left20:19
j416_ → j41620:19
← carbohydrate left20:20
→ cebor joined20:20
← reskp___ left20:20
→ Guest43848 joined20:20
→ minim joined20:21
alessand2o → Spockz20:21
← normanrichards left20:21
← Guest43848 left20:22
← tatsuya_o left20:22
→ jceb joined20:22
jceb → Guest4325620:23
← Guest74106 left20:23
→ tatsuya_o joined20:23
→ |Freeman| joined20:24
← mizu_no_oto left20:24
→ luxgeek joined20:24
← marthinal left20:24
→ infynyxx joined20:24
← vocifer left20:25
← pbujok left20:25
← LimeBlast left20:25
← wrouesnel left20:26
← multiverse left20:26
← cenuij left20:26
→ LimeBlast joined20:26
→ tplaner joined20:26
← tatsuya_o left20:27
← sdrfnord1 left20:28
← lite_ left20:28
← Guest43256 left20:29
→ lite_ joined20:29
← lite_ left20:30
→ tough_griff joined20:30
→ bamj0rb_ joined20:30
→ multiverse joined20:30
→ simesy joined20:30
← mmlac-bv left20:31
→ vocifer joined20:32
→ ciampix joined20:32
← jumperswitch_ left20:33
← LimeBlast left20:34
osse jrnieder: hi. the other day you said that git invokes the editor (vim in this case) the same as if I do 'vim foo.txt </dev/null'. What did you mean by that exactly? I can't find that in the code. Seems to be to inherits Git's stdin20:34
→ Artpicre joined20:35
→ buibex joined20:35
→ zarubin joined20:35
→ deuterium joined20:36
← buibex left20:36
→ LimeBlast joined20:36
← mfulz left20:37
← geekbri left20:38
→ mfulz joined20:38
← ncd|leeN left20:39
← mfulz left20:39
→ rat_thing joined20:39
→ tomnewmann joined20:40
← vurma left20:40
← tomnewmann left20:40
← LimeBlast left20:41
→ mfulz joined20:41
← mfulz left20:41
→ mfulz joined20:41
→ mklappstuhl joined20:41
→ LimeBlast joined20:42
← cmpera left20:43
→ de-Vri-es joined20:43
→ cmpera joined20:43
→ cenuij joined20:43
← Jackneill left20:44
← abdostar left20:45
→ ehmatthes joined20:45
→ abdostar joined20:45
← nnyk_ left20:48
→ bartzy joined20:48
← AWinterman left20:49
→ normanrichards joined20:49
← zarubin left20:50
← LimeBlast left20:50
← abdostar left20:50
Sonderblade what to do when git reports a conflict when git stash apply:ing?20:50
ojacobson same as you would with any other merge conflict20:51
resolve it20:51
→ abdostar joined20:51
← johnnyfuchs left20:51
ojacobson read the conflicting parts of the merge and apply brainpower to determine the appropriate outcomes :)20:51
← shellbackpacific left20:51
← gzg left20:51
Sonderblade i just want the stash' version everywhere20:52
→ LimeBlast joined20:52
de-Vri-es hmm, checkout -p shows hunks to discard from the work tree while git reset -p shows hunks to apply to the index20:53
seems a bit weird20:53
can I get reset -p to show hunks to discard like checkout -p does?20:53
ReachingFarr I've cloned a SVN repo using `git svn clone`, and when I did so I didn't have commit access so I didn't supply a username. Now I do have commit access but I don't know how to tell git-svn my username. Can anyone help?20:53
← mfulz left20:53
← TheBrainWork left20:53
→ HicksD_ joined20:53
M-ou-se ReachingFarr: --username20:54
ReachingFarr: (check git help svn)20:54
ReachingFarr M-ou-se: Passed to what command?20:54
← HicksD left20:54
→ mribeirodantas joined20:54
M-ou-se ReachingFarr: the command that needs access to the svn repository20:54
← multiverse left20:54
← tplaner left20:55
→ samholmes joined20:55
samholmes Am I the only person who finds it difficult to read the merge conflict files?20:55
Dougie187 depends on your editor or mergetool.20:56
→ tinti joined20:56
ToxicFrog samholmes: if you mean raw conflict markers? No, it's not just you. This is what git mergetool is for.20:57
→ jfoy joined20:58
← simesy left20:58
ReachingFarr M-ou-se: Thanks. The documentation doesn't make it clear that that option can be passed to commands other than init.20:58
← pandeiro left20:59
→ simesy joined20:59
M-ou-se ReachingFarr: yeah, it's a bit vague. i was in the same situation a few days ago :)20:59
← infynyxx left20:59
← abdostar left20:59
→ tpollard joined20:59
→ infynyxx joined20:59
→ pbujok joined20:59
ReachingFarr M-ou-se: Is there a way to make it so I don't have to pass --username to every svn command that needs repo access?20:59
← defaultro left20:59
→ multiverse joined21:00
→ richwestcoast joined21:00
M-ou-se ReachingFarr: svn should remember your username and password21:00
richwestcoast hello21:00
gitinfo richwestcoast: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.21:00
← raf_ left21:01
→ m8 joined21:01
M-ou-se ReachingFarr: possibly you need to remove a file in ~/.subversion to make it forget an old username21:02
← cannonball left21:02
→ kiku joined21:02
← epicowl left21:02
jrnieder osse: when you do "git commit -F -", the -F handling slurps up all of stdin21:02
osse: so what's left is an EOF21:02
→ refried_ joined21:03
ReachingFarr M-ou-se: Thanks. I hadn't actually tried a second command yet. I'll keep that in mind though.21:03
← simesy left21:03
→ MattMaker joined21:04
← melee left21:04
→ melee joined21:04
→ Fandekasp joined21:05
← Sonderblade left21:05
jrnieder samholmes: some tips:21:05
samholmes: -Xpatience sometimes makes the choice of conflicts a little saner21:06
← MoHaX left21:06
jrnieder samholmes: "git checkout --conflict=diff3 <path>" makes the conflict hunks show the common ancestor, too, so you can pick out what each side changed21:07
samholmes: 'git mergetool' can use a GUI side-by-side conflict resolution tool if you're more used to that21:08
← hholtmann left21:08
→ goshawk joined21:09
← LimeBlast left21:09
← cenuij left21:10
→ hholtmann joined21:11
← hholtmann left21:11
→ hatsune joined21:11
→ hholtmann joined21:12
→ mmlac-bv joined21:13
→ nnyk_ joined21:13
← tinti left21:13
← varlog left21:13
→ asQuirreL joined21:14
→ LimeBlast joined21:14
→ tinti joined21:14
← tough_griff left21:15
← psynor left21:15
← bauruine left21:15
← freeed left21:16
→ bauruine joined21:16
→ eletuchy joined21:16
← Pullphinger left21:17
→ PaulCapestany joined21:18
← breakingthings left21:18
→ MoHaX joined21:18
← cmpera left21:19
← hholtmann left21:19
← zhost left21:20
← chrob left21:20
← LuxuryMode left21:21
← jnavila left21:21
→ tough_griff joined21:22
← hatsune left21:22
→ zenpac joined21:22
zenpac Does this channel cover git flow?21:23
← LukeKetley left21:23
bsilver what do you mean?21:23
← tinti left21:24
de-Vri-es can I get 'git reset --patch' to show hunks to discard from the index (like 'git checkout --patch') rather than hunks to apply to the index? Seems more logical to me.21:25
also, you can recognize a hunk you mistakenly added with add --patch easier that way21:26
since it would look exactly the same21:26
ojacobson the index doesn't retain chunk boundaries21:26
so no, it would only look the same in degenerate cases21:26
de-Vri-es well, generelly edits that don't belong together are a fair bit apart21:27
ojacobson gitx and stash both have fairly nice stage/unstage/reset UIs though21:27
→ Leffe_ joined21:27
de-Vri-es right now I get mostly the same hunks, only inverted21:27
← MoHaX left21:27
zenpac The last time I did a "git checkout master" I was on a git flow feature, and it did not delete the feature code from the workspace. Did I do something wrong??21:27
→ cenuij joined21:27
← m0ltar left21:28
de-Vri-es and git checkout -p shows hunks to discard, so obviously it's possible21:28
ojacobson zenpac: had you committed the code to your feature branch?21:28
← LimeBlast left21:28
de-Vri-es I just want git reset -p to do it too..21:28
might be my memory failing me, but I remember it doing it that way some time ago21:29
→ tinti joined21:29
zenpac ojacobson: yes, ...21:29
→ LimeBlast joined21:29
← donmichelangelo left21:30
zenpac I may have failed to "git flow feature finish xyz", but I have this time.21:30
→ tplaner joined21:30
→ lite_ joined21:30
→ donmichelangelo joined21:30
→ eaj joined21:30
Leffe_ Does anyone know a good resource of teaching how to use git to develop a series of patches (that may later be submitted to upstream). Eg. how to do what I would do with hg mq in Git. I have found posts saying that git branches is the way to go, but have problem with simple things like going back to an earlier patch and update it by making source changes and record this into the patch/commit. I've understood that much that I can't update a commit, but not figur21:31
ed out how to do it instead.21:31
← Burer left21:31
de-Vri-es ojacobson: thanks for the tips, but I'm not looking for a gui. Do you know if I can get git reset -p to do what I want?21:31
→ reskp joined21:31
jrnieder Leffe_: the command to learn is "git rebase --interactive"21:31
→ iderik joined21:31
ojacobson de-Vri-es: I only have sarcastic responses to that.21:32
de-Vri-es really, why?21:32
ojacobson It's just the kind of guy I am?21:32
Anyways, the blunt answer is "no, and I'd be surprised if you can"21:32
→ psynor joined21:32
de-Vri-es I see, thanks. I think.21:32
ojacobson people who declare something to be "obviously possible" are frequently disappointed21:32
and if the biggest issue is inverted + and - signs then a GUI may actually be useful21:33
de-Vri-es I meant technically, not that git reset actually allows it21:33
ojacobson in as much as most of them are oriented around "what are you going to commit"21:33
oh, technically it's trivial; it's just a diff, and that's a long-solved problem21:33
← tplaner left21:33
jrnieder de-Vri-es: can you say a little more about the feature request?21:33
Leffe_ jrnieder: thanks, I'll dig into that command help21:33
jrnieder de-Vri-es: do you mean you want the meaning of '+' and '-' to be reversed?21:33
zenpac Is therea way to destroy a git flow feature?21:33
ojacobson 'diff a b == -diff b a' is even a fundamental principle for at least one DSCM system (darcs)21:33
→ btree joined21:33
de-Vri-es jrnieder: git reset -p shows hunks to apply to the index while git checkout -p shows hunks to discard from the work tree21:34
jrnieder de-Vri-es: or do you mean that you want to see both kinds of hunks in the same interactive session, to avoid having to run both commands?21:34
de-Vri-es this seems somewhat inconsistent to me21:34
→ tplaner joined21:34
de-Vri-es I prefer the way checkout -p does it, so I wondered if it can be configured21:34
← LimeBlast left21:35
jrnieder de-Vri-es: is this about '+' vs '-' or about what hunks are shown?21:35
← eaj left21:35
de-Vri-es eh, + vs - I guess21:35
jrnieder de-Vri-es: if '+' vs '-', it's probably worth asking about it on git@vger21:35
→ jday_ joined21:35
ojacobson He's got a reasonable UI argument about symmetry with git add --patch, really21:35
← pantsman left21:35
ojacobson it's just so far below the noise floor for me that my instinct is to be dismissive :)21:35
different users, different problems21:36
→ howlymowly joined21:36
jrnieder anything that can be done to make things more intuitive is probably worth it :)21:36
ojacobson sure, but there are much larger problems (like 'git checkout' :)21:36
de-Vri-es yeah, if I mistakenly added something with add -p and I want to reset -p it, I have to mentally revert the diff to see if it's the one I mistakenly added21:36
jrnieder eh, orthogonal problems can be worked on independently at the same time21:36
de-Vri-es: I think the convention used was basically arbitrary21:37
← ngladitz left21:37
→ kukks joined21:37
← TomyLobo left21:37
de-Vri-es might be nice if we could choose21:37
→ sea_striker joined21:37
→ chrob joined21:37
jrnieder de-Vri-es: I don't know. you'd still have to remember which one it was when deciding whether to pass --reverse21:37
→ Guest67497 joined21:37
← tough_griff left21:38
← ojacobson left21:38
← kiku left21:38
jrnieder de-Vri-es: I think the best possible first step would be to come up with some good mnemonics (whether for the current way or the opposite, it doesn't really matter) and add them to the documentation21:38
sea_striker hello, I was told that I might find help here with a git issue...21:38
I just get this: msg: Failed to init/update submodules21:38
← lite_ left21:38
← Guest67497 left21:39
de-Vri-es jrnieder: yeah, having it documented is a good thing21:39
→ tough_griff joined21:39
jrnieder de-Vri-es: or maybe some symbol other than '+' and '-' would work :)21:39
zenpac One of my git flow features needs to be updated to develop... Should I use "git flow feature rebase" ??21:39
jrnieder de-Vri-es: just thinking out loud21:39
← tplaner left21:39
jrnieder de-Vri-es: I've still been hoping for a spare moment to try turning on "[diff] mnemonicPrefix" by default again21:39
← cenuij left21:40
→ twoface88 joined21:40
jrnieder de-Vri-es: I always have it enabled here. After a couple of days of it feeling odd, it became comfortable and now I don't want to go back.21:40
← twoface88 left21:40
→ LimeBlast joined21:40
← psynor left21:41
de-Vri-es jrnieder: + and - are fine for me, as long as you're consistent what version is a and b (always the old version a would make sense to me)21:41
← delianides left21:41
de-Vri-es jrnieder: but I haven't explored mnemonicprefix, I'll look into that21:42
jrnieder de-Vri-es: hm, "git add -p" et al don't respect diff.mnemonicprefix21:43
de-Vri-es: looks like a bug21:43
de-Vri-es jrnieder: hmm, shame, that does sound like a bug21:43
← Pyrogerg left21:43
← howlymowly left21:44
← jkremser left21:45
→ cenuij joined21:46
← cenuij left21:46
→ cenuij joined21:46
alazare619 Hey i have a project im working on on github theres a folder that I cloned off another repo is there a way to keep that folder in sync with the other repo?21:46
Tabstar → Tabmow21:46
← grilix left21:47
← rryoumaa left21:47
→ johnnyfuchs joined21:47
← sea_striker left21:47
← v0n left21:47
← asQuirreL left21:47
→ mmitchel_ joined21:48
samholmes After solving conflicts, is there a git merge --continue command?21:48
← LimeBlast left21:49
← threesome left21:50
← diegoviola left21:50
jrnieder samholmes: there should be. but no one made one21:50
samholmes: "git commit" does the trick21:50
← Gardner left21:51
samholmes Will git commit add a message for me by default?21:51
grawity Nope.21:51
← mmitchell left21:51
jrnieder samholmes: it opens an editor window with a message template21:51
samholmes Ah. Thanks21:51
jrnieder samholmes: for you to customize and tell the war story of the merge :)21:51
← Dougie187 left21:51
← aydin left21:51
samholmes haha21:51
→ FernandoBasso joined21:52
→ donpi joined21:52
← mmitchel_ left21:52
→ LimeBlast joined21:53
→ Balliad joined21:53
osse jrnieder: ahh of course. and that's why Vim *doesn't* create problems when Git does not slurp it all. Thanks!21:54
← bsilver left21:54
→ Pengoo joined21:54
← Swayz left21:54
← danman left21:56
← refried_ left21:56
→ Dreadnaught joined21:57
← johnnyfuchs left21:58
← LimeBlast left21:58
→ refried_ joined21:58
→ zoli joined21:59
→ seanz joined21:59
← jdav_gone left21:59
seanz Greetings. I've got a question about .gitignore.21:59
I read on this page: http://git-scm.com/docs/gitignore21:59
→ iamjarvo_ joined21:59
seanz ...that if I include a line like this:21:59
**/test.file21:59
Then test.file will be ignored *anywhere* in the repo. Is that understanding correct?21:59
jrnieder seanz: sure, depending on what you mean by ignored22:00
seanz: gitignore is to prevent you from accidentally "git add"-ing a new file22:00
← refried_ left22:00
← mdiers left22:00
seanz jrnieder: I'm expecting that test.file will not show up as an untracked file at all.22:01
Anywhere.22:01
Is that not what it's for?22:01
jrnieder seanz: ok, it's untracked?22:01
seanz jrnieder: Yes.22:01
jrnieder seanz: if it's currently untracked then your understanding is right22:01
→ pandeiro joined22:01
jrnieder seanz: what's the question?22:01
→ refried_ joined22:01
seanz jrnieder: I have a line similar to what I asked about. Files created one level down are ignored the way I expect. Any more levels down and the files show up in git status.22:02
That's not what I expected to happen.22:02
← acharlieh left22:02
jrnieder seanz: what version of git are you using?22:02
seanz git version 1.8.1.522:02
← iamjarvo left22:02
← devbug left22:03
jrnieder ** handling was added in v1.8.2-rc0~85^2~12 (Support "**" wildcard in .gitignore and .gitattributes, 2012-10-15)22:03
in older git you just write "test.file"22:03
seanz jrnieder: Oh...I see.22:03
← iamjarvo_ left22:03
jrnieder as long as the line contains no slashes, it will do the right thing22:03
→ kcj joined22:03
jrnieder that works with newer git, too :)22:03
seanz Oh!22:04
Genius.22:04
→ grilix joined22:04
seanz Thanks for clearing it up.22:04
jrnieder sure thing22:04
→ LimeBlast joined22:04
jrnieder https://www.kernel.org/pub/software/scm/git/docs/git.html used to have links to the documentation built for each release22:04
but it doesn't seem to any more :/22:05
https://code.google.com/p/git-core/downloads/list has the HTML docs as a tarball for each release22:05
seanz jrnieder: I'll keep that in mind.22:05
→ delianides joined22:06
→ travisst1ton joined22:06
← MattMaker left22:06
← kevwil left22:08
→ epicowl joined22:09
← travisstaton left22:09
← bamj0rb_ left22:10
← aard_ left22:11
← mmlac-bv left22:12
→ hholtmann joined22:12
← longbeach left22:12
← tough_griff left22:12
→ AWinterman joined22:14
qsuscs → qsusOFFcs22:14
→ acharlieh joined22:14
← richwestcoast left22:15
→ richwestcoast joined22:15
→ Sigma joined22:15
← phile left22:16
← kermit left22:16
← m8 left22:17
← chrob left22:17
← btree left22:17
→ kermit joined22:17
→ mdiers joined22:18
← pheaver left22:18
← hholtmann left22:19
← jerius left22:19
→ DanielHollands joined22:19
→ ozette joined22:20
→ rednaks joined22:20
← LimeBlast left22:22
← pandeiro left22:22
← angelsl left22:23
→ mizu_no_oto joined22:24
→ tough_griff joined22:26
osse jrnieder: found a simply yet somewhat hacky solution. Noticed that use_shell = 1 for the commit editor child process, so I set core.editor to be 'vim </dev/tty' :)22:27
*simple22:27
→ ewnd9 joined22:27
← Sigma left22:28
← bgerber left22:29
← infynyxx left22:29
→ chrob joined22:30
← petey_ left22:30
→ jdav_gone joined22:30
→ petey_ joined22:30
← vkz left22:30
← eugenejen left22:31
→ psynor joined22:32
← rat_thing left22:32
← mklappstuhl left22:32
← normanrichards left22:33
→ pfFred joined22:33
← Destos left22:33
← kris left22:33
← donpi left22:33
← halu left22:34
→ robbyoconnor joined22:34
← thiago left22:34
← fling left22:34
→ lite_ joined22:35
← petey_ left22:35
→ eugenejen joined22:35
→ simesy joined22:36
← pfFredd left22:36
→ fling joined22:37
← DrShoggoth left22:37
← JGarrido left22:39
← lite_ left22:39
← reskp left22:39
→ JGarrido joined22:39
→ reskp joined22:39
← SHyx0rmZ left22:40
→ TGiFallen joined22:40
→ reskp__ joined22:41
← chuckharmston left22:41
→ eaj joined22:41
← glosoli left22:42
← sohail left22:42
← harobed_ left22:42
← pachet left22:43
← JGarrido left22:43
← reskp left22:44
← reskp__ left22:44
← chrob left22:45
→ reskp joined22:45
← blz left22:45
→ danman joined22:46
← tough_griff left22:46
← danman left22:46
← eaj left22:47
← marhaban left22:47
→ madewokherd joined22:47
← delianides left22:47
→ petey_ joined22:47
→ gzg joined22:48
← albel727 left22:48
← reskp left22:49
← mishok13 left22:49
← epicowl left22:49
← m7w left22:50
← valgrind left22:50
→ rednaks_ joined22:50
← robbyoconnor left22:51
← rednaks left22:51
← thegladiator_ left22:52
→ ShooterMG joined22:52
← eugenejen left22:53
← mdiers left22:53
← jasonp left22:54
← ZujkisNx left22:54
← gebbione left22:55
→ mdiers joined22:57
← mdiers left22:57
← travisst1ton left22:57
→ albel727 joined22:58
← beastd left22:58
→ bulletmark joined22:58
→ mdiers joined22:59
→ Joshi3s` joined23:00
← Joshi3s` left23:00
← mdiers left23:00
← jarr0dsz left23:01
← Balliad left23:01
← VictorCL left23:02
← germanoak left23:03
← peti left23:04
→ diegoviola joined23:06
← ewnd9 left23:07
→ travisstaton joined23:07
→ ojacobson joined23:08
← iderik left23:08
← natechan left23:10
← pbujok left23:11
← a-l-e left23:11
← King_Hual left23:11
← nicedice_ left23:11
→ nicedice__ joined23:11
← tang^ left23:11
← raijin left23:12
→ Vinnie_win joined23:13
→ reskp joined23:17
→ pandeiro joined23:18
← earny left23:20
→ earny joined23:20
← TheFuzzball left23:20
← donmichelangelo left23:21
← pfFred left23:21
→ donmichelangelo joined23:21
← ndim left23:22
← zenpac left23:23
→ ndim joined23:23
← nicedice__ left23:23
← Leffe_ left23:23
← awc737 left23:24
← _iron left23:25
→ awc737 joined23:25
← bwreilly left23:25
→ therealGent joined23:25
← reskp left23:26
← primitive left23:26
← pilif left23:26
→ tough_griff joined23:28
← gzg left23:29
← ddr2 left23:29
← ehmatthes left23:29
→ dsdeiz joined23:29
→ nicedice_ joined23:29
→ chuckharmston joined23:31
← rednaks_ left23:31
→ johnnyfuchs joined23:31
← diegoviola left23:31
← refried_ left23:32
← ReachingFarr left23:32
→ woollyams joined23:32
← sgambino left23:33
← dsdeiz left23:35
← psynor left23:35
→ lite_ joined23:35
← cads left23:36
→ psynor joined23:38
← tough_griff left23:39
← lite_ left23:39
→ jon_r joined23:39
→ rednaks_ joined23:41
→ oojacoboo joined23:41
← Ozch left23:41
→ eaj joined23:43
→ rat_thing joined23:43
→ mmlac-bv joined23:43
← Orbitrix left23:43
→ pilif joined23:44
← dort left23:46
→ pheaver joined23:46
← PaulCapestany left23:47
← eaj left23:47
← rat_thing left23:48
→ Devastator joined23:50
← cenuij left23:50
→ LuxuryMode joined23:51
← cigarshark left23:51
← frgtn left23:53
← yhager left23:53
← rednaks_ left23:53
→ PuercoPop joined23:53
→ frgtn joined23:53
← dwmw2_gone left23:53
← simesy left23:54
← decotii left23:54
PuercoPop how do I make a git push/authenticate with a specific key? It doesn't seem to be picking on ~/.ssh/config23:54
→ simesy joined23:54
Hello71 git calls ssh23:55
← bartzy left23:55
→ nutron joined23:55
← nutron left23:55
→ nutron joined23:55
→ bwreilly joined23:56
← frgtn left23:56
→ frgtn joined23:57
→ tough_griff joined23:57
← simesy left23:59

Logs Search ←Prev date Next date→ Channels Documentation