Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-06

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

All times shown according to UTC.

Time Nick Message
00:03 hahuang65 joined #git
00:09 Siegfried joined #git
00:10 dreiss joined #git
00:12 cqi joined #git
00:12 Derperpe1 joined #git
00:13 CheckDavid joined #git
00:13 menip joined #git
00:15 AlineGomes joined #git
00:20 Sasazuka_ joined #git
00:20 Siegfried joined #git
00:24 SwiftMatt joined #git
00:26 netj joined #git
00:27 rominronin joined #git
00:36 YuGiOhJCJ joined #git
00:38 Siegfried joined #git
00:39 anonymuse joined #git
00:40 Jon28 joined #git
00:52 Sna4x8 joined #git
00:54 Droolio joined #git
00:55 courrier joined #git
00:57 serialoverflow joined #git
00:57 P4nther joined #git
00:58 mischat joined #git
00:58 Guest12 joined #git
01:04 peepsalot joined #git
01:05 Sasazuka joined #git
01:06 Darren_ joined #git
01:09 Darren_ joined #git
01:11 P4nther joined #git
01:13 enleeten joined #git
01:13 maxb_ joined #git
01:14 GingerGeek joined #git
01:14 absence joined #git
01:14 sharkz joined #git
01:14 bekks_ joined #git
01:14 ojacobson_ joined #git
01:14 Mathieu_` joined #git
01:14 quizzi joined #git
01:14 ws2k3_ joined #git
01:14 Grievre joined #git
01:14 harv_ joined #git
01:14 Keridos_ joined #git
01:14 bshackle1t joined #git
01:14 GingerGeek joined #git
01:14 APic joined #git
01:14 perlpilo1 joined #git
01:14 qassim joined #git
01:14 BooK_ joined #git
01:14 dsop_ joined #git
01:14 MikeChernev joined #git
01:14 anry joined #git
01:14 BlessJah joined #git
01:14 Ruler- joined #git
01:14 angseus joined #git
01:14 jokajak joined #git
01:14 bambams joined #git
01:14 vishal joined #git
01:14 Grum_ joined #git
01:14 thunderb- joined #git
01:14 yazdmich joined #git
01:14 totemizer joined #git
01:14 Jan- joined #git
01:14 m0ltar joined #git
01:14 Phil-Work joined #git
01:14 esc joined #git
01:14 knittl joined #git
01:14 Garen joined #git
01:14 robogoat joined #git
01:14 spm_draget joined #git
01:14 sitaram joined #git
01:14 toydestroyer joined #git
01:14 alip_ joined #git
01:14 quesker joined #git
01:14 jgornick_ joined #git
01:14 JuliusN_ joined #git
01:14 Juri_Agarin joined #git
01:14 fuchstronaut joined #git
01:14 bremner joined #git
01:14 idmistir joined #git
01:14 alphor joined #git
01:14 Matsv joined #git
01:14 Nugget joined #git
01:14 HedgeMage joined #git
01:14 KnightsOfNi joined #git
01:14 DistantStar joined #git
01:14 Mathiasdm joined #git
01:14 ski7777 joined #git
01:14 skalpin joined #git
01:14 Peng_ joined #git
01:14 Roconda joined #git
01:14 DonVitoCorleone joined #git
01:14 mage_ joined #git
01:14 mrnuke joined #git
01:14 jokajak joined #git
01:14 doppo_ joined #git
01:14 bambams joined #git
01:14 osse joined #git
01:14 errr joined #git
01:14 ThunderChicken joined #git
01:14 Remram joined #git
01:14 sab3r joined #git
01:14 ilogger2_ joined #git
01:14 hfp_work joined #git
01:14 RickyB98 joined #git
01:14 ddavidd joined #git
01:14 Ramen joined #git
01:14 toydestroyer joined #git
01:14 de-vri-es joined #git
01:14 matthiaskrgr joined #git
01:14 todder joined #git
01:14 tribly joined #git
01:14 cschneid_ joined #git
01:14 fuchstronaut joined #git
01:14 fus joined #git
01:14 Fiouz joined #git
01:14 osse joined #git
01:14 Mekkis joined #git
01:14 EvilJStoker_ joined #git
01:14 BlackMaria joined #git
01:14 unreal joined #git
01:14 DistantStar joined #git
01:14 Peng_ joined #git
01:14 mattp joined #git
01:14 nioncode joined #git
01:14 dserodio joined #git
01:14 esc joined #git
01:14 JoshL joined #git
01:14 errr joined #git
01:14 knittl joined #git
01:14 zacts joined #git
01:14 SegFaultAX joined #git
01:14 ploop joined #git
01:14 sitaram joined #git
01:14 Derega_ joined #git
01:14 spaceone joined #git
01:14 EvilJStoker_ joined #git
01:14 BlaXpirit joined #git
01:14 unreal joined #git
01:14 chrysaor joined #git
01:14 HedgeMage joined #git
01:14 paramourne joined #git
01:14 daurnimator joined #git
01:14 Ratler joined #git
01:14 Eryn_1983_FL joined #git
01:14 selckin joined #git
01:14 ejnahc joined #git
01:14 tchan joined #git
01:14 tinanoo joined #git
01:14 tcsc joined #git
01:14 c0ded joined #git
01:14 Karazhan joined #git
01:14 jasom joined #git
01:14 fiete joined #git
01:15 hexa- joined #git
01:15 AndreSomers joined #git
01:15 ThunderChicken joined #git
01:15 dserodio joined #git
01:15 Remram joined #git
01:15 duarteper joined #git
01:15 qsx joined #git
01:15 JrCs joined #git
01:15 Infamous joined #git
01:15 r3c0d3x joined #git
01:15 bremner joined #git
01:15 SirCmpwn joined #git
01:15 eb0t joined #git
01:15 idr0p joined #git
01:15 tobiasBora joined #git
01:15 daurnimator joined #git
01:16 Ratler joined #git
01:16 tchan joined #git
01:16 BackEndCoder joined #git
01:16 fiete joined #git
01:16 idmistir joined #git
01:16 DonVitoCorleone joined #git
01:16 Kronuz joined #git
01:16 maxorator joined #git
01:16 Guest31885 joined #git
01:16 Guest1165 joined #git
01:16 Guest52669 joined #git
01:16 Guest52669 joined #git
01:16 ashnur joined #git
01:16 kini joined #git
01:16 martinklepsch joined #git
01:16 gsingh93 joined #git
01:16 IndigoTiger joined #git
01:16 n-st joined #git
01:16 johnlage joined #git
01:16 artgoeshere joined #git
01:16 systmkor joined #git
01:16 disi joined #git
01:16 AndrewAlexMac joined #git
01:16 ybden joined #git
01:16 CustosLimen joined #git
01:16 jrm joined #git
01:16 varesa joined #git
01:16 jor joined #git
01:16 t-mart joined #git
01:17 atrus joined #git
01:17 vaesper joined #git
01:17 midnightmagic joined #git
01:17 Guest31356 joined #git
01:17 Guest31356 joined #git
01:17 bejeb joined #git
01:17 perrier-jouet joined #git
01:17 Peuc joined #git
01:17 emerson joined #git
01:18 demize joined #git
01:18 Forkk joined #git
01:18 mquin joined #git
01:18 p1k joined #git
01:18 rancyd joined #git
01:18 strugee joined #git
01:19 HalfEatenPie joined #git
01:19 worstadmin joined #git
01:19 Tee_Pee joined #git
01:20 YuGiOhJCJ joined #git
01:20 caliculk joined #git
01:20 roelmonnens joined #git
01:20 UniFreak joined #git
01:21 davisonio joined #git
01:21 asdofindia joined #git
01:21 Bengi joined #git
01:22 ionelmc joined #git
01:23 nsh- joined #git
01:23 linuxmodder joined #git
01:23 UnnamedPlayer joined #git
01:23 contracode joined #git
01:24 addshore joined #git
01:24 shennyg joined #git
01:24 dpower joined #git
01:24 moop joined #git
01:24 murph joined #git
01:24 MLM_ joined #git
01:24 t-richards joined #git
01:24 dave0x6d joined #git
01:25 blacksyke joined #git
01:25 dede_ joined #git
01:25 discopatrick joined #git
01:25 kireevco joined #git
01:25 epic joined #git
01:25 noahsussman joined #git
01:25 wenzowski joined #git
01:25 srcerer joined #git
01:26 theresajayne joined #git
01:26 EmeraldExplorer joined #git
01:26 prosody joined #git
01:26 iota_pi joined #git
01:26 darkmist joined #git
01:26 chigang joined #git
01:26 mroth joined #git
01:26 WillMoogle joined #git
01:26 DuncanT joined #git
01:26 XDS2010 joined #git
01:26 altendky joined #git
01:26 richardlitt joined #git
01:26 codedmart joined #git
01:27 bcardarella joined #git
01:27 timwis joined #git
01:27 ggherdov joined #git
01:27 JackMc joined #git
01:27 thecomedian joined #git
01:27 lolmac_ joined #git
01:27 yena joined #git
01:27 Awesomecase joined #git
01:28 prosody joined #git
01:28 johtso joined #git
01:28 manuelschneid3r joined #git
01:28 durham_ joined #git
01:29 jonascj joined #git
01:29 cloudcell_ joined #git
01:31 UnnamedPlayer joined #git
01:32 reznord joined #git
01:33 cspotcode joined #git
01:33 ToeSnacks joined #git
01:33 mehdi___ joined #git
01:33 manveru joined #git
01:33 lucz joined #git
01:34 MacWinner joined #git
01:34 angular_mike_ joined #git
01:34 henriquev joined #git
01:34 safe joined #git
01:34 aendrew joined #git
01:35 G-Boy joined #git
01:36 Iacobus__ joined #git
01:38 elmcrest joined #git
01:42 pfg joined #git
01:42 rfv joined #git
01:42 Whisket joined #git
01:42 milkshoes joined #git
01:42 stealthii joined #git
01:42 Sasazuka joined #git
01:43 barq joined #git
01:43 tharuin joined #git
01:44 adambrenecki joined #git
01:44 huhlig joined #git
01:44 eshlox joined #git
01:45 gyre007 joined #git
01:45 Lowell joined #git
01:45 lebster joined #git
01:45 unholycrab joined #git
01:46 Nilesh_ joined #git
01:49 rivarun joined #git
01:54 shgysk8zer0_ joined #git
01:55 swords joined #git
01:59 slappymcfry joined #git
01:59 elsevero joined #git
02:00 mischat joined #git
02:03 rominronin joined #git
02:03 dsdeiz joined #git
02:03 dsdeiz joined #git
02:04 joki joined #git
02:05 pks joined #git
02:05 VladGh joined #git
02:05 iota_pi joined #git
02:05 Siegfried joined #git
02:06 SpeakerToMeat joined #git
02:06 Chinorro joined #git
02:13 ghostlight joined #git
02:16 snowkidind joined #git
02:21 yehowyada joined #git
02:21 yehowyada joined #git
02:31 mario__ joined #git
02:32 finalbeta joined #git
02:34 Fabricio20 joined #git
02:34 elsevero can I move commits to another user?
02:35 duarteper joined #git
02:35 diogenese joined #git
02:37 twn39 joined #git
02:37 ReptilianBrain joined #git
02:40 HedgeMage elsevero: not without changing commit history; people would have to re-clone
02:40 elsevero HedgeMage: I’m fine with that
02:41 elsevero HedgeMage: is this http://stackoverflow.com/a/5469802/850491 an solution ?
02:46 Vampire0 joined #git
02:46 HedgeMage elsevero: that discusses moving commits from a certain user to a different branch... you sound like you have commits currently attributed to Alice which you wish to be attributed to Bob...is that correct?
02:46 elsevero HedgeMage: yes, that’s correct
02:46 duderonomy joined #git
02:46 HedgeMage elsevero: The only way I know to do what you want without hosing your repo history is to use reposurgeon (note the need to re-clone after editing repo history like this).
02:46 HedgeMage hang on, I'll grab a link
02:46 HedgeMage elsevero: reposurgeon is here: http://www.catb.org/esr/reposurgeon/
02:46 elsevero HedgeMage: oh, cool. 10x! :)
02:46 HedgeMage You're welcome. :D
02:46 dsantiago joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:50 aavrug joined #git
02:50 BenderRodriguez joined #git
02:55 DolpheenDream joined #git
03:01 mischat joined #git
03:02 aw1 joined #git
03:02 jon-mac joined #git
03:04 pks joined #git
03:05 Vinnie_win_w joined #git
03:07 chachasmooth joined #git
03:09 danimal2 joined #git
03:16 hahuang61 joined #git
03:24 Darren_ joined #git
03:27 aidalgol joined #git
03:29 Vortex35 joined #git
03:29 polyrob_ joined #git
03:30 hexagoxel joined #git
03:31 jameser joined #git
03:34 jameser joined #git
03:34 Limes_ joined #git
03:35 rominronin joined #git
03:39 fatalhalt joined #git
03:41 sunri5e joined #git
03:48 Amnesiac joined #git
03:52 brent__ joined #git
03:55 aeontech joined #git
03:57 subhojit777 joined #git
04:00 dsdeiz joined #git
04:00 dsdeiz joined #git
04:00 fstd_ joined #git
04:02 mischat joined #git
04:03 Fabricio20_ joined #git
04:05 anuxivm left #git
04:05 dsdeiz joined #git
04:05 dsdeiz joined #git
04:13 Goplat joined #git
04:14 gzhang joined #git
04:15 cagmz joined #git
04:15 svm_invictvs joined #git
04:17 JamesBaxter joined #git
04:18 xall_ joined #git
04:20 a_thakur joined #git
04:24 Peng_ joined #git
04:39 JanC_ joined #git
04:40 webstrand joined #git
04:42 SwiftMatt joined #git
04:43 webstrand What happens when you add and commit a subrepository? Git doesn't seem to add it to .gitmodules
04:44 webstrand git gui calls it a subproject, but that term is less than enlightening
04:47 ZexaronS joined #git
04:47 ZexaronS hello
04:47 gitinfo ZexaronS: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
04:48 ZexaronS is git cloning same as github forking ?
04:48 ZexaronS if I set up git, do i have to make fork on github ?
04:48 ZexaronS im confused with these terminolgies
04:50 drbean joined #git
04:52 rivarun joined #git
04:52 twn39 joined #git
04:54 bronson joined #git
04:56 webstrand ZexaronS: Yes, cloning a repository is taking a full copy of the repository and all its history. Forking on Github is the same, except you're storing the copy on github and not on your local computer.
04:57 webstrand You may then clone your forked repository to your local machine so that you can make changes to it.
04:58 ZexaronS So I just download and set git to location ?
04:58 webstrand Or, if you wished to make changes to original repository (with the blessing of its owner) you could clone the original repository without forking.
04:59 dreiss joined #git
04:59 ZexaronS It asks me to, make new repo, clone existing, open existing ?
04:59 webstrand What are you trying to do?
04:59 Derperpe1 joined #git
05:00 ZexaronS set it up so i can start contributing to dolphin
05:00 xall_ joined #git
05:01 webstrand I'm assuming you're not a core developer, and would like to contribute via pull requests?
05:02 mischat joined #git
05:03 acetakwas joined #git
05:03 ZexaronS I don't know what are all the ways
05:03 ZexaronS I know only of pull
05:03 webstrand ZexaronS: In that case, fork on github, then follow githubs instructions for cloning your new repository
05:04 ZexaronS It said that i have to use GitHub Desktop, but I already have git installed because I missed that step
05:04 webstrand You're on windows?
05:04 ZexaronS yes
05:05 webstrand Are you able to use the commandline version of git?
05:05 webstrand like `git status`?
05:06 ZexaronS I installed with defaults
05:06 ZexaronS I have opened Git CMD and put in config for name and email, that's it
05:06 ZexaronS now im stuck here
05:07 spinningarrow[m] joined #git
05:07 ZexaronS Next step is something about authorization
05:07 mehola joined #git
05:07 rominronin joined #git
05:08 [0xAA] joined #git
05:09 ZexaronS Shortcuts that were created are git.exe, git cmd, git bash and git gui
05:09 matsaman joined #git
05:12 webstrand ZexaronS: Unfortunately, I'm not familliar enough with git on windows to help you. You're probably going to need to use Github Desktop
05:14 webstrand ZexaronS: This may be of interest: http://kylecordes.com/2008/git-windows-go
05:17 hahuang61 joined #git
05:20 AKPWD joined #git
05:22 cqi joined #git
05:26 NeverDie joined #git
05:27 bocaneri joined #git
05:29 howdoi joined #git
05:30 ayogi joined #git
05:30 subhojit777 joined #git
05:34 sbulage joined #git
05:35 JanC_ joined #git
05:36 brent__ joined #git
05:36 nikivi joined #git
05:43 SJr joined #git
05:43 romerocesar joined #git
05:49 acetakwas joined #git
05:52 Cabanossi joined #git
05:56 Derperpe1 joined #git
05:56 roelmonnens joined #git
05:59 Sna4x8 left #git
06:03 mischat joined #git
06:04 GodGinrai joined #git
06:04 rivarun joined #git
06:10 _ikke_ ZexaronS: You don't have to use github for windows
06:10 lindenle joined #git
06:10 _ikke_ That's just a very limited git gui specialized for github
06:10 jameser_ joined #git
06:11 ddavidd joined #git
06:11 ddavidd joined #git
06:12 ZexaronS okay ...
06:13 ZexaronS i took a break i'll continue later
06:18 brent__ joined #git
06:20 ogny joined #git
06:24 karstensrage doesnt seem like there is any way to add --patch with git gui
06:24 karstensrage is that correct?
06:24 grawity select stuff, right-click, pick "stage lines"
06:25 grawity or for that matter, just right-click and pick "stage hunk"
06:25 karstensrage oh nice
06:25 karstensrage thanks
06:25 ihradek joined #git
06:25 pks joined #git
06:26 acetakwas joined #git
06:31 dreiss joined #git
06:32 brent__ joined #git
06:32 rscata joined #git
06:35 puff joined #git
06:35 dreiss joined #git
06:36 ctcrnitv joined #git
06:37 puff Good evening.  I'm trying to find a happy medium between not committing a bunch of changes I had to make to get this project to build, and not creating a headache for the next guy to use this git repo.
06:37 NeverDie joined #git
06:37 hahuang61 joined #git
06:38 ctcrnitv question: when I fork a repo and then clone it, the only branch that git will list is "master". But there are many other branches on the remote. Does anyone know how I can get them to show up?
06:38 puff I'm working on existing android app.  Downloaded and set up Android Studio, which is based on Intellij Idea.  The person who set up this project included everything, including the .idea files.  I had to tweak some of the build.gradle files to get Android Studio to download the proper dependencies, it also apparently deleted a bunch of files in .idea/libraries and modified .idea/gradle.xml.
06:38 puff ctcrnitv: git branch -r ?
06:39 ctcrnitv nope, that didn't do it
06:39 rominronin joined #git
06:39 puff ctcrnitv: Either I don't understand your question, or you're missing something.
06:39 ctcrnitv probably I'm missing something
06:39 puff ctcrnitv: git branch -r should list all the branches on the remote repo.
06:39 puff ctcrnitv: git branch -a should list all the local branches.
06:39 howdoi $ cp ./git_hooks/pre-commit .git/hooks/pre-commit
06:39 howdoi cp: .git/hooks/pre-commit: No such file or directory
06:40 howdoi how come?
06:40 ctcrnitv yeah git branch -a doesn't list the local branches
06:40 ctcrnitv I can see the branches when I type git lg
06:40 ctcrnitv but when I type git branch -a it only lists master
06:40 puff ctcrnitv: You will only have local branches for branches that you specifically get... and I'm spacing on the command you use to do that.
06:41 howdoi Failed at the postinstall script 'cp ./git_hooks/pre-commit ./.git/hooks/pre-commit'; cp: .git/hooks/pre-commit: No such file or directory
06:41 ctcrnitv i can run git lg and see other local branches
06:41 brent__ joined #git
06:42 ctcrnitv i can check them out too
06:42 ctcrnitv when I do git branch will list it, but not before
06:42 ctcrnitv ohh wait nvm I understand what's going on
06:43 ctcrnitv nvm I'm set
06:44 puff ctcrnitv: What was it?
06:44 zmachine joined #git
06:45 elsevero joined #git
06:46 ThomasLocke joined #git
06:46 ThomasLocke joined #git
06:46 chachasmooth joined #git
06:47 ctcrnitv Well I was expecting git to automateically make the local branches that correspond to the remote branches
06:47 madhav joined #git
06:48 jameser joined #git
06:48 puff Right,w hich it doens't.
06:48 puff Which it doesn't.
06:48 ctcrnitv yup
06:48 subhojit777 joined #git
06:48 puff It only does that if you, if I recall correctly, check out the remote branch.
06:48 ctcrnitv exactly, that's what I just discovered
06:49 ctcrnitv (still learning git)
06:49 puff It's checkout, right?
06:49 ctcrnitv yup
06:49 puff Yeah, git's tricky.
06:49 puff I have several files full of notes.
06:49 madhav Hello all is git checkout necessary after doing a git clone
06:53 puff madhav: git checkout is what you use to tell git what branch you want to work on.  If you want to work on whatever the default branch is after you clone (isn't that master?) then you don't need to checkout.  But it's usually a bad idea to work on master.  You're better off creating a separate branch to work on.
06:54 puff ctcrnitv: I'm working on a tutorial about the underlying nature of git, but I haven't worked on it in several months, been busy with projects that don't involve git.
06:54 madhav Puff: okay
06:55 kadoban puff: The default default is master, but a repo can change what the default is. Pretty rarely done though.
06:56 puff ctcrnitv: Speaking of "haven't worked on it", to checkout a remote branch is  git checkout remotename:branchname, right?
06:56 puff kadoban: Yah.
06:57 kadoban Usually you just 'git checkout thebranch' and if that name doesn't exist locally, and exists only at one remote, it'll create the local one for you with the usual settings.
06:57 ctcrnitv puff, that might be necessary if you have multiple remotes I didn't have to do that
06:57 puff kadoban: Ah, thanks.
06:57 kadoban I don't think 'git checkout remotename:branchname' works. The longer versions, when the shortcut doesn't apply, are like ...  git checkout -b branchname origin/remotename -t    possibly
06:58 [0xAA] joined #git
06:59 qt-x joined #git
06:59 ctcrnitv yeah when I try it, error: did not match any files known to git
07:00 kadoban I believe that's attempting to be a pathspec, like when you do 'git show master:somefile', and it's probably confused why that makes no sense.
07:00 dermoth joined #git
07:01 puff kadoban: Okay, to clarify, what is the "proper" way to checkout a branch-for-which-you-have-no-local-copy (and is there a better name for it than that?) when the branch name is ambiguous (i.e. exists at more than one remote?)
07:02 grawity git checkout -b foo origin/foo
07:02 puff grawity: Thanks.
07:02 grawity that's essentially what the automagic `git checkout foo` would do if there wasn't ambiguity
07:02 kadoban puff: But usually you want some extra options to it, but ya that's the basics.
07:02 grawity you can also, technically, check out origin/foo directly – but then it doesn't become a local branch, you're just looking at a read-only copy that way
07:03 sbulage joined #git
07:03 kadoban I think the shortcut does what -t does, but might be wrong ... and might be other options needed too usually.
07:03 KekSi joined #git
07:03 kadoban Needless to say, I pretty much always have to look it up when the shortcut doesn't apply.
07:03 puff kadoban: The shortcut?
07:03 puff What does -t do?
07:04 puff Track?
07:04 mischat joined #git
07:05 puff kadoban: What extra options do you usually want?
07:05 kadoban Far too lazy to look it up, the manpage is there for you too though :)
07:06 qt-x joined #git
07:07 vuoto joined #git
07:07 puff Yeah, I'm looking at it, I see -theirs and -track... ah, okay, took another look and see that -t is -track.
07:08 puff --track.
07:08 davimore__ joined #git
07:08 fahadash joined #git
07:09 Loomaanaatii joined #git
07:11 Karazhan joined #git
07:18 bannakaf_ joined #git
07:19 puff Why is it, every time I deal with git, I end up with a couple dozen browser tabs open? :-)
07:19 twn39 joined #git
07:20 puff kadoban: Anyway, any advice on my conundrum about not checking in changes?
07:20 kadoban Think I missed that one
07:22 roelmonnens joined #git
07:22 roelmonn_ joined #git
07:22 puff kadoban: Working on an existing project, android app, guy who created the repo included .idea files (android studio is based on idea), had to tweak dependencies to get it to even build on my machine, trying to figure out the appropriate way to handle it in git.
07:23 puff I mean, option 1) ignore the problem, commit the changes, screw that guy :-)
07:23 puff option 2), tell git to ignore .idea and never commit any of my changes to it back to the repo... which is kinda annoying, though I do have a journal of all the steps I went through.
07:23 puff option 3)?
07:23 puff Profit!
07:24 puff Option 3, profit!
07:24 puff Anyway...
07:24 Alienpruts joined #git
07:24 puff Hm, I guess I lean towards option 2.
07:25 kadoban If it's stuff that differs between machines, it shouldn't be in git usually, !config probably has ideas, though some in there are kinda bad.
07:25 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
07:25 osse puff: is the .idea needed for building?
07:25 puff kadoban: Yeah, option 3), delete this crap from the repo and tell that guy he's an idiot for putting it there to start with.
07:26 puff osse: It's part of the android development environment... I'm not entirely sure if it's necessary or not.
07:27 osse puff: if it's not, nuke it from orbit. but if it is, at the very least make it work in general (e.g. use relative paths or some variable syntax in the IDE)
07:28 osse (in my opinion)
07:28 puff Option 4) git rename .idea to something like .idea_template, and locally gitignore .idea?
07:29 osse i think that is best used for individual files (config.cfg.template etc), but I guess it works for directories too
07:29 osse at least you're not making it worse :P
07:30 puff osse: That's my goal here.
07:31 bronson joined #git
07:32 madhav joined #git
07:32 osse puff: If I were in your shoes I would probably do that, noting down as a TODO to improve/rewrite the build system logic.
07:32 JeroenT joined #git
07:33 osse puff: not the other hand I *hate* the "first make it work, then make it pretty" approach because so often I make it work, then make something else work because of time constraints
07:34 zeroed joined #git
07:34 zeroed joined #git
07:34 puff osse: Heh, yeah, that's the story of my life.  I have a phrase for it, "first pass code".
07:34 puff I think I saw/came up with a better phrase, but I can't remember it now.  Have to check my notes.
07:35 puff First pass code is when you're thrashing around without a clear vision yet.
07:35 osse Nothing is more permanent than a temporary solution
07:35 puff Heh.
07:35 flavius joined #git
07:36 jnavila joined #git
07:37 puff default values for .gitignore probably are irrelevant if there's a custom .gitignore, right?
07:37 puff
07:37 overlord_tm joined #git
07:38 grawity there is no default value for .gitignore
07:38 puff grawity: Ah?  Okay.
07:39 Sceorem joined #git
07:41 chachasmooth joined #git
07:42 * osse hugs out-of-source builds
07:42 puff ?
07:43 osse just that handling .gitignore becomes easier then. not that it is hard in the first place
07:44 pks joined #git
07:45 puff Yeah.
07:45 puff What does "out-of-source" mean?
07:45 puff Or rather, what do you mean by it?
07:46 osse puff: that the generated/built files end up somewhere you specify that is outside the source
07:46 SantaClauze joined #git
07:48 puff Ah, build directories, etc.  Yeah.
07:49 govg joined #git
07:50 puff Hm, this is annoying... it appears that it's too late, because the files in .idea are tracked, adding .idea or even the entire explicit file path to .gitignore does not work.
07:51 osse you have to git rm it
07:51 puff I guess I could use --assume-unchanged, but that's the wrong way to do it.
07:51 puff osse: Doesn't that rm it from the repo too?  I'm just trying to make my git ignore my changes to it.
07:51 osse or maybe in your case:  git mv .idea .idea_template
07:51 osse puff: rm --cached then
07:52 puff osse:?
07:52 osse ??
07:52 puff osse: I don't follow your suggestion. rm --cached takes them out of the index, right?  I haven't added/commited the changes yet.
07:53 finalbeta joined #git
07:53 osse puff: yes. just like git rm, except it doesn't *also* actially remove the files from disk
07:54 drbean_ joined #git
07:57 dminuoso Is there a way to re-visit a commit and edit the patch/patches in an editor directly?
07:58 dminuoso (I don't care about rewriting history)
07:58 ajpiano joined #git
07:58 dminuoso I mean, I don't want to have to open each file and find the spots, it's just that I made a mistake and inserted the wrong identifier in about 15 files - so if I could edit the patch that would be much speedier.
07:58 freimatz joined #git
07:59 SwiftMatt joined #git
07:59 kadoban Well, you can generate and apply patches with git, so I suppose if you really want to, it'll involve some rebase stuff though.
07:59 puff osse: Hm, I'm not quite getting this... am I misreading the docs (https://git-scm.com/docs/git-rm), it seems to say that --cached unstages changes.  I don't have any changes staged.
07:59 kadoban 'git diff' output is typically a valid diff, and then if you just apply that on top of the correct commit and then rebase the rest on top of that, I guess it'll work.
08:00 kadoban a valid patch*
08:00 lordjancso joined #git
08:01 puff dminuoso: Are the commits pushed?
08:02 aidalgol joined #git
08:03 subhojit777 joined #git
08:04 jhgundersen joined #git
08:05 mischat joined #git
08:06 Cwolf3D joined #git
08:07 Tobbi joined #git
08:10 rominronin joined #git
08:12 madhav joined #git
08:13 acetakwas joined #git
08:13 TomyWork joined #git
08:14 elect joined #git
08:15 tvw joined #git
08:15 a_thakur joined #git
08:16 osse puff: it removes files
08:16 csk157_ joined #git
08:17 osse puff: if the repo contains foo.txt at the current commit and you do git rm foo.txt; git commit; then the next commit won't have that file in it.
08:17 osse that's all
08:19 puff osse: right, the disconnect is that I don't see how that fixes the problem.
08:20 moei joined #git
08:20 osse puff: what is the problem again?
08:20 osse puff: i thought you were gonna rename .idea to .idea_template
08:21 puff osse: The problem being that the Other Guy added these .idea files to the repo, and my Android Studio install apparently mucked about with them, deleting several and changing a few more.  I want my git to completely ignore any changes to these files.
08:21 puff osse: If they hadn't already been added to the repo, .gitignore would do the trick, but it's not, I assume because they were already added to the repo.
08:21 osse puff: git has no good way of keeping files around *and* overlooking changes to them. that's why the template trick is recommended
08:22 puff osse: I understand that, but I didn't set up this project.
08:22 osse puff: sounds to me like you think everything would be ok if they weren't there in the first place. so what's the problem with removing them?
08:22 puff osse: I guess I could do something clever...
08:22 puff osse: Because I'm a consultant and the Other Guy still works for that company.
08:22 invisbl joined #git
08:22 blackpajamas joined #git
08:22 puff osse: So I don't want to just go rampaging through his git project.
08:23 mehola joined #git
08:23 puff osse: Much those it requires it :-)
08:23 finalbeta joined #git
08:24 UTAN_dev joined #git
08:24 puff osse: I think I'll do this:  a) exit Android Studio.  b) mv .idea (the changed version) to .idea_new, c) extract a copy of the old/original .idea and mv it into my repo, c) git rename .idea to .idea_template, d) reverse steps b and c.
08:24 puff Or rather, d) mv .idea_new back to .idea.
08:24 puff Best of both worlds.
08:25 puff I fix the problem but in a less abrupt manner than simply removing it.
08:25 timvisher joined #git
08:26 bambams joined #git
08:26 kugel joined #git
08:26 thib_ joined #git
08:27 axisys joined #git
08:27 spb joined #git
08:28 chamunks- joined #git
08:29 MajorPayne joined #git
08:29 stux|RC-only joined #git
08:29 jokajak joined #git
08:30 neunon joined #git
08:30 rom1504 joined #git
08:31 Kronuz joined #git
08:31 Deamon joined #git
08:32 nopf joined #git
08:33 Someguy123 joined #git
08:33 relgar joined #git
08:33 Walex joined #git
08:33 AlHafoudh joined #git
08:34 ldlework joined #git
08:34 emerson joined #git
08:35 BlackMaria joined #git
08:36 Endarked joined #git
08:37 freimatz joined #git
08:37 spinningarrow joined #git
08:37 nyuszika7h joined #git
08:37 Cork joined #git
08:37 tabakhase joined #git
08:37 TomyWork joined #git
08:37 rscata joined #git
08:37 webstrand joined #git
08:37 hexagoxel joined #git
08:37 maxorator joined #git
08:37 boubou joined #git
08:37 epta joined #git
08:37 shampine joined #git
08:37 joelsmith joined #git
08:37 cheater joined #git
08:37 warthog9 joined #git
08:37 tomek joined #git
08:37 bodie_ joined #git
08:37 tilpner joined #git
08:37 bond joined #git
08:37 TankBo joined #git
08:37 Kamilion joined #git
08:37 weltall joined #git
08:37 MrC joined #git
08:37 relrod joined #git
08:37 ahammond joined #git
08:37 Davey joined #git
08:37 AlgorithmWizard joined #git
08:37 DolphinDream joined #git
08:37 orzo joined #git
08:37 ronny joined #git
08:37 jlewis joined #git
08:37 Eugene joined #git
08:37 cfoch joined #git
08:37 Tsutsukakushi joined #git
08:37 Anthaas joined #git
08:37 sparr joined #git
08:37 Mogget joined #git
08:37 qpdb joined #git
08:37 bcc joined #git
08:37 jave joined #git
08:37 kisonecat joined #git
08:37 heftig joined #git
08:37 vargas joined #git
08:37 prg318 joined #git
08:37 belak joined #git
08:37 da5id joined #git
08:37 etcinit joined #git
08:37 stevenxl joined #git
08:37 Corosus joined #git
08:37 Jonno_FTW joined #git
08:37 rishi joined #git
08:37 guampa joined #git
08:37 schneider joined #git
08:37 Nitesh joined #git
08:37 fling joined #git
08:37 crater2150 joined #git
08:37 dzho joined #git
08:37 cjohnson joined #git
08:37 markovh joined #git
08:37 MeltedLux joined #git
08:37 Milos joined #git
08:37 Raed joined #git
08:37 Sir_Galahad joined #git
08:37 karstensrage joined #git
08:37 CussBot joined #git
08:37 Muzer joined #git
08:37 TyrfingMjolnir joined #git
08:37 bluepixel joined #git
08:37 Xandaros joined #git
08:37 rewt joined #git
08:37 pikajude joined #git
08:37 Olipro joined #git
08:37 _W_ joined #git
08:37 sparetire joined #git
08:37 frobnic joined #git
08:37 sostenuto joined #git
08:37 catsup joined #git
08:37 __main__ joined #git
08:37 Sigma joined #git
08:37 QualityAddict joined #git
08:37 realz joined #git
08:37 the_cybersphinx joined #git
08:37 jorj joined #git
08:37 heroux joined #git
08:37 pasky joined #git
08:37 SuperSeriousCat joined #git
08:37 Slush- joined #git
08:37 Arguggi joined #git
08:37 sonOfRa joined #git
08:37 robnester joined #git
08:37 coasterz joined #git
08:37 rossome joined #git
08:37 imMute joined #git
08:37 cmn joined #git
08:37 cbreak joined #git
08:37 iron_houzi joined #git
08:37 Werring joined #git
08:37 bipolar joined #git
08:37 hanneso joined #git
08:37 rvsjoen joined #git
08:37 archaic joined #git
08:37 ThiefMaster joined #git
08:37 Nothing4You joined #git
08:37 drizbit joined #git
08:37 acr4 joined #git
08:37 deepy joined #git
08:37 Outsider__ joined #git
08:37 ppppp5 joined #git
08:37 c^ joined #git
08:37 linuxdaemon joined #git
08:37 lu_zero joined #git
08:37 AciD` joined #git
08:37 quite joined #git
08:37 hramrach joined #git
08:37 austin987 joined #git
08:37 nuck joined #git
08:37 Vaelatern joined #git
08:37 glebihan_ joined #git
08:37 Pursuit joined #git
08:37 mar77i joined #git
08:37 mgedmin joined #git
08:37 dikiaap joined #git
08:37 sevenever joined #git
08:37 leprechau joined #git
08:37 TSS_ joined #git
08:37 ShoaibJahejo joined #git
08:37 GodEater joined #git
08:37 gkatsev joined #git
08:37 boz_v1 joined #git
08:37 rt joined #git
08:37 dwts joined #git
08:37 HarryHallman joined #git
08:37 ujjain joined #git
08:37 zyxep joined #git
08:37 Soliton joined #git
08:37 kenansulayman joined #git
08:37 ekneuss joined #git
08:37 akkad joined #git
08:37 kier joined #git
08:37 UgJkA joined #git
08:37 hiwk joined #git
08:37 Dandelock joined #git
08:37 Sc0rpius joined #git
08:37 cafuser001 joined #git
08:37 simon816 joined #git
08:37 anonnumberanon joined #git
08:37 koenvg_ joined #git
08:37 nevyn_ joined #git
08:37 Kuukunen- joined #git
08:37 boshhead joined #git
08:37 dilfridge joined #git
08:37 ghoti joined #git
08:37 forgot joined #git
08:37 Kaisyu joined #git
08:37 Hello71 joined #git
08:37 atomi joined #git
08:37 lkurusa joined #git
08:37 rizonz joined #git
08:37 mitzip joined #git
08:37 wloncom joined #git
08:37 Kulrak joined #git
08:37 uranellus joined #git
08:37 tanuki joined #git
08:37 rideh joined #git
08:37 marvi joined #git
08:37 hyperair joined #git
08:37 krabat joined #git
08:37 scarcry joined #git
08:37 markelite joined #git
08:37 vrishab joined #git
08:37 hendry joined #git
08:37 dysfigured joined #git
08:37 hue joined #git
08:37 nellicus_ joined #git
08:37 unbalancedparen joined #git
08:37 kent\n joined #git
08:37 MattE joined #git
08:37 nikow joined #git
08:37 trobotham joined #git
08:37 jab416171 joined #git
08:37 Maple__ joined #git
08:37 farhaan joined #git
08:37 nephyrin` joined #git
08:37 jesk joined #git
08:37 CIAguy- joined #git
08:37 kfunk joined #git
08:37 hfp joined #git
08:37 arooni joined #git
08:37 AustinMatherne joined #git
08:37 Caelum joined #git
08:37 jdelStrother joined #git
08:37 hecliunyx joined #git
08:37 drawkula joined #git
08:37 ulkesh_ joined #git
08:37 nixdork joined #git
08:37 Bigcheese joined #git
08:37 wagle joined #git
08:37 LordRyan joined #git
08:37 nebg joined #git
08:37 Urbany joined #git
08:37 WizJin joined #git
08:37 kfc joined #git
08:37 LeMike joined #git
08:37 ntnn joined #git
08:37 swift1 joined #git
08:37 ExeciN joined #git
08:37 Timvde joined #git
08:37 Bilge joined #git
08:37 saidelike joined #git
08:37 devster31 joined #git
08:37 mloy joined #git
08:37 tonyj joined #git
08:37 skelterjohn joined #git
08:37 ToBeFree joined #git
08:37 zapb_ joined #git
08:37 brewmaster joined #git
08:37 fearless_man joined #git
08:37 _joes__ joined #git
08:37 lukky513 joined #git
08:37 gnarf joined #git
08:37 catern joined #git
08:37 mniip joined #git
08:37 guardian joined #git
08:37 Silex joined #git
08:37 pepijndevos joined #git
08:37 Orphis joined #git
08:37 salparadise joined #git
08:37 yonatankoren joined #git
08:37 tier2villain_ joined #git
08:37 larrybolt joined #git
08:37 gusnan joined #git
08:37 Zoxc joined #git
08:37 aca20031 joined #git
08:37 Ankhers joined #git
08:37 runlevl4 joined #git
08:37 colona_ joined #git
08:37 danemacmillan joined #git
08:37 tobie joined #git
08:37 Furai joined #git
08:37 i7c joined #git
08:37 ensign joined #git
08:37 niax joined #git
08:37 toogley joined #git
08:37 uebera|| joined #git
08:37 flupke joined #git
08:37 McKraken_zzzzz joined #git
08:37 MatthewAllan93 joined #git
08:37 waveclaw joined #git
08:37 Guest19788 joined #git
08:37 telephone joined #git
08:37 nedbat joined #git
08:37 dhanush joined #git
08:37 POQDavid joined #git
08:37 tjbp joined #git
08:37 davidstrauss joined #git
08:37 BinGOs joined #git
08:37 athaller joined #git
08:37 suy joined #git
08:37 Saturn812 joined #git
08:37 PaulePanter joined #git
08:37 kanzure joined #git
08:37 danmackay joined #git
08:37 jwest joined #git
08:37 monty joined #git
08:37 SleePy joined #git
08:37 jbondhus_ joined #git
08:37 plasticb1y joined #git
08:37 tokkee joined #git
08:37 Hogofwar joined #git
08:37 cxreg joined #git
08:37 snowinferno joined #git
08:37 qguv joined #git
08:37 jailbox joined #git
08:37 ReenignE joined #git
08:37 cjbrambo joined #git
08:37 aspiers joined #git
08:37 Yaiyan joined #git
08:37 cmosguy joined #git
08:37 dogmatic69 joined #git
08:37 Takumo joined #git
08:37 Xe joined #git
08:37 pigeon joined #git
08:37 Vorisi joined #git
08:37 shout-user27 joined #git
08:37 ohcibi joined #git
08:37 maqr joined #git
08:37 musca joined #git
08:37 __name__ joined #git
08:37 Esya joined #git
08:37 _cyril_ joined #git
08:37 bittyx joined #git
08:37 ninsei joined #git
08:37 rxo joined #git
08:37 Knirch joined #git
08:37 ericP joined #git
08:37 spacemud joined #git
08:37 bathtub_shark joined #git
08:37 VampiricPadraig joined #git
08:37 Zeedox joined #git
08:37 ^7heo joined #git
08:37 icedp joined #git
08:37 SirFunk joined #git
08:37 moritz joined #git
08:37 ngladitz joined #git
08:37 EgS joined #git
08:37 bttf joined #git
08:37 nezZario joined #git
08:37 gitinfo joined #git
08:37 Ph_ joined #git
08:37 AlexanderS joined #git
08:37 kba joined #git
08:37 Bombe joined #git
08:37 fscala joined #git
08:37 minibar joined #git
08:37 Nevik joined #git
08:37 ec\ joined #git
08:37 abra0 joined #git
08:37 gruetzkopf joined #git
08:37 nkhoit joined #git
08:37 Arokh joined #git
08:37 varx1 joined #git
08:37 Neico joined #git
08:37 Log1x joined #git
08:37 feodaron joined #git
08:38 Olipro joined #git
08:38 felixjet joined #git
08:38 catsup joined #git
08:38 Learath2 joined #git
08:38 ec\ joined #git
08:38 Vampire0 joined #git
08:38 mmattice joined #git
08:38 Karazhan joined #git
08:38 ljubak joined #git
08:38 musicmatze joined #git
08:38 tribly joined #git
08:38 bdeferme joined #git
08:38 Guest5799 joined #git
08:38 fold4 joined #git
08:39 Log1x joined #git
08:39 Vampire0 joined #git
08:39 mar77i joined #git
08:39 Olipro joined #git
08:39 mmattice joined #git
08:39 ldlework joined #git
08:39 manveru joined #git
08:39 CtrlC joined #git
08:39 CtrlC joined #git
08:39 pitastrudl joined #git
08:39 dersand joined #git
08:39 Sceorem joined #git
08:39 fiete joined #git
08:39 sparetire joined #git
08:39 Cabanossi joined #git
08:39 elect joined #git
08:39 Loomaanaatii joined #git
08:39 joshszep joined #git
08:40 artgoeshere joined #git
08:40 HelloShitty joined #git
08:40 nyuszika7h joined #git
08:40 eihabarabia joined #git
08:40 gsingh93 joined #git
08:40 azerus joined #git
08:40 Muzer joined #git
08:40 Guest6346 joined #git
08:41 filcab joined #git
08:41 Cwolf3D joined #git
08:41 FabTG joined #git
08:42 darkmist joined #git
08:42 jagob joined #git
08:43 Balliad joined #git
08:43 zeller joined #git
08:43 tomaw joined #git
08:43 mda1 joined #git
08:43 howdoi joined #git
08:43 RiPer joined #git
08:44 maktm joined #git
08:44 discopatrick joined #git
08:45 DuncanT joined #git
08:45 chigang joined #git
08:45 danslo joined #git
08:45 jonascj joined #git
08:45 cttttt joined #git
08:45 parliament joined #git
08:45 t-richards joined #git
08:45 blacksyke joined #git
08:46 yena joined #git
08:46 osse puff: if you're going with the template approach then you need to have both around
08:46 bbhoss joined #git
08:46 osse puff: and new devs need to make a *copy* of .idea_template, not rename it
08:46 stealthii joined #git
08:46 altendky joined #git
08:47 kireevco joined #git
08:47 martin_g joined #git
08:47 dmj` joined #git
08:47 Bengi joined #git
08:47 ams__ joined #git
08:47 cspotcode joined #git
08:47 shennyg joined #git
08:47 Travis-42 joined #git
08:47 thib joined #git
08:47 Tobbi joined #git
08:47 Tee_Pee joined #git
08:48 ojdo joined #git
08:48 mostlybadfly joined #git
08:48 nowhere_man joined #git
08:48 dpower joined #git
08:48 addshore joined #git
08:48 worstadmin joined #git
08:49 GameGamer43 joined #git
08:49 alexsystemf____ joined #git
08:49 flupke joined #git
08:49 ggherdov joined #git
08:49 dede_ joined #git
08:50 zifnab joined #git
08:50 iota_pi joined #git
08:50 theresajayne joined #git
08:50 davisonio joined #git
08:50 Lowell joined #git
08:50 epic joined #git
08:50 angelsl joined #git
08:50 kutenai joined #git
08:50 lebster joined #git
08:50 dave0x6d joined #git
08:51 llamapixel joined #git
08:51 twisted` joined #git
08:51 jleclanche joined #git
08:51 prosody joined #git
08:51 AlineGomes joined #git
08:51 unholycrab joined #git
08:51 angular_mike_ joined #git
08:51 noahsussman joined #git
08:52 hashpuppy joined #git
08:52 daxroc joined #git
08:52 boxrick1 joined #git
08:52 beckyconning__ joined #git
08:52 ionelmc joined #git
08:53 teadrop_ joined #git
08:53 moop joined #git
08:53 zmachine joined #git
08:54 rfv joined #git
08:54 [diecast] joined #git
08:54 sfan786_ joined #git
08:54 CEnnis91 joined #git
08:55 elmcrest joined #git
08:55 JackMc joined #git
08:55 MLM_ joined #git
08:55 cmosguy joined #git
08:56 thecomedian joined #git
08:56 ulkesh joined #git
08:56 WillMoogle joined #git
08:56 pfg joined #git
08:57 l2y joined #git
08:57 EmeraldExplorer joined #git
08:57 timwis joined #git
08:57 sylario joined #git
08:57 huhlig joined #git
08:57 wizonesolutions joined #git
08:57 etcinit joined #git
08:57 johtso joined #git
08:58 Awesomecase joined #git
08:58 ggherdov joined #git
08:59 codedmart joined #git
08:59 lolmac_ joined #git
09:00 eshlox joined #git
09:00 stevenxl joined #git
09:00 milkshoes joined #git
09:00 mehdi___ joined #git
09:00 nezZario joined #git
09:01 ELLIOTTCABLE joined #git
09:01 fahadash joined #git
09:01 Nilesh_ joined #git
09:01 XDS2010 joined #git
09:01 belak joined #git
09:01 felixjet joined #git
09:01 vdv joined #git
09:02 Iacobus__ joined #git
09:02 barq joined #git
09:03 bongjovi joined #git
09:03 ToeSnacks joined #git
09:04 GavinMagnus joined #git
09:04 eduardas_m joined #git
09:04 mikecmpbll joined #git
09:05 kurkale6ka joined #git
09:06 encod3 joined #git
09:07 ELLIOTTCABLE joined #git
09:08 mikejakobsen joined #git
09:08 XDS2010 joined #git
09:09 cloudcell_ joined #git
09:10 mikejakobsen joined #git
09:11 sebhoss joined #git
09:11 xall_ joined #git
09:13 gyre007 joined #git
09:13 yoyoyo_____ joined #git
09:14 systemovich joined #git
09:14 Whisket joined #git
09:15 janx joined #git
09:15 kwmiebach___ joined #git
09:18 theoceaniscool joined #git
09:19 encod3 joined #git
09:19 Karazhan joined #git
09:19 dminuoso Is there a way to run a git rebase interactive autosquash for the entire history?
09:19 dminuoso I basically have done dozens of commits, and now I want to autosquash it all together
09:20 marcogmonteiro joined #git
09:25 Silox| joined #git
09:28 JeroenT joined #git
09:29 JeroenT_ joined #git
09:29 mischat joined #git
09:29 cdown joined #git
09:31 jamespole joined #git
09:31 Jonuz joined #git
09:32 t0by joined #git
09:32 t0by joined #git
09:32 mischat joined #git
09:33 chachasmooth joined #git
09:33 tango_ joined #git
09:33 ghostlight joined #git
09:34 mischat joined #git
09:35 chll_ joined #git
09:38 Guest12 joined #git
09:42 rominron_ joined #git
09:47 davimore_ joined #git
09:47 Guest12 left #git
09:48 Tobbi joined #git
09:48 Domhack joined #git
09:58 jackharo joined #git
10:01 JeroenT joined #git
10:01 King_Hual joined #git
10:01 King_Hual joined #git
10:02 leeN joined #git
10:05 rossome joined #git
10:05 systemovich joined #git
10:07 a_thakur joined #git
10:07 manuelschneid3r joined #git
10:08 mehola joined #git
10:10 chele joined #git
10:10 jknetl joined #git
10:10 ogner joined #git
10:10 graingert joined #git
10:10 graingert how do I jump to a commit in tig?
10:11 Tobbi joined #git
10:13 lindenle joined #git
10:19 robotroll joined #git
10:21 ximr joined #git
10:22 andschwa joined #git
10:23 fuchstronaut I have a draft commit on top of a branch based on master. How do I revert the last n commits (so the changes remian but uncommited) and I can continue to work?
10:25 osse dminuoso: git reset --soft HEAD~14 && git commit
10:25 osse Where I've defined 14 commits as a "bunch"
10:25 osse Salt to taste
10:26 osse fuchstronaut: same goes for you
10:26 JeroenT joined #git
10:27 osse ez git gainz. two birds and whathaveyou
10:31 dminuoso osse: Oh well, I was rather thinking something along the lines of "autosquash my entire history"
10:31 canton7 dminuoso, "autosquash" means to do a rebase, and to take all commits whose messages start with "squash!" (or "fixup!"), and set up the rebase to squash / fixup those
10:32 bronson joined #git
10:32 canton7 if you don't have commits whose messages follow that pattern, it's not an autosquash :P
10:32 dminuoso canton7: I do.. in fact I alwyas use the commit --fixup stuff shortcut for it too
10:32 Juanito[m] joined #git
10:32 canton7 ok, so you want to do a rebase for all of history?
10:32 canton7 ... bear in mind that this will flatten out all merges
10:34 byte512 joined #git
10:34 dminuoso canton7: Uh..
10:34 dminuoso I guess not
10:35 jamespole left #git
10:35 canton7 are you fixup!/squash! commits just in a linear section of recent history?
10:38 dminuoso canton7: Yes.
10:38 canton7 dminuoso, OK, so do a 'git rebase -i first-squash-commit^'
10:39 canton7 (that is, do a rebase onto the commit before the first squash!/fixup! commit)
10:40 dminuoso canton7: Alright, here we go!
10:40 hahuang61 joined #git
10:42 dminuoso canton7: Yeah I did not realize how trivial this was. :P
10:42 vjgd joined #git
10:42 canton7 sweet!
10:42 canton7 things are easy when you know how, heh
10:43 kexmex joined #git
10:45 fuchstronaut thanks osse
10:46 JeroenT joined #git
10:46 danslo joined #git
10:47 Mogget joined #git
10:48 tvw joined #git
10:48 mischat_ joined #git
10:51 JeroenT joined #git
10:51 Mogget joined #git
10:51 Tobbi joined #git
10:52 JeroenT joined #git
10:52 mda1 joined #git
10:54 fuchstronaut can I apply a stash only partial=
10:54 dminuoso fuchstronaut: git checkout stash@{0} -- <filename>
10:55 dminuoso fuchstronaut: Or just pop the entire stash and then prepare a partial commit using git add -p
10:55 Snugglebash joined #git
10:55 dminuoso The last is probably more desirable
10:55 dminuoso (And then stash whats left back)
10:55 fuchstronaut I cant apply the stash because there is a conflict
10:55 fuchstronaut git checkout might work, thank you
10:56 canton7 hmm? checking out a stash will discard all work you've done since you created the stash
10:56 canton7 so don't do that
10:56 canton7 if you try and apply the stash but there's a conflict, that's fine. Just fix the conflict.
10:57 Mogget joined #git
10:57 fuchstronaut I just did checkout and the stash seems not to have changed
10:58 fuchstronaut fixing the conflict would be a huge pita in that case
10:58 canton7 you'll notice all commits you made since you made the stash will have vanished ;)
10:58 canton7 plus, you'll have !detached your HEAD
10:58 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
10:58 szymon joined #git
10:59 fuchstronaut My HEAD is not detached
10:59 fuchstronaut I think...
11:00 vuoto joined #git
11:00 fuchstronaut Why should that discard any changes? Basically I am just checking out a file from a resource that is not the working dir
11:00 canton7 ah, missed the filename bit
11:00 canton7 my bad
11:01 YuGiOhJCJ joined #git
11:02 fuchstronaut Dunno, it is so much different than copy&paste all changes and mail them in a .zip file :)
11:02 aw1 joined #git
11:04 MJC1 joined #git
11:06 marcogmonteiro joined #git
11:09 surlix joined #git
11:10 surlix nice.
11:10 surlix hay, i got a problem with initializing git to a remote directory, can anyone help me (I did set it up some months ago, but can't remember anything, except that, I'm new to git)
11:11 moei joined #git
11:11 shpew12 joined #git
11:12 Ediz joined #git
11:13 rominron_ joined #git
11:16 Snugglebash joined #git
11:17 osse surlix: on the server: cd /somewhere/project.git; git init --bare
11:18 csk157_ joined #git
11:18 osse surlix: on your PC:  git clone user@host:/somewhere/project.git
11:18 surlix so i have to clone it first even if i want to change something on the online repo too?
11:19 osse surlix: in principle the server repo doesn't have to be bare. but it makes it a pain to push to after
11:19 fuchstronaut surlix: you clone, change locally and push changes to the remote
11:20 surlix osse, fuchstronaut, thank ou
11:20 surlix *you
11:20 luhem joined #git
11:21 fuchstronaut Just click the like button
11:22 surlix another question: I cloned it via http, how do i remote in via SSH, so i dont have to put in my credentials everytime? (git remote...smth?)
11:22 rnsanchez joined #git
11:24 jackharo joined #git
11:24 ThunderChicken joined #git
11:24 Limes_ joined #git
11:25 minikN joined #git
11:25 jameser joined #git
11:26 Juanito[m] left #git
11:27 tobiasvl surlix: either by just editing .git/config, or you can use the commands "git remote set-url" to set it to the SSH URL
11:28 csk157_ joined #git
11:29 _ikke_ recommended is to git config instead of directly editing .git/config
11:30 MJC1 joined #git
11:32 cyan__ joined #git
11:35 MJC1 left #git
11:36 joki joined #git
11:38 vuoto joined #git
11:39 redeemed joined #git
11:40 jast doesn't really matter, as long as you don't try and directly mess with .git/config in scripts
11:42 surlix tobiasvl: it just tells me about the usage:usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
11:42 surlix or: git remote set-url --add <name> <newurl>
11:42 surlix or: git remote set-url --delete <name> <url>
11:42 surlix --push                manipulate push URLs
11:42 surlix --add                 add URL
11:42 surlix --delete              delete URLs
11:43 tango_ joined #git
11:43 selckin joined #git
11:45 canton7 surlix, and which usage do you think applies to you?
11:45 mischat joined #git
11:45 csk157 joined #git
11:45 surlix i tried --add
11:45 canton7 nope
11:45 canton7 'git remote set-url <name> <newurl>'
11:45 surlix what is the name there
11:46 canton7 the name of the remote to change the url for
11:47 surlix and then i get an error : fatal: No such remote 'Seminar_Time_Saving_1617/'
11:47 canton7 what's your remote called?
11:47 canton7 origin? something else?
11:47 mindfart joined #git
11:47 surlix im not sure what you mean there
11:48 surlix Im using gitlab, if that matters
11:48 JeroenT joined #git
11:48 canton7 what's the output of 'git remote -v'?
11:48 surlix no output
11:49 canton7 how did you create your repository?
11:49 surlix cloned it
11:49 canton7 did you clone it from somewhere with 'git clone'? Did you create a new empty repo with 'git ini'?
11:49 canton7 *git init
11:50 surlix git clone
11:50 canton7 and you've then done something to make git forget where you cloned it from?
11:51 canton7 what's the output of 'git branch -r'?
11:51 surlix still no output
11:51 canton7 'git branch -a'?
11:51 Tobbi joined #git
11:51 surlix Im an idiot
11:51 surlix i didnt cd to my git directory
11:51 surlix sorry
11:51 canton7 *sigh*
11:52 ertesx joined #git
11:52 surlix do i have to put in the whole url to <name>?
11:53 canton7 no
11:53 canton7 you put the name of the remote into <name>
11:53 e joined #git
11:53 canton7 if you cloned the repo, git will have created a remote called 'origin'
11:53 canton7 but you can rename that, or remove it, or add your own
11:53 canton7 that's why I asked for the output of 'git remote -v'
11:54 vdv joined #git
11:54 surlix originhttps://<url>(fetch)
11:54 surlix originhttps://<url> (push)
11:55 surlix both the same
11:55 canton7 ok, so it's called origin
11:55 surlix ah
11:55 canton7 'git remote set-url origin <new url>'
11:55 surlix thank you
11:55 surlix weird
11:55 canton7 "weird"?
11:56 surlix it still asks for a pw, but now i know more, thanks a lot
11:56 canton7 sure it's not your SSH key passphrase?
11:56 surlix even though i created an SSH key and uploaded
11:56 canton7 output of 'git remote -v' again?
11:56 canton7 what command are you using that prompts for a password?
11:57 surlix origin
11:57 surlix i wanted to pull
11:57 canton7 no, the output of 'git remote -v' isn't 'origin'
11:57 canton7 what command did you type that prompts for a password, *exactly*?
11:57 surlix git pull
11:58 canton7 right, and the output of 'git remote -v'?
11:58 surlix origingit@gitlab... (fetch)
11:58 surlix origingit@gitlab.... (push)
11:59 byte512 joined #git
11:59 canton7 ok, so you've definitely changed it to an SSH url - that's what I was checking
11:59 canton7 [11:56] <canton7> sure it's not your SSH key passphrase?
11:59 Shentino joined #git
12:00 surlix git@gitlab...de's password:
12:00 surlix not even asking for mine
12:00 canton7 right, you don't have your keys set up right
12:00 mischat_ joined #git
12:01 canton7 pastebin the output of 'ssh -vvv git@gitlab.de' (or whatever the SSH host is)
12:02 str joined #git
12:02 surlix http://pastebin.com/WCgGWumT
12:04 canton7 you haven't created any keys in .ssh
12:05 canton7 whatever you did to create an SSH key apparently didn't actually create it in the necessary place
12:06 bronson joined #git
12:07 surlix ok, then i try again, thanks a lot for your help
12:07 sdothum joined #git
12:09 ki0 joined #git
12:11 Mir4g3 joined #git
12:12 encod3 joined #git
12:12 Anja joined #git
12:15 jameser joined #git
12:16 mikecmpb_ joined #git
12:18 askb joined #git
12:19 SpeakerToMeat joined #git
12:20 kexmex joined #git
12:21 jameser joined #git
12:23 noecc joined #git
12:26 Tobbi joined #git
12:29 csk157 joined #git
12:29 sbulage joined #git
12:29 jameser joined #git
12:29 jeffreylevesque joined #git
12:29 gajus joined #git
12:29 treia joined #git
12:30 _Cyclone_ joined #git
12:31 d^sh_ joined #git
12:38 encod3 joined #git
12:39 ertes when i push, only the commit in question and its reachable parents are pushed, right?  so commits that i have rebased away (e.g. through squashing) don't leave my local repo
12:39 jameser joined #git
12:39 selckin yes
12:40 osse ertes: in git terms they're not even in your repo any more, by a strict definition. just garbage lying around that will eventually get reaped
12:40 canton7 weeell, depends on the value of 'push.default'
12:40 canton7 in newer gits, the default is that 'git push' pushes only the currently-checked-out branch
12:40 canton7 in older gits, 'git push' would push all branches which had a matching branch on the remote
12:41 ertes canton7: that's fine…  these changes aren't reachable from any branch
12:41 selckin all branches are reachable
12:41 hahuang61 joined #git
12:41 ertes ok, thanks everybody!
12:41 canton7 ah, but if "commits that I have rebased away" means commits that are no longer referenced, then no, they're not pushed
12:42 ertes yeah, these are basically only in my reflog…  so "garbage" =)
12:42 ertes even if i never GC, they still stay local…  if that's the case, i'm fine
12:42 canton7 git will gc them automatically after a while
12:43 ome joined #git
12:44 ertes i believe there is a way to disable that (though i haven't)
12:44 osse you can set the expiry thingies to 625462546 days I guess
12:44 ij joined #git
12:44 rominron_ joined #git
12:45 jimi_ joined #git
12:45 mikecmpbll joined #git
12:46 ertes git config --global gc.auto 0
12:47 osse ... or that
12:48 ertes ah, here is a better way:  git config --global gc.pruneExpire never
12:48 ertes which doesn't disable the other GC tasks
12:49 rivarun joined #git
12:50 mikecmpb_ joined #git
12:50 masuberu joined #git
12:52 krs93 joined #git
12:52 ZexaronS hello
12:52 ZexaronS im stuck setting up git for github
12:53 mkoskar joined #git
12:53 ZexaronS I installed git now I added name and email to global config
12:53 ZexaronS what now ?
12:53 ZexaronS im a bit confused with all these terms
12:53 canton7 ZexaronS, https://help.github.com/articles/create-a-repo/
12:54 ZexaronS do i have to first fork a project in github ?
12:54 canton7 (that's part of a larger set of articles by github here: https://help.github.com/categories/bootcamp/)
12:54 ZexaronS I would like to contribute
12:55 gebbione joined #git
12:56 gebbione hi folks, i would like to rebase my feature branch with the new changes from master instead of merging. I understand it will look cleaner
12:56 gebbione I tried git rebase master on the feature branch
12:56 gebbione solved conflicts and done, git rebase --continue
12:56 ZexaronS so i press Clone Repo in Git GUI ?
12:56 BlessJah ZexaronS: setup key-based authorisation (https://help.github.com/arti​cles/generating-an-ssh-key/)
12:56 gebbione then how do i force the branch to take the new structure/commits ?
12:57 canton7 ZexaronS, have you had a chance to read through all of those articles yet? :)
12:57 ojdo joined #git
12:57 canton7 gebbione, hmm? it's rewritten that branch to sit on top of master
12:57 gebbione a git push was giving me - ! [rejected]
12:57 canton7 yeah, well you've rewritten the feature branch. !rewrite_public_history
12:57 osse push --force(-with-lease)
12:57 canton7 !rewrite
12:57 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
12:57 ZexaronS authentication seems like it's set up after setting up the repo but it's earlier in the guides, weird
12:58 canton7 no, auth is for your account, and spans all of your repos
12:58 gebbione canton7, it is ok
12:58 gebbione it is a fork
12:58 BlessJah ZexaronS: you'll need to learn git before contributing some code, usually you will be able to contribute without using git (i.e. right now me and canton7 are contributing to git project by helping you)
12:58 ZexaronS Git asks me for source location, but where i'm suppose to enter https url ?
12:58 Alienpruts joined #git
12:58 canton7 gebbione, note that you working on other computers counts as "public"
12:58 canton7 ZexaronS, have you read those articles? (hint hint)
12:58 ZexaronS i did i don't quite get it
12:59 ZexaronS im continuing from yesterday
12:59 canton7 you must have read them awfully quickly. Try going a little slower
12:59 rnsanchez_ joined #git
12:59 GavinMagnus joined #git
13:00 GavinMagnus left #git
13:00 ZexaronS The GitHub terminology is conflicting with Git, this is just so confusing
13:00 gebbione canton7, what do you mean? the fork i am working on is just as personal repo i forked from another upstream
13:00 ZexaronS How is Clone different to a Download ?
13:00 gebbione i have updated the fork with the upstream and i just need to update the feature branch with the changes from master
13:00 osse ZexaronS: which Download?
13:01 ZexaronS I pressed "clone" on Git, and it doesn't have any place to enter the HTTPs URL for .git
13:01 BlessJah ZexaronS: go through https://help.github.com/categories/bootcamp/ and https://git-scm.com/book/en/v2/
13:03 ZexaronS so I'm not suppose to use Git Gui ?
13:03 ZexaronS i don't see it in the guides
13:04 Guest32453 left #git
13:04 BlessJah most tutorials will focus on git command line, because it's easier to explain git terms this way, and knowledge can be easily applied to different GUI clients
13:04 ZexaronS also there is no such thing as $ infront for windows, so it's more of a linux style guide
13:05 _rnsanchez_ joined #git
13:05 BlessJah you can get git commandline with $ in front from git-scm.com
13:05 BlessJah ZexaronS: what is your ultimate goal
13:05 ZexaronS I downloaded the official git and installed it, this is the git gui that came with it
13:06 ZexaronS contribute to dolphin, for starters
13:06 bronson joined #git
13:07 lohfu joined #git
13:07 BlessJah ZexaronS: then you should probably stick to helping people on forums, mailing lists, translating and creating blog posts (i.e. non-developer work)
13:07 lohfu joined #git
13:08 BlessJah ZexaronS: it seems that you're not a developer, unless your goal is to become one, you'll gain very little by learning git and downloading source code
13:09 kexmex joined #git
13:09 ZexaronS ah don't worry about that
13:10 ZexaronS I always found linux terminology to be very confusing to me
13:10 csk157 joined #git
13:10 ZexaronS the whole authentication cache im not sure if it's working or not
13:11 ZexaronS since bash doesn't report if the command completed successful, but on windows you usually get a response
13:11 ZexaronS the credential.helper wincred thing
13:11 ZexaronS i put it in after setting name and email, it probably worked since there was no error, but who knows
13:13 BlessJah if you are able to clone repository, everything works fine
13:13 Silox| joined #git
13:13 ZexaronS What does clone mean ?
13:14 osse obtain a complete copy
13:14 osse of files and history
13:14 ZexaronS In git ?
13:14 osse yes
13:14 ZexaronS So in github it's called a Fork ?
13:15 ZexaronS But then in github the green button says Clone or Download ... but this "clone" means something else then
13:15 tobiasvl a github fork is something else https://guides.github.com/activities/forking/
13:15 ZexaronS Cloning a Fork ?
13:15 BlessJah ZexaronS: download - get a zip with code (not a git copy), fork - create a project on github that is copy of so-called upstream project, clone - get a copy of repository usable with git
13:15 tobiasvl well technically, it's probably a clone, just on github's servers, which has the original repo as a remote
13:16 ZexaronS I don't know this just doesn't make sense, a fork sounds like it's a clone already
13:16 canton7 gebbione, let's say you're working on the same branch on two computers. They're in sync. You rebase the branch on one computer, and force-push it. On the other computer, you 'git pull'. Now you'll merge together the old and new versions of history
13:16 ZexaronS I made a fork in github, it looked like a clone to me, I deleted it when setting up git so I start over to make it right
13:17 tobiasvl ZexaronS: read the link I pasted earlier https://guides.github.com/activities/forking/
13:17 tobiasvl it explains what a fork is
13:18 krs93 joined #git
13:18 ZexaronS I do not understand the connection between git and github, the people in the project told me I can't use only github for contribution, I have to set up git, I'm setting up git, but it looks like I have to set up a little here a little there and it's all confusing terminology
13:19 tobiasvl ZexaronS: we can help if you ask the right questions :)
13:19 osse ZexaronS: git is a program. it manages repositories. github is a website. it hosts repositories.
13:19 Anja joined #git
13:19 tobiasvl ZexaronS: github is a website that hosts git repositories/projects. you can contribute to them in a rudimentary way on the website. you don't HAVE TO set up git. but to do anything beyond very basic things, you will need to set up git and clone the github repos and work on them locally on your machine.
13:20 Martiini joined #git
13:20 ZexaronS So, on the site it's called a fork, and when I do on PC it's called a clone ?
13:21 ZexaronS but the git on my PC is connected to my fork ?
13:21 ZexaronS So clone is just a downloaded fork
13:21 ZexaronS weird choice of terms
13:21 canton7 nah, that's not right
13:21 tobiasvl no, clone can be a downloaded non-fork too. you can clone the main repo without forking it.
13:22 JeroenT_ joined #git
13:22 ZexaronS How does then contributing without fork work ?
13:22 canton7 a git repository is a git repository. It's something which has a history of commits. Cloning is a very - to clone means to connect to a repository on another computer, and copy it to your computer. A 'clone' is a repository which was created by cloning another repository
13:22 BlessJah ZexaronS: seriously go through https://git-scm.com/book/en/v2/
13:22 canton7 *Cloning is a verb
13:23 canton7 Forking is a github-specific term. It means to create a repository on github by copying another repository on github. That copy also has links to the original repository, which affect how some things in the github UI work
13:23 canton7 A 'a fork' is a repository on github which was created by 'forking' another repository on github
13:23 tobiasvl ZexaronS: if you have contributor access to the main repo, you don't need to fork it and can contribute directly. if you do not, then you will need to fork it to contribute. forking just means to make a personal copy of the repo on github, then you do your changes on that fork (which you have full access to), and then you can ask the main repo to incorporate them.
13:24 ZexaronS Okay, so what is the origin of this whole thing, is git program a linux-world invention, and then some 3rd party came by and made a github website ?
13:24 canton7 yes
13:24 ZexaronS okay
13:24 tobiasvl there are many other services like github
13:24 paakku joined #git
13:25 bongjovi joined #git
13:25 berndj joined #git
13:26 ZexaronS That part which tobiasvl said is what I managed to figure out in recent weeks, without the direct access thing, no I don't think I have direct access ofcourse just starting
13:27 ZexaronS One thing I don't understand if I use git to update my fork, how will refreshing work, is this all a manual job through CMD ?
13:27 ZexaronS Git Gui confused me in the Clone window, there's only static paths but not url path
13:27 JeroenT joined #git
13:27 canton7 I strongly recommend reading the Pro Git book you were linked to earlier
13:28 ZexaronS So when I make changes in my local copy of the git, it's not updating with github in real-time, like some kind of remote database, it's more like FTP ?
13:28 rnsanchez joined #git
13:29 ZexaronS this seems like a steep prepping for what looks like simple stuff
13:29 ZexaronS it's kinda discouraging
13:30 ZexaronS maybe I need to go slower
13:30 ZexaronS and wait a few days for these 2 days to sink in a bit
13:31 dzho ZexaronS: managing changes can be very complex, every system for tracking and merging has its complexities, its advantages, and its disadvantages.
13:31 osse maybe git does something else than what you think it does
13:31 ZexaronS and I'm not used to deal everything with command lines, diorienting
13:31 tobiasvl ZexaronS: indeed, if you update your clone locally you will need to !sync those changes to your fork. if you update the fork through the web UI you don't need to do anything.
13:31 gitinfo ZexaronS: [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
13:31 dzho ZexaronS: I was going to ask what your background was with regard to command line.
13:31 dzho so, thanks for volunteering that.
13:32 tobiasvl that was maybe the wrong sync direction from what you meant
13:33 ZexaronS Yeah, so it looks like, every time I make a little change, I'll have to write 5 command lines, then, then go to github and then make pull request ... so does it amount to a lot of back and forth?
13:34 dzho > Forking is a github-specific term. <-- I'd say, rather, that in a free software context "forking" was already used for a social phenomenon, in which a group of people fissions into separate interest groups, concomitantly resulting in two code bases with a common parent. It is often not amicable, and in the best of cases, fraught. Github trivialized the term. A fork in Github is much closer to being what git pr
13:34 canton7 a pull request is just when you want to ask the maintainer of another repository to accept your changes
13:34 dzho oper calls a clone.
13:35 canton7 dzho, yeah, that language is pretty opaque to a newbie. I chose words that weren't entirely correct but were easy to understand
13:35 ZexaronS To me, fork and a branch seems like they're 2 words for a same thing
13:35 canton7 ZexaronS, please learn what a branch is, and what a repository is. !book is good
13:35 gitinfo ZexaronS: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
13:35 osse ZexaronS: but one is a piece of cutlery and one is a part of a bush!
13:35 dzho canton7: :-) just a peeve you innocently stumbled over, no rancor or recrimination towards you intended. I know who is responsible for this ;-)
13:35 osse words have different means in different contexts, unfortunately
13:36 ZexaronS But github has choosed to split the very similar terms apart
13:36 jeffreylevesque joined #git
13:36 canton7 ZexaronS, fork and branch are completely different. A branch exists within a repository, and is a pointer to a commit. A repository (which a fork is) is different: it's something which holds many commits, many branches, and many versions of files
13:37 mischat joined #git
13:37 dzho ZexaronS: another question, then, I think I have a clue about, but just to be clear: Do you have any previous experience with any other version control system?
13:37 Sceorem joined #git
13:38 JeroenT joined #git
13:38 dzho (sorry, I see there's more backscroll than I've read so far. off to catch up)
13:38 ZexaronS These are just words they picked subjectively, you could call Fork a "Subrepo" and it would be the same
13:39 ZexaronS I do have rants on the use of terminologies in IT world, since I usually don't agree with them but okay I understand this now
13:39 ZexaronS I understand it how GitHub has it, but I still won't agree with it
13:39 cdown joined #git
13:39 ZexaronS I would be 10 times less confusing if a Clone would be called "Local Fork" or something
13:40 canton7 ZexaronS, it'll make more sense once you learn how it actually all works
13:40 ayogi joined #git
13:40 canton7 zero85, you have a very imperfect understanding currently
13:40 canton7 oops, ZexaronS
13:40 Martiini joined #git
13:40 tobiasvl ZexaronS: what you need to understand is that git is distributed. one clone is not at all different or more "local" than another in the git world, only when you add github into the mix
13:40 ZexaronS I mean, Local Repo, since clones can be non-forks
13:40 canton7 you almost always use the form 'clone' as a verb
13:40 ZexaronS It's the same thing just downloaded an on my PC, shouldn't need to have a special term
13:40 tobiasvl ZexaronS: with github and similar services, one repo is indeed more authorative than "local" clones, but that's not inherent to git
13:41 ZexaronS I'm not english by the way
13:41 dzho I prefer to think of it the other way round, of GitHub "forks" as being a special case of git clones
13:41 canton7 ... and once there's a verb to create a specific thing, that specific thing tends to be identified by the noun form of the verb - that's just how the language works
13:41 m0viefreak joined #git
13:42 dzho ... internal only to GitHub (eg, one takes a GitHub-hosted repository, does a GitHub-flavored fork, to achieve another GitHub-hosted repository)
13:42 tobiasvl ZexaronS: if you make a "local repo" clone of a github "remote repo", and I clone your local repo, what's my repo then? and what if the github repo is taken down, and you decide that your "local repo" should be the new authorative repo? this is how git works – a clone is exactly that, a duplicate of another repo
13:42 siddart joined #git
13:43 mmlb joined #git
13:43 Martiini joined #git
13:43 ZexaronS But it's not that, it's just that terminology is assigned by what the desiner thinks makes sense, but if you look at the english language it self, something that is a "sub of something" ... in geometry they have Parents and Childs, in computer hardware they have Masters and Slaves (IDE Master, IDE Slave) in programming you have Repositories and Branches, but the Branch could be called a Fork too, "this branch is a fork of version
13:43 ZexaronS 494.948 of master branch"
13:44 canton7 no, you've gotten confused
13:44 canton7 branches are not repositories
13:44 canton7 branches cannot be forks
13:44 osse here's an idea: Forget about the word "fork". that's just something github wrote on the button
13:44 canton7 branches are a separate concept. one repository contains many branches, but also contains commits, history, etc...
13:45 ZexaronS osse, yess that's what I'm trying to say
13:45 anli joined #git
13:46 ZexaronS I'm saying, if you use the word Fork, and have the context that it is a "sub of something" it could be used instead of the word branch, since that too means "sub of something" or "a slave of the master"
13:46 canton7 again, branches and forks are *completely* different
13:46 osse ZexaronS: where does the "sub" come from?
13:46 canton7 a branch is not a sub of anything, or a slave of anything
13:46 osse libreoffice is a fork of openoffice. what's subby about that?
13:47 ZexaronS But I guess GitHub's Fork means "your own sub of something on our site database" ... is that right ?
13:47 canton7 a fork is like a fork in a path or a road
13:47 osse ZexaronS: yes
13:47 canton7 there was one path, then it forked, now there are two paths, both going forwards, but in slightly different directions
13:48 ZexaronS osse: So yes, I do understand it how they mean it already, but I still don't agree with the label Fork, as you guys said it's just a name they put on the button
13:48 ZexaronS To me, Fork sounds very similar it could mean a Branch, in the base language
13:48 canton7 ZexaronS, again you're very very new to git. You don't know the context, the usage, the impliciations, of any of these words
13:48 ZexaronS so that's why I got confused
13:48 BadSnappa joined #git
13:48 canton7 and again, the word "branch" already means something completely different
13:49 canton7 everything seems strange, new, and sometimes wrong, when you're new to it
13:50 ZexaronS You could put any label on there, the closer it is to everyone's context the easier it is to learn, this is what I figured out about terminologies especially in niches
13:50 canton7 and 'fork' makes a lot of sense to people who have been working in OSS projects
13:50 canton7 ... since it draws on a preexisting concept
13:50 ZexaronS They make perfect sense to the designer, but with people from other fields and life experiences it's not that easy
13:50 osse ZexaronS: the word "clone" was taken so they thought of something else... And if you really wanted to fork the project (like libreoffice, or jenkins, or mariadb) the first thing you'd do is obtain a copy of the repository that you control, and host it for others. perfect fit.
13:51 canton7 git was written for programmers by programmers. Don't be surprised when the terminology is chosen by programmers to make sense to programmers
13:52 davimore__ joined #git
13:52 emerson joined #git
13:52 nanga joined #git
13:52 nanga joined #git
13:52 synthroid joined #git
13:53 ZexaronS That's okay, but a lot of companies let too much marketing influence on their terminologies, many times they twist the technical description so the abbreviation fits some common term
13:53 canton7 I don't think that's what's happened here
13:54 ZexaronS No, but I saw the term Fork somewhere else many times without any github references
13:54 shinnya joined #git
13:54 ZexaronS just don't remember where
13:54 canton7 so?
13:54 canton7 it's a programming term
13:55 ZexaronS Because I remember it to be sub of something, or a Branch as you call it
13:55 canton7 no! I said repeatedly that a branch is COMPLETELY different
13:55 ZexaronS I don't know for what reason these 2 terms got split, I always thought they're the same thing
13:56 canton7 and a fork isn't a sub or child in any sense
13:56 canton7 no!
13:56 canton7 different!
13:56 canton7 again, completely different
13:56 canton7 I don't know how you could possibly have thought that I said a fork is similar to a branch :P
13:56 ZexaronS So then, Branch is the one for "sub of something", what is a Fork then ?
13:56 canton7 no, a branch is not a "sub of something"
13:57 canton7 look up to how I likened a fork to a fork in a path
13:57 canton7 <canton7> there was one path, then it forked, now there are two paths, both going forwards, but in slightly different directions
13:57 ZexaronS Wow
13:57 canton7 <canton7> branches are a separate concept. one repository contains many branches, but also contains commits, history, etc...
13:57 ZexaronS So a fork is that line that branches go onto ?
13:58 canton7 we're not getting anywhere, and I'm starting to feel like 98% of what I say, you're ignoring
13:58 canton7 which is very frustrating from my perspective as someone giving their free time to help out :P
13:58 synthroi_ joined #git
13:58 ZexaronS Because that's your own terminology. I'm going to use the established one, but for myself I usually translate to my own paradigm to what makes sense to me
13:59 canton7 no, this is the established git terminology
13:59 canton7 'fork', 'branch', 'repository', all have very specific, defined meanings
13:59 canton7 you cannot simply ignore those defined meanings
13:59 ikelso joined #git
13:59 canton7 and your own paradigm is very very immature - you're very new to git, and you don't know what most of these terms even mean in real terms
13:59 Limes_ joined #git
14:00 canton7 relying on it is fine, but be aware that it's woefully incomplete, and do not rely on it in the face of external evidence
14:00 ZexaronS That's fine I'll use the one already out there for communication, no problem, but I still won't agree with it probably, well, it's early to say, but usually when I enter a field, a program, I usually tear the terminology up, cause I haven't been in college, and I think the modern new generations have a really weird terminology especially the ones who just got out of college, it's so weird
14:01 canton7 langauge exists for one reason: so that we can communicate with each other
14:01 canton7 if you ignore that, you stop being able to communicate with people
14:01 canton7 sure, it might not make sense. at the end of the day that doesn't really matter: what matters is whether you can use it to communicate with someone
14:01 ZexaronS canton7, yes, I may not fully know what they mean, I will learn what they mean, then I'll just reassing the labels to the meanings how I see fit
14:02 canton7 if you tear up the established language and invent your own, cool, but you then can't use to to speak to anyone else
14:02 bremner also, pissing people off is fun, but counterproductive when you are seeking help
14:03 ZexaronS I'm saying, I'll use both, one for communication, one for myself in my head, so when I say Fork, I have to translate it in my head ... i know it's weird but it worked for me in the past, I usually have terminology clashes whatever I do these days
14:03 canton7 personally I think that's only going to end in pain for you and everyone around yoiu
14:05 ZexaronS But, this is not the first time, so, it's my thing, you don't have to be bothered by it, I may have underestimated the complexity of this, so I thought I just install it, download it, boom
14:05 canton7 my point is, when you communicate with people, you have to use the established terminology
14:05 canton7 you haven't been doing that today, as far as I can tell
14:06 canton7 anyway, my point that you should learn something about git still stands: !book
14:06 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
14:07 bronson joined #git
14:08 ZexaronS Bah don't worry, not going to end bad, it's just going to take longer for me, I won't force my terminology on anyone else, and I'm not annoyed by this discussion, I think it's healthy and thought provoking
14:08 canton7 it's very frustrating for me, as you apparently kept thinking I said the opposite of what I tried very hard (with *emphasis* and everything) to explain
14:09 cheater left #git
14:09 concerti joined #git
14:09 ZexaronS So to get that cleared up, bremner, when I learn, I usually stop in the middle, and have a terminology rant, once I'm over I get back to learning, so canton7, I wasn't ignoring the help, I just had to have a terminology rant, now I can go back to listening again
14:10 ZexaronS But I'm not angry or anything, so don't be frustrated with me, It's how it is with me usually
14:10 canton7 well you wasted my time :)
14:10 ZexaronS Eh, no, I did take everything you said into account
14:11 canton7 so what's the differene between a repository, clone, fork, and branch?
14:11 Achylles joined #git
14:11 tobiasvl don't forget to enjoy the weekend when that time comes, peeps
14:12 ikelso joined #git
14:12 ZexaronS I think we stopped at the fork as a line, I have to go back and read that part moment
14:13 JeroenT joined #git
14:14 JeroenT joined #git
14:14 ZexaronS Fork as a path
14:15 ZexaronS Okay, so I asked, is the fork that line in visual terms, and you have branches on that line ?
14:15 jimi_ joined #git
14:15 ZexaronS Or it's the other way around ?
14:16 canton7 the path I was talking about is the path that a whole repository takes
14:16 canton7 a whole project takes, if you'd rather
14:17 canton7 openoffice was created, and a lot of development happened. Then later it was forked into libreoffice, and both continued their own development
14:17 rominron_ joined #git
14:17 canton7 forking happens on the level of whole projects
14:17 rnsanchez joined #git
14:17 lindenle joined #git
14:18 jozwior joined #git
14:18 siddart joined #git
14:18 mikejakobsen joined #git
14:19 ZexaronS And the Branch is inside the same repo, dolphin has "master" and "stable" ?
14:19 canton7 yes
14:19 Guest6346 joined #git
14:19 ExoUNX joined #git
14:19 ZexaronS Allright, now, what if we swapped the labels, would it still make sense ?
14:19 canton7 branches are created, merged, destroyed, etc, on a fairly short timescale, within the development of a single project. They're different lines of work by the same people in the same project
14:20 canton7 sure you could redefine fork to mean branch, and branch to mean fork - and change them as established terms which have been used in their separate capacities for many many years
14:20 ZexaronS I mean, would it completely break the understanding if we swapped the labels.
14:20 canton7 just as you could switch the labels "accelerator" and "brake"
14:20 dzho ZexaronS: I don't know what your learning style is, but I might make a recommendation based on what helped me.
14:22 davimore_ joined #git
14:22 dzho ZexaronS: I know you're probably eager to get to a point where you can work on this specific goal (dolphin, looks like?) but instead of just reading and talking about git and github, maybe just start by making new directories (or folders if you prefer) on a local machine and put little toy repos in them. create files, change them, add, commit, merge. clone from one directory to another. make conflicting changes
14:22 dzho in each. try to push and pull back and forth from them. merge, etc.
14:22 dzho make branches in them.
14:22 dzho the whole works.
14:22 ZexaronS Well, you just experienced it first hand, I pause and have a terminology rant, depending on my overall mood (have to get my sleep cycle fixed after new years, and recovering from all the food)
14:22 dzho then, add in github, and do the same: make new toy repos, clone them, etc.
14:22 ZexaronS then I get back to learning
14:22 canton7 kindly keep your rants out of public channels in future :)
14:23 canton7 1185 people didn't care about it, heh
14:23 ij 1184*
14:24 canton7 ><
14:24 ash_workz joined #git
14:24 dzho it doesn't have to be code in your toy repositories. just text files that list things one line at a time, say. Start with, say, a list of the names of the 7 dwarves, only leave out one, or change the order of a couple from one commit, branch, fork, clone to another.
14:25 ZexaronS canton7, i said a while ago, that most people don't care because they're too adaptive to the established stuff, nobody wants to challenge the authority
14:25 dzho ok, if we're going to get into this sort of bullshit, I'm out
14:25 canton7 why on earth would you want to challenge an established terminolgy that everyone uses?
14:25 ZexaronS I talked to linux rooms before, how it's all "open source" but it's dominated by the opinions of those who contribute the most, and all the rest they just follow that
14:26 GodGinrai joined #git
14:26 ZexaronS Yes, see, because it's not everyone, most got into it, but only a few core people created it in the first place, that's why I don't agree "everyone uses" ... more like "everyone just had to deal with it"
14:27 canton7 no idea what you're on about :P
14:27 canton7 you can use git, and use its terminology, or not use it. It's entirely up to you.
14:27 canton7 "Open Source" doesn't mean that you get to change the terms that everyone uses
14:28 nickabbey joined #git
14:28 osse but you get to try to
14:28 ZexaronS Terms coined in linux some are still from the dawn ages of 90-ies, most people who contribute haven't got any input it making those terminologies, they use it yes, because they adapted to it without challenge
14:29 canton7 and that's how people cooperate, yes
14:29 canton7 you can go and create your own langauge if you want. Or you can speak English and talk to the rest of us
14:29 Gsham joined #git
14:29 nickabbey joined #git
14:29 canton7 You're not going to change the language that people speak in. There's no point.
14:29 canton7 Notice how we're talking in English, even though it's not your first language, because it works?
14:30 ZexaronS I don't have a problem with what makes sense, I don't remember exactly which, but I came across some very old things which keep dragging to this day
14:30 kpease joined #git
14:30 canton7 why aren't you trying to get my to talk Esperanto?
14:30 canton7 *get me
14:30 bremner lojban or gtfo
14:30 canton7 sometimes things don't make sense because you don't understand them yet (most of this git discussion is in this camp)
14:30 canton7 sometimes things don't make sense because of historical reasons, and you've just got to accept it and move on
14:30 kpease_ joined #git
14:31 csk157 joined #git
14:31 canton7 ... because the important thing is whether you can use the terms to communicate with people
14:31 ZexaronS canton7, I'm just talking about it I already said I don't want to force this on anybody , you are so bothered just because I'm talking about it.
14:31 canton7 yeah I've no idea why I'm engaging with you
14:32 ZexaronS Infact it's very healthy because this kind of thought provoking stuff makes you think out of the box, it may help you in future, and you may come to an example which I was talking about any you may remember what I was saying about terminologies and you may end up with a similar conclusion.
14:32 osse "terminal", "carriage return"
14:33 ZexaronS I think this is all positive talk nontheless
14:33 canton7 no, I'll just bear in mind that someone fixate on whether a term makes sense to them, despite their complete lack of context, and ignore what it's used to mean
14:34 canton7 *that some people fixate
14:34 dzho http://web.archive.org/web/20081218085704​/http://crackmonkey.org/faq.html#ANSWER7
14:34 Dougie187 joined #git
14:35 nidr0x joined #git
14:35 rt joined #git
14:36 ZexaronS I may not know fully about git and github, but what I was saying about terminologies in general is from all the other stuff I fully understand, so this is just a bad example, the point is, people don't go reverse engineering the field when they understand it, because they don't see the need for
14:36 stevenxl joined #git
14:36 stevenxl joined #git
14:37 canton7 and people who try and reverse engineer a field they have no clue about are never going to go anywhere, and are never going to be taken seriously (and rightly so)
14:39 ZexaronS This is what I was explaining in that case, that all kinds of niches, they understand their own niche, and they focused on it like a dot, so they are not able to see the big picture, if you take a step back and look it from a different angle you may find some things which are not done in an optimal way, in no way I said every term has to be changed, maybe only a few, for git and github I don't know yet, it's too early, because I don't
14:39 ZexaronS fully understand the system, but once I do understand it, then I'll have another look at the terminology from a wider perspective
14:40 boombatower joined #git
14:40 Ryanar joined #git
14:40 ZexaronS I'm just that kind of a guy I purposelly do critical analysis like this, that's why my parents called me a "philosopher" when I was little
14:40 qqx ZexaronS: And after you actually understand the system you want to change would be the time to inflict your thoughts on others.
14:40 ZexaronS I go look into things most people don't, in a way.
14:40 canton7 today you're done something completely different: not understood a term because you don't understand the concepts, and instead of learning, decided that everyone else was wrong
14:42 hahuang61 joined #git
14:42 ZexaronS Now that I cleared that up, this is just my standard way of doing things, you don't have to be bothered by this, I'm also outspoken so that's why i keep talking about this, but all the help was very appreciated, even tho it looks like it I am resisting it, It's all being processed, don't worry about it you did good help.
14:42 Es0teric joined #git
14:42 canton7 I suggest that you reevaluate your approach before your next project - it's likely going to be quite counter-productive. If you want to have your rate, open Notepad
14:43 canton7 *your rant
14:45 ZexaronS I admit that many times in a month I would just be very frustrated with some of the ways some things work and I would ask who the heck programmed this, half the time it's something from Microsoft, but that's not really the source of the way I think or why I'm explaining it here, it's not emotionally fueled.
14:45 nicksloan joined #git
14:45 canton7 why say it then? :S
14:46 ZexaronS Because I'm outspoken and philosopher, see, that's I wrote it, even if it's the smallest of the details, that's what philosophers do
14:47 canton7 the other 1191 people in here don't really care how often you're frustrated, sorry to say
14:47 canton7 this is a channel about git
14:47 ZexaronS But I'm not at a point to write a book yet, hehe
14:47 dsdeiz joined #git
14:47 dsdeiz joined #git
14:48 VladGh joined #git
14:49 d0nn1e joined #git
14:50 perlpilot ZexaronS: a small note from the peanut gallery here...you talk about being an outspoken philosopher, but mostly it just seems like you're mildly resistant to learning new concepts and are confused.  (Just my humble opinion.  Take it or leave it)
14:51 ZexaronS ... finding that graph
14:51 GodGinrai joined #git
14:55 ZexaronS perlpilot, I was confused, I'm not anymore, after I understood, I started ranting about terminology as I did a few weeks ago similarly on another subject, this was a very friendly and civil rant ... I wouldn't bring a hardcore rant here in public.
14:56 siddart_ joined #git
14:57 AaronMT joined #git
14:57 mischat_ joined #git
14:57 gtristan joined #git
14:57 selckin msysgit is still the thing to get on windows?
14:58 gtristan Is there a way I can run git fetch and have it report whether anything changed, in a machine readable way ?
14:59 axeld_ joined #git
14:59 selckin can try looking into git ls-remote, might help you
15:00 bannakaffalatta joined #git
15:00 canton7 selckin, 'git for windows'
15:00 _ikke_ selckin: git for windows is what it's called
15:00 canton7 iirc msysgit is the dev environment for it?
15:00 rewt joined #git
15:00 nanga joined #git
15:01 nanga joined #git
15:01 GodGinrai selckin: the thing to "git" :P
15:01 * GodGinrai gives selckin an obvious dad nudge
15:02 siddart_ joined #git
15:02 selckin thanks guys, do i want truetype fonts?
15:02 axeld_ I have a question about git svn: I have a source svn repository that changed it's URL (they forgot trunk/ and had no place to put branches and stuff). Unfortunately, it's a switch that doesn't share any ancestry information. It just starts at the subsequent revision, and doesn't have the history beyond that. How can I pull in the changes from the new source without having merge commits forever?
15:03 a_thakur joined #git
15:03 dreiss joined #git
15:03 selckin beyond=before?
15:03 axeld_ selckin: yes
15:04 selckin i'd convert both seperately to git, and then try to merge them, rebasing the commits from one repo should work
15:05 selckin if you have many branches & stuff, gonna have a bad time
15:08 Darren_ joined #git
15:08 bronson joined #git
15:08 rivarun joined #git
15:09 shgysk8zer0_ joined #git
15:10 nettoweb joined #git
15:11 Alienpruts joined #git
15:13 howdoi joined #git
15:16 cdown_ joined #git
15:16 Dougie187 left #git
15:17 fahadash joined #git
15:19 ikelso joined #git
15:19 axeld_ selckin: I've fetched both repositories into different git branches (let's call them "a" and "b"). "master" is at "a". I'd like to get master to b without losing a, that is, the history. b starts with a single commit that is practically a, but of course, completely different hashes. I can easily merge master to b, but I would prefer not to have merge commits when they aren't actually needed. How can a rebase solve this issue?
15:19 mischat joined #git
15:19 kristofferR joined #git
15:20 mischat joined #git
15:20 rivarun joined #git
15:20 HanClinto joined #git
15:21 regedit joined #git
15:21 axeld_ selckin: when I rebase b on top of a, will svn fetch continue to work?
15:21 rwb joined #git
15:22 axeld_ selckin: (b is actually remotes/git-svn)
15:22 Dougie187 joined #git
15:25 crose joined #git
15:26 snowkidind joined #git
15:27 JoshL joined #git
15:28 selckin if you want svn fetch to keep working i don't think you can do anything
15:30 synthroid joined #git
15:31 Cwolf3D joined #git
15:33 qqx It should be safe to use `git replace` to link the histories.
15:35 lucazz joined #git
15:36 axeld_ selckin: damn, but thanks
15:37 axeld_ qqx: never used git replace -- how would that work?
15:37 selckin thats new to me aswel, sounds cool if it can do that
15:38 mkoskar joined #git
15:38 qqx axeld_: Something like `git replace --graft <first commit of b> a`
15:39 qqx That would create a new commit that's identical to that first commit from b, but has "a" as the parent; and most git operations would use that instead of the original.
15:40 LeBlaaanc joined #git
15:41 nanga joined #git
15:41 nanga joined #git
15:43 ikelso joined #git
15:43 paultreny joined #git
15:43 axeld_ qqx: damn, I accidentally did the opposite, let me try again :-)
15:47 Guest72463 joined #git
15:48 e14_ joined #git
15:48 rominron_ joined #git
15:49 ejb joined #git
15:50 masuberu joined #git
15:52 thiago joined #git
15:52 axeld joined #git
15:53 astrofog joined #git
15:54 arand Does anyone know the history behind the old Git website header/logo, the one with the tree-eating monster? There's https://github.com/git/gitscm-old/b​lob/master/public/images/header.png But no further info/history that I cound find...
15:54 axeld qqx: I guess I can visually have the history back this way (somehow it's messed up with everything missing, but that was probably my fault), but will a "merge" from that branch be tricked into being able to do a ff?
15:54 Darren_ joined #git
15:56 qqx axeld: Merges should honor the replacement. But I haven't tried that myself. I also avoided doing git merges when using git-svn.
15:57 roelmonnens joined #git
15:57 Fabricio20 joined #git
15:58 TomyLobo joined #git
15:59 elsevero joined #git
15:59 troulouliou_div2 joined #git
16:00 a_thakur joined #git
16:00 axeld qqx: I have little choice, I'm afraid
16:00 axeld qqx: but thanks, anyway
16:01 Ryanar joined #git
16:01 ok91 joined #git
16:03 rts-sander joined #git
16:03 rts-sander Hi I do "git checkout -p -- file.ext", answer some with "y"  some with "n"
16:03 rts-sander then it says error: patch failed: file.ext
16:04 rts-sander patch does not apply
16:04 rts-sander how do I make the patch apply?
16:04 a_thakur joined #git
16:05 e14_ joined #git
16:05 Noldorin joined #git
16:05 Ryanar joined #git
16:06 a_thakur_ joined #git
16:07 Oatmeal joined #git
16:07 t0by joined #git
16:07 t0by joined #git
16:08 axeld qqx, selckin: as a follow up: it's actually working! A git replace --graft let's me merge --ff-only from the new branch, thanks a lot!
16:08 al-damiri joined #git
16:08 osse rts-sander: does it not say "apply to work tree anyway" ?
16:10 bronson joined #git
16:10 rts-sander osse, this is what it says: https://paste.fedoraproject.org/520947/18985148/
16:10 rts-sander it gives the error and then quits without doing anything
16:10 jagob joined #git
16:13 brent__ joined #git
16:13 paws_ joined #git
16:13 synthroi_ joined #git
16:15 roelmonnens joined #git
16:16 CheckDavid joined #git
16:17 newbie1 joined #git
16:18 brent__ joined #git
16:18 a_thakur joined #git
16:18 aarobc joined #git
16:19 kyan joined #git
16:20 ftoulemon I have the (bad) habit of staging some files with `git add`, and then `git commit` with the `-a` option, broking my previous `add`s. Is there a way to create a pre-commit hook checking if there is some staged files and warn me if I use the `-a` option ?
16:20 a_thakur joined #git
16:22 nanga joined #git
16:22 nanga joined #git
16:23 robattila256 joined #git
16:23 Limes_ joined #git
16:24 axeld qqx: Oh, git replace seems to work only locally, the replace objects won't be transmitted via fetch from that repository :-/
16:25 qqx axeld: Not with the default refspecs, no. But you can add refspecs to have them fetched.
16:25 vuoto joined #git
16:25 axeld qqx: I feel so dirty :-) How would I do that?
16:26 osse i'd use filter-branch to write it in stone, then push -f
16:27 qqx axeld: That would involve adding `fetch = refs/replace/*:refs/replace/*` to the configuration of the remote.
16:30 HanClinto_ joined #git
16:30 ploop joined #git
16:35 subhojit777 joined #git
16:35 tang^ joined #git
16:36 axeld qqx: thanks!
16:36 csk157 joined #git
16:36 pabs3 joined #git
16:36 oskarkv joined #git
16:37 ikelso joined #git
16:37 pabs3 is there a git command that will exit 0 if a file is modified and 1 if not?
16:37 pabs3 (or vice-versa)
16:38 selckin i'd check  ls-files
16:38 mizu_no_oto joined #git
16:39 pabs3 that doesn't seem to do that
16:39 _ikke_ ls-files only looks at the index
16:39 HardlySeen joined #git
16:39 buckowski joined #git
16:39 _ikke_ pabs3: git diff --quiet HEAD <file>
16:40 _ikke_ pabs3: And it's the other way around usually
16:40 _ikke_ 0 means okay, 1 means modified
16:40 rnsanchez joined #git
16:40 jccn joined #git
16:42 _ikke_ Nasty peer connection pabs3's connection
16:42 hahuang61 joined #git
16:42 pabs3 joined #git
16:45 cdg joined #git
16:47 Oebele joined #git
16:48 pabs3 joined #git
16:48 a_thakur joined #git
16:51 aavrug joined #git
16:51 csk157 joined #git
16:51 NeverDie joined #git
16:53 Gsham joined #git
16:55 JamesBaxter joined #git
16:55 ikelso joined #git
16:55 _TWS joined #git
16:56 plasticle joined #git
16:56 ikelso joined #git
16:57 kadoban joined #git
16:57 durham joined #git
16:58 bronson joined #git
17:01 dave0x6d joined #git
17:02 rnsanchez joined #git
17:02 minikN joined #git
17:03 cebor joined #git
17:03 GavinMagnus joined #git
17:05 synthroid joined #git
17:05 manuelmrtz joined #git
17:05 GavinMagnus left #git
17:06 LionsMane joined #git
17:07 silnp joined #git
17:07 Bill joined #git
17:07 rwb joined #git
17:07 durham joined #git
17:08 tmsmith joined #git
17:09 gargola joined #git
17:09 roelmonnens joined #git
17:10 ikelso joined #git
17:13 ikelso_ joined #git
17:13 ExoUNX joined #git
17:14 Darcidride joined #git
17:14 ExoUNX joined #git
17:14 rwb joined #git
17:15 svm_invictvs joined #git
17:16 mkoskar joined #git
17:18 mkoskar joined #git
17:18 madewokherd joined #git
17:19 jozwior joined #git
17:19 zacts joined #git
17:20 dreiss joined #git
17:21 rominronin joined #git
17:22 roelmonnens joined #git
17:23 SwiftMatt joined #git
17:24 g105b joined #git
17:27 silnp joined #git
17:27 theoceaniscool joined #git
17:28 Gsham joined #git
17:29 rath joined #git
17:30 crayon joined #git
17:32 tmsmith joined #git
17:34 sea-gull_ joined #git
17:34 tmsmith joined #git
17:35 ihradek joined #git
17:35 lindenle joined #git
17:36 JamesBaxter joined #git
17:36 ikelso joined #git
17:37 finalbeta joined #git
17:37 qatiu joined #git
17:40 svm_invictvs joined #git
17:41 Ryanar joined #git
17:42 vdv joined #git
17:45 ikelso joined #git
17:46 HanClinto__ joined #git
17:46 glnz joined #git
17:47 chardan joined #git
17:49 b1tchcakes joined #git
17:51 bronson joined #git
17:52 jnavila joined #git
17:54 YuGiOhJCJ joined #git
17:55 skypuke joined #git
17:57 shpew12 joined #git
18:04 roelmonnens joined #git
18:04 jozwior joined #git
18:06 JamesBaxter joined #git
18:08 ikelso joined #git
18:09 Es0teric joined #git
18:10 manuelschneid3r joined #git
18:12 Darcidride joined #git
18:12 bambams joined #git
18:12 ikelso_ joined #git
18:12 kristofferR joined #git
18:16 oskarkv_ joined #git
18:17 nwkj86 joined #git
18:17 chachasmooth joined #git
18:17 hahuang65 joined #git
18:18 mikejakobsen joined #git
18:19 deadnull joined #git
18:19 hahuang61 joined #git
18:21 duderonomy joined #git
18:22 nicoulaj joined #git
18:22 ejb joined #git
18:22 durham joined #git
18:24 cdg joined #git
18:24 ikelso joined #git
18:25 KV joined #git
18:26 shgysk8zer0_ joined #git
18:26 Pseudocrat joined #git
18:26 Pseudocrat joined #git
18:26 cagedwisdom joined #git
18:29 porsche944 joined #git
18:30 durham joined #git
18:30 danslo joined #git
18:31 dreiss joined #git
18:32 stick-shift joined #git
18:32 cdg_ joined #git
18:33 netj joined #git
18:34 Gsham joined #git
18:35 tiger0 joined #git
18:35 chachasmooth joined #git
18:36 synthroi_ joined #git
18:38 brent__ joined #git
18:38 synthro__ joined #git
18:40 joshszep joined #git
18:40 spacelord_ joined #git
18:41 druonysus joined #git
18:41 gmac joined #git
18:43 aeontech joined #git
18:45 ikelso joined #git
18:46 bket joined #git
18:48 chardan joined #git
18:48 AW3i joined #git
18:48 kexmex joined #git
18:49 courrier joined #git
18:51 jost joined #git
18:52 rominronin joined #git
18:52 faux___ joined #git
18:52 inflames joined #git
18:53 jost joined #git
18:55 Limes__ joined #git
18:56 Oebele joined #git
18:56 erem4 joined #git
18:57 tnecniv joined #git
18:58 ResidentBiscuit joined #git
18:58 ljubak joined #git
18:59 ikelso joined #git
19:02 pabs3 joined #git
19:02 aw1 joined #git
19:06 ResidentBiscuit joined #git
19:08 jnavila joined #git
19:12 ctcrnitv joined #git
19:14 ctcrnitv could a remote be thought of as a directory or is that way off base?
19:14 thiago it's an alias for a URL
19:14 thiago so you don't have to type the URL all the time
19:15 Sasazuka joined #git
19:16 _TWS joined #git
19:16 hahuang61 joined #git
19:17 jimi_ joined #git
19:18 Bombe Hmm, is there a way to have rebase reset the author on all commits it touches?
19:18 thiago no
19:19 Bombe Dang.
19:20 chachasmooth joined #git
19:21 jlewis joined #git
19:21 hanneso_ joined #git
19:21 boz_v1_ joined #git
19:22 _W joined #git
19:22 lu_zero_ joined #git
19:22 lu_zero_ joined #git
19:22 redo joined #git
19:22 seveneve2 joined #git
19:22 maxorator joined #git
19:23 ppppp5 joined #git
19:23 metachr0n joined #git
19:23 zzz joined #git
19:24 akkad joined #git
19:24 mephistorium joined #git
19:24 Tobbi joined #git
19:25 spacelord_ joined #git
19:26 jave joined #git
19:30 miczac joined #git
19:30 ghostlight joined #git
19:30 ToxicFrog pabs3: _ikke_ | pabs3: git diff --quiet HEAD <file> _ikke_ | pabs3: And it's the other way around usually _ikke_ | 0 means okay, 1 means modified
19:33 quetz joined #git
19:33 ikelso joined #git
19:36 [log] joined #git
19:36 cdown joined #git
19:38 dsantiago joined #git
19:39 dsantiag_ joined #git
19:40 WayToDoor joined #git
19:41 mikecmpbll joined #git
19:41 khfeng joined #git
19:44 Bob8989 joined #git
19:45 osse Bombe, thiago: yes, sort of. add the line 'exec git commit --amend --reset-author' after every line in the todo list with rebase -i
19:46 Bombe I did it manually for the four commits in question… :)
19:47 CussBot joined #git
19:47 osse Booo
19:47 durham joined #git
19:48 durham_ joined #git
19:50 _TWS joined #git
19:50 Bombe Yes. So much shame. :(
19:50 [log] joined #git
19:50 apotry joined #git
19:51 Es0teric joined #git
19:52 Ramen joined #git
19:53 Martiini joined #git
19:54 qpdb joined #git
19:54 diogenese joined #git
19:55 cdown joined #git
19:56 leprechau joined #git
19:57 durham joined #git
20:01 Isla_de_Muerte joined #git
20:02 s2013 joined #git
20:03 vuoto joined #git
20:03 plasticle joined #git
20:05 [cust] joined #git
20:07 sdothum joined #git
20:07 vuoto joined #git
20:07 KV joined #git
20:07 Mikerhinos joined #git
20:09 glebihan joined #git
20:10 Atm0spher1c joined #git
20:10 donught joined #git
20:10 Ramen joined #git
20:10 donught joined #git
20:11 noob_on_rails joined #git
20:11 noob_on_rails hile i was able to push to my remote git repo , now when i try to "git push broker1 services" to push a new branch "services" to my "broker1" remote repo i get :error: cannot run ssh: No such file or directory , fatal: unable to fork
20:11 noob_on_rails ut if i write git remote , i can see broker1
20:12 KV joined #git
20:12 aeontech joined #git
20:12 [cust] joined #git
20:12 noob_on_rails joined #git
20:13 ikelso joined #git
20:13 Synthead joined #git
20:14 marc_v92 joined #git
20:15 Domhack joined #git
20:16 netj joined #git
20:16 noob_on_rails duh , ssh was not present .. wtf...
20:16 druonysus joined #git
20:17 [cust] joined #git
20:20 hahuang61 joined #git
20:24 tyreld joined #git
20:24 rominronin joined #git
20:25 jimklo joined #git
20:26 SwiftMatt joined #git
20:30 aeontech joined #git
20:30 jimklo greetings, my company hosted git repo forced me to update my credentials with a new password.  I'm on OS X Yosemite, git 2.10.0 using osxkeychain helper.  I've updated all the passwords for the accounts I could find in keychain, but git still tells me that login/password is incorrect when I try to fetch the remote.  Please advise...
20:32 Lea2 joined #git
20:32 mikejakobsen joined #git
20:32 glebihan joined #git
20:33 Ramen joined #git
20:37 Puffball joined #git
20:37 hahuang61 joined #git
20:39 Guest45004 joined #git
20:40 pcre joined #git
20:43 svm_invictvs joined #git
20:43 Shentino joined #git
20:45 tnecniv joined #git
20:45 imachuchu joined #git
20:48 WaReZ joined #git
20:50 Ramen joined #git
20:50 mizu_no_oto joined #git
20:52 _TWS joined #git
20:53 _TWS_ joined #git
20:54 noecc left #git
20:55 jccn joined #git
20:59 phos1 joined #git
20:59 m0viefreak joined #git
21:00 phos1 For some reason when i do “git reset —hard origin master” I am ambiguous argument. I’ve done this before and never had an issue, how do I fix it?
21:00 Bombe Add the missing slash.
21:00 phos1 Bombe: I tried origin/master as well
21:00 osse phos1: pastebin git for-each-ref | grep master
21:01 Bombe Unless your branch names are really fucked up that is not ambiguous.
21:01 ihradek joined #git
21:01 _ikke_ Not sure if it's a copy/paste, but your -- turn into an en- or em-ash
21:01 _ikke_ em-dash
21:02 phos1 Doing a fetch origin master and a pull origin master work but not reset
21:02 _ikke_ phos1: git resets takes one parameter
21:03 ianmethyst joined #git
21:03 _ikke_ It takes a branch (ref), and in your case, it's called origin/master
21:03 jagob joined #git
21:03 _ikke_ (git pull and fetch take 2 parameters, a remote, and a branchname, so git fetch origin master)
21:03 phos1 Hmm, so that doesn’t help me figure out what i’ve broken here
21:04 Bombe You could try what has been suggested to you five minutes ago…
21:06 druonysus joined #git
21:06 kristofferR joined #git
21:07 Limes_ joined #git
21:07 barteks2x joined #git
21:07 WalkinBot joined #git
21:08 phos1 I did the pastebing thing, no results, and my dashes were proper dashes
21:08 _ikke_ phos1: did you specify a single argument, instead of 2?
21:08 Bombe So you don’t have a ref named “master.”
21:08 Bombe That might be something to worry about.
21:08 _ikke_ "git reset --hard origin/master"
21:09 phos1 I did git reset —hard origin/master
21:09 _ikke_ Bombe: Not necessarily
21:09 _ikke_ Nothing requires you to have a branch called master
21:09 _ikke_ phos1: And what did that return?
21:09 Bombe _ikke_, if you want to reset to origin/master you better damn well have a master in the origin remote.
21:09 phos1 same “ambiguous argument
21:10 _ikke_ phos1: what does git branch -r return?
21:10 _ikke_ does it return origin/master?
21:10 wootehfoot joined #git
21:10 Bombe Does “git remote” list origin?
21:10 Bombe Do you even have a git repository?
21:10 Ahmed90 joined #git
21:10 phos1 Yes git remote lists origin
21:10 Bombe Check for .svn directories.
21:11 _ikke_ Bombe: If there wasn't a git repository, git would've said so
21:11 Bombe _ikke_, I know. However, he’s trying to use a ref he says he doesn’t have.
21:11 Ragnor joined #git
21:11 _ikke_ That's why I ask him to run git branch -r
21:11 _ikke_ it will return what remote tracking branches he has
21:12 Bombe _ikke_, that should probably take him about eight minutes and he won’t tell you the results. Speaking from experience.
21:12 phos1 Got it, I thought my pull had fetched the branch but it didn’t I did get fetch —all, and then i had master to be able to reset to
21:12 _ikke_ ;-)
21:12 Hobbyboy joined #git
21:13 phos1 I somehow expect that anything that says “origin” would know to look remote, I forget i have to pull or fetch it first to work with it
21:13 _ikke_ phos1: note that pull = fetch + merge
21:13 _ikke_ If you don't want to merge something, don't use pull
21:14 _ikke_ (just fyi)
21:14 phos1 that’s, didn’t know that.
21:14 phos1 I always try to come back, you were good enough to help, I can try to be good enough to tell you what stupid thing i missed lol
21:14 jason237 joined #git
21:15 _ikke_ yw
21:16 phos1 Does anyone here use bitbucket pipelines to deploy code to a docker enviroment? Any good resources on setting it up ? i was trying to do it in Gitlab but the resources seem sparse
21:18 belak phos1: you'll probably have a bit of trouble with that. Because pipelines is built on docker, it's hard to build docker images in it.
21:19 phos1 Hmm. What i am trying to do is have a online enviroment to test against for each of my branches. I want it to update as code is pushed to a branch. Gitlab review apps says it supports thiat, but the directions seem to be missing some steps .
21:20 askb joined #git
21:22 spearthistle joined #git
21:24 SwiftMatt joined #git
21:25 ikelso joined #git
21:25 SwiftMatt joined #git
21:27 robotroll joined #git
21:28 bayman joined #git
21:30 bayman when I run git pull, i keep getting a merge notice in nano, how do I stop that?
21:30 _ikke_ bayman: Don't use git pull if you don't want to merge :-)
21:31 _ikke_ (the message is there for a reason, if you don't expect it to be there, you probably don't want to merge)
21:31 bayman well i've been using git pull fine before.. until i accidentally git pushed from my production server instead of my dev environment
21:31 bayman so my branch is messed up or something
21:32 _ikke_ Your branch has diverged, that's why it is creating a merge commit (which requires a message)
21:32 bayman how do i just go back go one branch
21:33 _ikke_ git pull --rebase
21:33 finalbeta joined #git
21:34 blackwind_123 joined #git
21:36 blackwind_123 joined #git
21:36 freimatz joined #git
21:36 ikelso joined #git
21:37 mizu_no_oto joined #git
21:38 Bass10 joined #git
21:39 KV joined #git
21:40 chardan joined #git
21:40 imachuchu bayman: you probably also want to look into the difference between git fetch and git pull
21:41 [cust] joined #git
21:42 dmoerner joined #git
21:43 FSadino joined #git
21:44 [cust] joined #git
21:44 bayman i run git pull —rebase, then git status, it says Your branch is ahead of 'origin/master' by 1 commit.
21:44 FSadino How do I completely remove a .git/all_branches/cache etc.. To initializate a new git in a folder?
21:45 [cust] joined #git
21:45 f3_ joined #git
21:45 thiago FSadino: rm -rf .git
21:45 _ikke_ bayman: git push
21:45 ki0_ joined #git
21:45 jimklo after updating my LDAP password, I can no longer fetch, pull, etc. I keep getting the error: `fatal: remote error: Invalid username or password.`, even though I updated the entries within OS X Keychain.  anyone know how I might resolve?
21:45 mniip joined #git
21:46 bayman but it's my production server.. i don't care about the changes made there
21:46 roelmonnens joined #git
21:46 FSadino thiago: this keeps cache because when I need to solve conflicts it automatic grab previews resolution
21:46 bayman only the changes i make from my laptop source
21:46 thiago FSadino: no, it doesn't
21:47 thiago FSadino: everything is inside .git
21:47 bayman can i ignore the changes made on my production server source?
21:48 thiago bayman: you probably want !config. What do you mean by "ignore"?
21:48 gitinfo bayman: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
21:48 FSadino I know, I did this but it keeps branches and when I use mergetool it automates the previews resolution of files
21:48 thiago why are the changes a problem?
21:48 thiago FSadino: it does not keep the branches either
21:48 [cust] joined #git
21:49 Guest42712 joined #git
21:50 bayman well, i  had nano index.html open, and my internet connection was dropped then the server created index.html.save… so i rm -rf index.html.save on the server
21:50 bayman but git tracked the change
21:51 thiago bayman: git didn't track it just because the file was created
21:51 thiago you added that file
21:51 roger_raymond joined #git
21:51 thiago you can add *.save to .gitignore, or you can just not add the files
21:52 bayman well i deleted it already
21:52 irqq joined #git
21:52 bayman and now it says my branch is ahead of 'origin/master' by 1 commit
21:52 _ikke_ If you want to ignore what you pushed from production, you should undo the rebase
21:52 bayman how do i do that?
21:53 BlessJah is there preffered way (library or package) for managing git from python?
21:54 _ikke_ BlessJah: https://github.com/jelmer/dulwich perhaps?
21:54 _ikke_ I have no experience with them
21:55 bayman if i just re clone my repo to a new folder and delete the old one, will it just use the source from repo and ignore all changes on local server?
21:56 rominronin joined #git
21:57 BlessJah bayman: separate clones are unaware of each other - all they know is where the remote (server) is
21:57 BlessJah but you don't usually need to do this to recover
21:57 bayman i treid git pull --rebase
21:58 ikelso joined #git
21:58 bayman i still see a merge notice
22:00 BlessJah bayman: I've skimmed through backlog: you have accidentially pushed from production server (git is not deployment tool btw), later you tried pulling on development machine and it asked you to merge changes
22:00 BlessJah is that right?
22:00 hagabaka joined #git
22:02 bayman the merge notice is when I try pulling on production server
22:02 bayman my development is my macbook
22:03 Ryanar joined #git
22:03 Guest55 joined #git
22:04 linuxmodder joined #git
22:05 BlessJah can I assume that: remote from which you pull is The Single Source of Truth™, and you want production in exactly same state as on remote?
22:05 BlessJah by whatever means it takes?
22:05 bayman Yes
22:05 leeN joined #git
22:05 BlessJah then your deployment script may look like this : git fetch ; git reset --hard origin/master ; git clean -fxd
22:06 BlessJah you should test it before you run it on production
22:08 BlessJah fetch - download changes (but do not apply), reset --hard will erase any modifications and differences between local and remote, clean will remove any files not tracked by git
22:08 Ramen joined #git
22:09 ikelso joined #git
22:09 BlessJah take extreme caution with clean -fxd - shall you have any files created directly on server (config, cache, temporary) they will be gone
22:09 bayman when I run git push from dev, it says e338be2..a38c13e  master -> master
22:10 bayman is master -> master normal?
22:10 BlessJah yes, it is
22:10 BlessJah !deploy bayman
22:10 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
22:12 phos1 left #git
22:12 bayman thanks no more merg notice
22:12 BlessJah bayman: option I gave you is improvement over 4.2, but with comment "newbie unsafe"
22:13 bayman why isn't git a deployment tool?
22:13 bayman i shouldnt use git to deploy source to production server?
22:14 BlessJah git is version control system, not a deployment tool, but you can build deployment tool using git
22:14 Bombe Why are scissors not the correct tool to drive in screws?
22:14 Bombe Because that’s not what they’re made for.
22:14 _ikke_ imo the only role git should play in deployments is providing the source code
22:15 BlessJah _ikke_: care to elaborate? is it about binaries stored in git or using hooks to trigger deployment?
22:15 bayman how else am i suppose to get my source code to my server
22:15 kadoban Also when you see proponents of a tool telling you *not* to use it for something, that should be hard to ignore, since human nature is ... to use something you like for everything.
22:15 kadoban bayman: However you used to. I personally like rsync
22:16 BlessJah bayman: you will be fine using git
22:16 bayman i was following a django tutorial guide that used git to push to server
22:16 kadoban Yes, many people seem to like doing so ... I find it inflexible and mostly just annoying.
22:17 BlessJah kadoban: connection might die mid-transfer, boom
22:18 BlessJah git gives you download-then-apply, nearly atomic switches and easy inspection if anything failed to deploy or was modified (git status)
22:18 kadoban BlessJah: rsync handles that fine. git in fact does worse at "atomic" and etc.
22:18 bayman joined #git
22:19 BlessJah kadoban: git checkout is local operation, therefore less likely to die mid-filight, rsync updates bytes it receives over wire
22:20 _ikke_ BlessJah: I like git archive + symlinking to a release
22:20 * BlessJah is ready to defend deployment systems build on top of git
22:20 _ikke_ which is atomic and easily reversable
22:20 raspado joined #git
22:21 BlessJah symlink to an tar archive? how would you execute tar archive (let's assume our code is bunch of python/bash/perl scripts deployed directly as source code)
22:21 xuba joined #git
22:21 _ikke_ BlessJah: When I say git should not be used for deployments, I'm mostly talking about methods which rely on git checkout
22:21 _ikke_ BlessJah: I extract the tar
22:21 _ikke_ the tar is only used for transport
22:22 thallada joined #git
22:22 BlessJah and what's the problem with checkout/reset approaches?
22:22 zzz joined #git
22:22 WalkinBot left #git
22:23 rwb joined #git
22:23 BlessJah with separate GIT_DIR, and deploy script living outside the repo so you won't lock yourself out?
22:23 jimklo how can I figure out where git is pulling it's credentials when it's authenticating?
22:24 dwts joined #git
22:24 BlessJah jimklo: is it http or ssh transport?
22:24 jimklo BlessJah: https
22:24 SwiftMatt joined #git
22:24 Juzzika joined #git
22:25 jimklo all I know is if I use the following: `GIT_TRACE=2 GIT_CURL_VERBOSE=2 GIT_TRACE_PERFORMANCE=2 GIT_TRACE_PACK_ACCESS=2 GIT_TRACE_PACKET=2 GIT_TRACE_PACKFILE=2 GIT_TRACE_SETUP=2 GIT_TRACE_SHALLOW=2 git fetch`
22:25 jimmyeatworld joined #git
22:25 jimklo If i reverse the encoded password, it's not any of the ones stored in .git-credentials, in osx keychain, or anywhere I can determine
22:26 nickabbey joined #git
22:26 _ikke_ jimklo: does git config -l return anything about credential helpers?
22:27 jimklo credential.helper=store
22:27 imachuchu hey, is there any way to guarentee a file permissions (say 400) in git? We have some keys we want to always make sure have that permission (they're vagrant keys for developing so no security concern) but don't want to have to manually change them on every clone
22:27 jimklo I had that as osxkeychain previously
22:27 BlessJah _ikke_: in case I'm not responding I might be AFK, I'm still interested wats wrong with checkout/reset deploy methods
22:27 _ikke_ BlessJah: right
22:28 menip joined #git
22:28 BlessJah imachuchu: dont store keys in git, or store them encrypted
22:29 jimklo _ikke_: actually take that back... i comes back with 3 entries
22:29 jimklo 2 with `credential.helper=osxkeychain` and one with `credential.helper=store`
22:30 imachuchu BlessJah: again, these are used for local only vagrant installations that don't have network access for development testing, there really isn't a security concern
22:31 BlessJah you can only remove write permision, and git tracks only one set of bits, so you can have 444, 644 or 755 (I might be wrong here)
22:31 yitz joined #git
22:32 jgrasser joined #git
22:32 _ikke_ git applies umask
22:32 yitz If I got two git(hub) repos with no conflicting filenames and I want to merge all the commits from one into the other, how would I go about doing that? Can I do that?
22:32 _ikke_ so 666 or 777 combined with umask
22:32 nyuszika7h joined #git
22:33 BlessJah !subtree !submodule yitz
22:33 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
22:33 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
22:34 yitz I don't want a submodule. I'm trying to merge multiple repos into one
22:34 ResidentBiscuit joined #git
22:34 yitz I got a bunch of single-file repos with one irssi script. I'm trying to fold them all into a single repo with a bunch of scripts
22:35 BlessJah then clone one, add second as remote (git remote add <name> <url>), fetch and merge
22:35 * BlessJah afk
22:35 yitz Huh. OK. Will give that a try. Thanks!
22:37 rivarun joined #git
22:37 Ramen joined #git
22:37 imachuchu BlessJah, _ikke_: thanks for your help, I'll look around and see if I can get it to work but from a bit of testing it looks like we may have to stick with our manually changing it on every clone (which isn't terrible really).
22:41 yitz Heh. merge --allow-unrelated-histories
22:41 KV joined #git
22:42 spearthistle joined #git
22:43 PettanShoutaKun joined #git
22:45 pcre joined #git
22:46 PettanShoutaKun okay... I have two branches that are (sort of) identical EXCEPT for the latest commit... I branched one from the other and pushed one commit to it. Then I went back and changed a ton of the commit messages on the older branch. Is there a way to pick my latest commit off the top of this branch... and somehow pull in the other branch where the commit names are changed and then stick this commit back on top of it?
22:46 dregad joined #git
22:47 PettanShoutaKun honestly copy pasta might be a better solution at this point, but I thought it might be a good exercise/learning opportunity
22:49 imachuchu PettanShoutaKun: yes. Look into cherry-pick
22:49 imachuchu bascially you want all of branch A, but with the very last commit on branch B added on top
22:50 PettanShoutaKun can I just rebase my latest commit onto my old branch?
22:51 PettanShoutaKun I think that actually worked
22:51 BlessJah PettanShoutaKun: rebase will try to put all non-renamed commits on top of renamed, but you can remove them and have rebase apply only one commit
22:52 BlessJah otherwise you could create third branch with renamed, cherry pick that one commit, and reset once you are satisfied
22:52 PettanShoutaKun you know that last idea probably isn't that bad
22:52 BlessJah result of both operatios will be the same
22:53 xaa joined #git
22:54 PettanShoutaKun how would I remove the non-renamed commits from the rebase?
22:54 BlessJah interactive rebase allows you to reorder/remove/edit commits
23:00 eaxxae joined #git
23:00 sea-gull_ joined #git
23:01 fmeerkoetter joined #git
23:02 inflames joined #git
23:04 brent__ joined #git
23:05 manuelschneid3r joined #git
23:07 brent__ joined #git
23:08 PettanShoutaKun okay now that I probably complete destroyed some of the upstream URLs during my task... is there a way to reset all of those as if I had just freshly checkout this out anew?
23:08 aeontech left #git
23:08 PettanShoutaKun other than deleting everything and re-cloning it from remote
23:10 cdg joined #git
23:20 NeverDie joined #git
23:20 safe joined #git
23:21 Ramen joined #git
23:22 pabs3 left #git
23:24 hahuang61 joined #git
23:24 inflames joined #git
23:25 syg_ joined #git
23:25 Limes_ joined #git
23:25 fling joined #git
23:25 imachuchu PettanShoutaKun: !reflog
23:25 gitinfo PettanShoutaKun: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
23:26 cdown joined #git
23:26 imachuchu PettanShoutaKun: nothing's lost, you just need to find out the hashes of the commits you want. Also all of the remote's refs are still marked as such (assuming you haven't pushed/force pushed)
23:26 PettanShoutaKun I mean I was kind of dumb and ran command to switch one branches upstream to another
23:28 BlessJah switch it back then
23:28 rominronin joined #git
23:32 fatalhalt joined #git
23:33 jason237 joined #git
23:33 Dougie187 left #git
23:35 gmac joined #git
23:36 shgysk8zer0_ joined #git
23:40 cyphase joined #git
23:42 KV joined #git
23:43 courrier joined #git
23:45 jimklo joined #git
23:46 gearheads joined #git
23:46 gearheads Hello! I needed a little help with git squash
23:47 bshackle1t left #git
23:47 Achylles joined #git
23:48 gearheads I have three 4 commits and want to squash the previous 3 commits to the latest one
23:48 madewokherd joined #git
23:48 gearheads I have 4 commits^^
23:51 yitz left #git
23:52 Run http://stackoverflow.com/questions/​5308816/how-to-use-git-merge-squash
23:52 Ramen joined #git
23:53 xaa joined #git
23:56 Run If you just want to redo the last 4 commits, you could do: git rebase -i HEAD~4

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