Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-07

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

All times shown according to UTC.

Time Nick Message
00:05 magicTurtle joined #git
00:05 tesuji_ joined #git
00:06 sargas joined #git
00:06 ytl_ joined #git
00:07 Seveas joined #git
00:07 interne7y joined #git
00:08 Vampire0 damjan, you only have to add --tags to get tags in branches you are not fetching. One software I regularly fetch (I forgot which right now) does not have the tags in the branches, but commits unique to the tag, so those tags are only fetched if I fetch with --tags
00:09 IWishIKnew joined #git
00:11 sargas_ joined #git
00:13 JanC_ joined #git
00:15 arescorpio joined #git
00:16 valar joined #git
00:17 SwiftMatt joined #git
00:17 Lyqyd joined #git
00:20 Seveas joined #git
00:20 crose joined #git
00:21 fuchstronaut joined #git
00:22 aidalgol joined #git
00:24 Goplat joined #git
00:24 ShekharReddy joined #git
00:29 sd512 joined #git
00:29 cyphase joined #git
00:30 sd512 Hello, If i have forked another repository, how to I bring the latest changes from the "parent" project into my fork?
00:31 sd512 (on git hub if it matters)
00:32 damjan sd512: add a new remote
00:32 m0viefreak joined #git
00:32 damjan pul or fetchl remote branch into a local branch
00:33 damjan then either rebase or merge that branch into yours
00:34 SwiftMatt joined #git
00:35 hahuang65 joined #git
00:36 sd512 damjan, ok thanks. do you know if that is something I can do from the github website, or do I run that on my local copy only?
00:36 damjan on your local
00:36 stevenbenner joined #git
00:37 stevenbenner joined #git
00:38 spudowiar joined #git
00:40 Seveas joined #git
00:41 ash_workz joined #git
00:42 Seveas joined #git
00:45 Seveas joined #git
00:50 livingstn joined #git
01:02 Maple__ joined #git
01:09 Dougie187 joined #git
01:16 wxg joined #git
01:24 valar joined #git
01:25 wgrant joined #git
01:31 pks joined #git
01:34 Lyqyd joined #git
01:36 hahuang65 joined #git
01:46 wxg joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and botany | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Nurture your git-twigs and they will grow into a full branch
01:49 dreiss joined #git
01:52 d^sh joined #git
01:58 BSaboia joined #git
02:00 jaequery joined #git
02:08 interne7y joined #git
02:11 magicTurtle joined #git
02:12 dreiss joined #git
02:16 trelane joined #git
02:16 trelane joined #git
02:17 sdothum joined #git
02:17 claudiop joined #git
02:20 claudiop Hi. Lets say that I have my dotfiles on git, and there is a branch for the Laptop, another for the Desktop, with slight modifications such as the display settings. Can I commit to every single branch at the same without merging them (invalidating the specific settings)?
02:20 claudiop And will the commits be in duplicate?
02:22 fuchstronaut joined #git
02:24 sangy joined #git
02:28 kam270 joined #git
02:29 Orbitrix joined #git
02:29 realz joined #git
02:30 mischat joined #git
02:31 kam270 joined #git
02:33 kam270 joined #git
02:34 frogonwheels joined #git
02:35 ljc joined #git
02:35 kam270 joined #git
02:37 hahuang65 joined #git
02:37 kam270 joined #git
02:39 kam270 joined #git
02:41 kam270 joined #git
02:43 clevodearia joined #git
02:43 moneylotion joined #git
02:43 zumba_addict joined #git
02:44 Dougie187 left #git
02:44 moneylotion hey, i was using phabricator on an old machine, but wondering if there are any simpler alternatives out there??? i want to be able to virtually parse commits, more than git log, or git diff
02:46 Derperperd joined #git
02:47 lagothrix joined #git
02:49 Limes__ joined #git
02:49 HedgeMage moneylotion: Can you tell us exactly which subset of phabricator's features you want/need?  It's kind of a monster.
02:50 moneylotion i really only need to view commits, and track developments
02:51 hexagoxel joined #git
02:51 moneylotion hedgemage, i was looking at gitlab, and it looks a bit lighter weight compared to phab
02:52 skylite joined #git
02:53 linuxmint joined #git
02:55 harish_ joined #git
02:57 SwiftMatt joined #git
03:00 chachasmooth joined #git
03:09 SwiftMatt joined #git
03:10 zumba_addict joined #git
03:13 leehambley joined #git
03:18 leehambley joined #git
03:19 Izabia joined #git
03:20 SwiftMatt joined #git
03:23 fuchstronaut joined #git
03:24 fahadash joined #git
03:24 fstd_ joined #git
03:32 xall joined #git
03:32 zacts joined #git
03:33 SwiftMatt joined #git
03:35 diphtherial left #git
03:37 hahuang65 joined #git
03:44 SwiftMatt joined #git
03:52 nettoweb joined #git
03:52 akitada joined #git
03:53 stoopkid joined #git
03:57 fairuz joined #git
03:58 HedgeMage moneylotion: If you're just looking for the web UI for your git repo, yes gitlab should fit the bill nicely.
03:58 tinajohnson___ joined #git
03:58 HedgeMage moneylotion: there are some other phabricator features gitlab doesn't have...but if you aren't using them, there's no sense in dealing with the associated overhead IMO
03:59 kadoban joined #git
04:00 kadoban joined #git
04:02 thecomedian joined #git
04:02 vdv joined #git
04:05 frogonwheels joined #git
04:05 semantipc joined #git
04:06 cdown joined #git
04:08 gtristan joined #git
04:09 interne7y joined #git
04:11 MrWoohoo joined #git
04:11 leehambley joined #git
04:13 semantipc joined #git
04:18 shmuli joined #git
04:21 xlegoman joined #git
04:21 lolmac joined #git
04:23 cdown joined #git
04:24 fuchstronaut joined #git
04:28 tango_ joined #git
04:31 nivag joined #git
04:33 SwiftMatt joined #git
04:34 Cabanossi joined #git
04:37 jaequery joined #git
04:38 gfixler joined #git
04:38 hahuang65 joined #git
04:40 mattsl joined #git
04:40 fairuz joined #git
04:43 zacts joined #git
04:46 SwiftMatt joined #git
04:47 languitar joined #git
04:48 mattsl I'm using a third party django app that has a small bugfix that is very simple and I need it. I only know the bare minimum of git. Is there a way to apply just that one patch?
04:50 mattsl It's just 3 lines, so I can just copy and paste the changes into my lib source, but that seems really messy.
04:51 kadoban mattsl: Where is the "patch" you want to apply, and in what format is it? Is it really a .patch file? Those aren't specific to git.
04:52 mattsl kadoban: It's just a commit that was made to the master.
04:52 mattsl kadoban: I'm assuming I can't really do anything with that without applying everything that may have come before it?
04:52 kadoban mattsl: 'git cherry-pick' is probably what you want then, you just specify a commit you want to copy over to whatever branch you're on.
04:53 mattsl Oh, nice. But that doesn't work if I installed via, pip, right?
04:54 kadoban I doubt it. You're just working with sourcecode at that point and would have to build and install it however.
04:54 SwiftMatt joined #git
04:55 mattsl Ok. Thanks. So in theory, if I wanted to keep it as clean as possible, I could install the lastest stable via git instead of pip and then cherry-pick that one commit?
04:55 kadoban I guess? I don't really know pip at all.
04:57 mattsl Well the "problem" is that pip will just install the numbered releases. So it doesn't have all the bleeding edge patches. However, I don't want everything, I want the stable version plus this one minor fix.
04:57 kadoban Sounds right then
04:59 mattsl Cool. Thanks. My Googling wasn't getting me the cherry-pick for some reason.
04:59 Shentino joined #git
04:59 zumba_addict joined #git
05:00 kadoban Yeah, git has a lot of parts, and cherry-pick is not necessarily in the toolbox an absolute beginner would use very much (usually you want to merge or rebase)
05:05 Shentino joined #git
05:05 rivarun joined #git
05:05 bremner cherry-pick is actually a bit less confusing / powerful than rebase IMHO
05:10 phaleth joined #git
05:19 kadoban It is, but it's still not really part of the really basic toolset. Of course neither necessarily are merges or rebases, but people tend to learn those first, since they're a part of a lot of basic workflows.
05:20 freimatz joined #git
05:21 jaequery joined #git
05:23 jaequery joined #git
05:23 stoopkid joined #git
05:25 fuchstronaut joined #git
05:27 jaequery joined #git
05:28 st0opkid joined #git
05:31 ae__ joined #git
05:36 leeN joined #git
05:37 soham joined #git
05:38 DANtheBEASTman is there a way to 'cherry-pick' lines for a commit, without resorting to git gui or manually editing patches?
05:38 semantipc joined #git
05:39 hahuang65 joined #git
05:41 kadoban DANtheBEASTman: 'git add -p' perhaps?
05:42 DANtheBEASTman ah, that' what i'm having trouble with, it only wants to add in hunks and i only want to commit a single line, the rest in a different commit
05:43 kadoban If you want more granular than it'll do by specifying you want to 's'plit the hunk it's asking you about, you'll have to manually 'e'dit it.
05:43 DANtheBEASTman bah, i'm perpetually messing up the patch
05:43 tango_ I find that a UI tool in this case can be very helpful, for what it's worth
05:44 tango_ even a TUI like tig
05:44 DANtheBEASTman oo tig i haven't used that. `git gui` is complaining about my font choice, says Error in startup script: expected integer but got "Sans"  (database entry for "-font" in widget ".branch.l1")
05:46 DANtheBEASTman if this were a bash script i'd think someone forgot their quotes, but this is my first time looking at tcl source
05:49 tango_ DANtheBEASTman: tig is my go-to "graphical" tool for git. very practical for these little things
05:49 tango_ an alternative would be something like the fugitive plugin for vim, if that's your editor
05:50 DANtheBEASTman y'know, i do have fugitive installed (and probably half a dozen other plugins for git that i have yet to fully grok) but i never actually use it
05:50 tango_ I mostly don't use it either
05:50 tango_ I only remember about it when I need to revert some edit
05:51 zacts joined #git
05:51 tango_ often I actually switch to a different terminal and run git diff to even just see what I changed 8-)
05:51 boombatower what was the new diff feature related to space boundaries?
05:51 tango_ not exactly smart of me 8-P
05:51 boombatower can't seem to find anything in docs
05:51 netj joined #git
05:52 tango_ boombatower: what do you mean by space boundaries?
05:52 xall joined #git
05:52 boombatower hmm, perhaps --compaction-heuristic
05:52 DANtheBEASTman i've been trying to 'git gud' with just using `git` from the shell, but manually editing patches is so tedious.. i just want to add a single line, you'd think it wouldn't need a lot of fuss..
05:52 eka joined #git
05:52 boombatower tango_: something about not diffing outside of a function or something to try and improve diffs
05:52 boombatower ie where therre was a blank line or somehting
05:53 boombatower I remember reading in release notes a little while back
05:53 boombatower I have what I believe is a good test case, but can't seem to find it
05:53 tango_ boombatower: interesting, never heard about it though so I can't help
05:53 tango_ DANtheBEASTman: well add interactive, edit chunk, remove everything but context and extra line
05:54 tango_ or tig, enter add mode, 1 on the line you want to add 8-D
05:54 fairuz joined #git
05:55 boombatower tango_: this looks like it "beautiful diffs" https://github.com/blog/2188-git-2-9-has-been-released
05:55 snowkidind joined #git
05:55 boombatower unfortunately my case isn't affected
05:55 boombatower :(
05:56 boombatower show removing an entire function
05:56 boombatower which is untouched (added back
05:56 boombatower crappy diff
05:56 boombatower oh well
05:57 DANtheBEASTman tango_: yeah currently trying to figure out how to add with tig
05:58 boombatower never seen a diff this misleading
05:58 boombatower I see why it's doing it, but really bad
06:00 DANtheBEASTman ahh, i just figured out how to git gud. git config --global alias.gud 'commit -a -m "git gud"'
06:01 * DANtheBEASTman apologizes for the memes
06:01 tango_ boombatower: if it's not private code you might see if the mailing list has help to offer
06:01 boombatower tango_: yeah, see what you think. https://github.com/symfony/symfony/pull/19558/files
06:01 boombatower note the close() addition
06:01 boombatower it is actually untouched
06:02 boombatower but since the setInput() is pulled from constructor
06:02 boombatower it decided to represent it that way
06:02 boombatower I guess I could just reorder it
06:02 boombatower but seems silly
06:02 fairuz joined #git
06:03 tango_ boombatower: can't actually have a look at it now, sorry, but thanks, I'm curious to see what happens
06:03 * tango_ has had his fair share of funky merges doing all sorts of silly things
06:04 boombatower to be clear, nothing is "incorrect"
06:04 boombatower just a very misleading diff
06:05 * tango_ is currently in console and without a mouse, so clicking on links is non-trivial
06:06 tango_ hm let me see if I can arrange something with tmux and elinks
06:06 tango_ does github work with elinks I wonder 8-D
06:06 boombatower tango_: for a text version https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/19558.patch
06:07 tango_ hm I always enter tmux's selection mode by mistake, and how I don't remember how it's done, lol
06:07 tango_ just a sec
06:10 sto0pkid joined #git
06:10 interne7y joined #git
06:12 tango_ boombatower: so what exactly should I be looking for?
06:12 boombatower tango_: close() appears to be added, but it is infact untouched
06:12 boombatower reason being constructor was moved into setInput()
06:12 boombatower and called fromt there
06:13 boombatower close() was in between constructor and new function
06:13 boombatower so it kinda nuked it and added it back to keep constructor body
06:13 tango_ oh I see now
06:13 boombatower nothing wrong, just very hard to read
06:13 boombatower if I put setInput above close()
06:13 boombatower I imagine it'd look at a lot better
06:13 tango_ what do other diff algorithms think of it?
06:13 boombatower tango_: tried them all and got same
06:14 boombatower including the new deal
06:14 tango_ hm
06:14 tango_ boombatower: do ask on the ML
06:14 tango_ they might have a hint
06:14 boombatower alright
06:15 mkoskar joined #git
06:15 DANtheBEASTman tango_: speaking of hints, care to share the trick for using tig to stage changes? can't seem to find adding anywhere in the man page or in the :help
06:16 Celelibi joined #git
06:20 tango_ DANtheBEASTman: as I said I'm a bit limited now but IIRC 's' brings you to the status view where you can do things such as stage/unstage files/hunks/lines
06:21 tango_ not entirely sure it's s
06:21 tango_ even just <enter> on the Unstaged changes in the main view might do it
06:24 Codfection joined #git
06:26 tango_ on an unrelated note, if anybody has experience with a robust esata and/or usb3 jbod with at least 4 bays, suggestions welcome
06:26 fuchstronaut joined #git
06:26 stoopkid joined #git
06:29 flavster joined #git
06:35 Aljone joined #git
06:35 Codfection joined #git
06:40 hahuang65 joined #git
06:44 Fabricio20 joined #git
06:45 OnBrokenWings joined #git
06:46 fairuz joined #git
06:49 xpk joined #git
06:50 SwiftMatt joined #git
06:51 piling joined #git
07:02 blackwind_123 joined #git
07:04 SwiftMatt joined #git
07:09 semantipc joined #git
07:11 st0opkid joined #git
07:12 SwiftMatt joined #git
07:14 Jon28_ joined #git
07:16 ambro718 joined #git
07:18 mischat joined #git
07:21 cyan__ joined #git
07:23 zacts joined #git
07:24 Harwood joined #git
07:26 vuoto joined #git
07:27 fuchstronaut joined #git
07:28 jost joined #git
07:31 ytl joined #git
07:32 sto0pkid joined #git
07:33 mohabaks joined #git
07:33 subhojit777 joined #git
07:34 SteffanW joined #git
07:40 hahuang65 joined #git
07:44 kevlarman joined #git
07:45 kevlarman is there a nice way to get the commit id back from git-describe output that has had the commit id prefix stripped?
07:46 kevlarman (in this case i know that it is unambiguous)
07:51 GavinMagnus joined #git
07:53 jstein joined #git
07:54 blackwind_123 joined #git
07:57 fairuz joined #git
07:57 Fabricio20 joined #git
07:59 moneylotion joined #git
08:04 vuoto joined #git
08:04 Fabricio20_ joined #git
08:11 interne7y joined #git
08:12 mariuscc joined #git
08:12 tomog999 joined #git
08:16 kisonecat joined #git
08:21 star_prone joined #git
08:24 GavinMagnus left #git
08:27 fuchstronaut joined #git
08:28 eivarv joined #git
08:28 Orbitrix joined #git
08:29 Orbitrix joined #git
08:31 dsdeiz joined #git
08:34 NeverDie joined #git
08:35 meloc joined #git
08:36 meloc joined #git
08:38 ArchNoob joined #git
08:38 LiohAu joined #git
08:39 slayerjain joined #git
08:41 hahuang65 joined #git
08:45 onurrunoonur joined #git
08:48 moei joined #git
08:49 khmarbaise joined #git
08:50 jguillen_ joined #git
08:50 johnny56 joined #git
08:52 zarubin joined #git
08:54 st0opkid joined #git
08:57 nitin joined #git
09:02 eivarv joined #git
09:03 The_Phoenix joined #git
09:03 cbreak kevlarman: do it yourself?
09:03 cbreak find the tag that it uses
09:03 cbreak then find the commits that are n after that
09:04 kevlarman cbreak: n is in the high thousands
09:04 cbreak kevlarman: and you never merged?
09:05 cbreak kevlarman: well, you can do a git log --oneline --decorate
09:05 The_Phoenix joined #git
09:05 cbreak kevlarman: load the output into a text editor with line numbers
09:05 cbreak and subtract :)
09:05 cbreak maybe you find the right one
09:05 kevlarman cbreak: i was hoping for something in shell script
09:05 cbreak you could awk something too I guess
09:07 kevlarman git log --one-line --reverse tag..|sed -n "1234p" was my attempt, but it only produces something close, not exact
09:07 kevlarman so i'm not understanding how something works
09:07 cbreak or something with git log --reverse -n thatnumber thattag | tail -n 1
09:08 kevlarman git log tag produces commits older than the tag
09:09 cbreak kevlarman: maybe you have to use --first-parent
09:09 cbreak kevlarman: oh, yes
09:09 cbreak kevlarman: git log --oneline --reverse tag..HEAD
09:09 cbreak with -n to limit the output
09:09 cbreak and tail to cut away all but the last output
09:10 cbreak wonder if that works...
09:10 cbreak anyway, I doubt this is reliable
09:10 cbreak I don't know how the number semantic in tags is, does it count merges?
09:10 cbreak does it count the merged-in commits?
09:10 cbreak if not, which path does it follow to count?
09:10 cbreak that's why I said you might have to use --first-parent
09:11 [Brain] joined #git
09:11 phanimahesh joined #git
09:11 kevlarman --first-parent causes it to produce much newer commits than it should
09:13 cbreak so it probably counts merge participants
09:13 kevlarman also it looks like -n limits the results before the reversing
09:14 kevlarman so that part needs to happen after the first pipe anyway
09:16 xaa joined #git
09:16 GavinMagnus joined #git
09:16 GavinMagnus left #git
09:17 catsup joined #git
09:17 jguillen_ joined #git
09:20 Dyonisos joined #git
09:24 stoopkid joined #git
09:27 Aljone Counting objects: 9486, done.Delta compression using up to 4 threads.Compressing objects: 100% (9266/9266), done.Writing objects: 100% (9429/9429), 460.77 MiB | 3.72 MiB/s, done.Total 9429 (delta 1198), reused 0 (delta 0)efrror: RPC failed; result=22, HTTP code = 413
09:27 Aljone atal: The remote end hung up unexpectedlyfatal: The remote end hung up unexpectedlyEverything up-to-date
09:27 Aljone anyone can help me out
09:28 Aljone i was put my limit to 1250m so it should be problem with nginx configurations , i have no idea whats happening
09:28 fuchstronaut joined #git
09:29 kevlarman Aljone: check njinx's logs
09:31 davisonio joined #git
09:31 Aljone client intended to send too large body: 483153085 bytes, clie
09:33 jguillen joined #git
09:35 st0opkid joined #git
09:35 kevlarman Aljone: that's ~500mb, sounds like you either got the wrong setting or forgot to restart nginx
09:36 Fabricio20__ joined #git
09:36 playfullyExist joined #git
09:36 Aljone i restarted and rebooted the server
09:37 cbreak Aljone: SSH, tried it? :)
09:37 cyan__ joined #git
09:38 Aljone im loged in the terminal
09:38 Aljone ssh yes
09:39 jguillen joined #git
09:40 satifant joined #git
09:41 kevlarman cbreak: my dad got stuck working with the old version of microsoft's git server that doesn't support ssh, attempting to set up continuous integration in that environment was ...interesting :P
09:41 Aljone cbreak: something fishy is going on
09:41 Aljone i stoped nginx but the website still up
09:42 hahuang65 joined #git
09:43 Anderson69s_Deb joined #git
09:44 garethdaine joined #git
09:44 Aljone root       778   767  0 04:42 ?        00:00:00 runsv nginxroot       784   778  0 04:42 ?        00:00:00 svlogd -tt /var/log/gitlab/nginx root      2678   778  0 04:54 ?        00:00:00 nginx: master process /opt/gitlab/embedded/sbin/nginx -p /var/opt/gitlab/nginx 2003      2679  2678  0 04:54 ?        00:00:00 nginx: worker process
09:45 Aljone ideas?
09:45 iveqy joined #git
09:46 zeroed joined #git
09:49 freimatz joined #git
09:53 kevlarman Aljone: how did you stop it?
09:53 Fabricio20 joined #git
10:02 davisonio joined #git
10:03 Jackneill joined #git
10:05 cbreak Aljone: I mean instead of http
10:05 Aljone im upgrading my centos
10:12 fairuz joined #git
10:13 eivarv joined #git
10:15 khmarbaise joined #git
10:16 dlaboratory joined #git
10:17 lohfu joined #git
10:24 Fabricio20_ joined #git
10:25 zeroed joined #git
10:29 fuchstronaut joined #git
10:39 xall joined #git
10:41 sdothum joined #git
10:43 hahuang65 joined #git
10:54 zarubin joined #git
10:57 fairuz joined #git
10:58 dlaboratory joined #git
11:01 LiohAu joined #git
11:06 davisonio joined #git
11:07 stasmakarov joined #git
11:09 aard_ joined #git
11:12 robotroll joined #git
11:13 fairuz joined #git
11:13 felher_ joined #git
11:14 GlenK hey.  so if I've forked something from github, and added upstream.  is there anything wrong with updating like so?  git pull upstream master
11:16 GlenK other stuff I see says git merge, so yeah.  I'm not sure if it really matters either way at this point.  Frick, suppose I really need to buckle down and learn git better, eh?
11:17 GlenK think there's a udacity course floating around I've been meaning to do...
11:17 damjan i ussualy work on a separate branch, but `git fetch upstream master:master`
11:17 damjan so I have both in my repo before doing any merging or rebasing
11:18 ojdo joined #git
11:21 Maple__ joined #git
11:25 swift1 joined #git
11:25 carsten__ joined #git
11:25 swift1 joined #git
11:27 LarArT joined #git
11:28 cyphase joined #git
11:29 swift1 joined #git
11:30 fuchstronaut joined #git
11:31 swift1 joined #git
11:38 vdv joined #git
11:39 harish_ joined #git
11:43 hahuang65 joined #git
11:51 Fabricio20 joined #git
11:52 zarubin joined #git
11:55 star_prone joined #git
11:58 ae__ joined #git
12:03 bartosz_ joined #git
12:04 harish_ joined #git
12:08 sanketdg joined #git
12:08 awt joined #git
12:08 SteffanW joined #git
12:11 Fabricio20_ joined #git
12:15 sea-gull joined #git
12:16 fahadash joined #git
12:17 anuxivm joined #git
12:27 davisonio joined #git
12:30 paul424 joined #git
12:30 fuchstronaut joined #git
12:34 Rodya_ joined #git
12:34 usm4n joined #git
12:41 The_Phoenix joined #git
12:41 lucid joined #git
12:41 dlab joined #git
12:42 Fabricio20__ joined #git
12:42 lucid I'm using git under osx and windows. Under Windows git-diff is saying "warning: LF will be replaced by CRLF in..." but I have core.autocrlf=false... so why will it be converted?
12:43 nettoweb joined #git
12:43 lucid and more importantly, how can I stop that?
12:44 jeffreylevesque joined #git
12:44 lucid is it just for the purposes of the diff? at the end it says "
12:44 hahuang65 joined #git
12:44 lucid is it just for the purposes of the diff? at the end it says "The file will have its original line endings in your working directory."
12:45 djb-irc joined #git
12:46 NeonSynth joined #git
12:46 vuoto joined #git
12:51 unknownIdentity joined #git
12:51 mikecmpbll joined #git
12:51 dlab left #git
12:54 iCrusader joined #git
13:02 dlaboratory joined #git
13:02 khmarbaise joined #git
13:11 zeroed joined #git
13:15 Orbitrix joined #git
13:20 nettoweb joined #git
13:27 Tachyon_ joined #git
13:28 cdown joined #git
13:31 fuchstronaut joined #git
13:33 liuzhen joined #git
13:34 The_Phoenix joined #git
13:38 wwwi joined #git
13:42 HanClinto joined #git
13:43 wwwi left #git
13:43 vuoto joined #git
13:44 wxg joined #git
13:44 lel joined #git
13:44 lel joined #git
13:45 hahuang65 joined #git
13:47 xlegoman joined #git
13:49 inflex left #git
13:50 davisonio joined #git
13:52 awt joined #git
13:53 peroht joined #git
13:54 peroht_ joined #git
13:54 piling joined #git
13:56 rbern joined #git
13:56 slayerjain joined #git
14:08 Jon28_ joined #git
14:08 catsup joined #git
14:14 interne7y joined #git
14:19 non_linux_expert joined #git
14:20 peroht joined #git
14:20 peroht_ joined #git
14:21 GenZai joined #git
14:21 str joined #git
14:22 LeMike joined #git
14:23 shinnya joined #git
14:24 Cassiopaya joined #git
14:26 IlNominePatre joined #git
14:27 GenZai joined #git
14:28 blackwind_123 joined #git
14:28 jaafar joined #git
14:30 cdown joined #git
14:30 The_Phoenix joined #git
14:31 GenZai joined #git
14:32 fuchstronaut joined #git
14:34 mischat joined #git
14:34 Darcidride joined #git
14:35 peroht joined #git
14:35 peroht_ joined #git
14:35 Impaloo joined #git
14:35 wrouesnel joined #git
14:37 harish_ joined #git
14:37 unbalancedparen joined #git
14:37 cagmz joined #git
14:39 rardiol joined #git
14:40 zacts joined #git
14:43 shymega joined #git
14:44 happy-dude joined #git
14:44 kus joined #git
14:44 vuoto joined #git
14:46 hahuang65 joined #git
14:47 duarteper portugalfriends channel
14:48 magicTurtle joined #git
14:50 zivester joined #git
14:51 Lomex joined #git
14:53 peroht_ joined #git
14:53 peroht joined #git
14:54 l4v2 joined #git
14:57 peroht joined #git
14:57 phanimahesh joined #git
14:59 UTAN_dev joined #git
15:00 davisonio joined #git
15:05 LarArT joined #git
15:12 zincrokx joined #git
15:13 peroht joined #git
15:13 jpzfw joined #git
15:14 j416 joined #git
15:16 anuxivm joined #git
15:19 wrouesnel joined #git
15:20 f3r70rr35f joined #git
15:20 peroht_ joined #git
15:21 BenderRodriguez joined #git
15:22 Mannn joined #git
15:23 peroht joined #git
15:25 star_prone joined #git
15:26 agiz joined #git
15:27 peroht_ joined #git
15:29 zumba_addict joined #git
15:29 peroht_ left #git
15:32 HappyLoa- joined #git
15:32 davisonio joined #git
15:33 fuchstronaut joined #git
15:34 zeroed joined #git
15:34 mischat joined #git
15:35 bjsz joined #git
15:35 zumba_addict joined #git
15:39 seishun joined #git
15:39 orion joined #git
15:39 seishun what does "Falling back to patching base and 3-way merge" mean? Google only gives results about conflicts, but I sometimes get it when it merges successfully
15:40 orion Hi. If I have a bare repository, what's the best way to view its contents?
15:41 zacts joined #git
15:41 nedbat orion: clone it to a full working tree?
15:41 m0viefreak joined #git
15:42 mischat joined #git
15:43 star_prone joined #git
15:43 madewokherd joined #git
15:44 orion Ok, thanks.
15:44 orion left #git
15:46 dreiss joined #git
15:46 hahuang65 joined #git
15:47 _Mica_ joined #git
15:49 Codfection joined #git
15:50 razieliyo joined #git
15:50 zumba_addict joined #git
15:51 ribasushi joined #git
15:53 foist joined #git
15:54 thiago joined #git
15:55 _Mica_ joined #git
15:56 _Mica_ left #git
15:57 zumba_addict joined #git
15:57 FelixVi joined #git
15:58 LiohAu joined #git
15:59 wrouesnel1 joined #git
16:00 mohabaks joined #git
16:00 CheckDavid joined #git
16:03 romerocesar joined #git
16:05 johnny56 joined #git
16:06 Ma5ter joined #git
16:06 MrMojito joined #git
16:06 zumba_addict joined #git
16:07 zacts joined #git
16:08 a_thakur joined #git
16:11 star_prone joined #git
16:14 interne7y joined #git
16:15 raz hrmph.. why doesn't 'git add -p' let me stage individual lines and refuses to split the hunk further :/
16:15 raz is there some way to stage individual lines with the CLI, without resorting to error-prone patch editing?
16:15 cagmz joined #git
16:16 osse no
16:17 vuoto joined #git
16:17 satifant what a pity
16:17 osse staging individual lines is not so hard in the patch edit thing. remove all the others
16:17 kbs joined #git
16:19 HappyLoa- joined #git
16:20 sdothum joined #git
16:23 star_prone joined #git
16:23 nilsi joined #git
16:24 NeverDie joined #git
16:29 ahmedelgabri joined #git
16:30 mariuscc joined #git
16:31 a_thakur_ joined #git
16:32 ams__ joined #git
16:34 fuchstronaut joined #git
16:36 claudiop joined #git
16:36 jaequery joined #git
16:37 Khisanth joined #git
16:38 xlegoman joined #git
16:38 star_prone joined #git
16:41 eivarv joined #git
16:43 eivarv joined #git
16:44 tachoknight_ joined #git
16:45 Oebele joined #git
16:46 Fgeso joined #git
16:47 hahuang65 joined #git
16:49 nilsi_ joined #git
16:54 Raging_Hog joined #git
17:00 Rodya_ joined #git
17:03 ksolv joined #git
17:03 LarArT joined #git
17:04 ytl joined #git
17:06 jeffreylevesque joined #git
17:07 darkbit joined #git
17:09 The_Phoenix joined #git
17:10 johnny56_ joined #git
17:10 The_Phoenix joined #git
17:10 cagmz joined #git
17:11 phanimahesh use magit/vimagit
17:11 phanimahesh if you need it regularly
17:11 skylite joined #git
17:11 The_Phoenix joined #git
17:12 mohabaks joined #git
17:12 VladGh_ joined #git
17:13 The_Phoenix joined #git
17:14 The_Phoenix joined #git
17:15 Rodya_ joined #git
17:18 therealGent joined #git
17:19 leeN joined #git
17:19 eka joined #git
17:19 SteffanW joined #git
17:22 altendky joined #git
17:22 eka joined #git
17:23 skylite joined #git
17:26 heftig joined #git
17:31 jstein_ joined #git
17:33 _Mica_ joined #git
17:33 _Mica_ left #git
17:34 skylite joined #git
17:34 fuchstronaut joined #git
17:35 SpeakerToMeat joined #git
17:36 eivarv joined #git
17:39 Derperperd joined #git
17:40 GavinMagnus joined #git
17:40 kadoban joined #git
17:41 dsdeiz joined #git
17:47 p4trix joined #git
17:48 hahuang65 joined #git
17:54 SpeakerToMeat joined #git
17:56 Finnoloid joined #git
17:59 shgysk8zer0 joined #git
18:04 ProbabilityMoon joined #git
18:05 phanimahesh joined #git
18:07 SoItBegins joined #git
18:10 phanimahesh joined #git
18:10 circ-user-aUJuR joined #git
18:14 cyan__ joined #git
18:16 ribasushi joined #git
18:17 phanimahesh joined #git
18:20 beyertech joined #git
18:22 beyertech joined #git
18:24 beyertech joined #git
18:26 beyertech joined #git
18:27 khmarbaise joined #git
18:27 Brain joined #git
18:32 leehambley joined #git
18:35 fuchstronaut joined #git
18:37 phanimahesh joined #git
18:38 [Brain] joined #git
18:42 madebymarkca joined #git
18:42 phanimahesh joined #git
18:44 tango_ joined #git
18:45 GavinMagnus left #git
18:46 Tachyon_ joined #git
18:46 EvilDMP__ joined #git
18:47 Tachyon_ joined #git
18:48 GavinMagnus joined #git
18:48 GavinMagnus left #git
18:49 hahuang65 joined #git
18:50 EvilDMP__ joined #git
18:51 astrofog joined #git
18:53 EvilDMP__ joined #git
18:53 jguillen joined #git
18:53 DJ_Spies joined #git
18:58 zincrokx joined #git
18:58 ugjka_ joined #git
18:59 zincrokx joined #git
19:00 zincrokx joined #git
19:00 zincrokx joined #git
19:01 rardiol joined #git
19:01 eivarv joined #git
19:01 zincrokx joined #git
19:02 zincrokx joined #git
19:03 jhass joined #git
19:05 beyertech joined #git
19:07 beyertech joined #git
19:13 khmarbaise_ joined #git
19:13 hahuang65 joined #git
19:14 ericsupreme joined #git
19:20 LarArT joined #git
19:21 p4trix joined #git
19:23 PaulCapestany joined #git
19:31 lss8 joined #git
19:32 ash_workz joined #git
19:35 shinnya joined #git
19:35 diegoviola joined #git
19:35 tectonic joined #git
19:36 fuchstronaut joined #git
19:41 awt joined #git
19:41 lss8 joined #git
19:48 ki0 joined #git
19:49 ningu joined #git
19:49 ningu I have a remote branch that shows up in git branch -r, but not git branch, so I can't switch to it with git checkout. what do I need to do to fetch it?
19:51 str joined #git
19:53 ningu hmm
19:53 ningu actually, apparently it does work to just do git checkout
19:53 ningu it sets it up with the right remote tracking etc.
19:53 akiva joined #git
19:54 tectonic left #git
20:00 rkazak joined #git
20:05 diego1 joined #git
20:05 diego1 joined #git
20:05 lss8 joined #git
20:06 Darcidride joined #git
20:07 ahmedelgabri joined #git
20:11 eivarv joined #git
20:16 ahmedelgabri joined #git
20:16 interne7y joined #git
20:16 HoierM joined #git
20:18 Darcidride joined #git
20:20 Darcidride joined #git
20:21 mgarate joined #git
20:23 khmarbaise joined #git
20:26 beyertech joined #git
20:27 ResidentBiscuit joined #git
20:28 GavinMagnus joined #git
20:28 beyertech joined #git
20:31 beyertech joined #git
20:33 Spec-Chum joined #git
20:34 beyertech joined #git
20:36 beyertech joined #git
20:37 fuchstronaut joined #git
20:39 beyertech joined #git
20:41 mohabaks joined #git
20:42 beyertech joined #git
20:43 xlegoman joined #git
20:43 hahuang65 joined #git
20:46 [R] joined #git
20:46 [R] is there any way to get the server to modify the commit msg in a hook?
20:47 ningu left #git
20:47 kadoban [R]: You wouldn't want to do that anyway, it'd be ... weird. Then the history you have wouldn't match what's actually on the remote.
20:47 [R] yeah, that was the one thing i'd be worried about
20:48 [R] i'm using gerrit, and i love how they put info in the 'notes', but im using gitlab, and it has no way to visualize it, so i was hoping i could just stick them in the commit msg somehow
20:48 yqt joined #git
20:49 ahmedelgabri joined #git
20:52 ksolv joined #git
20:53 ahmedelgabri joined #git
20:53 nettoweb joined #git
20:54 beyertech joined #git
20:55 GavinMagnus left #git
20:56 xall joined #git
20:56 rewt [R], if the commit message is changed, the commit hash will change along with it, so your next push will say the repos diverged, and you'd have to rebase before pushing
20:58 [R] well that's no fun
20:58 [R] can't i just ninja go in ther eand change the message?
20:59 qsx no.
20:59 qsx unless you break sha1 (hint: highly unlikely.)
20:59 [R] :(
21:00 ytl_ joined #git
21:01 damjan [R]: exactly. no one wants fun with their source code :)
21:01 [R] i guess if i reference the issue # in the message, and then have gerrit add a comment to the issue referening hte code review
21:01 ahmedelgabri joined #git
21:04 Rodya_ joined #git
21:04 jstimm joined #git
21:05 Derperperd joined #git
21:05 davisonio joined #git
21:13 cdown joined #git
21:19 mellernoia joined #git
21:19 star_prone joined #git
21:20 spudowiar joined #git
21:21 HappyLoa- joined #git
21:21 ahmedelgabri joined #git
21:23 beyertech joined #git
21:24 Electrometro joined #git
21:25 beyertech joined #git
21:26 diegoviola joined #git
21:26 mablae_ joined #git
21:28 beyertech joined #git
21:31 beyertech joined #git
21:32 Brain joined #git
21:33 justanotheruser joined #git
21:33 CheckDavid joined #git
21:33 beyertech joined #git
21:35 ahr3n joined #git
21:36 beyertech joined #git
21:37 netj joined #git
21:37 fuchstronaut joined #git
21:39 beyertech_ joined #git
21:40 aidalgol joined #git
21:41 semantipc joined #git
21:41 kbs joined #git
21:42 beyertech joined #git
21:46 mablae__ joined #git
21:47 mischat joined #git
21:48 crayon joined #git
21:51 dcpc007 joined #git
21:53 d4rklit3 joined #git
21:53 therealGent joined #git
21:53 therealGent joined #git
21:55 semantipc joined #git
21:56 diego1 joined #git
21:56 sim590 left #git
21:56 diego1 joined #git
21:57 sim590 joined #git
21:57 sim590 left #git
21:57 ajacmac joined #git
21:57 sim590 joined #git
21:58 ajacmac How do I setup a server as a remote?
21:58 semantipc joined #git
21:58 damjan ajacmac: git remote add ...
21:59 ajacmac That just allows me to connect to an existing remote, right?
21:59 Rodya_ joined #git
22:00 ajacmac What I want is to make an AWS instance and a raspberry pi remotes I can push to.
22:00 damjan ajacmac: what was your question then?
22:00 damjan you only need ssh and git on them so that you push to them
22:00 kbs One path of least resistance might just be to enable ssh access to it.?
22:00 kbs ^^
22:00 damjan unless you need fancy features like github has with protected branches and what not
22:01 damjan hell, you can even just rsync .git to a remote server
22:01 ajacmac I'm just trying to figure out the easiest work flow for multiple production servers, etc.
22:01 semantipc joined #git
22:02 ajacmac Ok, rsync.git I haven't heard of
22:02 damjan that's all you need to recover everything from a git repo
22:02 kbs you're probably going to do that over ssh I'd imagine, and at that point can simply just use git directly. likely ssh+git is the easiest combo
22:02 ajacmac I'll look it up, thanks
22:03 ajacmac Can I script ssh ing into multiple servers and pulling, etc.?
22:04 osse yes
22:04 kadoban Pulling in a script is likely not a good idea. pull implies merge, which is a manual activity.
22:04 ajacmac Cool, I'll keep that in mind too, then.
22:04 beyertech joined #git
22:05 * kbs wonders if the goal is more around pushing configuration files to servers
22:05 kadoban Sounds a lot like you're trying to use git for deployment? Doesn't seem like a very good idea.
22:05 Rodya_ joined #git
22:06 ajacmac Ya, I am. I've been trying and failing to find out what people do for deployment when they don't have money to spend on a paid service.
22:06 damjan ajacmac: use ansible?
22:06 damjan salt puppet whatever?
22:07 ajacmac It's been years since I've heard the name ansible, I'd forgotten it.
22:07 ajacmac Thanks!
22:07 damjan ajacmac: you should've stated your original issue from the begining
22:07 beyertech joined #git
22:09 _Ra_ joined #git
22:09 jstimm joined #git
22:10 beyertech joined #git
22:13 rubyonrailed joined #git
22:15 rubyonrailed joined #git
22:17 interne7y joined #git
22:18 eivarv joined #git
22:18 whitby joined #git
22:20 blr joined #git
22:20 rardiol left #git
22:21 _Ra_ left #git
22:22 jeffreylevesque joined #git
22:23 SoItBegins joined #git
22:24 durham joined #git
22:25 durham joined #git
22:28 Maple__ joined #git
22:30 dsantiago joined #git
22:30 RedneckDonut joined #git
22:31 sy joined #git
22:32 Goplat joined #git
22:33 askhader joined #git
22:33 askhader I cloned a project with a submodule, but the submodule is missing despite having an entry in .gitmodules. How do I rectify this?
22:33 askhader git submodule update has no output
22:34 bobdobbs I've got an existing git project. I added a github repo as a remote. When I push, nothing gets added to github
22:34 boombatower joined #git
22:34 bobdobbs When I do 'git push -u origin master', the console responds: "Branch master set up to track remote branch master from origin"
22:35 bobdobbs So then I go to my browser, and load the git page. The repo exists. If I navigate to 'code', I see the 'quick setup' instructions. No code was pushed.
22:35 l4v2 joined #git
22:36 cbreak bobdobbs: code doesn't matter
22:36 cbreak bobdobbs: is the history there?
22:36 bobdobbs I thought that maybe the remote doesn't exist. So I re-add it. The console returns a fatal error, saying that the remote already exists.
22:36 bobdobbs cbreak:
22:37 cbreak check if you have the same commits
22:37 damjan bobdobbs: is origin the github repo?
22:37 bobdobbs damjan: I don't know. I also have a bitbucket repo. So maybe the bitbucket repo is 'origin'.
22:37 damjan bobdobbs: git remote -v
22:38 damjan how can you not know that??? how did you even add it then?
22:38 askhader How do I install a submobule?
22:38 askhader The submodule is already in the project but the directory is absent after I cloned it.
22:38 bobdobbs damjan: I added the project the way I usually do: just following the instructions that github provides.
22:38 fuchstronaut joined #git
22:40 bobdobbs damjan: ah, I see. 'git remote -v' returns a listing. I can see the github entries listed with 'github' as the first field. So I guess that that is the name of the github repo.
22:40 bobdobbs so I'll try 'git push github'
22:40 damjan askhader: when you clone you can use --recursive, or after that "git submodule update --init"
22:40 damjan bobdobbs: right
22:40 bobdobbs hey, that does it
22:41 bobdobbs I know have that repo on github!
22:41 bobdobbs thanks!
22:43 mibr0 joined #git
22:45 cagmz joined #git
22:46 hahuang65 joined #git
22:47 p4trix joined #git
22:48 ytl joined #git
22:49 rubyonrailed joined #git
22:50 askhader damjan: None of these commands had any effect.
22:50 askhader The submodule's directory is still missing
22:51 damjan what repo is that?
22:51 nfk joined #git
22:51 askhader Alamofire, does it matter?
22:51 rorro joined #git
22:52 damjan just to see it. since the commands are those
22:53 damjan this one ? https://github.com/Alamofire/Alamofire ??
22:53 askhader damjan: Here is my .gitmodule https://gist.github.com/679574b85939f5c786f0a107510149fa
22:53 askhader yes
22:54 damjan I hope you ment .gitmodules up there
22:54 mibr0 joined #git
22:55 damjan askhader: I don't understant what you're doing. you have a new repo, or you cloned some other repo??
22:56 mibr0 joined #git
22:57 askhader cloned a repo
22:57 askhader And the Alamofire submodule Path is nowhere to be found
22:58 reim joined #git
22:58 omata joined #git
22:59 damjan what next?
22:59 askhader That's the story. I need the submodule present.
22:59 dreamseeker joined #git
23:00 omata left #git
23:00 mach0ne joined #git
23:00 aspiers joined #git
23:01 cbreak askhader: just git submoudule update --init
23:01 cbreak that's all you have to do
23:01 cbreak askhader: IF your repo has a submodule
23:01 cbreak askhader: you can check with git ls-tree -r HEAD
23:01 askhader That command has no output and seemingly no effect.
23:01 cbreak askhader: then you don't have a submodule
23:02 askhader So what is the .gitmodules doing in my repository?
23:02 cbreak askhader: maybe a leftover
23:02 cbreak or someone just created a file
23:02 cbreak .gitmodules is not relevant for the existence of a submodule
23:02 askhader Fair enough. Thanks for the guidance.
23:02 cbreak it is relevant for the initial URL and other meta data
23:02 cbreak what matters is the entry in the tree
23:03 cbreak the command I gave you above shows the tree
23:03 askhader Perfect.
23:03 cbreak is there a commit entry in the tree? That is a submodule
23:07 cbreak ah well, good night :)
23:07 Noldorin joined #git
23:07 cbreak if you want to add a submodule, use git submodule add
23:09 jeffreylevesque joined #git
23:13 Jon28_ joined #git
23:21 xall joined #git
23:21 Gamecubic joined #git
23:21 LeBlaaanc joined #git
23:22 ffabi joined #git
23:22 mablae_ joined #git
23:28 ffabi joined #git
23:30 cagmz joined #git
23:31 zacts joined #git
23:33 rubyonrailed joined #git
23:34 mischat joined #git
23:35 BenderRodriguez joined #git
23:36 j416 joined #git
23:37 tanuki joined #git
23:39 fuchstronaut joined #git
23:40 Dreamer3 joined #git
23:41 LeBlaaanc joined #git
23:43 johnchalekson joined #git
23:44 underpantz joined #git
23:44 johnchalekson joined #git
23:47 hahuang65 joined #git
23:47 Izabia joined #git
23:51 moei joined #git
23:57 Gitzilla joined #git
23:57 _28_ria joined #git

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