Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-05

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 hahuang61 joined #git
00:02 raajay joined #git
00:02 Gsham joined #git
00:03 garethdaine joined #git
00:04 zivester joined #git
00:04 _TWS joined #git
00:05 dsdeiz joined #git
00:05 dsdeiz joined #git
00:05 rbern joined #git
00:06 anuxivm joined #git
00:08 MrWoohoo joined #git
00:12 madewokherd joined #git
00:12 Celelibi joined #git
00:15 isysd joined #git
00:18 todd_dsm joined #git
00:22 SwiftMatt joined #git
00:23 sunri5e joined #git
00:23 anonymuse joined #git
00:25 theoceaniscool joined #git
00:25 duderonomy joined #git
00:27 cdown joined #git
00:30 gtristan joined #git
00:32 a_thakur joined #git
00:34 jbu hi all: can anyone tell me why I can't use a HEAD^1:<path> refspec while pulling?  I realize you can reset the HEAD and checkout a specific file, but why can't I pull an individual file?
00:36 menip joined #git
00:37 jbu the git pull man page says i can use a refspec
00:38 osse jbu: refspec != pathspec.  You cannot pull individual files because pull (ie. fetch) gets new history and there is no individual history per file
00:40 arunpyasi joined #git
00:41 raajay left #git
00:41 jbu osse, a ref spec isn't a path spec, but a path spec is a ref spec, right? The gitpull manpage says I can use a refspec and a path spec is a ref spec
00:42 osse jbu: It's not
00:42 jbu on the git revisions page I see the specifying revisions section has <rev>:<path> in there
00:43 jbu I'm not sure how I'm misinterpreting
00:43 jbu though I do believe you, I just want to know what my misunderstanding is
00:44 osse jbu: That's how one specifies a blob or tree (aka specific version of a file or directory)
00:44 osse Basically it's equivalent to writing a specific hash directl
00:45 Zialus joined #git
00:46 osse The closest you will get to what you want, if I understand correctly, is   git fetch; git checkout branch -- file
00:47 jbu osse, alright, thanks
00:48 kadoban joelsmith: The doc just isn't very clear, though it does say that "The ones listed near the end of this list name trees and blobs contained in a commit." You kind of have to understand from each description what it can be used to name.
00:49 jbu kadoban, was that last message supposed to be for me?
00:50 kadoban Woops, yes.
00:50 jbu kadoban, I actually assumed that the doc wasn't clear
00:51 jbu kadoban, when something says <refspec> I assume we should be able to replace it with anything in the git revision "specifying revisions" page
00:51 jbu when a command says <refspec>*
00:51 jbu but I am finding that seems not to be true
00:51 kadoban Yes, that title isn't very good.
00:51 Anja_ joined #git
00:52 kadoban There probably should be another section for things that don't specify revisions ... maybe.
00:52 jbu kadoban, I also find it really confusing that they're called refspecs but they're for specifying revisions (should be revspec no?)
00:52 jbu so I'm not sure if I've been misunderstanding
00:52 osse ref = reference != revision
00:52 rewt you can also:  git show branch:./file > file
00:53 rewt that'll let you grab it to a different filename, in case you want to diff with what you currently have
00:55 tnecniv joined #git
00:55 tmsmith joined #git
00:55 elsevero_ joined #git
00:56 Puffball joined #git
01:01 e joined #git
01:02 NeverDie joined #git
01:03 Fabricio20 joined #git
01:07 adino joined #git
01:08 bulletmark joined #git
01:11 jw4242 joined #git
01:12 pabs3 joined #git
01:13 shpew12 joined #git
01:13 buffal0 joined #git
01:13 brent__ joined #git
01:14 Derperperd joined #git
01:16 brent__ joined #git
01:17 Tobbi joined #git
01:19 aarobc joined #git
01:22 cagomez joined #git
01:23 bill99 joined #git
01:25 Siegfried joined #git
01:26 sunri5e joined #git
01:27 adymitruk is there a way in git rebase -i to change the author and committer?
01:27 adymitruk ie, I don't want to resort to filter-branch
01:28 adymitruk would insertng "exec git commit --amend --author=.." do the job
01:28 adymitruk I would add that after each pick line..
01:29 sparr joined #git
01:29 dsdeiz joined #git
01:31 sunri5e joined #git
01:32 aeontech joined #git
01:32 sunri5e joined #git
01:34 oskarkv joined #git
01:35 Fabricio20 joined #git
01:38 Darren_ joined #git
01:38 sunri5e joined #git
01:39 Fabricio20 joined #git
01:41 dreiss joined #git
01:45 cdg joined #git
01:48 Nilesh_ joined #git
01:48 hahuang61 joined #git
01:57 mkoskar joined #git
01:57 Sasazuka joined #git
01:58 Derperperd joined #git
01:58 duderonomy joined #git
02:00 cqi joined #git
02:01 Derperperd joined #git
02:02 brent__ joined #git
02:03 cdg joined #git
02:04 LandonJH joined #git
02:07 pks joined #git
02:07 nwkj86 joined #git
02:10 ISmithers joined #git
02:15 cdg_ joined #git
02:15 le_melomane joined #git
02:18 almy joined #git
02:22 esenegoid joined #git
02:26 anuxivm left #git
02:28 fatalhalt joined #git
02:28 dsantiago joined #git
02:31 finalbeta joined #git
02:33 cagmz_ joined #git
02:39 xall joined #git
02:46 Vampire0_ joined #git
02:46 cyphase joined #git
02:46 Goplat joined #git
02:46 d^sh_ joined #git
02:47 looper joined #git
02:47 safe joined #git
02:49 durham joined #git
02:52 davimore__ joined #git
02:52 BSaboia joined #git
02:55 drbean_ joined #git
02:57 aavrug joined #git
02:57 SwiftMatt joined #git
03:00 aw1 joined #git
03:05 Ariadeno_ joined #git
03:05 avarab joined #git
03:05 avarab joined #git
03:05 netj joined #git
03:05 marcaddeo joined #git
03:05 milki joined #git
03:05 rudi_s joined #git
03:05 kkirsche joined #git
03:05 jerrcs joined #git
03:05 rawtaz joined #git
03:05 SupaHam joined #git
03:05 spb joined #git
03:05 Chinorro_ joined #git
03:05 andschwa joined #git
03:05 ColdKeyboard joined #git
03:05 jephsf joined #git
03:05 snits joined #git
03:05 robins joined #git
03:05 thesquib joined #git
03:05 tgummerer joined #git
03:05 blueyed joined #git
03:05 MacGyver joined #git
03:05 adymitruk joined #git
03:05 thejoecarroll joined #git
03:05 chridal joined #git
03:05 TheOrangeOne joined #git
03:05 sim642 joined #git
03:05 grawity joined #git
03:05 rockfruit joined #git
03:05 MacGyver joined #git
03:05 creppe joined #git
03:05 EvilJStoker joined #git
03:05 Korvin joined #git
03:05 jokester joined #git
03:05 roflin joined #git
03:05 _ikke_ joined #git
03:05 jokester joined #git
03:05 EvilJStoker joined #git
03:06 asd5a joined #git
03:06 cwillu_at_work joined #git
03:06 rcn joined #git
03:06 quadz joined #git
03:06 Thorn joined #git
03:06 Ram-Z_ joined #git
03:06 madknight joined #git
03:06 dersand joined #git
03:06 noctux joined #git
03:06 j416 joined #git
03:06 troyt joined #git
03:06 Pie_Napple joined #git
03:06 leah2 joined #git
03:06 Exagone313 joined #git
03:06 jhasse joined #git
03:06 mutex_ joined #git
03:06 pcarrier joined #git
03:06 pcarrier joined #git
03:06 Cathy joined #git
03:06 anbz joined #git
03:07 jrahmy joined #git
03:08 mt joined #git
03:08 VoidFox joined #git
03:08 Log1x joined #git
03:08 Log1x joined #git
03:08 dsantiago joined #git
03:09 chachasmooth joined #git
03:10 huhlig joined #git
03:19 howdoi joined #git
03:24 ghostlight joined #git
03:26 infernix joined #git
03:27 MuffinMedic joined #git
03:27 hexagoxel joined #git
03:30 rbern joined #git
03:32 raedah joined #git
03:34 menip joined #git
03:36 xall_ joined #git
03:37 duderonomy joined #git
03:42 sunri5e joined #git
03:43 jbu all: in my local master, I committed a file.  This commit isn't present on the remote master.  So when I do git log origin/master..master, I expect it to show just the single commit that origin/master doesn't have.  Instead it prints nothing.  Anyone know what my misunderstanding is here?
03:43 carpii joined #git
03:47 jbu nevermind...my head was detached :/
03:53 a_thakur joined #git
03:53 cdown joined #git
03:53 Vortex34 joined #git
03:53 Wasp joined #git
03:55 askb joined #git
03:57 micha joined #git
03:57 cdown_ joined #git
03:58 dreiss joined #git
04:00 ome joined #git
04:02 fuzzmz joined #git
04:02 fatalhalt joined #git
04:02 fstd_ joined #git
04:10 Derperpe1 joined #git
04:17 salamanderrake joined #git
04:18 inflames joined #git
04:20 Emperor_Earth joined #git
04:30 MarMi joined #git
04:30 duderonomy joined #git
04:31 Derperpe1 joined #git
04:34 matsaman joined #git
04:37 svm_invictvs joined #git
04:40 subhojit777 joined #git
04:42 brent__ joined #git
04:42 xall_ joined #git
04:46 mischat joined #git
04:54 laumann_ left #git
04:54 laumann_ joined #git
04:54 cdown joined #git
04:56 laumann_ left #git
04:57 jbu figuratively and literally
04:59 laumann joined #git
05:02 cqi joined #git
05:04 unnamedplayer joined #git
05:07 UnnamedPlayer joined #git
05:12 donught joined #git
05:14 pabs3 left #git
05:17 kexmex joined #git
05:22 hahuang65 joined #git
05:24 JamesBaxter joined #git
05:47 brent__ joined #git
05:48 adino joined #git
05:49 ayogi joined #git
05:49 freimatz3 joined #git
05:51 bocaneri joined #git
05:52 bocaneri joined #git
05:53 dreiss joined #git
05:53 Cabanossi joined #git
05:55 hahuang65 joined #git
05:59 sbulage joined #git
06:00 lindenle joined #git
06:03 wellst joined #git
06:13 wellst joined #git
06:14 rscata joined #git
06:17 GodGinrai joined #git
06:21 dreiss joined #git
06:25 f0rks joined #git
06:27 ki0 joined #git
06:29 menip joined #git
06:48 ThomasLocke joined #git
06:48 ThomasLocke joined #git
06:48 oaao joined #git
06:49 Raging_Hog joined #git
06:49 oaao joined #git
06:51 hahuang61 joined #git
06:53 mic4ael joined #git
06:53 xterm joined #git
07:01 dermoth joined #git
07:07 Chaser joined #git
07:09 _ng joined #git
07:09 chele joined #git
07:10 jozwior_ joined #git
07:12 stick-shift joined #git
07:13 JeroenT joined #git
07:14 hhee joined #git
07:15 hhee joined #git
07:16 a_thakur joined #git
07:21 cagedwisdom joined #git
07:22 robins left #git
07:22 robinsmidsrod joined #git
07:24 zefferno joined #git
07:31 spacelord_ joined #git
07:31 Snugglebash joined #git
07:35 qt-x joined #git
07:36 dreiss joined #git
07:38 Sceorem joined #git
07:40 acetakwas joined #git
07:40 _nwkj86 joined #git
07:41 JeroenT joined #git
07:42 nd joined #git
07:42 lordjancso joined #git
07:44 stick-shift joined #git
07:45 stick-shift joined #git
07:46 stick-shift joined #git
07:47 stick-shift joined #git
07:48 stick-shift joined #git
07:48 systemovich joined #git
07:48 jnavila joined #git
07:48 stick-shift joined #git
07:49 stick-shift joined #git
07:50 stick-shift joined #git
07:53 JeroenT joined #git
07:54 ki0 joined #git
07:59 Alienpruts joined #git
08:01 jknetl joined #git
08:02 noodle joined #git
08:02 tsunamie joined #git
08:02 elect joined #git
08:04 Vortex35 joined #git
08:04 Siegfried joined #git
08:04 tvw joined #git
08:05 energizer joined #git
08:06 energizer If I do git merge, will everything red in git diff go away?
08:06 Tobbi joined #git
08:06 tvl energizer: red stuff in git diff just means lines that were removed
08:06 energizer tvl: but i dont want them to be removed
08:07 energizer i like the red stuff
08:08 tobiasvl energizer: OK, I'm just saying that merging doesn't make removed lines go away
08:08 ghostlight joined #git
08:09 energizer tobiasvl: thats a little hard for me to understand. is there another way to say the same thing
08:09 tobiasvl probably I'm misunderstanding your actual question
08:09 tobiasvl could you explain better what you're wondering about?
08:09 tobiasvl do you have an actual problem?
08:09 energizer i like the red version not the green version
08:10 jast what diff is showing you unwanted red lines? what command did you run to get the diff?
08:10 energizer i dont know what will happen if i say git merge
08:10 energizer git diff
08:11 jast okay, so that says you have uncommitted changes that aren't doing what you want them to do
08:11 tobiasvl that just shows you what you haven't committed yet
08:11 jast basically you want to go back to whatever is in the last commit>
08:11 tobiasvl "git merge" won't apply those changes or anything
08:11 energizer i made some changes on another computer, pushed them to github, fetched them here. now git diff shows some red and some green. but i like the red version more
08:11 jast fetching doesn't apply the changes... did you do anything else?
08:12 energizer no i didnt merge yet
08:12 bl0w3d_0ut joined #git
08:12 deltab just "git diff" with no parameters?
08:13 energizer right
08:13 energizer wait
08:13 energizer no
08:13 energizer git diff origin/master
08:13 jast see, that's quite different
08:13 energizer right
08:13 energizer sorry
08:15 Tanfrieze joined #git
08:15 energizer So to summarize. i made some changes on another computer, pushed them to github, fetched them here. now git diff origin/master shows some red and some green. but i like the red version more
08:15 jast the thing is, it isn't really straightforward to see from that diff what's going to be merged
08:16 jast a merge combines changes from two different places (compared to the original which both of the places are based on). the diff doesn't look at the base, so all it can tell you is how the two versions are different
08:16 energizer so the diff origin/master is saying relative to origin/master, what you have on master is these removals and these additions, but doesn't specify which version of a given line will end up in the merge, is that right?
08:16 carpii why not compare it to your local master, rather than origin master?
08:17 jast my suggestion is to go ahead and do the merge, if the result doesn't look like what you want, you can easily undo it (just don't push before you've looked at it)
08:17 energizer carpii: i'm on master already
08:17 deltab do you have any uncommitted changes locally?
08:18 carpii hm ok, so these commits should never have made it as far as local master really
08:18 carpii if theyve removed lines you want to keep
08:18 alcohol joined #git
08:18 jagob joined #git
08:18 cyan__ joined #git
08:18 jast remember this is a direct comparison, there may not actually be anything wrong with the red lines
08:18 energizer well i think they're only 'removed' in the sense that they haven't been added to local master but have been added to origin master
08:19 carpii oh ok
08:19 carpii so youve tried to just git pull?
08:19 energizer fetch
08:19 carpii ok fetch :p
08:19 energizer deltab: no uncommitted changes locally
08:19 energizer jast: is my above clarifying questino correct?
08:21 jast well, git diff with just one argument compares your working tree (including any uncommitted changes) to the version given as the argument
08:21 energizer ok i think that's consistent with my prior understanding
08:21 energizer ill try the merge as u suggest
08:22 jast basically your diff says: these red lines do not exist in the current working tree, but they do exist in origin/master
08:22 TomyWork joined #git
08:22 energizer oh, merge conflicts
08:23 energizer is there a recommended merge tool for newbies
08:23 jast personally I tend to just directly edit the conflicted files by looking at the conflict markers in them
08:23 Snugglebash joined #git
08:24 jast I believe meld and kdiff3 are pretty straightforward, don't know about the rest
08:24 jast hmm, do we have fancy advice about this? !eek
08:24 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
08:24 Unode joined #git
08:24 Anja_ joined #git
08:25 jast right, that's pretty basic
08:25 energizer well so far i can say, meld is visually impressive
08:25 netj joined #git
08:26 jast overwhelming impressive or clean impressive? ;)
08:26 dminuoso joined #git
08:26 energizer so what's happening here is the two conflicting versions are on the left and right and my resolved version is in the middle?
08:26 dminuoso So the only difference between a tag, a remote and a commit is just the directory name the ref lies in?
08:26 jast something like that, yeah. I don't remember the specific UI very well
08:26 dminuoso Does this imply I can treat them all the same (i.e. treat a tag like a commit, or a remote like a tag) ?
08:26 deltab perforce merge is pretty nice (I only actually use vim-fugitive's :Gdiff, however, as I edit files remotely)
08:27 dminuoso Because it seems all a "ref" is, is just a pointer to a commit
08:27 jast dminuoso: yes, except annotated tags (created with -a or -s, I think) are usually references to a tag object which, in turn, references another Git object (almost always a commit)
08:27 jast s/usually//
08:27 dminuoso jast: Alright.
08:27 jast in practical use, refs pretty much always end up resolving to a commit
08:28 dsdeiz joined #git
08:28 dsdeiz joined #git
08:28 dminuoso jast: So the difference between "tags" and "remotes" is just convention?
08:28 deltab dminuoso: a tag points to one particular commit, and doesn't get updated; a branch head updates to point to newly-added commits
08:28 jast dminuoso: well, hardcoded convention in some instances, because some of the tools know about these namespaces
08:28 jast for instance, 'git branch' will only ever created refs in refs/heads/
08:28 jast *create
08:28 d0nn1e joined #git
08:31 dminuoso jast: Right
08:31 masak_ left #git
08:31 jast oh, and I guess notes are a bit special, too (usually in refs/notes)
08:33 energizer ok i picked all the changes i wanted, now what happens if i press save? (i seem to have three separate documents open in meld)
08:33 Tobbi joined #git
08:33 jast meld uses temporary files provided by git, when you save git will pick up the changes and do its magic
08:33 vinnie-the-panin joined #git
08:34 jast not right when you save, that is, but when you quit it will pick up the saved changes
08:34 carpii left #git
08:35 aax joined #git
08:35 energizer ok saved, committed with merge commit message, now i have these extra untracked files hanging around. make sure i'm happy, then delete?
08:36 jast probably, yeah
08:36 xall_ joined #git
08:37 deltab yes, those should be the versions from the two sides of the merge, and the one you saved is what gets committed as the result of the merge
08:37 BadSnappa joined #git
08:37 nowhereman joined #git
08:38 deltab btw, if you think meld is impressive, http://naleid.com/images/f​our_pane_merge_p4merge.gif
08:38 jhgundersen joined #git
08:39 energizer wow
08:39 Alienpruts joined #git
08:41 deltab via http://naleid.com/blog/2013/10/29/​how-to-use-p4merge-as-a-3-way-merg​e-tool-with-git-and-tower-dot-app/
08:42 Balliad joined #git
08:42 Tobbi joined #git
08:42 energizer cool
08:44 nickMe joined #git
08:45 rcn joined #git
08:45 Meteorhead joined #git
08:46 kurkale6ka joined #git
08:46 cagedwisdom joined #git
08:47 cdown joined #git
08:49 encod3 joined #git
08:50 Balliad joined #git
08:50 theoceaniscool joined #git
08:50 dsdeiz joined #git
08:50 encod3 joined #git
08:51 stick-shift joined #git
08:53 hahuang61 joined #git
08:56 Mo joined #git
08:56 Mo Hi, for a repo I'm only interested in the log, I don't need the working file, so I did git clone --bare, but I can't git pull inside there now. How do I pull updates?
08:57 rominronin joined #git
08:58 a_thakur joined #git
08:59 mischat joined #git
09:00 deltab Mo: pulling includes merging, which needs a worktree so that there's somewhere to resolve conflicts
09:00 deltab use fetch instead
09:00 davimore_ joined #git
09:01 encod3 joined #git
09:02 encod3 joined #git
09:03 Siegfried joined #git
09:03 lindenle joined #git
09:04 bongjovi joined #git
09:05 GavinMagnus joined #git
09:06 Celelibi joined #git
09:07 mikecmpbll joined #git
09:09 metachr0n joined #git
09:09 Mo deltab: git fetch always says Fetching.. * branch... no up-to-date or something to see if there were updates, no?
09:09 deltab git fetch -v  shows more
09:10 watmm joined #git
09:10 Renter deltab: it's really weird for me to hear that, I've been using git for years in a professional setting and I'm only now finding out about fetch :)
09:11 Tobbi joined #git
09:12 jast that's kind of concerning ;)
09:12 jast Mo: 'git clone --bare' does not set up configuration to make later updates easy
09:12 jast for that purpose, --mirror may be a better choice
09:13 Renter jast: I've been through like two git trainings, read a bunch of docs and stackexchange, pretty much everywhere it starts with git pull :P
09:13 jast you can still update, it just takes a little more, e.g. git fetch origin refs/heads/*:refs/heads/*
09:13 selckin Renter: get your money back
09:13 jast the official tutorial mentions fetch right after pull
09:14 jast for reference, man gittutorial
09:14 gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html
09:14 Renter In my defence, I came from vss -> svn so I just switched commit -> push, update -> pull, and it's worked just fine so far
09:14 jast reminds me, I wanted to make the manpages auto-update
09:14 selckin update = pull --rebase
09:14 JeroenT joined #git
09:14 Renter selckin: yes, I found out about pull -rebase this year as well :)
09:15 energizer Renter: im new to all this but the Pro Git book was really helpful for me
09:15 Renter 'oh huh, that's handy, no merge commits'
09:15 PioneerAxon joined #git
09:15 energizer (and free online https://git-scm.com/book/en/v2)
09:15 jast ... and done
09:15 selckin you sound like hype driven development company
09:16 jast hmm, quite a leap, that
09:16 Renter you say hype, I say aggressive marketing, tomato, tomato
09:16 wget joined #git
09:16 wget joined #git
09:16 selckin so they were using svn, swtiched to git, learned just enough to use it like svn
09:16 Renter oh no, sorry, I switched companies
09:16 Renter vss -> svn was within a company, then company switch
09:17 jast at this point it's really not a hype
09:17 jast and even if you stick with a minimal usage pattern there are still advantages to git
09:17 Renter oh yes
09:17 jast (and disadvantages, if you like having your repository double as a file archive)
09:17 robotroll joined #git
09:18 selckin not digging at git, but so many people i see that refusie to learn the basics about the tools they use every single day
09:18 selckin everything i have to help my college setup their ide i wanna die
09:18 jast well you can't spend time on everything
09:18 Renter selckin: relevant xkcd https://xkcd.com/1597/
09:18 selckin Renter: always good if you can laugh at yourself
09:19 jast people make trade-offs. I think spending extra time understanding your tools is well worth the effort, but not everyone agrees
09:19 jast for the first three or so years of me using vim, I wasn't being very efficient, either
09:19 JeroenT_ joined #git
09:19 clmsy joined #git
09:19 Renter I use vim, probably not even close to being as effective as I could :)
09:20 jast and I only started appreciating the jump list, for instance
09:20 jast only recently, that is
09:21 marcogmonteiro joined #git
09:21 Renter huh, interesting
09:21 UniFreak joined #git
09:21 jast if you just look at one vim feature a week, turns out you can learn a whole lot :)
09:22 UniFreak hi. say I have a branch 'feature', I want to know from which branch this `freature` is created. how to do that?
09:22 jast same for its competitor(s), of course, but I don't know nearly as much about those
09:22 energizer jast: thats an interesting approach, do you consciously try to pick up a feature a week?
09:22 jast UniFreak: git doesn't really care to remember that specific detail, you can look at "feature"'s reflog and it *might* help: git log -g feature, at the end
09:23 PioneerAxon joined #git
09:23 jast energizer: nah, I don't put a clock to it
09:23 Tobbi joined #git
09:23 jast but I do keep looking, which is what matters
09:23 energizer ya somehow ive gotten discouraged
09:23 energizer from learning my text editor
09:24 jast don't do it all at once. small things at a time
09:24 jast then you can spend a while figuring out how the newest small thing fits into your workflow, and before you know it it's second nature
09:24 energizer C-x C-c- C-M-C-p C-omg-honestly
09:24 selckin if it is the main development editor you should learn a lot about it, for most these are IDEs these days tho, and not vim/emacs/...
09:24 jast well that's emacs for you ;)
09:24 garethdaine joined #git
09:24 deltab look at http://vi.stackexchange.com/ occasionally
09:25 deltab install some of these: https://github.com/tpope
09:25 jast if you do use emacs and aren't terribly experienced with it, you might appreciate spacemacs
09:25 jast I'm using quite a few vim plugins by now
09:25 jast in case you're curious: https://gist.github.com/jast/e3​930169cdee4bb972dd141efd13b3ff
09:26 jast there are still a few things I'm not happy with, it's a perpetual work in progress
09:26 energizer ive been using emacs for a few years so i have the elementary stuff in muscle memory -- enough that when i tried out atom i put emacs keybindings -- but not enough that i did indeed try out atom
09:26 jast fortunately I'm not at all interested in atom ;)
09:29 ismithers joined #git
09:29 systemovich joined #git
09:31 Gloomy joined #git
09:31 mischat joined #git
09:40 JeroenT joined #git
09:43 elect joined #git
09:43 bl0w3d_0ut joined #git
09:45 TankBo joined #git
09:46 TankBo Hey. Does anyone know if the new "core.sshCommand" also applies to `git submodule update --init` calls? I'm not having success with it.
09:46 t0by joined #git
09:46 t0by joined #git
09:46 GavinMagnus left #git
09:48 Gloomy joined #git
09:48 jast probably not. seems like a corner case, anyway... technically the submodule is a repo of its own, so it might actually be wrong to reuse the value from the parent repo
09:48 jast so, if you ask me, there isn't really one right way to handle this kind of situation
09:49 xall_ joined #git
09:49 PioneerAxon joined #git
09:50 Gloomy joined #git
09:50 Serpent7776 joined #git
09:51 PioneerAxon joined #git
09:52 Gloomy joined #git
09:52 TankBo jast: Too bad. My scenario is that the submodule URLs are pointing to github.com, and I use an SSH host setting for using a specific key file. So I'd like to explicitly tell Git what SSH keyfile to use for the operation. Seems like I have to settle for GIT_SSH_COMMAND.
09:55 canton7 TankBo, can't you customise the bit in your .git/config for that submodule, and set up a different url for it, then use your SSH config to apply a particular key to that host?
09:56 chll_ joined #git
09:56 aeontech joined #git
09:56 TankBo canton7: Yup that'd be possible, it's just another setting I have to take care of and pay attention to, e.g. when using `git submodule init` in case someone else adds another module.
09:56 TankBo core.sshCommand just sounded perfect for my use-case. :-)
09:56 Lachezar joined #git
09:57 canton7 TankBo, what exactly is your scenario? Do you want to use the same SSH key for all connections to remotes from that repo only?
09:57 overlord_tm joined #git
09:57 PioneerAxon joined #git
09:58 mischat joined #git
09:58 canton7 the repo and all of its submodules, I mean
09:58 Lachezar Hey all. I've got a problem with Git: there are some files that contain \r\n as line separators, and *MUST* contain those, since they're used for comparison in test cases, but Git insists on converting those to \n on Linux and wreaks havok on my test cases. What can I do about that?
09:58 canton7 Lachezar, set up your .gitattributes so that git doesn't do line ending conversion on them
09:58 canton7 man gitattributes
09:58 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
09:59 TankBo canton7: Exactly. By default I use my "private" SSH key for GitHub, for hobby projects and personal repositories. For other repositories though I use my work SSH key. And when `git submodule` falls back to my default SSH key, I won't be able to access "work submodules" without further configuration.
10:00 canton7 e.g. a line like 'myfile -text', I think?
10:00 ismithers1 joined #git
10:00 canton7 TankBo, you might be able to use url.<base>.insteadOf in that repo? Set that to a host, then use your ssh config to use a key for that host?
10:00 TankBo canton7: Oh, that sounds interesting. Sec!
10:01 canton7 (never used that myself, and not sure if it applies to submodules, although I'd be surprised if it didn't... Sounds like it should work though)
10:01 TankBo canton7: Wow, I wasn't aware of that one, that's just superb. Thanks!
10:01 PioneerAxon joined #git
10:01 canton7 You've confirmed that it works? awesome!
10:02 selckin Lachezar: git will not change line endings on linux, only broken windows installs can possibly do it by default (it asks during install)
10:02 canton7 selckin, that's incorrect
10:03 selckin prove it
10:03 TankBo canton7: Argh, unfortunately no, it's not substituted for submodules. :(
10:03 canton7 TankBo, aww :(
10:03 bannakaffalatta joined #git
10:03 jast chances are the file has been normalized to \n already in the repo
10:03 canton7 selckin, if you have a .gitattributes with text eol=crlf, git will convert to crlf whether you're on windows or linux
10:03 jast AFAIK there is nothing that rewrites \r\n to \n during checkout
10:03 canton7 selckin, if you've set core.eol = crlf on linux, git will normalize to crlf
10:03 selckin canton7: yes and the sky is blue, any other information thats not related?
10:04 selckin canton7: then you should ask him if he accidently set that option
10:04 jast all of the line ending normalization happens on writing to the index, only denormalization happens on checkout
10:05 canton7 selckin, chill out :) whether git does normalization or not depends on configuration. Whether you're on Windows or not only affects the default value for one configuration option. You can change that option, or there are other options you can change on any platform
10:05 Cwolf3D joined #git
10:05 canton7 therefore "git will not change line endings on linux" is incorrect - it will if you configure it to
10:06 selckin his statement "on linux" implied he believe it does it by default
10:06 selckin not that he changed some arcane setting
10:06 canton7 setting up line ending normalization isn't "arcane" - it's fairly standard practice
10:07 canton7 the fact that his CRLF is being converted to LF does rather imply that normalization is set up
10:07 canton7 I'm going to guess his repo has a .gitattributes which sets up normalization
10:07 selckin so you solution was to add another setting to override thet setting?
10:08 jast or autocrlf is active (many stupid websites recommend it)
10:08 canton7 yes. My guess is that he has a blanket rule for all files. That's probably fine for 99% of his files, except this one. So my advice is to set up more specific configuration for this special file
10:08 Lachezar canton7: The .gitattributes reference was key. I saw that the original dev has '*.txt text eol=lf' there, but a 'handful' of the .txt files need to be \r\n, so I added them explicitly as 'binary'.
10:09 jast it might even make sense to set 'eol=crlf' on them to have git enforce CRLF
10:09 canton7 Lachezar, sweet. Marked them as binary how exactly? Be aware that that might stop git from merging them, depending on what exactly you did
10:09 canton7 selckin, see? ^
10:10 canton7 and yeah, follow jast's suggestion
10:10 selckin canton7: you got lucky and that wasn't what you told him todo
10:10 canton7 selckin, no I'm experienced, and it was
10:10 navidr joined #git
10:10 Lachezar canton7: 'path/to/file/in/repository/content.txt binary' for every file
10:11 canton7 Lachezar, you probably don't want 'binary'
10:11 canton7 Lachezar, that will stop git from diffing or merging them
10:11 canton7 you probably want 'text eol=crlf'
10:11 Lachezar canton7: What should I put? Tried 'text eol=crlf' but the files seems to retain the \n
10:12 selckin you remove those settings so git doesn't change them at all
10:12 selckin or go talk to whoever added it and ask why lf is enforced on the project
10:12 selckin (and then possibly comply to the policy)
10:12 canton7 Lachezar, you might need to check the file out again?
10:12 canton7 selckin, yeah - if the person who set up the repo set up line normalization, you're probably going to be in trouble if you remove it ;)
10:13 selckin canton7: why?
10:13 selckin oh not technical trouble
10:13 canton7 because they probably had their reasons for configuring eol normalization
10:13 selckin yeah
10:13 canton7 yeah
10:13 mischat joined #git
10:14 Lachezar canton7: 'git reset file' after changing the .gitattributes for the files seems to work!
10:15 jast eol=crlf will get applied the next time you commit a change to the file, or the index entry gets re-generated for any other reason
10:15 canton7 Lachezar, cool! For more info read https://help.github.com/articl​es/dealing-with-line-endings/, especially the "Refreshing a repository..." bit. However if things look fine now no need to follow the steps in that section!
10:15 bl0w3d_0ut joined #git
10:16 Silox| joined #git
10:19 finalbeta joined #git
10:20 Lachezar canton7: I'm pretty sure the original dev just overlooked those. Most files are *really* lf only, these handful however are relics, but are binary compared as expected result.
10:20 Grievar joined #git
10:21 Grievar What's the best way to mirror a git repo, where we want to use the mirror as a remote?
10:21 noctux joined #git
10:21 canton7 Lachezar, yeah, most likely. Also be aware that you can use globs in your gitattributes, if your special-case files are globbable
10:21 Grievar In particular, I don't want everything to blow up if someone tries to pull from my mirror while the mirror itself is pulling
10:21 Grievar (does git already handle that correctly?)
10:21 Shentino joined #git
10:22 Lachezar canton7: No, they're not globable, it's just a small subset of files that are QR Encoded multi-line text. Most are single-line :)
10:22 canton7 ah, sweet
10:22 King_Hual joined #git
10:23 overlord_tm joined #git
10:23 Snugglebash joined #git
10:24 jast Grievar: git clone --mirror (and later git fetch). don't worry, fetches are atomic.
10:24 jast per ref, that is
10:25 jast if you fetch during an update that changes both A and B, you might get the old version of B and the new version of A, but each individual ref will be in a consistent state
10:27 nanga joined #git
10:27 nanga joined #git
10:28 ihradek joined #git
10:29 Grievar jast: so basically, I have the "main" repo, the mirror repo, and an automated system that pulls from the mirror repo. The mirror repo is only modified by fetching from the main repo, the automated system never pushes
10:29 Grievar this should just work?
10:29 rnsanchez joined #git
10:29 Grievar (I'm mainly doing this because the "main" repo is located remotely and goes inaccessible occasionally)
10:30 jast Grievar: yeah, seems pretty straightforward
10:30 Grievar ok!
10:30 jast with bare/mirror repos you don't use pull, though, you use fetch
10:30 bschindler joined #git
10:30 Grievar right
10:31 bschindler Hi - I have a repo that was converted using git-svn. It seems git svn imports the repo by storing the data as-is. So if the repo stored windows line endings, the git repo will have line endings as well
10:31 Grievar we might occasionally have to clean up messes caused by force pushing with this setup but that isn't frequently a problem
10:31 tobiasvl or the automated system could push to the bare repo
10:31 * Lachezar does similar thing to have a closer/local copy of the Android repo.
10:31 Grievar (i.e. someone deletes a branch in the main repo, then later creates a branch with the same name)
10:31 Grievar (e.g., rather)
10:31 bschindler How can I convert the repo to store unix line endings?
10:32 canton7 bschindler, this looks promising: http://superuser.com/a/293951
10:32 mazert_ joined #git
10:34 bschindler canton7, thx
10:36 theaj42 joined #git
10:36 bl0w3d_0ut joined #git
10:37 ismithers joined #git
10:37 nidr0x joined #git
10:37 Tobbi joined #git
10:39 ismithers1 joined #git
10:39 jast Grievar: --mirror sets itself up so that future fetches into the mirror overwrite everything
10:43 nettoweb joined #git
10:43 ismithers joined #git
10:43 eduardas_m joined #git
10:46 Limes_ joined #git
10:51 ok91 joined #git
10:52 Grievar jast: Thanks!
10:52 cebor joined #git
10:53 hahuang61 joined #git
10:54 achadwick joined #git
10:54 jast Grievar: you might want to run 'git fetch --prune', too, to remove refs that no longer exist in the original repo
10:58 csk157 joined #git
10:59 YuGiOhJCJ joined #git
11:00 bl0w3d_0ut joined #git
11:02 nickMe joined #git
11:03 qt-x joined #git
11:03 rbern joined #git
11:04 ismithers1 joined #git
11:05 Tobbi joined #git
11:06 garethdaine joined #git
11:06 Cork joined #git
11:08 ismithers joined #git
11:08 ismithers1 joined #git
11:09 JeroenT joined #git
11:09 theoceaniscool joined #git
11:10 JeroenT joined #git
11:13 wget joined #git
11:13 wget joined #git
11:14 nikivi joined #git
11:15 dsdeiz joined #git
11:15 dsdeiz joined #git
11:15 eduardas_m joined #git
11:20 donught joined #git
11:20 Tobbi joined #git
11:22 cyan__ joined #git
11:23 MafiaInc joined #git
11:26 bl0w3d_0ut joined #git
11:26 sylario joined #git
11:28 nikivi joined #git
11:29 ome joined #git
11:31 addictNRO joined #git
11:31 Fabricio20 joined #git
11:32 leeN joined #git
11:32 oskarkv joined #git
11:33 a_thakur joined #git
11:36 manuelschneid3r joined #git
11:37 jimi_ joined #git
11:37 joki- joined #git
11:38 ok91 joined #git
11:38 masuberu joined #git
11:41 Tobbi joined #git
11:41 workerbeetwo joined #git
11:42 workerbeetwo Hi. to force pull an update/gitrebased branch?
11:44 workerbeetwo or how to delete the local branch without and retrieve the new version of the same?
11:44 JeroenT_ joined #git
11:44 Emperor_Earth joined #git
11:45 Phil-Work workerbeetwo: git fetch ; git branch -f yourbranch origin/yourbranch
11:46 Phil-Work first, you need to checkout to something that isn't yourbranch
11:48 bl0w3d_0ut joined #git
11:49 jast no need
11:49 star_prone joined #git
11:49 jast when on the branch you want to change: git fetch; git reset --hard origin/yourbranch
11:49 jast will destroy uncommitted changes, too
11:49 bl0w3d_0ut joined #git
11:51 aw1 joined #git
11:51 ertesx joined #git
11:51 maktm joined #git
11:51 maktm say i have a fork where i made a few commits to and the master/original went ahead of me without updating
11:52 maktm is it possible to revert my change (i.e. undo them) then update to the master?
11:52 maktm i'm 6 commits ahead, 12 commits behind original:master
11:53 jast you want to get rid of all of your commits?
11:54 Unode left #git
11:54 maktm jast, yeah the commits i made to my fork
11:54 maktm as in a new fork
11:55 a_thakur joined #git
11:55 gear4 joined #git
11:55 mikap joined #git
11:55 rebrec_ joined #git
11:55 jj-_ joined #git
11:55 Rhonda joined #git
11:55 Spinkzeit` joined #git
11:55 cyberz joined #git
11:55 ldleworker joined #git
11:55 ftoulemon joined #git
11:55 BeerSerc joined #git
11:55 Pieter_ joined #git
11:55 cworth joined #git
11:55 przemoc joined #git
11:55 silnp joined #git
11:55 arand joined #git
11:55 mikap joined #git
11:55 bond joined #git
11:55 mns joined #git
11:56 axisys joined #git
11:56 vdl joined #git
11:56 Orbitrix joined #git
11:56 feodaron joined #git
11:56 umbSublime joined #git
11:56 dustinm joined #git
11:56 smithbone joined #git
11:56 jnavila joined #git
11:56 likewhoa joined #git
11:56 gnoirzox1 joined #git
11:56 biertie joined #git
11:56 TomyWork joined #git
11:56 Peng joined #git
11:56 Stravy joined #git
11:56 przemoc joined #git
11:56 axisys joined #git
11:56 m1dnight1 joined #git
11:56 Sleepy63 joined #git
11:56 umbSublime joined #git
11:56 mdk joined #git
11:56 Karazhan joined #git
11:56 themill joined #git
11:56 swalladge joined #git
11:56 malide joined #git
11:56 jast maktm: okay, simple then: git reset --hard origin/master (or whatever it's called in your repo). conveniently throws away uncommitted changes, too.
11:56 BrAsS_mOnKeY joined #git
11:56 ariver joined #git
11:56 tilpner joined #git
11:56 ahf joined #git
11:56 holdsworth joined #git
11:56 bodie_ joined #git
11:56 raatiniemi joined #git
11:56 Xethron joined #git
11:57 kireevco joined #git
11:57 giraffe joined #git
11:57 vcoinminer joined #git
11:57 tmz joined #git
11:57 grift joined #git
11:57 shakalaka joined #git
11:57 monokrome joined #git
11:57 tomek joined #git
11:57 tomek joined #git
11:58 chamunks joined #git
11:58 warthog9 joined #git
11:58 Tobbi joined #git
11:59 qlkzy_ joined #git
12:00 Lunatrius joined #git
12:00 ELLIOTTCABLE joined #git
12:00 a_thakur joined #git
12:01 angular_mike_ joined #git
12:01 Snugglebash joined #git
12:01 barq joined #git
12:01 ELLIOTTCABLE joined #git
12:01 eshlox joined #git
12:03 csk157_ joined #git
12:05 nikivi joined #git
12:06 maktm jast, yep. just had to add the upstream then do that
12:06 maktm thanks a lot
12:08 AlineGomes joined #git
12:08 Loomaanaatii joined #git
12:11 newbie1 joined #git
12:17 ghostlight joined #git
12:18 _ng joined #git
12:20 kristofferR joined #git
12:21 Darcidride joined #git
12:22 Loomaanaatii joined #git
12:22 hwoarang joined #git
12:23 zeroed joined #git
12:23 zeroed joined #git
12:23 freimatz joined #git
12:24 leftriver94 joined #git
12:24 roelmonnens joined #git
12:27 leftriver94 how can I check what is wrong with git proxy? here is my gitconfig
12:27 leftriver94 [https] proxy = socks5://127.0.0.1:1081
12:27 Xethron joined #git
12:27 leftriver94 git clone https://gitlab.com/gitlab-org/gitlab-ce.git    130  Klone nach 'gitlab-ce' ... fatal: unable to access 'https://gitlab.com/gitlab-org/gitlab-ce.git/': Failed to connect to gitlab.com port 443:
12:28 leftriver94 proxychains git clone https://gitlab.com/gitlab-org/gitlab-ce.git [proxychains] config file found: /etc/proxychains.conf [proxychains] preloading /usr/lib/libproxychains4.so [proxychains] DLL init: proxychains-ng 4.12 Klone nach 'gitlab-ce' ... [proxychains] DLL init: proxychains-ng 4.12 [proxychains] Strict chain  ...  127.0.0.1:1081  ...  gitlab.com:443  ...  OK [proxychains] DLL init: proxychains-ng 4.12 remote: Counting object
12:28 hwoarang_ joined #git
12:28 minikN joined #git
12:29 leftriver94 git clone directly is not working. but force proxy by using proxychains is working. I do not know what is wrong. Any comments will be appreciated
12:30 selckin docs say http.proxy not https.proxy
12:30 rumble joined #git
12:31 leftriver94 ok I will try if that works. Thank you
12:32 garethdaine joined #git
12:33 addictNRO joined #git
12:34 addictNRO left #git
12:35 Snugglebash joined #git
12:38 babilen joined #git
12:41 jknetl joined #git
12:43 CheckDavid joined #git
12:43 Tobbi joined #git
12:45 Achylles joined #git
12:54 hahuang61 joined #git
12:57 ojdo joined #git
12:58 garethdaine joined #git
13:02 leeN joined #git
13:02 synthroid joined #git
13:04 synthroi_ joined #git
13:06 UniFreak joined #git
13:06 Snugglebash joined #git
13:06 lindenle joined #git
13:09 pbrewczynski joined #git
13:12 aavrug joined #git
13:13 grumble joined #git
13:13 Derperpe1 joined #git
13:14 charlie_ joined #git
13:14 babilen joined #git
13:18 bl0w3d_0ut joined #git
13:21 thiago joined #git
13:22 zeroed joined #git
13:22 zeroed joined #git
13:23 leeN joined #git
13:25 Tobbi joined #git
13:26 al-damiri joined #git
13:27 siddart joined #git
13:33 Endarked joined #git
13:33 biertie joined #git
13:33 csk157_ joined #git
13:34 siddart joined #git
13:36 SteffanW joined #git
13:37 Gloomy joined #git
13:38 lindenle joined #git
13:40 cqi joined #git
13:40 jeffreylevesque joined #git
13:41 sdothum joined #git
13:41 csk157_ left #git
13:42 Random832 joined #git
13:43 thethorongil joined #git
13:44 csk157 joined #git
13:44 deciph3r joined #git
13:45 deciph3r joined #git
13:47 JeroenT joined #git
13:49 howdoi joined #git
13:52 _Cyclone_ joined #git
13:55 cheater joined #git
13:55 cheater hi guys
13:57 JeroenT joined #git
13:57 irqq joined #git
13:58 gajus joined #git
13:58 kristofferR joined #git
14:00 irqq it seems my git installation does not have git-svn. How do I get this? My git is installed as a freebsd pkg.
14:00 _ng joined #git
14:01 irqq ... all I want to do is `git svn clone ...`, per https://git-scm.com/docs/git-svn
14:01 hariel joined #git
14:02 rwb joined #git
14:02 canton7 irqq, you might have to ask the freebsd guys
14:03 canton7 it's down to how they packaged it
14:03 canton7 is there a separate git-svn package?
14:05 rwb joined #git
14:06 irqq can I compile it from sources and add to existing git installation?
14:06 babilen joined #git
14:06 Tobbi joined #git
14:06 mischat_ joined #git
14:06 selckin ask in  #freebsd
14:06 shpew12 joined #git
14:07 canton7 irqq, top hit on google suggests that it's in the 'git-subversion' package?
14:08 irqq OK, I searched for git-svn package :)
14:09 bket joined #git
14:10 eduardas_m joined #git
14:10 BadSnappa joined #git
14:10 BinGOs there does appear to be a git-subversion package.
14:10 [0xAA] joined #git
14:12 irqq Yes, subversion vs. svn is what confused me. Thanks!
14:13 noecc joined #git
14:14 Derperpe1 joined #git
14:15 manuelschneid3r joined #git
14:16 nidr0x joined #git
14:16 mazert_ joined #git
14:18 jimi_ joined #git
14:18 hohoho joined #git
14:18 joelsmith joined #git
14:19 shampine joined #git
14:20 ExoUNX joined #git
14:21 Gsham joined #git
14:21 leftriver37 joined #git
14:21 leftriver37 hello guys, I need to show the identical files between two branches. How can I do that?
14:22 lindenle joined #git
14:23 GT4066 joined #git
14:23 leftriver37 more specifically, all files that exist on both branches and have the same contents in both branches.
14:24 siddart joined #git
14:24 selckin i'd be suprised if you can do that without some scripting
14:25 hhee joined #git
14:25 hhee joined #git
14:26 Tobbi joined #git
14:26 leftriver37 that sucks
14:27 bremner like so much in life.
14:28 leftriver37 could you point me in the right direction as to how i could script that maybe? I am really new to git
14:29 lindenle joined #git
14:31 nikivi joined #git
14:31 lattera joined #git
14:32 ikelso joined #git
14:32 GodGinrai joined #git
14:32 cheater uhh why not just git diff origin/branch1 origin/branch2
14:32 cheater and it'll show you all files that are not the same
14:33 selckin ( git ls-tree -r commit-sha-1; git ls-tree -r commit-sha-2 ) | sort | uniq -c | grep '^ \+2' | sed -re "s/.*\t//"
14:33 selckin maybe, don't use in production
14:34 workerbeetwo Phil-Work: Thank you. I did work, by the way.
14:34 diogenese joined #git
14:36 selckin leftriver37: check the man pages etc if that works, ls-tree should show all the files + their hash, and then it filters to ones that are in the output 2 tiimes (from both commits)
14:37 str joined #git
14:38 shinnya joined #git
14:38 GodGinrai joined #git
14:39 ToBeCloud joined #git
14:39 nicksloan joined #git
14:40 anonymuse joined #git
14:40 Gloomy joined #git
14:41 Tobbi joined #git
14:41 osse leftriver37: git ls-tree --name-only -r branch1 | grep -vFf <(git diff --name-only branch1 branch2)
14:41 bannakaffalatta joined #git
14:42 lindenle joined #git
14:42 zivester joined #git
14:43 ShekharReddy joined #git
14:44 leftriver37 osse: thanks, that shows all the files that are identical right? a litlle hard to tell as I have a lot of files. Trying to find common files between etckeeper on two different machines
14:44 osse leftriver37: yes
14:44 leftriver37 osse: super!
14:44 selckin list all files, then filters the changed ones
14:44 gtristan joined #git
14:45 caffeinatedcode joined #git
14:45 leftriver37 osse: and only files that are tracked by git right?
14:45 osse yes
14:45 UniFreak joined #git
14:46 osse there is no way for that command to list untracked files since it doesn't read the file system, only git's own database
14:46 osse aka. the repo
14:46 ddavidd joined #git
14:46 Ordentlig joined #git
14:47 leftriver37 osse: okay, that is great. was a little hard to understand the voodoo here :D
14:47 UniFreak joined #git
14:47 osse the voodoo is mostly grep
14:48 selckin the <() basicly create a file descriptor from whats inside, which is the then passed to grep as a file (-f) to filter (-v)
14:48 Dougie187 joined #git
14:48 AaronMT joined #git
14:48 rivarun joined #git
14:48 BlessJah /1/lp
14:49 osse leftriver37: noob version:   git diff --name-only branch1 branch2 > diff-files; git ls-tree --recursive --name-only branch1 | grep --invert-match --fixed-strings --file=diff-files
14:51 visual joined #git
14:52 Ranhir joined #git
14:52 Khisanth joined #git
14:53 ddavidd Every so often it seems I goof up the order of: Check upstream, pull, push local commits. And it asks me to commit a merge, something like: "Merge branch 'master' of ssh://......" What's actually going on here?
14:53 nickabbey joined #git
14:54 osse ddavidd: That's a pull
14:54 osse ddavidd: Specifically when your master and the upstream master are different
14:55 hahuang61 joined #git
14:56 ddavidd osse: Why when I pull at other times does it not ask me to commit, and it just grabs the commits upstream?
14:56 tobiasvl ddavidd: then it does what's called a !fast_forward merge
14:56 gitinfo ddavidd: [!ff] A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf
14:56 selckin when you have new local commits, and there are new remote commits
14:57 selckin you need to redice to merge, or rebase (which can conflict, so git needs a clean work dir)
14:57 selckin so it asks you to commit before it continues
14:58 leftriver37 osse: any idea how I could do the same for 3 or more branches?
14:58 visual left #git
14:59 ddavidd selckin: I had a clean working directory before I pulled, is that what you're saying? If I look back at the commit ("Merge branch 'master' of ssh://.....") it's literally the same commit as one previous. It's like perhaps I mashed over it, and it needs to commit again? Not sure I'm making sense.
15:00 ddavidd tobiasvl: Thanks, I'll look into ff merge.
15:01 Guest26_ joined #git
15:02 tobiasvl ddavidd: if the remote branch is not a descendant of the local branch, you will have to merge two divergent histories together, which is what it's telling you. if it IS a descendant, it can do an ff merge, which does not need a merge commit. and then there's rebase, which can replay your local work on top of the divergent remote.
15:02 JamesBaxter joined #git
15:02 tobiasvl ddavidd: the reason the commit looks like literally the same commit, is because the merge commit merges two branches together, and the diff of that merge commit will display the diffs between the branches. at least I assume you're talking about the diff here
15:04 Es0teric joined #git
15:04 ash_workz joined #git
15:05 tobiasvl ddavidd: fast forward: "hey, the remote has stuff that you don't have, and that's all. let's just go get it." rebase: "hey, you've done some stuff on top of this branch, but in the meantime there's been stuff added to the remote as well. let's just go get the new stuff and put your own stuff on top of that instead." merge: "you have done some stuff, the remote has done some stuff, let's mash it together,
15:05 tobiasvl resolve any possible conflicts, and record the ...
15:05 tobiasvl ... resolution of those conflicts in this special 'merge commit'"
15:06 shpew12 joined #git
15:06 ddavidd tobiasvl: That was helpful. Thank you!
15:07 tobiasvl hehe, thanks, it was a rare attempt at pedagogy ;P
15:08 Derperpe1 joined #git
15:08 LionsMane joined #git
15:11 noecc left #git
15:13 thethorongil joined #git
15:15 Snugglebash joined #git
15:15 thebope joined #git
15:16 Tobbi joined #git
15:16 mazert_ joined #git
15:16 infra-red joined #git
15:17 ketas joined #git
15:17 mmattice joined #git
15:18 rscata joined #git
15:18 leonarth joined #git
15:19 HanClinto joined #git
15:19 chrisml joined #git
15:24 synthroid joined #git
15:25 a_thakur joined #git
15:26 Rapture joined #git
15:26 Tobbi joined #git
15:27 nettoweb joined #git
15:27 Noldorin joined #git
15:28 webdev007 joined #git
15:29 kpease joined #git
15:29 Guest26_ joined #git
15:32 Rhonda joined #git
15:37 quackgyver joined #git
15:37 vinnie-the-panin joined #git
15:38 mischat joined #git
15:40 LeBlaaanc joined #git
15:43 Tobbi joined #git
15:44 _ng joined #git
15:45 unbalanced joined #git
15:45 boombatower joined #git
15:46 e14 joined #git
15:51 _pop joined #git
15:51 mda1 joined #git
15:53 _pop Hey can you create a private repository with git? Is it something you do when you initialize a local repo or when you set the upstream remote and push it?
15:53 JamesBaxter joined #git
15:53 selckin git repo is as private as any other file on your computer
15:54 subhojit777 joined #git
15:58 Darren_ joined #git
15:58 stfn joined #git
16:01 nettoweb joined #git
16:01 SpeakerToMeat joined #git
16:01 treia joined #git
16:02 ResidentBiscuit joined #git
16:02 Endarked joined #git
16:02 aeontech joined #git
16:03 davimore__ joined #git
16:03 jnavila joined #git
16:03 roelmonn_ joined #git
16:05 mischat_ joined #git
16:05 _pop_ joined #git
16:06 _pop_ selckin: But doesn't it default to public when you push it to github?
16:06 selckin !github
16:06 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
16:07 _pop_ Sure but is this a git or github feature? I know how to use the Github UI to do this. I was just wondering if there was a canonical way in git to do it.
16:08 _ikke_ _pop_: No, that has nothing to do with git itself
16:08 _ikke_ It's specific to the hosting solution
16:08 bannakaffalatta joined #git
16:08 _pop_ _ikke_: Ah thanks for clearing that up :)
16:08 selckin is my email private? if you use gmail, obviosuly it is not
16:08 Derperpe1 joined #git
16:09 _pop_ selckin: Thanks but I think it's valid to have some doubt here considering how much git and github interact :D
16:09 selckin its like email and gmail
16:09 Tobbi joined #git
16:12 csk157_ joined #git
16:13 jbu_ joined #git
16:14 troulouliou_div2 joined #git
16:14 Nilesh_ joined #git
16:14 Es0teric joined #git
16:15 jbu_ all: Trying to understand why "git diff HEAD HEAD@{5 minutes ago}" doesn't work, even though the last HEAD@{5 minutes ago} is in the revision specification example page.  When I change it to HEAD@{5.minutes.ago} it works (seen somewhere else).  Anyone know why?
16:15 jbu_ Error was: fatal: ambiguous argument 'HEAD@{5': unknown revision or path not in the working tree.
16:16 selckin quote it
16:17 brent__ joined #git
16:18 eduardas_m joined #git
16:19 jbu_ selckin, great, seems to work, but the quotes arent in the revision specification page
16:19 jbu_ seems really odd
16:19 selckin knowing how to use the shell is assumed i guess
16:19 qqx jbu_: The man page is documenting what git expects, the quotes are required by your shell.
16:19 perlpilot joined #git
16:20 jbu_ qqx, ah
16:20 xall_ joined #git
16:20 jbu_ thanks folks
16:22 brent__ joined #git
16:22 _ikke_ (context: the shell splits arguments on space, so git will receive each part as a separate argument instead of a single argument)
16:22 aavrug joined #git
16:24 dsdeiz joined #git
16:24 dsdeiz joined #git
16:24 ExoUNX joined #git
16:26 Electrometro joined #git
16:26 ejb joined #git
16:27 zefferno joined #git
16:30 crayon joined #git
16:30 aarobc joined #git
16:31 siddart joined #git
16:32 jost__ joined #git
16:33 thiago joined #git
16:34 tang^ joined #git
16:34 zeroed joined #git
16:34 zeroed joined #git
16:34 neilthereildeil joined #git
16:35 neilthereildeil how can i get more debugging infor about why git apply fails?
16:37 bl0w3d_0ut joined #git
16:37 thiago because the patch doesn't apply
16:37 kyan joined #git
16:37 thiago try using the patch command, which will apply the hunks it can apply, save the rest as rejects
16:37 neilthereildeil yea it told me that and gave an error
16:37 neilthereildeil but im trynna debug why
16:37 neilthereildeil ok
16:37 selckin what error, try -p1
16:38 jccn joined #git
16:39 neilthereildeil p1 still fails
16:39 thiago right, patch requires -p1
16:39 InfoTest joined #git
16:39 neilthereildeil trying patch
16:39 thiago you will not get it to succeed
16:39 thiago if it fails with git apply, it will fail with patch
16:39 thiago try a more comprehensive tool, like kdiff3
16:39 kadoban joined #git
16:40 neilthereildeil it seemes like it succeeded
16:40 neilthereildeil patching file
16:40 neilthereildeil patching file
16:40 neilthereildeil patching file
16:40 thiago read the output
16:40 neilthereildeil it patched all 3
16:40 neilthereildeil that was the output
16:40 thiago patch shouldn't succeed where git apply fails
16:40 neilthereildeil followed by respective filenames
16:40 thiago any "REJECT" ?
16:41 neilthereildeil where would i find REJECT? in the text ofr the file?
16:41 neilthereildeil of-*
16:41 neilthereildeil of*
16:41 thiago in the output
16:41 neilthereildeil it didnt say reject in stdout
16:41 neilthereildeil maybe its a whitespace issue?
16:41 e14 joined #git
16:41 Achylles joined #git
16:42 thiago again, patch shouldn't have succeeded where git apply fails
16:42 neilthereildeil loooks like it did...
16:42 _ikke_ ps. git apply accept --reject to do the same as patch
16:42 thiago they're basically the same tool
16:42 thiago but, lucky you
16:43 _ikke_ and also -v
16:43 neilthereildeil it just said "patching file <FILE1>" for each of the 3 modified files
16:43 _ikke_ --verbose
16:43 Limes_ joined #git
16:44 neilthereildeil ok that answers the first question i asked in this room today
16:44 neilthereildeil thxc
16:45 vrlx joined #git
16:50 alex1a joined #git
16:50 synthroid joined #git
16:50 roelmonnens joined #git
16:51 alex1a hi, anyone know why github refuse to give permission to push ? i have a team with team and members collaboratting added on repository settings. i need to manually add all ssh keys for everyone ?
16:51 alex1a can't create a team, give right access and associate to repository ?
16:52 Oebele joined #git
16:52 qqx alex1a: !github
16:52 gitinfo alex1a: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
16:53 alex1a yeah i know qqx
16:53 neilthereildeil FILE_DEVICE_NETWORK_FILE_SYSTEM fixed it
16:53 neilthereildeil --ignore-whitespace fixed it
16:53 selckin need to become a company or whatever its called on github, not a normal user account
16:53 iaey joined #git
16:54 netj joined #git
16:54 alex1a yeah i already create a team, associate team members, give right acces and admin acces. but git refuse to give permissions to push. i guess i need to add manually the deploy keys of each one, bitbucket seems to works better on this
16:54 alex1a thanks anyway
16:55 selckin bye
16:55 nettoweb joined #git
16:56 hahuang61 joined #git
16:56 jstimm joined #git
16:59 ihradek joined #git
16:59 neilthereildeil left #git
17:01 bl0w3d_0ut joined #git
17:03 durham joined #git
17:04 NwS joined #git
17:06 adino joined #git
17:06 madewokherd joined #git
17:07 ejb joined #git
17:08 pcre_ joined #git
17:09 Derperpe1 joined #git
17:12 thethorongil joined #git
17:13 emerson joined #git
17:14 raspado joined #git
17:15 matsaman joined #git
17:16 kpease joined #git
17:17 rominronin joined #git
17:18 dmin7b5 joined #git
17:18 moestevens_ joined #git
17:18 Es0teric joined #git
17:20 bl0w3d_0ut joined #git
17:21 rominronin joined #git
17:24 nickabbey joined #git
17:25 sea-gull_ joined #git
17:25 Tobbi joined #git
17:27 perlpilot joined #git
17:27 neure joined #git
17:27 neure hi
17:27 neure say i want to use git and gerrit for a small team, is that feasible?
17:27 aarobc joined #git
17:28 `slikts joined #git
17:28 matsaman neure: if you have someone to maintain the system, yes of course
17:28 matsaman or if you do it the way Windows admins do it: even if you don't have someone to maintain the system =P
17:28 neure how much there is to maintain?
17:29 matsaman neure: mostly just the server, I guess
17:29 matsaman more if it's a public-facing server
17:29 matsaman a lot more
17:29 neure private for a small team
17:29 neure starting with 3 persons
17:30 matsaman then you could potentially let the install rot and not maintain it for as long as it provided all the features you require
17:30 mischat joined #git
17:30 matsaman not that I would personally do that, but it's an option
17:31 Derperpe1 joined #git
17:31 chardan joined #git
17:32 kristofferR joined #git
17:32 neure rot?
17:32 neure ah
17:33 durham joined #git
17:33 neure should i setup regular backup for the server?
17:33 thiago joined #git
17:34 bl0w3d_0ut joined #git
17:34 ki0 joined #git
17:35 Electrometro joined #git
17:36 mathematic-alpha joined #git
17:39 iota_pi joined #git
17:39 Wueza joined #git
17:40 aeontech joined #git
17:42 NeverDie joined #git
17:43 thiago joined #git
17:43 aeontech joined #git
17:45 tnecniv joined #git
17:45 sea-gull_ joined #git
17:46 dreiss joined #git
17:47 ThomasTang joined #git
17:49 digidog joined #git
17:49 ocbtec joined #git
17:52 digidog_ joined #git
17:52 emg joined #git
17:53 mischat_ joined #git
17:53 digidog__ joined #git
17:53 thiago joined #git
17:54 todd_dsm joined #git
17:54 svm_invictvs joined #git
17:58 bl0w3d_0ut joined #git
17:59 gigq joined #git
18:00 ejb joined #git
18:00 moestevens left #git
18:01 nickabbey joined #git
18:01 noecc joined #git
18:03 roelmonnens joined #git
18:04 imachuchu joined #git
18:04 sea-gull_ joined #git
18:04 robotroll joined #git
18:06 gargola joined #git
18:06 garethdaine joined #git
18:06 mischat joined #git
18:07 cdg joined #git
18:07 vdv joined #git
18:08 cdg joined #git
18:10 hahuang61 joined #git
18:11 epta joined #git
18:12 brent__ joined #git
18:13 robattila256 joined #git
18:13 epta How to make git verify signed commits of other users, not me? I just need to import public to gpg store, right?
18:14 epta public key*
18:15 King_Hual joined #git
18:15 adino joined #git
18:16 b1tchcakes joined #git
18:17 mischat joined #git
18:19 CheckDavid joined #git
18:19 b1tchcakes joined #git
18:21 LiberalCarrot joined #git
18:21 LiberalCarrot left #git
18:21 saml joined #git
18:22 rominronin joined #git
18:22 sarbyn joined #git
18:22 LionsMane joined #git
18:23 Electrometro joined #git
18:26 bl0w3d_0ut joined #git
18:27 tang^ joined #git
18:30 Groscheri joined #git
18:31 spacelord_ joined #git
18:31 bl0w3d_0ut joined #git
18:31 nettoweb1 joined #git
18:32 shgysk8zer0_ joined #git
18:32 Gsham joined #git
18:33 roelmonnens joined #git
18:33 mischat joined #git
18:34 lindenle joined #git
18:34 bl0w3d_0ut joined #git
18:35 neurre joined #git
18:36 overlord_tm joined #git
18:36 roelmonnens joined #git
18:37 roelmonnens joined #git
18:38 finalbeta joined #git
18:38 noecc joined #git
18:39 neunon joined #git
18:39 emerson joined #git
18:42 bssf joined #git
18:44 nettoweb joined #git
18:44 aeontech joined #git
18:45 roelmonnens joined #git
18:46 rivarun joined #git
18:47 alhariel joined #git
18:47 zero85 joined #git
18:50 raedah joined #git
18:50 tyreld joined #git
18:50 dobbi joined #git
18:50 nobso joined #git
18:51 roelmonnens joined #git
18:52 ejb joined #git
18:53 dsantiago joined #git
18:53 alhariel joined #git
18:53 raedah is there a simpler way to merge changes into the latest commit then, git add file, git commit -m 'latest', git rebase -i HEAD~2, edit squash, edit description, confirm.
18:54 j416 raedah: git commit --amend
18:54 crose joined #git
18:55 raedah j416: THANKS
18:56 aeontech joined #git
18:56 j416 o/
18:57 alhariel joined #git
18:57 TomyLobo joined #git
18:58 shgshg joined #git
18:59 dsantiag_ joined #git
19:00 Domhack joined #git
19:00 alhariel joined #git
19:00 ayogi joined #git
19:00 Guest55 joined #git
19:00 m0viefreak joined #git
19:00 aw1 joined #git
19:02 Es0teric joined #git
19:04 joshszep joined #git
19:04 garethdaine joined #git
19:05 bl0w3d_0ut joined #git
19:05 cdown joined #git
19:08 sathed joined #git
19:08 karstensrage if i do git diff -w file.c
19:08 sathed Anyone in here have any experience with hooks in GitBlit?
19:09 karstensrage it shows me the clear diffs that i expect which include some code wrapped in if blocks so the indent changed
19:09 double-you joined #git
19:09 karstensrage but the git add shows the entire code block changed in the if due to the indent
19:09 Oatmeal joined #git
19:09 Eugene sathed - i haven't used hooks and Gitblit together, but I do make use of both. What's wrong?
19:10 karstensrage is thee some other way to see the add -patch so it commits the right thing but shows the addition of the if block clearly?
19:10 j416 karstensrage: I don't think it supports that.
19:11 j416 karstensrage: how would it know that you wanted to add all the whitespace-only changes?
19:11 karstensrage yeah
19:11 karstensrage i understand that
19:11 mathematic-alpha left #git
19:11 karstensrage i just wish it was clearer that the if blocks were added not that the indent changed
19:11 j416 why is it an issue?
19:11 karstensrage why is what an issue?
19:12 sathed Eugene - I'm trying to set up a hook to mirror a local repository to an AWS CodeCommit repo. I'm finding very little documentation on GitBlit hooks though. I know it relies on groovy for hooks, so it's a bit more complicated than just creating a post-receive shell script to do a git push --mirror...
19:12 j416 that add -p doesn't show it like that
19:12 j416 I often do git diff before adding anyway
19:12 xterm joined #git
19:12 sathed We are actually using Gitolite as well. I have the Gitolite scripts working just fine. I'm just having trouble with GitBlit. Know of any documentation out there?
19:12 j416 because I want to see the entire diff, in order to figure out what to add and in what order
19:12 jnavila joined #git
19:13 Eugene Just the gitblit docs, which don't look great. I would stick with gitolite
19:13 Eugene If you want a GUI(right?) you can have gitolite push to gitblit
19:13 karstensrage j416, it seems like code changed that really didnt
19:13 j416 karstensrage: it really did, though
19:13 mikecmpbll joined #git
19:13 ewto joined #git
19:13 j416 karstensrage: and you can check with git diff -w (or -b) as you say, and then add it? :)
19:13 nettoweb joined #git
19:14 j416 karstensrage: after adding, you can easily diff again to see that you added the right things?
19:15 sathed Well, we are in the process of moving back to Gitolite, so it's going to take some time to get everything worked out. Currently, it's only me and a few others using Gitolite. Everyone else is still on GitBlit. So, I still need to make it work.
19:15 jimi_ joined #git
19:15 Sasazuka joined #git
19:15 sathed I thought I could get away with a post-receive.groovy script that executes a shell script -- Runtime runtime exec "git push --mirror ..." but that fails miserably.
19:15 bl0w3d_0ut joined #git
19:16 aeontech joined #git
19:18 roelmonnens joined #git
19:23 Atm0spher1c joined #git
19:28 shgysk8zer0_ joined #git
19:29 zdip joined #git
19:31 mephistorium joined #git
19:31 Es0teric joined #git
19:32 emerson joined #git
19:32 Balliad joined #git
19:33 irqq joined #git
19:33 Meteorhead__ joined #git
19:34 aarobc joined #git
19:34 aidalgol joined #git
19:38 Guest61108 left #git
19:39 Vortex34 joined #git
19:39 fahadash joined #git
19:40 e14 joined #git
19:40 sathed Eugene - Just for your FYI - I found someone who has used hooks with GitBlit. Their anwser: don't. So, I just set up a cron job to run every 10 minutes. :P
19:41 Gsham joined #git
19:42 Eugene Oh good, my instinct was correct.
19:42 Anja joined #git
19:42 sathed To make them work though - you need to create the groovy script in the folder Groovy folder defined with the groovy.scriptsFolder in the gitblit.properties file. Then, you have to use the UI to create manually select which groovy scripts you want to run for each repo. Pain in the ass in my opinion...
19:43 marlinc joined #git
19:44 bannakaffalatta joined #git
19:46 jagob joined #git
19:46 nickabbey joined #git
19:48 nikivi joined #git
19:49 webdev007 joined #git
19:50 nickabbey joined #git
19:52 sathed left #git
19:52 rominronin joined #git
19:53 Eugene Sounds like Java
19:54 NeverDie joined #git
19:54 druonysus joined #git
19:56 raedah joined #git
19:57 rivarun joined #git
19:58 marc_v92 joined #git
19:59 duderonomy joined #git
20:00 Sasazuka joined #git
20:01 chardan joined #git
20:05 holodoc joined #git
20:07 jnavila joined #git
20:08 Darcidride joined #git
20:10 Vinnie_win joined #git
20:10 aarobc joined #git
20:13 azerus joined #git
20:16 kpease joined #git
20:16 Singmyr joined #git
20:17 cagedwisdom joined #git
20:19 Ardethian joined #git
20:20 snowkidind joined #git
20:21 netj joined #git
20:21 akushner joined #git
20:23 _nwkj86 joined #git
20:23 sunri5e joined #git
20:24 cdown joined #git
20:24 shpew12 joined #git
20:25 kpease_ joined #git
20:28 DonRichie joined #git
20:31 bl0w3d_0ut joined #git
20:36 matsaman joined #git
20:39 matsaman joined #git
20:39 vuoto joined #git
20:41 vuoto joined #git
20:46 vuoto joined #git
20:49 druonysus joined #git
20:50 _nwkj86 joined #git
20:51 cagedwisdom joined #git
20:51 _Cyclone_ joined #git
20:54 Dazzyp joined #git
20:58 todd_dsm joined #git
20:58 askb joined #git
20:59 durham joined #git
21:03 marc_v92 joined #git
21:05 siddart joined #git
21:08 brent__ joined #git
21:08 dsdeiz joined #git
21:08 dsdeiz joined #git
21:10 sea-gull_ joined #git
21:15 Neo_ joined #git
21:16 roygbiv joined #git
21:18 brent__ joined #git
21:20 shinnya joined #git
21:22 Fabricio20 joined #git
21:24 rominronin joined #git
21:27 svm_invictvs joined #git
21:28 nettoweb joined #git
21:28 d0nn1e joined #git
21:28 jagob joined #git
21:29 cagomez joined #git
21:31 Starky joined #git
21:31 derk0pf joined #git
21:31 jagob joined #git
21:32 Starky joined #git
21:33 cyan__ joined #git
21:36 cdg joined #git
21:37 bl0w3d_0ut joined #git
21:38 thiago joined #git
21:39 jnavila joined #git
21:40 grayjoc joined #git
21:41 bjoe2k4 joined #git
21:51 sunri5e joined #git
21:51 anli joined #git
21:51 VladGh joined #git
21:52 shgysk8zer0_ joined #git
21:52 stick-shift joined #git
21:56 LaptopBrain joined #git
21:56 slash77 joined #git
21:56 crayon joined #git
21:57 quesker joined #git
21:58 quesker I made changes to a ton of files and git rm some too.  is there some way to just commit one of the removes for now?
21:59 BlessJah quesker: git reset -- <files> will unstage
21:59 BlessJah git add/rm what you want commited; then commit
22:00 jagob joined #git
22:00 Guest95998 sorry, off-topic, but do channels like #git and #mutt ban unregistered nicks? i noticed i'm getting disconnected and connecting as guest*.
22:00 quesker there are about 100 staged.  I guess I will just let this fall in with the others
22:01 BlessJah Guest95998: usually  not
22:01 preaction Guest95998: #git quiets unregistered users
22:02 BlessJah quesker: "fall"?
22:02 preaction but that's not going to get you disconnected. someone doing "ghost" on the nick will
22:02 HoierM joined #git
22:02 Guest95998 ok. weird. i tried to change my nick back, even after identifying to nickserv, but i'm told i can't change my nick while banned on #git, #mutt.
22:02 Guest95998 i have it registered and locked down.. so.. weird..
22:03 quesker well if I reset how do I get all these rm and mv staged again?
22:03 BlessJah do them again
22:04 paulg joined #git
22:04 quesker like I said almost 100.  ouch.  I will just let this special one go in the same commit with the others and hopefully remmeber to put a note about it in the commit log
22:04 masuberu joined #git
22:04 ok91 joined #git
22:05 quesker usually I commit often but this refresh I was going to commit all together but then a separate thing popped up
22:05 Derperpe1 joined #git
22:06 BlessJah why not create a branch?
22:06 Guest95998 last time it happened, i parted those channels, changed nick, then rejoined. i guess i'll just do the same again and investigate later. thx for the quick off-topic convo.
22:06 BlessJah you could also use rebase
22:06 NeverDie joined #git
22:06 quesker I never branch.  I don't get branching.  merging seems like a nightmare
22:07 quesker and it puts weird >>> or something in my code
22:07 Guest95998 left #git
22:07 str joined #git
22:07 BlessJah whoah, you are meant to remove them :D
22:08 quesker yeah I don't have time for that  :)
22:08 ariver joined #git
22:08 quesker I never even know it puts them there until tests start failing
22:08 * paulg rotfl
22:09 BlessJah git status will list them
22:10 BlessJah unfortunately the only advice i can give you is to learn to git
22:10 quesker few hundred thousand lines in the last 8 years here I never used branches.  small team, 3-4 people, rarely editing the same exact file
22:10 nwkj86 joined #git
22:10 quesker obivously everyone uses branches but merging seems like a huge mess to me
22:11 moritz merging was a mess with svn; with git, it's usually fully automatic
22:11 paulg quesker, maybe you need to step back and decide if a merge is the right thing for your work flow.
22:11 alexruf joined #git
22:12 quesker don't you have to merge the branches back in?
22:12 BlessJah if a git is the right tool
22:12 paulg no.  with a small team and a limited set of changes,  you might just want to "refresh" the changes against the new baseline.
22:13 BlessJah quesker: 8 years of using git?
22:13 quesker well no, we started with umm I forget, then svn then perforce then git
22:13 quesker what was the thing before svn?
22:14 BlessJah cvs?
22:14 quesker cvs?
22:14 quesker yeah
22:14 paulg I believe it was called "chaos".   :)
22:14 peepsalot visual source safe
22:14 tang^ the >>> in your code is a sign of a failed merge that you ignored
22:14 peepsalot hehehehe
22:14 BlessJah you should understand the tools by now, really
22:15 quesker you would think
22:16 akushner joined #git
22:17 paulg hint.  If you are doing patch wrangling on a daily basis, you want to look at "wiggle"
22:17 saidi joined #git
22:17 BlessJah this industry requires you to learn all the time, yet some find themselves comfortable with what they know and afraid of new
22:20 Gsham joined #git
22:20 quesker I can't get how extra steps of branchung buys much in the workflow here.  except for the specific case I came here to ask about  :)
22:20 paulg given that git appeared in 2005, it is kind of hard to classify it as "new"
22:21 BlessJah paulg: new as in unknown
22:21 tang^ quesker: write a script to redo it
22:21 jeffreylevesque joined #git
22:22 quesker true that.  I could take the status output and make a script for sure
22:22 GavinMagnus joined #git
22:22 BlessJah use git status --porcelain
22:22 durham joined #git
22:23 BlessJah quesker: spend few minutes and go through think-like-a-git (.net or .com, i dont remember)
22:23 quesker ok
22:23 quesker thanks
22:23 tang^ I have a project that has a bunch of adds/moves/deletes/changes on my branch... a massive effort
22:24 tang^ but since the dev branch is also being updated, I need to rebase occasionally and reset out my changes before rebasing
22:24 tang^ rerun my script to modify the working directory again
22:24 quesker how did some modifieds get staged?  I didn't add them
22:24 LBV_User joined #git
22:24 tang^ quesker: IDE?
22:24 quesker cli
22:25 emg joined #git
22:25 BlessJah you had to add them, maybe you git added directory?
22:25 tang^ I have some IDE's that will auto-add changes
22:25 tang^ or if you do a git mv
22:26 quesker ah git mv and an edit both I think.
22:26 * paulg passes out 40 wire IDE cables.
22:26 quesker oh just the mv?
22:26 BlessJah mv == rm+add
22:26 tang^ if you use git to do the mv, it will do the rm+add staged for you
22:27 quesker I think it must have been the git mv plus changing them
22:27 * paulg passes out IDE optical drives
22:31 Gsham joined #git
22:33 svm_invictvs joined #git
22:34 Fabricio20 joined #git
22:36 cdg joined #git
22:37 ghormoon joined #git
22:41 boubou joined #git
22:42 rwb joined #git
22:43 jagob joined #git
22:44 Sasazuka_ joined #git
22:45 rivarun joined #git
22:46 mischat joined #git
22:46 ikelso joined #git
22:46 crayon joined #git
22:47 Sasazuka joined #git
22:48 brent__ joined #git
22:48 Fabricio20_ joined #git
22:49 jimi_ joined #git
22:51 anonymuse joined #git
22:56 rominronin joined #git
22:57 todd_dsm joined #git
22:59 jagob joined #git
23:00 jozwior joined #git
23:01 fmeerkoetter joined #git
23:01 holgersson joined #git
23:01 durham joined #git
23:03 prg3 joined #git
23:06 robotroll joined #git
23:07 hashpuppy joined #git
23:08 keyan__ joined #git
23:09 Dougie187 left #git
23:09 inflames joined #git
23:11 weckstrom joined #git
23:11 boubou joined #git
23:13 mischat joined #git
23:17 prg3 joined #git
23:18 rivarun joined #git
23:19 cyphase joined #git
23:24 minikN joined #git
23:24 chardan joined #git
23:25 GavinMagnus left #git
23:25 kyan joined #git
23:26 Sasazuka joined #git
23:27 shpew12 joined #git
23:28 druonysus joined #git
23:33 Aleric https://codepad.co/snippet/AWp2zjCN
23:33 Siegfried joined #git
23:34 aeon joined #git
23:35 Aleric Automatically checks out a configured branch for each submodule, does a pull --ff-only - and commits possible local changes in submodules (that you author) and updates the reference to them in the main project :)
23:35 zivester joined #git
23:36 bannakaffalatta joined #git
23:37 Aleric Less clean state: https://codepad.co/snippet/CoXadZs8
23:40 dsdeiz joined #git
23:41 davimore_ joined #git
23:41 ayjay_t joined #git
23:44 Aleric I think I reached the point now where I just do: git submodule add HTTP-URL-HERE && ./autogen.sh .. and then have a new submodule with the http url in .gitmodules, but an ssh (easier to push) url inside the submodule, renamed remote (both according to env vars), automatically updated configure.ac (through including a newly generated submodules.m4), submodule specific snippets for configure.ac (included by submodule provided path/configure.m4), dependency on
23:44 Aleric other submodules, automatically updated SUBDIRS where appropriate.. etc.
23:46 aarobc joined #git
23:46 rbern joined #git
23:47 Siegfried joined #git
23:47 anuxivm joined #git
23:50 rcn joined #git
23:51 jozwior joined #git
23:51 buffal0 joined #git
23:52 elsevero joined #git
23:52 jimi_ joined #git
23:54 dsdeiz joined #git
23:54 dsdeiz joined #git
23:58 Siegfried joined #git
23:58 Anja joined #git
23:59 Derperpe1 joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary