Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-29

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

All times shown according to UTC.

Time Nick Message
00:02 e14 joined #git
00:04 kbs left #git
00:05 Ardethian joined #git
00:07 durham_ joined #git
00:07 flaguy48 joined #git
00:08 thiago joined #git
00:09 tristanp joined #git
00:10 e14 joined #git
00:12 amdi_ joined #git
00:15 ki0 joined #git
00:16 snowkidind joined #git
00:17 alhariel joined #git
00:17 anuxivm left #git
00:21 svm_invictvs joined #git
00:23 hck89 joined #git
00:24 e14 joined #git
00:27 dsantiag_ joined #git
00:28 e14 joined #git
00:29 xall joined #git
00:31 fuchstronaut joined #git
00:33 infernix joined #git
00:33 xall_ joined #git
00:33 anonymuse joined #git
00:34 Ryanar joined #git
00:40 fstd_ joined #git
00:40 fstd_ joined #git
00:48 Rodya_ joined #git
00:52 beatdown joined #git
00:53 tristanp joined #git
00:53 cagedwisdom joined #git
00:53 Khisanth joined #git
00:53 akurniawan joined #git
00:55 irqq_ joined #git
00:55 patrick99e99 joined #git
00:55 ojdo joined #git
00:56 pandabearit_ joined #git
00:56 patrick99e99 \q
00:58 tristanp_ joined #git
00:58 patrick99e99 joined #git
00:59 patrick99e99 ugh-- i somehow screwed up my repo...  I had a submodule that I didn't realize was a submodile, and I moved it to a different folder with git mv, and then when I realized stuff was broken I moved it back...  and now when I do git status, I get "fatal: Not a git repository: Externals/cocos2d-iphone/../../../.git/modules/Externals/the-repo"
00:59 watabou joined #git
00:59 patrick99e99 aghhhhh...  what did I do, and how can I fix this?
01:00 patrick99e99 somehow ../../.. is all in there...
01:00 Ryanar joined #git
01:01 patrick99e99 .git has:   gitdir: ../../../.git/modules/Externals/cocos2d-iphone-classic
01:02 patrick99e99 huh.. maybe everything is ok after all.. i think the folder was just named wrong.
01:03 Rr4sT joined #git
01:04 re1_ joined #git
01:04 prg3 joined #git
01:08 arescorpio joined #git
01:09 Rodya_ joined #git
01:10 tristanp joined #git
01:12 patrick99e99 omg.. no.. everything is screwed up
01:13 patrick99e99 I don't understand
01:13 patrick99e99 why would moving a folder and moving it back break everything?
01:14 patrick99e99 when i git status I get
01:14 patrick99e99 fatal: Could not chdir to '../../../../MyApp/libs/cocos2d-iphone': No such file or directory
01:14 patrick99e99 that patch should be /Externals/cocos2d-iphone not /libs
01:14 patrick99e99 and if I ack for that, I cant find it anywhere
01:15 patrick99e99 how do I change that?
01:17 Ryanar joined #git
01:17 Khisanth joined #git
01:19 patrick99e99 found it.. it was in .git/modules/path-to-submodule/config
01:19 patrick99e99 renamed it and now its ok
01:21 finalbeta joined #git
01:21 tristanp joined #git
01:23 cagedwisdom joined #git
01:25 Ryanar joined #git
01:29 a3Dman_ joined #git
01:30 dsantiago joined #git
01:32 fuchstronaut joined #git
01:36 gfixler joined #git
01:38 akurniawan joined #git
01:46 Vampire0 joined #git
01:46 mrpackethead joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
01:50 kaldoran joined #git
01:54 liuzhen joined #git
01:56 matoro joined #git
01:56 overlord_tm joined #git
01:57 QwertyDragon joined #git
01:57 ki0 joined #git
02:00 robogoat joined #git
02:01 jaafar joined #git
02:02 d^sh joined #git
02:04 Dougie187 joined #git
02:12 Jack joined #git
02:13 ahmed_elgabri joined #git
02:13 pothepanda joined #git
02:15 flaguy48 joined #git
02:15 hexagoxel joined #git
02:15 Prawnzy joined #git
02:17 sunri5e joined #git
02:19 Limes joined #git
02:20 flaguy48 joined #git
02:20 Prawnzy joined #git
02:21 anonymuse joined #git
02:25 z4kst4r joined #git
02:26 mangolisk joined #git
02:26 infernix joined #git
02:27 z4kst4r I am a beginner in using git. I am trying to get one file(clone) from my remote repository. I have more than one file in that repository. However when I am cloning it I get an empty directory. any help is appreciated
02:28 MacGyver Git doesn't really do partial clones.
02:28 MacGyver I mean yes it does, kinda somewhat someway but not if you're a beginner.
02:28 z4kst4r Ok I was being a dickhead.
02:29 z4kst4r those files were .* files and I was just doing ls -l; ls
02:29 MacGyver Well there you go.
02:30 Prawnzy joined #git
02:31 Ryanar joined #git
02:33 fuchstronaut joined #git
02:38 Goplat joined #git
02:40 lagothri1 joined #git
02:41 einnjo joined #git
02:44 cdown joined #git
02:46 chachasmooth joined #git
02:49 chandu20 joined #git
02:49 converge joined #git
02:49 converge joined #git
02:50 BenderRodriguez joined #git
02:52 d^sh joined #git
02:54 DolphinDream joined #git
02:55 [cust] joined #git
02:55 z4kst4r joined #git
02:56 bongobrown joined #git
02:56 Dougie187 left #git
02:57 rkazak joined #git
03:00 Celelibi_ joined #git
03:00 prg3 joined #git
03:02 denimsoft joined #git
03:04 justanotheruser joined #git
03:07 sssilver_ joined #git
03:11 prg3 joined #git
03:14 sunri5e joined #git
03:14 Vortex35 joined #git
03:18 Flarrow joined #git
03:19 Flarrow Hi, quick question, is there a way to pull everything from a remote directory, inside the directory you are on?
03:20 Flarrow As in, imagine I'm in ~/ and I want to pull from github.com/Flarrow/Hello, but I don't want the "Hello" directory inside ~/, just everything inside "Hello" , directly in ~/
03:21 phroa pull to an existing repo or clone a new repo?
03:21 Flarrow phroa: What's the difference?
03:21 Flarrow I think clone
03:22 phroa you can't clone in to a folder that already has files, but you can use "git clone path/to/source/repo /path/to/destination/folder" to choose a folder besides the name of the source repo itself
03:22 _cyril_ joined #git
03:23 Flarrow phroa: Yes, but doing that, I would have to git init in a folder that isn't the one that's going to contain everything in the destination folder("Hello" in this example)
03:24 phroa well no, clone clones the repository and inits it with the current HEAD of the remote repo, you don't even need to create the destination folder beforehand iirc
03:24 phroa see man git-clone
03:24 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
03:25 phroa pull updates an existing repository, which _would_ have had to have been previously init'ed
03:26 phroa what you could do is `git init` in your ~ directory (I really don't recommend this... at all...) then point the ~ repo at .../Hello and pull; that would put .../Hello's files right in ~
03:26 dsc2 joined #git
03:26 phroa are you doing this to manage dotfiles, by chance?
03:26 rchavik joined #git
03:26 Flarrow Imagine I have "one" and "two" files in github.com/Flarrow/Hello. What I want to do is put "one" and "two" inside ~/abc without the "Hello" in ~/abc
03:27 Flarrow without the "Hello" being inside ~/abc*
03:27 phroa "git clone git@github.com:Flarrow/hello ~/abc"
03:27 dsc2 Hey all. Question about this: http://stackoverflow.com/q/2765421   -- Why isn't the tracking set up by default when you push a new branch to a remote?
03:28 Flarrow But where do I "git init" ?
03:28 MrWoohoo joined #git
03:28 Flarrow phroa: ^
03:28 phroa you don't, clone handles it :)
03:28 joki joined #git
03:28 Flarrow Let me try
03:29 phroa (the "abc" folder will be the git root, with .git inside it)
03:29 dsc2 and i'm guessing that "git push -u origin <branch>"  is really the correct command, assuming "origin" is the correct remote name?
03:29 mehola joined #git
03:31 prg3 joined #git
03:32 chachasmooth joined #git
03:33 fuchstronaut joined #git
03:34 alex1a joined #git
03:36 Darren_ joined #git
03:39 pandbearit joined #git
03:39 prg3_ joined #git
03:42 prg3 joined #git
03:47 flaguy48 joined #git
03:48 xall_ joined #git
03:49 railssmith joined #git
03:49 lagothrix joined #git
03:50 hexagoxel joined #git
03:54 shinnya joined #git
03:57 Prawnzy joined #git
03:59 jost_ joined #git
04:04 rkazak joined #git
04:05 jimi_ joined #git
04:10 anonymuse joined #git
04:10 durham joined #git
04:15 nan2 joined #git
04:16 QwertyDragon joined #git
04:17 subhojit777 joined #git
04:21 safe joined #git
04:21 j0nny joined #git
04:24 j0nny is there a canonical folder name for stuff that is more or less a white board - like things you might accumulate over the course of figuring out a project?
04:24 ahmed_elgabri joined #git
04:25 kadoban Not really. I usually don't even have it on the same branch as the rest of content. It tends to be its own orphan branch.
04:25 chandu20 joined #git
04:26 j0nny should I call the branch garbage-junk ?
04:26 j0nny whiteboard-garbage-junk-hippie-hangout-for-mostly-genxers?
04:26 Cabanossi joined #git
04:26 kadoban *shrug*
04:27 j0nny yeah I feel the *shrug*
04:27 kadoban I think I usually call it 'docs' or something, though that could be ambiguous.
04:27 j0nny it could be full of doctors
04:28 j0nny ephemera ?
04:28 j0nny seems abit monicle man
04:28 j0nny I mosly wanted to make sure there was not alreasy like a world wide agreed on name for it.
04:29 phroa notes
04:29 j0nny dang that's real good
04:29 j0nny notes
04:29 j0nny the world wide agreed on standard.
04:30 j0nny unoffical-notes
04:30 Jameser joined #git
04:31 j0nny I kind of like "napkin-notes"
04:31 deltab or lab notes
04:32 j0nny lab notes is 10^x more professional
04:33 j0nny it really gives the feeling of in-progress
04:33 j0nny not to be taken too seriously but not to be ignored.
04:34 railssmith joined #git
04:34 daey_ joined #git
04:34 fuchstronaut joined #git
04:35 j0nny laboratoryOrphanBranch
04:35 j0nny pretty sweet?
04:35 j0nny reverse *shrug* anyone??? ??
04:35 svm_invictvs joined #git
04:35 sdothum joined #git
04:36 j0nny I mean that would require you to be _in_ the shrug position and then revert back to normal...
04:38 sombok joined #git
04:41 nan2 joined #git
04:47 nan2 joined #git
04:50 railssmith joined #git
04:54 StrongJava joined #git
04:58 NeverDie_ joined #git
05:00 snthsnth joined #git
05:03 Lyqyd joined #git
05:06 jaguarmagenta joined #git
05:09 railssmith joined #git
05:09 ljc joined #git
05:12 bocaneri joined #git
05:13 anonymuse joined #git
05:15 bmahe joined #git
05:17 sdothum joined #git
05:17 ochorocho__ joined #git
05:19 tristanp joined #git
05:23 daey_ joined #git
05:25 inflames joined #git
05:25 Anja joined #git
05:27 jaguarmagenta joined #git
05:27 railssmith joined #git
05:36 fuchstronaut joined #git
05:36 dermoth joined #git
05:37 lordPoseidon joined #git
05:38 lordPoseidon left #git
05:39 lordPoseidon_ joined #git
05:42 akurniawan joined #git
05:42 Cabanossi joined #git
05:42 lordPoseidon joined #git
05:43 lordPoseidon joined #git
05:43 a0k joined #git
05:45 freimatz joined #git
05:46 nilg joined #git
05:47 a0k left #git
05:49 SwiftMatt joined #git
05:51 jgrasser joined #git
05:57 blackwind_123 joined #git
05:57 dreiss joined #git
05:58 ShekharReddy joined #git
06:00 LucaTM joined #git
06:01 dermoth joined #git
06:03 liuzhen joined #git
06:04 denimsoft joined #git
06:06 chronos_ joined #git
06:06 jaguarmagenta joined #git
06:09 pks joined #git
06:15 johnkevinmbasco joined #git
06:18 ochorocho__ joined #git
06:18 railssmith joined #git
06:20 kampiyo joined #git
06:23 sssilver joined #git
06:23 a_thakur joined #git
06:25 ljc joined #git
06:27 chandu20 joined #git
06:33 phanimahesh joined #git
06:33 lordPoseidon joined #git
06:34 lordPoseidon warning Connection reset by peer
06:34 lordPoseidon hello I need help, I want to install git-bzr-ng, but i am not able to do it
06:35 lordPoseidon i tried to do sudo apt-get install git-bzr-ng but terminal said no package found
06:35 lordPoseidon I have ubuntu 16.04
06:36 fuchstronaut joined #git
06:37 jozwior joined #git
06:40 lordPoseidon plz help me
06:40 ahmed_elgabri joined #git
06:48 JanC_ joined #git
06:53 brillenfux joined #git
06:56 phanimahesh joined #git
07:01 anonymuse joined #git
07:02 rahtgaz joined #git
07:05 tristanp joined #git
07:08 xall_ joined #git
07:09 mrpackethead joined #git
07:13 mangolisk joined #git
07:18 pks joined #git
07:19 ochorocho__ joined #git
07:24 _cyril_ joined #git
07:24 tristanp joined #git
07:24 brillenfux joined #git
07:26 Serdensane joined #git
07:26 pokalyis joined #git
07:27 gniourf joined #git
07:29 Groscheri joined #git
07:30 [Brain] joined #git
07:37 fuchstronaut joined #git
07:39 ok91 joined #git
07:39 arup_r joined #git
07:40 arup_r I want to clean the history of a file application.yml.example. What command I should do ? some credentials are check in anf pushed to github and pull by other dev.
07:41 arup_r I cleaned the credential, but I need to remove old history from tracking. Can you help me?
07:41 phroa !bfg
07:41 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
07:42 phroa naturally anyone that has a copy of the file in their history already won't be affected by this tool, only your local copy and the remote you're overwriting.  I'd suggest you regenerate every credential like ASAP
07:44 anonymuse joined #git
07:45 Raging_Hog joined #git
07:46 sssilver joined #git
07:47 hamid999[m] joined #git
07:47 PioneerAxon joined #git
07:49 a_thakur joined #git
07:49 arup_r phroa: can I clean the history of the file except the current one without that tool?
07:49 phroa refer to man git-filter-branch if you want to do it yourself
07:49 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
07:50 phroa (or I suppose you could do a whole lot of manual interactive rebasing, man git-rebase /INTERACTIVE)
07:50 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
07:50 Seveas Eugene: of course it isn't total garbage. I use it all the time...
07:53 raijin joined #git
07:54 shinnya joined #git
07:55 xelxebar joined #git
07:58 d0nn1e joined #git
08:02 Siegfried joined #git
08:02 Siegfried Hi all, I am trying to use CI to do automatic deployment for the first time.  Is there an easy one line bash script to assert that I'm on the master branch?
08:03 chandu20 joined #git
08:06 ngperfex joined #git
08:06 gr8kodr joined #git
08:07 ahmed_elgabri joined #git
08:08 ngperfex why am i getting ^M when i git diff. core.autocrlf is set to true. iam getting this after pulling the changes. i have read about if and looks like autocrlf set to true should fix the issue but its still there.
08:09 ngperfex it and*
08:09 a3Dman- joined #git
08:09 kimonorouge joined #git
08:11 m1dnight_ joined #git
08:12 davimore joined #git
08:13 Xuefer joined #git
08:14 gr8kodr looking for assistance setting up git server frontend for personal git projects, don't know how to make the server visible via a subdomain
08:14 GenZai joined #git
08:18 sq-one joined #git
08:20 patrick99e99 joined #git
08:20 irqq joined #git
08:22 davix joined #git
08:24 sea-gull_ joined #git
08:26 hamid999[m] left #git
08:27 Prawnzy joined #git
08:29 stuh84 joined #git
08:29 Jackneill_ joined #git
08:30 ok91 joined #git
08:32 bmahe joined #git
08:33 Jameser joined #git
08:38 fuchstronaut joined #git
08:40 phanimahesh joined #git
08:42 Jameser joined #git
08:42 oskarkv joined #git
08:44 gambler joined #git
08:48 PocketKiller CussBot: wordstats #git
08:48 CussBot PocketKiller: shit with 927 uses, fuck with 875 uses, damn with 791 uses, nichi with 75 uses, nichiwa with 75 uses
08:48 PocketKiller CussBot: nickstats #git
08:48 CussBot PocketKiller: osse with 284 cusses, qsuscs with 122 cusses, Eugene with 110 cusses, cbreak with 84 cusses, ojacobson with 83 cusses
08:48 PocketKiller >_>
08:48 PocketKiller <_<
08:49 LucaTM_ joined #git
08:53 overlord_tm joined #git
08:56 a_thakur joined #git
09:00 finalbeta joined #git
09:02 afuentes joined #git
09:02 LucaTM joined #git
09:10 davimore_ joined #git
09:20 ochorocho__ joined #git
09:22 subhojit777 joined #git
09:24 Anja_ joined #git
09:25 jaguarmagenta joined #git
09:26 fscala joined #git
09:31 satifant joined #git
09:36 qsx appearently my old nick was naughty.
09:37 jozwior joined #git
09:39 fuchstronaut joined #git
09:55 eivarv joined #git
09:55 jaafar joined #git
09:56 mangolisk_ joined #git
09:58 mangolisk_ joined #git
09:59 dodobrain joined #git
10:00 Spec-Chum joined #git
10:05 dodobrain joined #git
10:05 xaa__ joined #git
10:06 Seveas Siegfried: if [ $(git rev-parse --symbolic-full-name) = "refs/heads/master" ]; then echo "Yes master"; fi
10:07 Seveas make that rev-parse --symbolic-full-name HEAD
10:10 slappymcfry joined #git
10:17 gr8kodr joined #git
10:18 mikecmpbll joined #git
10:19 ahmed_elgabri joined #git
10:20 Anja__ joined #git
10:20 tvw joined #git
10:26 robotroll joined #git
10:27 m0viefreak joined #git
10:27 fuchstronaut joined #git
10:27 fuchstronaut joined #git
10:30 davimore__ joined #git
10:31 King_Hual joined #git
10:34 pdgwien joined #git
10:34 flavius joined #git
10:46 irqq joined #git
10:46 GavinMagnus joined #git
10:46 flavius joined #git
10:47 mangolisk joined #git
10:50 Xuefer_citTz joined #git
10:52 jost joined #git
10:54 fees joined #git
10:55 dogman joined #git
10:56 chandu20 joined #git
11:01 bruce_lee joined #git
11:01 bernardio joined #git
11:04 dogman left #git
11:06 denimsoft joined #git
11:06 fuchstronaut joined #git
11:06 fuchstronaut joined #git
11:07 Darcidride joined #git
11:10 Endarked joined #git
11:11 mkoskar Having use $ git remote set-branches <remote> ... , I was expecting that not including branches would be deleted, or subject to pruning, but not really, I suppose currently one has to remove them manually?
11:11 mkoskar *used
11:12 mkoskar *included
11:15 pokalyis joined #git
11:19 felixjet joined #git
11:29 _nwkj86 joined #git
11:29 p4trix joined #git
11:29 phaleth joined #git
11:30 howdoi joined #git
11:33 freimatz joined #git
11:34 fuchstronaut joined #git
11:39 GT4066 joined #git
11:41 danslo_ joined #git
11:43 chele joined #git
11:43 yaelvaya joined #git
11:46 ochorocho__ joined #git
11:47 _cyril_ joined #git
11:49 pks joined #git
11:50 Starky joined #git
11:51 irqq joined #git
11:55 irqq_ joined #git
12:01 LucaTM_ joined #git
12:02 anuxivm joined #git
12:02 pokalyis joined #git
12:03 NimeshNeema joined #git
12:04 aviraldg joined #git
12:04 aviraldg joined #git
12:08 anuxivm left #git
12:10 anuxivm joined #git
12:11 dermoth joined #git
12:11 liuzhen joined #git
12:12 dan2k3k4 joined #git
12:13 djb-irc joined #git
12:14 usm4n joined #git
12:15 ieee joined #git
12:17 ki0 joined #git
12:18 djb-irc joined #git
12:20 irqq joined #git
12:20 treehug88 joined #git
12:22 alhariel joined #git
12:23 ok91 joined #git
12:23 _cyril_ joined #git
12:23 ahmed_elgabri joined #git
12:25 irqq_ joined #git
12:29 usm4n joined #git
12:34 mrpackethead joined #git
12:40 sdothum joined #git
12:42 converge joined #git
12:44 Jameser joined #git
12:44 raijin joined #git
12:44 Cabanossi joined #git
12:46 usm4n_ joined #git
12:48 HoierM joined #git
12:50 pirate21994 joined #git
12:50 JamesBaxter joined #git
12:50 aswen joined #git
12:50 joki joined #git
12:51 usm4n joined #git
12:51 danslo_ joined #git
12:52 aswen joined #git
12:52 mehola joined #git
12:57 _ikke_ .version
12:57 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
12:57 danslo_ joined #git
13:00 manuel joined #git
13:00 robattila256 joined #git
13:01 netj joined #git
13:01 kimonorouge joined #git
13:04 tobiasvl oh nice.
13:05 tobiasvl _ikke_: are gitinfo's dot commands documented anywhere? or just !
13:06 _ikke_ !trigger
13:06 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
13:06 _ikke_ Hmm, dot command I don't know\
13:06 _ikke_ You could look at the source to find them
13:06 tobiasvl yeah I guess
13:06 _ikke_ Some are here https://jk.gs/git/bot/
13:06 _ikke_ .version is documented there for example
13:06 gitinfo _ikke_: .version: still at 2.10.2, not updating topic.
13:07 _ikke_ lol
13:07 tobiasvl oh, right, it is there
13:08 rapha joined #git
13:08 rapha Hi!
13:08 rapha Will git reset --hard HEAD~1 the current state of files in any way?
13:09 rapha (I want to undo the last /commit/ but keep the stat of files. The files are alright, just the commit was too big and won't upload to GitHub because they have a per-push limit)
13:09 hck89 joined #git
13:10 canton7 rapha, --hard will reset all files, yes
13:10 tobiasvl rapha: in that case, you want --soft
13:10 mkoskar rapha: you want --soft
13:10 _ikke_ or mixed if you also want to update the index
13:10 Starky joined #git
13:10 _ikke_ --hard would undo all uncomitted changes, so you should be careful with that one
13:11 rapha Wow, a passionate three answers at once! Thank you guys!
13:11 tobiasvl hehe, we don't want you to lose your work, so we all scramble to the rescue
13:11 rapha :-)))
13:12 rapha _ikke_: why would I want to update the index or not update it in such a case?
13:12 irqq__ joined #git
13:12 _ikke_ rapha: keeping any changes staged or not
13:13 _ikke_ If you want to undo the commit, but keep the changes staged, you'd use --soft
13:13 _ikke_ if you want to also unstage everything, you use --mixed
13:14 rapha _ikke_: just to be crystal clear: staging is what happens when you do 'git add', right? So because I need smaller commits to be able to upload them, I would need to restage, so --mixed is the correct choice.
13:14 _ikke_ rapha: right
13:15 rapha okay, super
13:15 rapha i think i'll still try it on a test-repo first :)
13:15 mkoskar The thing I've asked before about "git remote set-branches <remote> ..." and subsequent not removed remote branches, don't you think it would be good thing for "git prune" to do?
13:17 kazantip joined #git
13:18 espindola joined #git
13:18 Spydar007 joined #git
13:20 SporkWitch mkoskar: no, it wouldn't.  Modification of remote repositories should always be explicit
13:21 JelmerD joined #git
13:23 hck89 joined #git
13:27 mkoskar SporkWitch: what modification? say you clone repo with 20 remote branches, then you set you want only 1 to be tracked, I think it's reasonable to ask for some support in deleting 19 which are not updated anyway anymore
13:29 _ikke_ mkoskar: It says it sets up which branches are tracked, usually this does not mean other branches are not being fetched
13:30 _ikke_ mkoskar: ok, checked, it does update the refspec
13:33 mkoskar _ikke_: yeah, it's probably not a common thing to do and I myself usually clone only single branch to begin with, I've just came across this repo I've cloned completely with around 20 branches so wanted to get rid of some I don't need and hence my question :)
13:34 gdelfino joined #git
13:34 _ikke_ mkoskar: you can always suggest it on the mailing list and see what they think about it
13:36 _ikke_ I'd just manually remove the branches I'm not interested in
13:36 mkoskar _ikke_: yep, will do ... just wanted to double-check if I'm not missing smt. obvious
13:37 BrianBlaze420 joined #git
13:37 mkoskar true, there are workarounds, I guess this is "nice to have" category ;)
13:41 JelmerD joined #git
13:47 ochorocho__ joined #git
13:49 CEnnis91 joined #git
13:49 SporkWitch mkoskar: apologies, i thought you were wanting it to delete the remote branches
13:50 _ADN_ joined #git
13:51 JamesBaxter joined #git
13:52 ochorocho__ joined #git
13:52 Spacew00t joined #git
13:58 Learath2 joined #git
13:58 mkoskar SporkWitch: oh, no problem ;)
13:59 hck89 joined #git
14:06 rapha _ikke_: tobiasvl: so it worked just fine, did exactly what I needed :)
14:06 PioneerAxon joined #git
14:10 kazantip joined #git
14:11 rbern joined #git
14:13 _ikke_ yw
14:13 r__rios joined #git
14:13 jaguarmagenta joined #git
14:16 shafun joined #git
14:19 r_rios joined #git
14:19 r_rios Hello, all. I have a branch with some useful changes I made to one file in my codebase, but the original code changed so much that merging the branch creates a ton of hard to solve conflicts. What's the best approach the changes to that file to the codebase? Cherrypicking?
14:22 mrpackethead joined #git
14:23 _ikke_ r_rios: yeah, that seems best
14:24 _ikke_ Well
14:24 _ikke_ Cherry-picking does not prevent conflicts
14:24 mischat joined #git
14:25 r_rios _ikke_: Is there a way I can only cherry-pick the changes made to the one file that was changed in the branch?
14:25 snowkidind joined #git
14:25 shpew12 joined #git
14:28 ki0 joined #git
14:29 User458764 joined #git
14:30 ahmed_elgabri joined #git
14:30 overlord_tm joined #git
14:30 danslo_ joined #git
14:32 zivester joined #git
14:34 ToBeCloud joined #git
14:34 tom[] joined #git
14:35 madewokherd joined #git
14:35 sea-gull_ joined #git
14:36 StrongJava joined #git
14:37 aswen joined #git
14:37 phanimahesh joined #git
14:37 robotroll joined #git
14:39 m0viefreak joined #git
14:41 _ADN_ joined #git
14:42 toogley joined #git
14:43 phanimahesh joined #git
14:47 vuoto joined #git
14:48 phanimahesh joined #git
14:51 shpew12 joined #git
14:53 mehola joined #git
14:55 wrouesnel joined #git
14:56 mizu_no_oto joined #git
14:57 kbs joined #git
14:57 Puhe joined #git
15:00 Serdensane left #git
15:02 overlordtm joined #git
15:02 ki0_ joined #git
15:03 e14 joined #git
15:03 phanimahesh joined #git
15:04 snowkidind joined #git
15:04 finalbeta joined #git
15:08 e14 joined #git
15:08 phanimahesh joined #git
15:08 a_thakur joined #git
15:09 denimsoft joined #git
15:10 eivarv joined #git
15:10 cdg joined #git
15:11 davimore_ joined #git
15:13 lindenle joined #git
15:14 Murii joined #git
15:17 e14 joined #git
15:21 sombok joined #git
15:23 phanimahesh joined #git
15:25 pandbearit joined #git
15:25 przemoc86 joined #git
15:25 Pent joined #git
15:26 railssmith joined #git
15:27 soc joined #git
15:28 soc hi
15:28 phanimahesh joined #git
15:28 soc I have a branch and I want to supplant commits on that branch starting at a certain commit onto my master branch
15:28 soc what's the recommended way to do that
15:29 soc basically, I could do cherry-pick, but there are a quite a few commits and I'd like to automate it
15:29 _ikke_ soc: sounds like rebase
15:29 mischat joined #git
15:29 _ikke_ Do you want to move a branch, or copy commits?
15:29 soc I don't want to change the original branch
15:29 soc copy commits
15:30 Xethron joined #git
15:30 Derperperd joined #git
15:31 _ikke_ Ok, that's more the job for cherry-pick then
15:31 _ikke_ You know you can cherry-pick multiple commits at the same time?
15:31 soc can I somehow automate it, to run cherry-pick on commits since commits 1234?
15:33 phanimahesh joined #git
15:34 _ikke_ soc: You can specify a range
15:34 _ikke_ git cherry-pick 1234..<branch>
15:36 soc oh, cool, thanks!
15:37 ayjay_t joined #git
15:39 soc mhhh ... is 1234 the oldest commit to pick?
15:39 soc because it seems cherry-pick tries to merge things much older than 1234
15:41 e14 joined #git
15:41 pandbearit joined #git
15:42 akurniawan joined #git
15:44 eivarv joined #git
15:45 soc error: Commit 4e139bc08a3055dc3999adef38890946af61fe98 is a merge but no -m option was given.
15:45 soc fatal: cherry-pick failed
15:45 soc I searched for documentation about that, but the docs talk only about revert in the context of this error
15:45 meauses joined #git
15:45 _ikke_ so one of the commits you try to cherry pick is a merge commit
15:47 manuel joined #git
15:47 dreiss joined #git
15:47 soc can I ignore them?
15:48 soc I replaced master with the closest non-merge commit, and now it merged 4 commits from 5 months, not the stuff I actually want :-/
15:48 _ikke_ soc: what does git log --oneline 1234..<branch> return?
15:48 ayjay_t joined #git
15:49 irqq joined #git
15:50 cdown joined #git
15:50 Prawnzy joined #git
15:50 soc that shows the correct list of commits
15:51 soc is there a way to just prune this list from merge commits?
15:51 raijin joined #git
15:51 _ADN_ joined #git
15:51 soc then I could just copy and paste the remaining commits into cherry-pick
15:54 phanimahesh joined #git
15:55 e14_ joined #git
15:56 sombok left #git
15:57 jaafar joined #git
15:58 svm_invictvs joined #git
15:59 phanimahesh joined #git
16:00 freimatz joined #git
16:00 Ryanar joined #git
16:02 nd joined #git
16:03 railssmith joined #git
16:04 przemoc joined #git
16:06 gdelfino joined #git
16:07 meauses joined #git
16:07 svm_invictvs joined #git
16:07 Learath2 joined #git
16:07 fuchstronaut joined #git
16:07 fuchstronaut joined #git
16:10 Darcidride joined #git
16:11 jaguarmagenta joined #git
16:11 sangy joined #git
16:12 _ikke_ --max-parents=1
16:12 HoierM joined #git
16:14 phanimahesh joined #git
16:16 toogley joined #git
16:17 a_thakur joined #git
16:18 toogley joined #git
16:21 cdg joined #git
16:21 fuchstronaut joined #git
16:22 kimonorouge joined #git
16:22 ahmed_elgabri joined #git
16:23 e14 joined #git
16:23 toogley joined #git
16:24 durham joined #git
16:25 toogley joined #git
16:27 toogley joined #git
16:28 toogley joined #git
16:29 toogley joined #git
16:29 toogley joined #git
16:30 toogley joined #git
16:31 phanimahesh joined #git
16:31 danslo_ joined #git
16:35 guest3456 joined #git
16:35 ctcrnitv joined #git
16:36 guest3456 my VM crashed and now my local repo inside of it is corrupted
16:36 guest3456 fatal: not a git repository
16:36 phanimahesh joined #git
16:36 guest3456 it looks like the .git/HEAD file is corrupted and doesn't point to a commit
16:36 guest3456 what should i do?
16:38 _ikke_ Make it point to a commit
16:38 grawity usually it points to a branch, so use `git symbolic-ref HEAD refs/heads/master`
16:38 grawity or "echo 'ref: refs/heads/master' > .git/HEAD"
16:38 einnjo joined #git
16:39 ctcrnitv I have a bunch of commits in a repo
16:39 mehola joined #git
16:39 ctcrnitv and I forgot to install browser-sync early like I was planning to
16:39 ctcrnitv so that all my downstream commits have browser-sync available
16:40 ctcrnitv is there any way to make it so that I have browser-sync from the start in all the downstream commits?
16:41 ctcrnitv i.e I want to be able to go to any of my previous commits and have browser-sync there (I'm using it for practicing CSS stuff)
16:41 phanimahesh joined #git
16:42 guest3456 grawity: the 2nd command worked, the 1st i got the same fatal error
16:42 guest3456 but now i'm getting broken ref errors
16:42 DopeMeston left #git
16:42 meauses joined #git
16:42 railssmith joined #git
16:43 rewt ctcrnitv, sounds like you should have browser-sync outside the git repo everywhere you want to use it -- if you have it in your git repo and you go back to an old commit, it will have the "then current" version of it, which may be pretty old
16:43 jason237 joined #git
16:43 rewt you can't arbitrarily update files in old commits (easily without likely causing issues)
16:44 grawity you kind of could, using `git rebase` to edit the initial commit
16:44 rkazak joined #git
16:44 kimonorouge joined #git
16:44 GenZai joined #git
16:45 rewt that's the parenthesized part
16:45 rewt anyone else that checked it out would need to make sure they check out the new history and update any branches etc
16:46 ctcrnitv it's just a local repo, I'm using it for practicing
16:46 rewt "anyone else" includes other locations the repo is checked out at
16:46 ctcrnitv when I try rebase it makes a different branch, it looks all messy
16:46 phanimahesh joined #git
16:46 ctcrnitv it doesn't cleanly update all the downstream commits like I wanted
16:47 Goplat joined #git
16:48 rewt yes, updating history can get messy -- git wasn't meant to be used like that
16:50 ctcrnitv actually I did something that worked
16:50 ctcrnitv tried rebasing, didn't do it, tried merging, also didn't do it
16:50 ctcrnitv but cherry-pick worked
16:51 converge joined #git
16:51 converge joined #git
16:52 rewt cherry-pick doesn't update old commits; it just cherry picks a commit from a series of commits and applies it to the end of another series of commits
16:52 eivarv joined #git
16:52 converge I use to pull using the command: git pull, not its always asking to describe the remote and branch git pull <remote> <branch>, anyone knows why ?
16:53 davix joined #git
16:53 rewt converge, you probably don't have tracking set -- do:  git branch --set-upstream-to=origin/<branch>
16:53 rewt while you're in the branch you want to update
16:54 ctcrnitv yeah it made a "prime" of the commits, but I was able to cherry pick the downstream commits onto the new branch and then force my master branch over, which did exactly what I wanted
16:55 ctcrnitv which was to have browser-sync available to all the downstream commits
16:55 ctcrnitv maybe I just didn't ask the right question
16:56 phanimahesh joined #git
16:57 meauses joined #git
16:58 mkoskar joined #git
16:59 ctcrnitv I was following this https://git-scm.com/docs/gitworkflows the "merging upwards" section
17:01 phanimahesh joined #git
17:01 robotroll joined #git
17:01 Emperor_Earth joined #git
17:03 mkoskar joined #git
17:06 JamesBaxter joined #git
17:06 phanimahesh joined #git
17:07 nilg joined #git
17:10 cdown joined #git
17:10 rjcode joined #git
17:10 alex1a joined #git
17:11 denimsoft joined #git
17:11 grawity joined #git
17:12 dviola joined #git
17:12 juvenal joined #git
17:14 railssmith joined #git
17:16 phanimahesh joined #git
17:19 StrongJava joined #git
17:19 chele joined #git
17:19 rjcode joined #git
17:20 jimi_ joined #git
17:20 Shentino joined #git
17:21 narupo joined #git
17:21 CheckDavid joined #git
17:21 ahmed_elgabri joined #git
17:21 cdg joined #git
17:21 dhollinger joined #git
17:24 e14 joined #git
17:25 eivarv joined #git
17:26 phanimahesh joined #git
17:27 shock- joined #git
17:27 converge rewt: tks
17:28 GavinMagnus left #git
17:29 manuel joined #git
17:30 _mirko_ joined #git
17:31 _mirko_ hi, I have problem patching some program, I need some help. Git clone link: "https://github.com/sr/dwm.git" Patch link: http://dwm.suckless.org/patches/dwm-systray-git-20160626-7af4d43.diff
17:31 _mirko_ I found the patch here: http://dwm.suckless.org/patches/systray
17:31 phanimahesh joined #git
17:32 _mirko_ these are the errors: http://paste.debian.net/890797/
17:33 e14 joined #git
17:33 _mirko_ latest commit hash is be47ee81e72dbb99c2e8622218dc4312ef7d92a7
17:38 sssilver joined #git
17:40 rjcode joined #git
17:41 rjcode joined #git
17:42 qpdb joined #git
17:42 kadoban joined #git
17:46 lindenle joined #git
17:46 phanimahesh joined #git
17:47 netj joined #git
17:47 usm4n joined #git
17:47 railssmith joined #git
17:49 CEnnis91 joined #git
17:51 Limes joined #git
17:51 sagerdearia joined #git
17:51 phanimahesh joined #git
17:57 rjcode joined #git
17:58 rjcode joined #git
17:58 cyphase joined #git
18:00 anuxivm left #git
18:02 ki0 joined #git
18:04 ahr3n joined #git
18:07 meadmoon joined #git
18:12 xlegoman joined #git
18:13 _ADN_ joined #git
18:20 einnjo joined #git
18:22 railssmith joined #git
18:23 snthsnth joined #git
18:23 cdg joined #git
18:25 eivarv joined #git
18:27 subhojit_ joined #git
18:29 ctcrnitv is there a way to set my git alias to 'g'?
18:30 ctcrnitv so I could just do 'g ls' or 'g co'
18:31 ctcrnitv I tried setting 'git = g' in .gifconfig but it didn't work
18:31 ctcrnitv also trued
18:31 ctcrnitv also tried restarting my terminal
18:33 KnownSyntax joined #git
18:33 KnownSyntax joined #git
18:33 jaguarmagenta joined #git
18:35 steelsw0rd joined #git
18:35 xameada joined #git
18:35 DeltaHeavy joined #git
18:35 tobiasvl ctcrnitv: that would have to be done in your shell
18:35 ctcrnitv ohh..right. thanks
18:36 railssmith joined #git
18:36 tobiasvl if you use bash: alias g=git
18:36 finalbeta joined #git
18:36 einnjo joined #git
18:36 tobiasvl add it to .bashrc or something to make it persistent
18:38 dsantiago joined #git
18:42 GenZai joined #git
18:45 mehola joined #git
18:47 jen_ joined #git
18:47 jen_ i am using webhooks in github to autodeploy to production server. For each private repo, do I need separate deploy keys?
18:48 tobiasvl jen_: that's more suited for #github
18:48 User458764 joined #git
18:48 jen_ no help there
18:48 jen_ tobiasvl:
18:48 tobiasvl no? so you posted there? !crosspost then
18:48 gitinfo Note: The above question was posted in both #git and #github
18:49 jen_ it was and person said yes
18:49 jen_ but neglected my follow up question
18:49 tobiasvl this is why crossposting is bad. you were already told that you need separate deploy keys.
18:50 tobiasvl so you knew the answer to the question you posed here.
18:50 tobiasvl kinda rude.
18:50 tobiasvl I see in #github now that you just posted follow-up questions without hilighting the person who answered you first
18:50 jen_ the answer was yes, but i had a subsequent question
18:50 vuoto joined #git
18:50 tobiasvl then why did you not pose that subsequent question here first?
18:50 glebihan_ joined #git
18:50 tobiasvl anyway, I don't know the answer and would direct you to #github
18:51 r_rios joined #git
18:51 r_rios joined #git
18:51 jen_ closing thanks
18:51 jen_ left #git
18:59 laumann joined #git
18:59 Remram joined #git
19:00 Balliad joined #git
19:00 webstrand joined #git
19:01 dermoth joined #git
19:01 jaguarmagenta joined #git
19:03 Balliad joined #git
19:07 pirate21994 joined #git
19:12 denimsoft joined #git
19:13 kimonorouge joined #git
19:14 Starky joined #git
19:15 Starky joined #git
19:16 cloister joined #git
19:20 overlordtm joined #git
19:22 ovalseven8 joined #git
19:23 ovalseven8 Hello, I would like to have JUST ONE BRANCH that is based on another remote branch. How do this?
19:23 ovalseven8 From a GitHub user
19:24 cdg joined #git
19:30 russo joined #git
19:31 jimmyeatworld joined #git
19:31 menip joined #git
19:32 cloister joined #git
19:32 jaguarmagenta joined #git
19:34 danslo_ joined #git
19:40 osse ovalseven8: delete all the others?
19:40 osse not sure if i understand the question
19:43 WayToDoor joined #git
19:44 kimonorouge joined #git
19:45 kimonorouge joined #git
19:46 mrpacket_ joined #git
19:49 arand joined #git
19:50 meauses joined #git
19:51 arand joined #git
19:52 Prawnzy joined #git
19:54 xameada joined #git
19:54 Starky joined #git
19:55 Endarked joined #git
19:56 Aboba joined #git
19:58 patrick99e99 joined #git
20:00 ke4nhw joined #git
20:00 stemid left #git
20:01 bmahe joined #git
20:02 einnjo joined #git
20:03 beagleGuy joined #git
20:03 cagedwisdom joined #git
20:04 HoierM joined #git
20:05 aidalgol joined #git
20:06 Shentino joined #git
20:09 stemid joined #git
20:10 demize ovalseven8: When cloning, or for an existing repo?..
20:11 ovalseven8 demize, I want ONE BRANCH based on a specific branch from someone's GitHub repo
20:11 ovalseven8 But not fetch all the branches
20:12 Random832 ovalseven8: so you already have a repo, based on a different fork?
20:12 preaction man git clone
20:12 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
20:12 ovalseven8 Random832, Yes, based on a different fork
20:12 osse git clone --single-branch
20:12 Random832 ovalseven8: git branch --set-upstream
20:13 Random832 specifically - create the remote, fetch from it, and then "git branch --set-upstream [your branch name] [remote]/[their branch name]"
20:13 ovalseven8 I've already a forked repo and so has the other person. And the other person created a PR and I'd like to add a change to the PR. So I need a branch not based on the original project but the person's branch.
20:13 preaction right, so you need to add the remote, and then you can fetch the branch
20:14 ovalseven8 preaction: But only fetch one branch?
20:14 demize Don't even need to add a remote.
20:14 demize git fetch https://url/to/repo foo:foo
20:14 preaction ovalseven8: how much have they really changed in your repo? does it really matter?
20:15 demize Though if you want you can add a remote and configure it to only fetch a single branch too.
20:15 QwertyDragon joined #git
20:19 howitdo joined #git
20:23 netj joined #git
20:25 cdg joined #git
20:25 sangy joined #git
20:25 eivarv joined #git
20:28 m0viefreak joined #git
20:31 einnjo joined #git
20:42 ovalseven8 left #git
20:43 davimore joined #git
20:43 boombatower joined #git
20:51 mizu_no_oto joined #git
20:51 snthsnth joined #git
20:52 tzhuang joined #git
20:53 Starky joined #git
20:53 samtheknife joined #git
20:55 samtheknife joined #git
20:56 samtheknife left #git
20:57 cdg joined #git
21:01 davimore_ joined #git
21:01 kimonorouge joined #git
21:01 menip joined #git
21:03 soc left #git
21:04 Balliad joined #git
21:04 davimore__ joined #git
21:05 mizu_no_oto joined #git
21:11 ki0 joined #git
21:13 patrick99e99 joined #git
21:14 warthog9 joined #git
21:16 r_rios joined #git
21:17 davimore_ joined #git
21:21 King_Hual` joined #git
21:24 King_Hual joined #git
21:26 gfixler joined #git
21:26 einnjo joined #git
21:27 Ardethian joined #git
21:28 SwiftMatt joined #git
21:33 [Brain] joined #git
21:35 SpeakerToMeat joined #git
21:36 danslo_ joined #git
21:39 pgimeno joined #git
21:43 JamesBaxter joined #git
21:51 xall_ joined #git
21:54 skunkz joined #git
21:54 pokalyis joined #git
21:55 SuperSeriousCat joined #git
21:55 tvw joined #git
21:56 jason237 joined #git
21:56 King_Hual` joined #git
21:57 Prawnzy joined #git
21:57 jumpman joined #git
21:59 ke4nhw Hi all, just a quick use case before my question. I'm not a business or student or codemaster. I am an amateur programmer that is working with Visual Studio 2010 and Java (mainly Eclipse, IntelliJ, and JGrasp as my primary IDE's with some vim for smaller stuff). As of right now I am the only user from multiple computers one of which may access remote, and may have a couple of additional users
21:59 ke4nhw later. <cont>
22:00 ke4nhw I want something that is relatively easy to setup, configure, and maintain on an inhouse centos server, and to access from my IDE's. Is git the best choice or will subversion likely fit the bill better?
22:01 steelsw0rd joined #git
22:02 Lunatrius joined #git
22:03 Goplat joined #git
22:03 e14 joined #git
22:05 PaulCapestany joined #git
22:07 Klumben joined #git
22:08 sleepyhead joined #git
22:09 A5101 joined #git
22:10 satifant git should be fine and is definitely easy to setup :)
22:13 Shakeel_ joined #git
22:14 ke4nhw Okay, easy is good. I am going to be creating unique users specifically for access to the code repos. Do these users need any privs on the server, such as a shell? I prefer to deny shells when they're not needed.
22:15 bulletmark joined #git
22:16 k__ joined #git
22:17 jaguarmagenta joined #git
22:17 kadoban ke4nhw: I'd look into gitolite. It's pretty easy to set up and maintain, and it does a lot of that stuff for you (and more)
22:17 satifant yes, that's possible: https://git-scm.com/book/ch4-4.html (last part)
22:18 Starky joined #git
22:18 jaguarmagenta joined #git
22:19 ke4nhw I'll pull some info on gitolite and I'll also pull the URL you just sent.
22:19 Starky joined #git
22:22 ke4nhw Are we talking about gitolite3 or gitolite?
22:25 pandbearit joined #git
22:25 nidr0x joined #git
22:26 kadoban ke4nhw: I think version 3.x is the current version. I'm not sure which would be which, are those from your package manager or something?
22:26 jstein_ joined #git
22:26 kadoban http://gitolite.com/gitolite/ is what I'm referring to, I've never done anything except the manual installation it links to there
22:27 kadoban I would think something from a package manager would be fine too, though I'm not 100% sure how that would work (how you'd set it up so you can admin it, etc.)
22:27 kpease joined #git
22:30 Prawnzy joined #git
22:36 Pent joined #git
22:37 p4trix joined #git
22:40 ke4nhw yep, yum is showing both
22:42 frobnic joined #git
22:43 ke4nhw One thing I'm not liking is the ssh keys, especially when I start giving access to other people. Access to the server is going to be strictly OpenVPN, no exceptions, even in the local network, and that already involves several certificates and configs. Any more and other users may feel that it's just overkill.
22:44 ke4nhw The openvpn is already up and going, so that part is taken care of.
22:45 maxb Perhaps you should reconsider the use of OpenVPN. It seems like an excessive burden with little benefit to impose VPNs within a local network.
22:46 Xuefer joined #git
22:46 maxb Whereas tunnelling connections over SSH is a standard shared by multiple version control systems and other tools such as rsync - it's not like Git is chosing anything unusual by adopting this pattern
22:47 SwiftMatt joined #git
22:49 ke4nhw I know and yes I know ssh is a common standard. The reason the vpn exists within the local network is that some of the data in the local network does flow wirelessly, and I have other services, like Samba, that don't have the strongest encryption schemes. This keeps the wireless data from client to server protected end to end. As for other users, they will be accessing the code from outside the
22:49 ke4nhw local network, likely from their homes, so vpn there does hold obvious benefits.
22:50 e14 joined #git
22:51 preaction so use unauthenticated http
22:51 maxb This seems awfully paranoid for an amateur setup.
22:54 theskillwithin joined #git
22:56 ke4nhw using a vpn, regardless of the data being moved, when dealing with remote clients is an accepted and standard practice, and OpenVPN, while secure, is not overly complex. And amateur here means I am not a professional, but the projects I am working on are those where I don't want the source code plastered on billboards on the side of the Interstate. If the program comes together well then its use
22:56 ke4nhw will be better served if the code is kept as need-to-know as I can achieve without airgapping and posting an armed batallion...
22:57 pgimeno left #git
22:57 Fissure joined #git
22:58 ke4nhw Either way, especially for remote, the vpn stays, and since I'm the only one with local network wireless access anyway, I'll keep that as well... As for the code repo, does git allow for other schemes of access such as Samba, or is it also strictly ssh by key? Or can it handle ssh by user/pass authentication?
22:59 NeverTired joined #git
23:02 maxb Git doesn't care how you authenticate to SSH, though your users may well care, since being asked to input a password for each command that touches the server is less pleasant than being able to use a ssh-agent to cache a key in memory
23:03 jazzpi left #git
23:03 ke4nhw that is true, I wasn't aware it would be multiple commands, I thought it would simply be to check out and check in code, or to review changes...
23:04 maxb Git can tunnel its protocol over HTTP too, but the same issue of authenticating each command applies, which is why SSH with keys is the dominant standard
23:04 matoro joined #git
23:05 ke4nhw It seems then that ssh with keys will be the way to go...
23:05 railssmith joined #git
23:05 maxb Well, remote authentication is only needed for commands which actually talk to the server, and you can do a lot with Git whilst completely disconnected. Much more than, say, with Subversion.
23:09 ke4nhw Now, in for example Eclipse, once they configure their IDE with the keys they should be able to work relatively seamlessly by just checking out code and checking in changes? One more question, will git or gitolite inform the user if they are checking out code that someone else also has checked out, even if just for information purposes?
23:09 jab416171 joined #git
23:10 misterpink joined #git
23:11 madewokherd checkout is a local operation, so no
23:12 netj joined #git
23:12 shinnya joined #git
23:12 madewokherd there's no way to declare through git that you're working on specific files
23:13 pokalyis joined #git
23:15 ke4nhw So how does someone retrieve the source code for a program from the server, do their work, check it back in, and retrieve it again later including any changes that, for exammple, I may have made?
23:16 preaction git clone, git commit, git push, git pull, in that order
23:16 madewokherd typically, you clone a repository, giving you a local copy of every branch, tag, and commit
23:16 madewokherd you can then switch to a specific branch, tag, or commit, without communicating with the server
23:19 madewokherd after making your changes, you make a new commit on your local branch, and push it to the repository on the server (which can fail if someone else pushed in the mean time, in that case you'll have to resolve your changes with theirs before you can push)
23:19 Aboba_ joined #git
23:19 madewokherd at least, that's the general idea, I skipped over some details
23:20 ke4nhw if someone else did push how do you resolve with them? Peer to Peer?
23:21 madewokherd one option is git rebase, which replays your work on top of theirs
23:22 mrpackethead joined #git
23:23 chris123456 joined #git
23:27 JamesBaxter joined #git
23:27 badloop left #git
23:28 cdg joined #git
23:29 ToBeCloud joined #git
23:33 Shentino joined #git
23:33 akurniawan joined #git
23:37 alex1a joined #git
23:37 danslo_ joined #git
23:37 ke4nhw I will need to see how much of this can be handled by the IDE's to see how much the end user will need to do... I will pull the documentation on these and go from there. Thanks for all the info and I hope this works out :)
23:39 ayjay_t joined #git
23:40 Gsham joined #git
23:40 fiddlerwoaroof_ joined #git
23:41 pandbearit joined #git
23:42 anuxivm joined #git
23:48 mmlb joined #git
23:54 arand__ joined #git
23:55 JZA left #git
23:57 Siegfried joined #git
23:58 Oatmeal joined #git

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