| 2017-02-12 |
| ← chipotle left | 00:00 |
| → askb joined | 00:00 |
| → joshszep joined | 00:00 |
| ← tristanp left | 00:01 |
| → tristanp joined | 00:02 |
| → ozmage joined | 00:02 |
| → GodGinrai joined | 00:04 |
| ← UserOO7 left | 00:04 |
| ← joshszep left | 00:04 |
| ← ozmage left | 00:05 |
| ← tristanp left | 00:06 |
| ← askb left | 00:06 |
| → askb joined | 00:07 |
| ← clemf left | 00:07 |
| ← matsaman left | 00:07 |
| ← m4sk1n left | 00:07 |
| → fstd_ joined | 00:07 |
| ← LeBlaaanc left | 00:08 |
| ← GodGinrai left | 00:08 |
| ← matoro left | 00:08 |
| ← fstd left | 00:08 |
| fstd_ → fstd | 00:08 |
| → danemacmillan joined | 00:09 |
| ← danemacmillan left | 00:09 |
| ← e01 left | 00:10 |
| → matsaman joined | 00:10 |
| ← finalbeta left | 00:10 |
| → e01 joined | 00:10 |
| → enckse joined | 00:10 |
| ← e01 left | 00:10 |
| → e01 joined | 00:10 |
| → storrgie joined | 00:11 |
| → clemf joined | 00:11 |
| ← storrgie left | 00:12 |
| ← enckse left | 00:12 |
| → enckse joined | 00:13 |
| → Gsham joined | 00:14 |
| → storrgie joined | 00:14 |
| ← e01 left | 00:15 |
| ← Oatmeal left | 00:16 |
| ← dbl4k left | 00:19 |
| ← Gsham left | 00:19 |
| ← notebox left | 00:20 |
| → notebox joined | 00:21 |
| → meadmoon joined | 00:21 |
| → ljc joined | 00:22 |
| ← meadmoon left | 00:24 |
| → matoro joined | 00:25 |
| ← govg left | 00:25 |
| → SwiftMatt joined | 00:27 |
| ← Naan left | 00:27 |
| ← mischat left | 00:29 |
| → dave0x6d joined | 00:33 |
| ← pbrewczynski left | 00:36 |
| → tristanp joined | 00:38 |
| → pur3eval joined | 00:43 |
| → kyan joined | 00:43 |
| → bongobrown joined | 00:43 |
| → Vampire0 joined | 00:44 |
| ← fstd left | 00:44 |
| → fstd joined | 00:44 |
| ← Vampire0_ left | 00:45 |
| ← MineCoins left | 00:45 |
|
Richard_Cavell
| Hi everyone. I have a working directory with a project. Someone online insisted that I post my code to github.com, so I did. He gave me the commands, and there is a .git directory in my working directory. Since then I've been typing $git push when I wanted to commit (because I don't know git), and my wd is out of sync with github and git commit won't fix it. What do I do? | 00:46 |
| ← Raed left | 00:46 |
|
memfrob
| try git pull then git push again | 00:47 |
| ← pur3eval left | 00:47 |
| ← svm_invictvs left | 00:48 |
|
Richard_Cavell
| $git pull results in: There is no tracking information for the current branch. Please specify which branch you want to merge with. | 00:48 |
| ← King_Hual left | 00:49 |
|
memfrob
| Ok, where are you starting from? | 00:49 |
|
| Does git checkout master work? | 00:49 |
|
| If you properly cloned your tree you shouldn't have to do that. | 00:50 |
|
Richard_Cavell
| If I do that will it wipe my recent changes? | 00:50 |
| ← Tobbi left | 00:51 |
|
memfrob
| ok so you already made changes. | 00:51 |
| ← bongobrown left | 00:51 |
|
memfrob
| what does git branch -a say? | 00:51 |
|
Richard_Cavell
| * master | 00:51 |
|
| remotes/origin/master | 00:51 |
|
memfrob
| what does git log say? | 00:51 |
| → rogi joined | 00:51 |
| → Gsham joined | 00:52 |
| → mehola joined | 00:52 |
|
memfrob
| does git log have your recent change? i.e. did you make a commit? | 00:52 |
| → raatiniemi joined | 00:52 |
|
Richard_Cavell
| git log output: http://ideone.com/IU9vmZ | 00:53 |
| ← rogi left | 00:53 |
|
memfrob
| better yet, does git diff HEAD say anything | 00:53 |
|
Richard_Cavell
| git diff HEAD produces 4 pages of output | 00:53 |
|
memfrob
| ok thats probably why | 00:54 |
|
| run git add -A | 00:54 |
|
| then git commit -as | 00:54 |
| → modin joined | 00:54 |
|
Richard_Cavell
| Yes, that seems to have worked. git diff HEAD now has no ouptut | 00:55 |
|
memfrob
| then git push should work, if not, git push origin +master | 00:55 |
| ← Taikibansei left | 00:55 |
| → rewt joined | 00:56 |
|
memfrob
| if the first one doesn't work then something is wrong though | 00:56 |
|
Richard_Cavell
| git push worked | 00:56 |
|
memfrob
| nooicee | 00:56 |
|
Richard_Cavell
| Okay, I'm a bit more relaxed now. Thanks | 00:56 |
|
| So if I want to commit from now on, what do I type? | 00:56 |
| ← durham left | 00:57 |
|
Richard_Cavell
| (I'm the only committer, I'm just putting my code up for another guy to look at) | 00:57 |
|
memfrob
| no problem man, you ever need anything join this channel, we're all git experts with no egos. | 00:57 |
| → durham joined | 00:57 |
| → Raed joined | 00:57 |
| → Nugget joined | 00:57 |
|
memfrob
| git add -A means to add everything (new files, folders, etc) in the work directory to git, i.e. to track them | 00:58 |
|
| if you're only modifying files that already exist in the git tree and are being tracked, I use git commit -as | 00:58 |
| ← matsaman left | 00:58 |
| ← mnaser left | 00:58 |
|
memfrob
| -a = "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected." | 00:59 |
|
| -s is just a sign off message, so it says signed off by <your name and email> | 00:59 |
|
| it makes it look nicer and not like you're trying to be an anonymous coward. | 01:00 |
|
Richard_Cavell
| So to remove certain files from the list of files that git versions, should I do git rm --cached filename ? | 01:00 |
| → MattMaker joined | 01:00 |
| → matsaman joined | 01:00 |
| → rwp joined | 01:00 |
| → sharpy joined | 01:00 |
|
memfrob
| you want to stop tracking a file in git but leave the file in the work tree? that sounds like a bad idea. | 01:00 |
| → flo[m]1 joined | 01:01 |
| → chipotle joined | 01:01 |
| → FiveBroDeepBook joined | 01:02 |
|
memfrob
| i personally never do that but if you want git to stop tracking a file, you just add the file (and path if necessary) to .gitignore | 01:02 |
| → __main__ joined | 01:02 |
| ← notebox left | 01:02 |
| → m0ltar joined | 01:02 |
| → caliculk joined | 01:02 |
|
Richard_Cavell
| How do I remove them from github? | 01:03 |
|
memfrob
| as if they never existed and re-write history or the good way? | 01:03 |
|
Richard_Cavell
| The good way | 01:03 |
|
memfrob
| ah, just rm -rf file/directory then run git add -A again thats what i do | 01:04 |
| ← borkr left | 01:04 |
|
Richard_Cavell
| No, I want them to exist on my computer but not at github | 01:04 |
|
| For example, object files | 01:04 |
| ← Electrometro left | 01:05 |
|
memfrob
| You should add object files and auto-gen'd files to .gitignore but if you already added it by mistake, git rm --cached <file> | 01:05 |
|
| then do ensure it's done right, git rm --cached -r . && git add . | 01:06 |
|
| s/do/to/ | 01:06 |
| ← FiveBroDeepBook left | 01:06 |
|
memfrob
| that will make sure files in .gitignore are not tracked | 01:06 |
|
| HEH! I know more about git than I thought I did. | 01:07 |
|
Richard_Cavell
| memfrob: I have run git rm --cached on the files, and it appears to have removed them from versioning. But they're still on github. | 01:07 |
| → qpdb joined | 01:07 |
|
memfrob
| you committed it? | 01:07 |
| → jagobdue joined | 01:07 |
|
Richard_Cavell
| yes | 01:07 |
|
memfrob
| OH RIGHT! sorry. ok re-add the file to git and track it, then move the file outside of the git directory, then run git add -A again | 01:08 |
| ← sharpy left | 01:08 |
|
memfrob
| and you're going to need to remove the file from .gitignore if you did that already. | 01:09 |
| → sharpy joined | 01:09 |
|
memfrob
| then in git commit -as it should mention that the file was deleted. | 01:10 |
| ← dersand left | 01:10 |
|
memfrob
| there's probably another way to do that without moving the file outside of the git tree but that's what i do to keep myself sane. | 01:10 |
| ← jagob left | 01:10 |
|
Richard_Cavell
| They're still there on github | 01:10 |
|
memfrob
| was the file deleted in git commit ? | 01:11 |
|
Richard_Cavell
| No, doesn't look like it | 01:11 |
| → IntruderSRB joined | 01:11 |
|
memfrob
| you need to make sure the file is tracked again first | 01:12 |
|
| if it doesn't show up in git commit then it won't show up on github | 01:12 |
|
Richard_Cavell
| Okay, they're versioned and they're in the working directory. What about a git rm filename? | 01:13 |
| ← CheckDavid left | 01:14 |
|
memfrob
| you can use that too, i personally don't. | 01:14 |
| ← ljc left | 01:14 |
|
memfrob
| hence why i didn't think of it earlier :P | 01:15 |
|
Richard_Cavell
| I ran it but it's still on github | 01:15 |
|
memfrob
| was it deleted in git commit ? | 01:15 |
|
| does git commit --amend show that you deleted the file? | 01:16 |
|
Richard_Cavell
| http://ideone.com/8n0LCy Here's the output | 01:16 |
|
memfrob
| git config --global user.name "Richard Cavell" | 01:16 |
|
| git config --global user.email [email@hidden.address] | 01:16 |
|
Richard_Cavell
| ok done | 01:17 |
|
memfrob
| git commit --amend --reset-author | 01:17 |
| → mnaser joined | 01:17 |
|
memfrob
| then git push | 01:17 |
| → notebox joined | 01:18 |
| → knigitz joined | 01:18 |
|
memfrob
| imma pull my hair out if that doesn't work | 01:18 |
|
| memfrob gets ready to point a gun at his own head | 01:19 |
| ← tristanp left | 01:19 |
|
matsaman
| =) | 01:19 |
|
Richard_Cavell
| Don't do that | 01:19 |
|
| It worked. Thanks. | 01:20 |
|
| Now when I've done some work, I go $git commit -as; git push correct? | 01:20 |
| → tristanp_ joined | 01:20 |
|
memfrob
| yes, git commit -as makes the commit and has you sign off on it, git push sends it to the server | 01:22 |
|
Richard_Cavell
| Okay goood. That's all I want to learn about git for now. | 01:23 |
|
memfrob
| hawsome! | 01:24 |
|
| so what VCS do you usually use? SVN? CVS Pharmacy? | 01:27 |
| → carpii joined | 01:27 |
|
memfrob
| Something tells me you usually don't use hg or bzr. | 01:27 |
| → pandeiro joined | 01:28 |
| → redhedded1 joined | 01:29 |
| ← sharpy left | 01:29 |
| → mischat joined | 01:29 |
| ← YuGiOhJCJ left | 01:29 |
| → sharpy joined | 01:29 |
| ← ToBeCloud left | 01:31 |
| → arescorpio joined | 01:31 |
|
memfrob
| Too much C programming, I'm gunna go game for awhile. I'll be back another day. Take care everyone! | 01:31 |
| ← memfrob left | 01:31 |
| → afuentes joined | 01:32 |
| ← tristanp_ left | 01:32 |
| → Vampire0_ joined | 01:36 |
| ← mischat left | 01:36 |
| ← d1z left | 01:37 |
| → tristanp_ joined | 01:37 |
| ← Vampire0 left | 01:38 |
| ← rewt left | 01:42 |
| → rewt joined | 01:43 |
| ← johnny56 left | 01:45 |
| ← aidalgol left | 01:45 |
| → jameser joined | 01:46 |
| → johnny56 joined | 01:46 |
| → astrofog joined | 01:47 |
| ← yqt left | 01:47 |
| → cdg joined | 01:48 |
| ← tristanp_ left | 01:50 |
| → tristanp joined | 01:51 |
| ← johnny56 left | 01:51 |
| → johnny56 joined | 01:52 |
| ← Xunie left | 01:54 |
| ← tristanp left | 01:56 |
| → d1z joined | 01:57 |
| → tristanp joined | 01:59 |
| ← waveclaw left | 01:59 |
| ← MattMaker left | 02:00 |
| → MattMaker joined | 02:00 |
| ← tristanp left | 02:01 |
| → tristanp joined | 02:02 |
| → dreiss joined | 02:02 |
| ← notebox left | 02:02 |
| ← jstimm left | 02:03 |
| ← Starky left | 02:04 |
| ← MattMaker left | 02:05 |
| ← tristanp left | 02:09 |
| ← clemf left | 02:10 |
| → tristanp joined | 02:11 |
| → rgrinberg joined | 02:13 |
| → finalbeta joined | 02:15 |
| Vampire0_ → Vampire0 | 02:15 |
| ← tristanp left | 02:15 |
| → tristanp joined | 02:16 |
| → waveclaw joined | 02:21 |
| ← pks left | 02:21 |
| ← tristanp left | 02:21 |
| → pks joined | 02:22 |
| → tristanp joined | 02:22 |
| → Vampire0_ joined | 02:23 |
| ← IntruderSRB left | 02:23 |
| ← Vampire0 left | 02:24 |
| ← tristanp left | 02:24 |
| → tristanp joined | 02:24 |
| ← tristanp left | 02:24 |
| Vampire0_ → Vampire0 | 02:24 |
| → Xe joined | 02:25 |
| → tristanp joined | 02:25 |
| → justan0theruser joined | 02:27 |
| ← justanotheruser left | 02:28 |
| ← tristanp left | 02:29 |
| → tristanp joined | 02:30 |
| ← tristanp left | 02:30 |
| → tristanp joined | 02:31 |
| ← miczac left | 02:31 |
| ← jameser left | 02:31 |
| ← tristanp left | 02:31 |
| → tristanp joined | 02:32 |
| → pur3eval joined | 02:32 |
| ← jimi_ left | 02:32 |
| ← Derperperd left | 02:36 |
| ← pur3eval left | 02:36 |
| → jimi_ joined | 02:37 |
| → ertes joined | 02:38 |
| → Wulf4 joined | 02:39 |
| → miczac joined | 02:39 |
| gitinfo set mode: +v | 02:41 |
| ← astrofog left | 02:42 |
| ← Wulf left | 02:42 |
| Wulf4 → Wulf | 02:42 |
| ← tvw left | 02:42 |
| ← JamEngulfer left | 02:43 |
| ← dave0x6d left | 02:45 |
| ← tristanp left | 02:45 |
| → tristanp joined | 02:46 |
| → tristanp_ joined | 02:47 |
| ← tristanp left | 02:47 |
| → dcy joined | 02:50 |
| → jameser joined | 02:51 |
| ← d^sh left | 02:54 |
| ← ojdo left | 02:55 |
| → d^sh joined | 02:56 |
| ← chipotle left | 02:57 |
| ← afuentes left | 02:58 |
| ← pandeiro left | 03:00 |
| → ozmage joined | 03:01 |
| → ojdo joined | 03:02 |
| ← Vortex34 left | 03:04 |
| ← tristanp_ left | 03:05 |
| → tristanp joined | 03:06 |
| ← tristanp left | 03:08 |
| → tristanp joined | 03:09 |
| ← johnny56 left | 03:09 |
| → ffilozov joined | 03:11 |
| → c0ded joined | 03:11 |
| ← CEnnis91 left | 03:12 |
| → johnny56 joined | 03:15 |
| ← tristanp left | 03:15 |
| → tristanp joined | 03:15 |
| ← tristanp left | 03:15 |
| → tristanp joined | 03:16 |
| ← miczac left | 03:17 |
| → Vortex34 joined | 03:18 |
| ← tristanp left | 03:18 |
| ← ozmage left | 03:19 |
| → Vinnie_win_d joined | 03:20 |
| ← Vinnie_win left | 03:21 |
| → cdg_ joined | 03:21 |
| ← reconx86_ left | 03:23 |
| ← jagobdue left | 03:23 |
| → reconx86 joined | 03:23 |
| ← cdg left | 03:23 |
| → rogerraymond joined | 03:24 |
| ← roger_raymond left | 03:24 |
| → tristanp joined | 03:25 |
| ← hexagoxel left | 03:25 |
| → cceckman joined | 03:25 |
| → Vinnie_win joined | 03:26 |
| ← reconx86 left | 03:26 |
| ← chachasmooth left | 03:26 |
| → reconx86 joined | 03:27 |
| ← fstd left | 03:28 |
| → fstd_ joined | 03:28 |
| fstd_ → fstd | 03:28 |
| ← unbalancedparen left | 03:29 |
| ← Vinnie_win_d left | 03:29 |
|
cceckman
| Greetings, qq: I have two repositories, X and Y. Y is a submodule of X. User A doesn't have (direct) access to Y, but does have access to X. Do they continue to not have access to Y, i.e. their submodule fetch will fail? | 03:29 |
| → chachasmooth joined | 03:29 |
| ← knigitz left | 03:30 |
| → hexagoxel joined | 03:30 |
| ← tristanp left | 03:32 |
|
carpii
| yes, submodules are seperate repo's, so they need permission to those too | 03:33 |
|
| and if not, then submodule fetch will fail | 03:33 |
| ← reconx86 left | 03:33 |
| ← jimi_ left | 03:33 |
| → reconx86 joined | 03:33 |
| → jimi_sanchez joined | 03:33 |
| → Ryanar joined | 03:34 |
| ← Ryanar left | 03:34 |
|
cceckman
| carpii: Great- thanks! | 03:34 |
|
carpii
| np | 03:34 |
|
cceckman
| Is this a typical pattern? Google turns up a couple of mentions of it. | 03:36 |
|
kadoban
| No, it sounds mostly useless. What use is a repo with submodules that other people won't have access to? | 03:36 |
|
cceckman
| kadoban: publish my configuration for (dotfiles, monitoring stack, etc.) but keep the specific login secrets (nickserv password, API keys, etc) separate | 03:37 |
|
carpii
| yeah i guess the only use cases are security related | 03:38 |
|
cceckman
| Since someone cloning it would need to branch anyway | 03:38 |
|
carpii
| but it renders the parent repo useless anyway so... | 03:38 |
| ← jameser left | 03:38 |
|
carpii
| may aswell deny access to that too | 03:38 |
|
cceckman
| carpii: Eh, useless for cloning maybe, not for reference altogether, I'd say | 03:39 |
| → AustinMatherne joined | 03:39 |
| → tristanp joined | 03:40 |
|
carpii
| well yeah true | 03:40 |
| ← cceckman left | 03:42 |
| ← tristanp left | 03:43 |
| → ismithers joined | 03:43 |
| → ankit01ojha joined | 03:45 |
| → justanotheruser joined | 03:47 |
| ← justan0theruser left | 03:47 |
| → pur3eval joined | 03:47 |
| → raijin joined | 03:48 |
| ← raijin left | 03:48 |
| → chipotle joined | 03:49 |
| ← pur3eval left | 03:52 |
| ← dcy left | 03:55 |
| → pumafied joined | 03:55 |
| ← pumafied left | 03:56 |
| → Emperor_Earth joined | 03:56 |
| → jameser joined | 03:58 |
| ← kruncher left | 04:01 |
| ← sunri5e left | 04:02 |
| ojacobson_ → ojacobson | 04:02 |
| → sunri5e joined | 04:03 |
| ← shgysk8zer0_ left | 04:05 |
| → Groovin joined | 04:10 |
| → GroovinDB joined | 04:10 |
| → JelmerD joined | 04:14 |
| ← cdg_ left | 04:16 |
| → slappymcfry joined | 04:18 |
| → mohabaks joined | 04:19 |
| → jeffspeff joined | 04:21 |
| → shinnya joined | 04:24 |
| ← jeffspeff left | 04:27 |
| → jeffspeff joined | 04:28 |
| ← jeffspeff left | 04:29 |
| → freezer joined | 04:31 |
| → Nilesh_ joined | 04:32 |
| ← Noldorin left | 04:34 |
| → Cabanoss- joined | 04:35 |
| ← freezer left | 04:35 |
| ← jameser left | 04:35 |
| ← pks left | 04:37 |
| → pks joined | 04:37 |
| ← Cabanossi left | 04:38 |
| Cabanoss- → Cabanossi | 04:38 |
| → UserOO7 joined | 04:39 |
| → shgysk8zer0_ joined | 04:41 |
| ← carpii left | 04:46 |
| ← endiruna left | 04:49 |
| → endiruna joined | 04:50 |
| ← UserOO7 left | 04:55 |
| → Puffball joined | 04:57 |
| ← arescorpio left | 04:59 |
| → jameser joined | 05:01 |
| ← chipotle left | 05:01 |
| → pur3eval joined | 05:03 |
| ← SwiftMatt left | 05:05 |
| ← pur3eval left | 05:08 |
| → dsdeiz joined | 05:08 |
| ← dsdeiz left | 05:08 |
| → dsdeiz joined | 05:08 |
| ← jameser left | 05:09 |
| ← mohabaks left | 05:10 |
| → safe joined | 05:11 |
| ← l4v2 left | 05:13 |
| → notebox joined | 05:13 |
| ← notebox left | 05:14 |
| ← durham left | 05:16 |
| ← cagmz left | 05:17 |
| ← GroovinDB left | 05:19 |
| → MattMaker joined | 05:20 |
| → kisonecat joined | 05:22 |
| → mohabaks joined | 05:24 |
| → hussam joined | 05:25 |
| ← MattMaker left | 05:26 |
| → durham joined | 05:27 |
| → MattMaker joined | 05:31 |
| ← MattMaker left | 05:33 |
| → MattMaker joined | 05:33 |
| → cbreak joined | 05:34 |
| → nd_ joined | 05:34 |
| → CIAguy- joined | 05:37 |
| ← nd left | 05:37 |
| ← MattMaker left | 05:38 |
| ← DolpheenDream left | 05:46 |
| ← eb0t left | 05:46 |
| → FiveBroDeepBook joined | 05:49 |
| → jameser joined | 05:50 |
| ← ankit01ojha left | 05:50 |
| ← Doginal left | 05:53 |
| ← jameser left | 05:54 |
| ← FiveBroDeepBook left | 05:54 |
| → datahead8888 joined | 05:54 |
| ← datahead8888 left | 05:56 |
| → datahead8888 joined | 05:56 |
| → snapfractalpop joined | 05:58 |
| → MattMaker joined | 05:59 |
|
snapfractalpop
| Anyone using this: https://github.com/github/gitignore/blob/master/Android.gitignore in Android Studio? | 05:59 |
| ← mohabaks left | 06:00 |
| ← jimi_sanchez left | 06:00 |
|
matsaman
| using other people's boilerplate .gitignore files (or indeed anything) seems problematic | 06:00 |
| → jagob joined | 06:03 |
| ← jagob left | 06:03 |
| → jeffspeff joined | 06:05 |
| → FiveBroDeepBook joined | 06:09 |
| → Guest9 joined | 06:11 |
| ← MattMaker left | 06:12 |
| → nuck joined | 06:13 |
| ← FiveBroDeepBook left | 06:14 |
| ← menip left | 06:14 |
| → kevr joined | 06:15 |
|
snapfractalpop
| matsaman: what's your solution? do you learn all the idiosyncracies of the IDE and manually create a gitignore each time? | 06:16 |
|
kevr
| so i was attempting to rebase -i so i could remove a commit from a merge, and i ended up just letting rebase merge everything over. how can i use git rebase -i to exclude specific commits? | 06:17 |
|
| is there an example somewhere of -i's content? | 06:17 |
|
snapfractalpop
| kevr: any reason not to revert? | 06:17 |
|
matsaman
| snapfractalpop: yup | 06:18 |
|
kevr
| i just did a git reset --hard to a good commit before the extras | 06:18 |
|
matsaman
| also if something requires that many special overrides, I want to know it does | 06:18 |
|
kevr
| snapfractalpop: but i want to basically merge another branch onto master, but i wanna exclude some commits from the other branch | 06:19 |
|
| google said this is possible with git rebase -i | 06:19 |
| → pur3eval joined | 06:19 |
|
snapfractalpop
| matsaman: hm.. I'm debating this because I still haven't decided whether IDE things belong in the git history for my android projects | 06:19 |
|
| kevr: revert is different from reset | 06:19 |
|
| it keeps the history, IIRC | 06:19 |
|
matsaman
| snapfractalpop: I think it'll be unlikely anything to do with your local IDE won't have local user specific paths and strings within them | 06:20 |
|
| ideally such things would not even be under your git, IMO | 06:20 |
|
| to need to be ignored in the first place | 06:20 |
|
snapfractalpop
| matsaman: true.. but I can't be totally sure, since I'm not 100% familiar with AS | 06:21 |
|
kevr
| snapfractalpop: oh, i see, well that's fine, i just removed the history from master, i still have it on the other branch | 06:21 |
|
snapfractalpop
| matsaman: also, there can be binary assets created in the build process, etc. | 06:21 |
|
| matsaman shrugs | 06:21 |
|
matsaman
| it's not personal, but I trust what I know, not what others tell me | 06:22 |
|
snapfractalpop
| matsaman: my concern is that I don't know what all should / shouldn't be included as best practice | 06:22 |
|
matsaman
| well there's no harm looking at what people include | 06:22 |
|
| I just wouldn't substitute it wholesale with learning what to include for yourself | 06:22 |
|
snapfractalpop
| I know that not *everything* should be included.. and some tutorials keep using "git add ." or "git add -a" which in my case is wrong for sure | 06:23 |
|
matsaman
| a lot of people do that, they substitute other people's choices; I find that problematic =D | 06:23 |
| ← pur3eval left | 06:23 |
|
kevr
| great, i just rebased and completely removed a commit that i wanted to keep | 06:24 |
|
| ugh | 06:24 |
|
snapfractalpop
| matsaman: yeah.. I'm thinking of more as a starting point, using a boilerplate .gitignore to see what particular directories the IDE shouldn't be versioning.. then researching further | 06:24 |
|
| kevr: it may still exist somewhere | 06:24 |
|
matsaman
| well what's nice is git will tell you all the new files | 06:24 |
| → acetakwas joined | 06:24 |
|
matsaman
| so it should be apparent what you will want to ignore | 06:24 |
|
| or not | 06:24 |
| ← nuck left | 06:25 |
|
matsaman
| as long as your first commit isn't after editing 80,000 files =P | 06:25 |
|
snapfractalpop
| matsaman: haha true | 06:25 |
| → MattMaker joined | 06:25 |
|
snapfractalpop
| btw, I use tig sometimes.. | 06:25 |
| → d4f4s joined | 06:25 |
|
matsaman
| tig seems pretty cool | 06:26 |
|
snapfractalpop
| quite handy little git tool | 06:26 |
|
| it helped me learn staging chunks and whatnot | 06:26 |
|
kevr
| it's not about excluding files | 06:27 |
|
| basically | 06:27 |
|
| say i have a master branch, and i wanna create a branch that has some custom files in it, so i commit a special commit on the new branch that says something like "Development files", and then i make a bunch of other commits on that branch, and i wanna merge everything into master _except_ for the commit for "Development files" | 06:28 |
|
| so i was trying to do that | 06:28 |
|
snapfractalpop
| kevr: the commit that you removed may still be present .. just don't do a clean | 06:28 |
|
kevr
| indeed | 06:28 |
|
| where would i get the commit from? | 06:28 |
|
| i dropped it in the rebase | 06:28 |
| → aavrug joined | 06:29 |
| → nuck joined | 06:29 |
|
snapfractalpop
| kevr: do you have the hash of the commit? | 06:29 |
| → MineCoins joined | 06:29 |
|
kevr
| no, git log didn't show the commit anymore, luckily the server still had the commit so i just pulled it back | 06:30 |
|
snapfractalpop
| git reflog? | 06:30 |
|
| ah.. nevermind then. | 06:30 |
|
kevr
| oh shit, what the fuck | 06:30 |
|
| it just duplicated a bunch of commits | 06:30 |
|
| T_T | 06:30 |
|
snapfractalpop
| kevr: you rebased.. so the state was different | 06:31 |
|
| if your server has the exact state you want, you can force pull | 06:31 |
|
| otherwise, the rebase you did locally will prevent a clean pull | 06:31 |
|
kevr
| well fuck | 06:31 |
|
| alright | 06:31 |
|
| thanks | 06:31 |
|
snapfractalpop
| also, if you didn't have the server, you may still have been able to find the "lost" commit with git reflog | 06:32 |
| ← Gsham left | 06:32 |
| ← acetakwas left | 06:36 |
| → acetakwas joined | 06:36 |
|
snapfractalpop
| also git fsck --lost-found | 06:38 |
| ← d4f4s left | 06:40 |
| ← shgysk8zer0_ left | 06:41 |
| ← leeN left | 06:43 |
| → Guest28675 joined | 06:44 |
| ← Guest28675 left | 06:46 |
| → _ng joined | 06:47 |
| ← acetakwas left | 06:49 |
| ← ffilozov left | 06:54 |
| ← matsaman left | 06:56 |
| → a3Dman joined | 06:58 |
| → vivu joined | 06:59 |
| ← dermoth left | 07:00 |
| → dermoth joined | 07:00 |
| ← rivarun left | 07:01 |
| → rivarun joined | 07:02 |
| → acetakwas joined | 07:03 |
| → dave0x6d joined | 07:03 |
| ← safe left | 07:04 |
| ← aavrug left | 07:05 |
| → MACscr joined | 07:09 |
| ← durham left | 07:11 |
| ← xlegoman left | 07:11 |
| ← acetakwas left | 07:14 |
| → acetakwas joined | 07:17 |
| → Electrometro joined | 07:25 |
| ← boombatower left | 07:25 |
| → clemf joined | 07:31 |
| ← jeffspeff left | 07:32 |
| → ronny joined | 07:36 |
| ← snapfractalpop left | 07:41 |
| ← acetakwas left | 07:43 |
| → Oatmeal joined | 07:47 |
| → Guest85 joined | 07:47 |
| → xbob joined | 07:49 |
| ← justanotheruser left | 07:50 |
| → aavrug joined | 07:53 |
| → Derperperd joined | 07:54 |
| → e01 joined | 07:56 |
| ← e01 left | 07:56 |
| → e01 joined | 07:56 |
| ← aavrug left | 07:59 |
| → m4sk1n joined | 07:59 |
| → pur3eval joined | 08:08 |
| ← madewokherd left | 08:10 |
| ← pur3eval left | 08:12 |
| ← robattila256 left | 08:13 |
| → Murii joined | 08:25 |
| → afuentes joined | 08:33 |
| → theoceaniscool joined | 08:35 |
| ← rgrinberg left | 08:35 |
| → Ardethian joined | 08:36 |
| ← Hink left | 08:39 |
| → thinkpad joined | 08:40 |
| ← thiago left | 08:42 |
| → WayToDoor joined | 08:44 |
| ← theoceaniscool left | 08:44 |
| ← Derperperd left | 08:49 |
| ← dreiss left | 08:50 |
| ← thinkpad left | 08:53 |
| → Hink joined | 08:54 |
| → thinkpad joined | 08:55 |
| ← clemf left | 08:58 |
| ← Hink left | 09:01 |
| → _main_ joined | 09:01 |
| ← _main_ left | 09:01 |
| ← __main__ left | 09:02 |
| → _main_ joined | 09:02 |
| → Hink joined | 09:02 |
| ← Goplat left | 09:03 |
| ← _main_ left | 09:03 |
| → glebihan joined | 09:04 |
| → __main__ joined | 09:04 |
| → jameser joined | 09:05 |
| ← a3Dman left | 09:07 |
| ← jameser left | 09:09 |
| → DBag joined | 09:12 |
| ← dave0x6d left | 09:15 |
| → govg joined | 09:15 |
| → robotroll joined | 09:18 |
| ← WayToDoor left | 09:19 |
| → dersand joined | 09:19 |
| ← thinkpad left | 09:20 |
| ← e01 left | 09:27 |
|
d1z
| hello | 09:27 |
| → xmajedz joined | 09:32 |
|
xmajedz
| git commit suicide | 09:32 |
| → venmx joined | 09:33 |
| → j7k6 joined | 09:38 |
| → thinkpad joined | 09:40 |
| → mohabaks joined | 09:41 |
| → Ozymandy joined | 09:41 |
| ← thinkpad left | 09:41 |
| ← metachr0n left | 09:43 |
|
d1z
| I have a git repository that I'm constantly working on (laptop), and I want it to be cloneable from my vps. I've already set the git user in my system, added a public key for the vps and proceeded to attempt a git clone (the server cloning my local git repo) via git clone [email@hidden.address] however I get a fatal error, make sure the repository exists | 09:43 |
| → metachr0n joined | 09:44 |
| → thinkpad joined | 09:45 |
| → Derperperd joined | 09:46 |
|
d1z
| bah | 09:47 |
|
| it was a dumb mistake, I was actually doing [email@hidden.address] and I was getting the error that :PORT:/srv/git/myproject.git didn't exist... ofc | 09:48 |
| ← Derperperd left | 09:51 |
| ← thinkpad left | 09:52 |
| ← pks left | 09:53 |
| → YuGiOhJCJ joined | 09:54 |
| ← mohabaks left | 09:54 |
| → pur3eval joined | 09:56 |
| → thinkpad joined | 09:57 |
| → a3Dman joined | 09:58 |
| → cris_ joined | 09:58 |
| ← pur3eval left | 10:01 |
| ← DBag left | 10:06 |
| ← robotroll left | 10:07 |
| ← Oatmeal left | 10:11 |
| ← Wulf left | 10:15 |
| → Wulf joined | 10:17 |
| ← m4sk1n left | 10:17 |
| → synthmeat joined | 10:23 |
| → m4sk1n joined | 10:23 |
| → catsup joined | 10:24 |
| ← shinnya left | 10:24 |
| ← catsup left | 10:24 |
| → catsup joined | 10:24 |
| → jimi_ joined | 10:25 |
| ← jimi_ left | 10:25 |
| → jimi_ joined | 10:25 |
| ← a3Dman left | 10:32 |
| → miczac joined | 10:33 |
| gitinfo set mode: +v | 10:33 |
| ← j7k6 left | 10:35 |
| → pbrewczynski joined | 10:36 |
| ← afuentes left | 10:37 |
| → flavius joined | 10:38 |
| → a3Dman joined | 10:39 |
| → DBag joined | 10:39 |
| → jimi_sanchez joined | 10:40 |
| ← jimi_ left | 10:42 |
| ← xmajedz left | 10:42 |
| ← cris_ left | 10:46 |
| → cris_ joined | 10:46 |
| → Hudu joined | 10:46 |
| → mohabaks joined | 10:46 |
| ← cris_ left | 10:47 |
| ← govg left | 10:47 |
|
d1z
| is it possible to clone the git with working index as well? I mean the changes that haven't been commited | 10:47 |
| ← Hudu left | 10:48 |
| → vivuroy joined | 10:52 |
|
_ikke_
| nope | 10:53 |
| → King_Hual joined | 10:54 |
| ← vivu left | 10:55 |
| ← LiftLeft left | 10:55 |
| → CheckDavid joined | 10:55 |
| ← vivuroy left | 10:57 |
| → leeN joined | 10:58 |
| → vivuroy joined | 11:01 |
| → govg joined | 11:03 |
| ← vivuroy left | 11:06 |
| → vivuroy joined | 11:06 |
| → DDBag joined | 11:06 |
| ← DBag left | 11:09 |
| → Limes joined | 11:14 |
| → Derperperd joined | 11:16 |
| → jnavila joined | 11:17 |
| → eroux joined | 11:17 |
| → j7k6 joined | 11:19 |
| ← mehola left | 11:19 |
| → pks joined | 11:19 |
| → mehola joined | 11:19 |
| ← pks left | 11:19 |
| ← mehola left | 11:20 |
| → c0c0 joined | 11:20 |
| → pks joined | 11:21 |
| ← Derperperd left | 11:21 |
| ← pks left | 11:22 |
| → tmk joined | 11:22 |
| → pks joined | 11:23 |
| ← pks left | 11:24 |
| → pks joined | 11:24 |
| ← pks left | 11:24 |
| → pks joined | 11:25 |
| ← pks left | 11:26 |
| ← vivuroy left | 11:26 |
| → pks joined | 11:26 |
| → vivuroy joined | 11:27 |
| ← Bizkit left | 11:29 |
| → elsevero joined | 11:29 |
| → KAAM2NX joined | 11:30 |
| ← diogenese left | 11:31 |
| → diogenese joined | 11:33 |
| ← cyphaw left | 11:33 |
| ← govg left | 11:33 |
| ← Wulf left | 11:34 |
| ← j7k6 left | 11:35 |
|
flavius
| d1z: Clone or merge? | 11:37 |
| → mrBen2k2k2k joined | 11:38 |
|
flavius
| Your question doesn't make sense, if you have "an index", you've already cloned it | 11:38 |
| → mikecmpbll joined | 11:38 |
|
d1z
| flavius: sorry I meant the stage | 11:40 |
| ← jnavila left | 11:40 |
|
d1z
| the actual file changes that haven't been commited, but are present at file system level | 11:40 |
|
flavius
| d1z: so your question is then: is it possible to merge, while having something on the stage? | 11:41 |
|
| not clone, merge | 11:41 |
| ← Limes left | 11:42 |
| → j7k6 joined | 11:43 |
| → pur3eval joined | 11:45 |
| ← mohabaks left | 11:45 |
| → govg joined | 11:45 |
| ← blackwind_123 left | 11:46 |
| ← inflames left | 11:46 |
| → blackwind_123 joined | 11:46 |
| → apotry joined | 11:46 |
| → FiveBroDeepBook joined | 11:47 |
| → Jackneill_ joined | 11:48 |
| ← slappymcfry left | 11:48 |
| ← pur3eval left | 11:50 |
| ← FiveBroDeepBook left | 11:50 |
| → ChiLL_SurF joined | 11:50 |
| ← Ozymandy left | 11:52 |
| → ertesx joined | 11:53 |
| → dbl4k joined | 11:54 |
| → notebox joined | 11:54 |
| ← elsevero left | 11:56 |
| → FiveBroDeepBook joined | 11:57 |
| ← ertes left | 11:57 |
| ertesx → ertes | 11:57 |
| → cojack joined | 11:57 |
| → acetakwas joined | 11:57 |
|
cojack
| hello guys, I have a simple question about git alias, im creating new alias like: git config --global alias.bump '!bump_version', where bump_version is function from external file included as: ~/.oh-my-zsh/custom/scripts/git/bump_version.sh and body of this function is here: https://gist.github.com/cojack/8347bd679f82997ebce65ab44e7b1fe4 could some one explain me why after reload zsh I've got an error like: fatal: While expanding alias 'bump': | 11:59 |
|
| 'bump_version': No such file or directory. Thanks in advance | 11:59 |
| ← apotry left | 11:59 |
| → apotry joined | 12:00 |
| → jmd joined | 12:04 |
|
jmd
| How do I do a git bisect across a merge ? | 12:04 |
| → jozwior joined | 12:04 |
| ← FiveBroDeepBook left | 12:07 |
|
d1z
| flavius: uhm, I don't know if that is exactly equivalent,. Basically I have a remote vps where I do the tests. And I have a repo in my laptop and at github. I'm trying to upload code from my laptop to the vps without actually having to commit the changes into the history (sometimes), so I need a setup where git helps upload even the workspace itself, but without copying the entire directory to a remote instead | 12:09 |
|
| (via scp), as that also brings all the files that are gitignored whilst doing it somehow with git allows me to upload just the changes to the files | 12:09 |
| → jameser joined | 12:09 |
| → borkr joined | 12:10 |
|
d1z
| that are part of the git project. doing it outside git would have to be full of --ignores of files because there are many very well sized files inside the directory of the repo that cannot be constantly pulled up towards the server | 12:11 |
| → m0viefreak joined | 12:11 |
| → robotroll joined | 12:11 |
|
d1z
| s/pulled up/uploaded | 12:12 |
| ← j7k6 left | 12:12 |
| ← cagedwisdom left | 12:14 |
| ← Vinnie_win left | 12:15 |
| ← govg left | 12:19 |
| → mehola joined | 12:20 |
| ← jameser left | 12:23 |
| → sbulage joined | 12:24 |
| ← mehola left | 12:26 |
| → jottr joined | 12:26 |
| → govg joined | 12:27 |
| → j7k6 joined | 12:28 |
| → Wulf joined | 12:29 |
| → Limes joined | 12:30 |
| → efeuska joined | 12:31 |
| → DDDBag joined | 12:33 |
| → tibi77 joined | 12:33 |
| → afuentes joined | 12:34 |
| → inflames joined | 12:34 |
| ← DDBag left | 12:36 |
| ← j7k6 left | 12:36 |
| ← jozwior left | 12:36 |
| → Glooomy joined | 12:38 |
| → nettoweb joined | 12:38 |
| ← tibi77 left | 12:41 |
| → tibi771 joined | 12:41 |
| → mischat joined | 12:41 |
| ← notebox left | 12:43 |
| ← eroux left | 12:45 |
| ← mischat left | 12:46 |
| → nostrora joined | 12:47 |
| ← zzz left | 12:48 |
| → jnavila joined | 12:48 |
| ← vivuroy left | 12:49 |
| → ankit01ojha joined | 12:50 |
| → santagada joined | 12:51 |
| ← tibi771 left | 12:52 |
| ← jmd left | 12:53 |
| ← askb left | 12:57 |
| ← tmk left | 12:58 |
| → zzz joined | 12:58 |
| → jottr_ joined | 13:00 |
| → tmk joined | 13:00 |
| ← d1z left | 13:03 |
| ← jottr left | 13:03 |
| → cdg joined | 13:03 |
| → notebox joined | 13:05 |
| → vivuroy joined | 13:07 |
| ← miczac left | 13:08 |
| ← inflames left | 13:09 |
| ← mikecmpbll left | 13:09 |
| ← xbob left | 13:10 |
| ← zzz left | 13:10 |
| → manuelschneid3r joined | 13:11 |
| ← nostrora left | 13:14 |
| → jottr joined | 13:16 |
| → miczac joined | 13:16 |
| gitinfo set mode: +v | 13:17 |
| ← jottr left | 13:18 |
| → Balliad joined | 13:18 |
| ← jottr_ left | 13:18 |
| → WayToDoor joined | 13:19 |
| → d1z joined | 13:21 |
| ← govg left | 13:22 |
| → basiclaser joined | 13:23 |
| → dviola joined | 13:23 |
| → jameser joined | 13:24 |
| ← WayToDoor left | 13:25 |
| ← cdg left | 13:26 |
| ← nettoweb left | 13:27 |
| ← jameser left | 13:27 |
| → WayToDoor joined | 13:28 |
| ← jimi_sanchez left | 13:31 |
| → nostrora joined | 13:32 |
| → Tobbi joined | 13:32 |
| → pur3eval joined | 13:34 |
| ← jnavila left | 13:38 |
| ← manuelschneid3r left | 13:38 |
| → e01 joined | 13:39 |
| ← pur3eval left | 13:39 |
| → satifant joined | 13:40 |
| → mischat joined | 13:42 |
| ← Balliad left | 13:42 |
| ← WayToDoor left | 13:43 |
| ← cojack left | 13:44 |
| ← tmk left | 13:44 |
| → manuelschneid3r joined | 13:45 |
| ← mischat left | 13:46 |
| → mischat joined | 13:46 |
| → yqt joined | 13:47 |
| → jameser joined | 13:47 |
| → WayToDoor joined | 13:48 |
| → narendraj9 joined | 13:48 |
| ← narendraj9 left | 13:52 |
| → j7k6 joined | 13:53 |
| ← _ng left | 13:56 |
| ← Limes left | 13:58 |
| ← WayToDoor left | 13:59 |
| → xmajedz joined | 13:59 |
| ← jameser left | 14:02 |
| → re1 joined | 14:02 |
| → cdg joined | 14:03 |
| → t0by joined | 14:04 |
| ← t0by left | 14:04 |
| → t0by joined | 14:04 |
| → Gsham joined | 14:04 |
| ← j7k6 left | 14:05 |
| → DBag joined | 14:07 |
| → j7k6 joined | 14:08 |
| ← DDDBag left | 14:08 |
| ← dsdeiz left | 14:10 |
| → Vampire0_ joined | 14:10 |
| ← NullableTruth left | 14:10 |
| → NullableTruth joined | 14:11 |
| ← Vampire0 left | 14:11 |
| ← j7k6 left | 14:13 |
| → Vampire0 joined | 14:14 |
| → xbob joined | 14:14 |
| ← Vampire0_ left | 14:14 |
| → Ranmaru joined | 14:15 |
| → jameser joined | 14:15 |
| → xlegoman joined | 14:16 |
| ← jameser left | 14:18 |
| ← mischat left | 14:18 |
| → cs_shadow joined | 14:19 |
| ← nostrora left | 14:20 |
| → nostrora joined | 14:21 |
| ← nostrora left | 14:21 |
| → rostam joined | 14:22 |
| → jameser joined | 14:22 |
|
rostam
| Hi git question. I have a git repo with two branch (master, DEMO1). If in one branh (master) I use git reset head (need to do this to sync with remote github) when I want to switch the other branch (DEMO), I get complains: error: your local changes to the following files would be overwitten by checkout. How can I manage this please? | 14:23 |
| ← jameser left | 14:24 |
| ← snits left | 14:25 |
|
_ikke_
| rostam: git reset HEAD would not do very much (except for untaging staged changes) | 14:25 |
|
| What command are you executing precisely? | 14:25 |
| ← xmajedz left | 14:27 |
|
rostam
| _ikke_, git reset <commit id> | 14:27 |
| ← eizua left | 14:29 |
| ← Tobbi left | 14:32 |
|
rostam
| _ikke_, my git repo is a local clone of remote git repository (github). I have done some changes to my local file system, which is not needed to push to remote git. So I created a branch and reset the maser branch to the point without those changes in order to pull from remote git. | 14:32 |
| ← e01 left | 14:32 |
| → e01 joined | 14:33 |
| ← e01 left | 14:33 |
| → e01 joined | 14:33 |
| → byte512 joined | 14:34 |
| → _ng joined | 14:35 |
| ← sunri5e left | 14:35 |
| ← e01 left | 14:37 |
| → sunri5e joined | 14:38 |
| → Vampire0_ joined | 14:38 |
| ← Vampire0 left | 14:39 |
| ← dviola left | 14:43 |
| ← Murii left | 14:43 |
| → Murii joined | 14:44 |
| → theoceaniscool joined | 14:45 |
| → dave0x6d joined | 14:46 |
| → jimi_ joined | 14:46 |
| → khisanth_ joined | 14:46 |
| → dviola joined | 14:48 |
| → e01 joined | 14:48 |
| ← _ng left | 14:54 |
| ← Murii left | 14:54 |
| → Murii joined | 14:55 |
| → Bizkit joined | 14:55 |
| → danielmahon joined | 14:55 |
|
_ikke_
| rostam: right, git reset <commit> only resets where the current branch points to (and the index), but not the working tree | 14:57 |
| → Tobbi joined | 14:58 |
|
rostam
| _ikke_, how can I push selectively to uppers stream, by that I mean some of my local changes I don't wish to push upsream? thanks | 14:59 |
| → loopsmark joined | 15:02 |
| ← loopsmark left | 15:02 |
| → GavinMagnus joined | 15:02 |
| → govg joined | 15:02 |
| → loopsmark joined | 15:02 |
|
_ikke_
| rostam: commit them on a separate branch, or do not commit them at all | 15:02 |
| → Cogitabundus joined | 15:03 |
| ← Cogitabundus left | 15:03 |
| ← raynold left | 15:04 |
| → raijin joined | 15:04 |
| ← borkr left | 15:05 |
| gitinfo set mode: +v | 15:06 |
|
loopsmark
| Hi, one question, I don't know if my problem is the workflow or my knowledge, we work in modularized software, and we use branches for each module, then when the module changes are ok we do a merge request to the master | 15:06 |
| → Vampire0 joined | 15:06 |
|
loopsmark
| the problem is, when people are working on his module (branch) and the master moves ahead, this could be 100 of commits irrelevant to the module, we do a rebase from master, but that leaves every branch full of commits that are not relevant to the module | 15:06 |
| ← Vampire0_ left | 15:07 |
|
loopsmark
| is there a way to keep the log clean? is the best solution to actually create a master for each module? | 15:07 |
|
nedbat
| loopsmark: sounds like you'd be better off with a separate repo for each module | 15:08 |
| ← nicoulaj left | 15:08 |
| ← DBag left | 15:09 |
| ← YuGiOhJCJ left | 15:09 |
| → nicoulaj joined | 15:09 |
|
loopsmark
| nedbat: yes, this is what I though | 15:09 |
|
| thought* | 15:09 |
| ← ankit01ojha left | 15:10 |
|
rostam
| _ikke_, thanks | 15:11 |
|
loopsmark
| but this means a bit of overhead of keeping track of all the repos | 15:11 |
|
nedbat
| loopsmark: yes | 15:12 |
| → _ng joined | 15:13 |
| ← d1z left | 15:13 |
| → justanotheruser joined | 15:14 |
|
loopsmark
| because I was also thinking if there was a possibility to make a branch in a way that only keep track of specific files while it keeps the other at a main repo level | 15:14 |
| ← miczac left | 15:17 |
| → mischat joined | 15:19 |
| ← Tobbi left | 15:19 |
|
loopsmark
| but maybe that doesn't make sense at all | 15:20 |
| → miczac joined | 15:20 |
| → dsdeiz joined | 15:21 |
| gitinfo set mode: +v | 15:21 |
| → cdg_ joined | 15:22 |
| → pur3eval joined | 15:23 |
| ← notebox left | 15:24 |
| → SwiftMatt joined | 15:24 |
| ← mischat left | 15:24 |
| ← cdg left | 15:24 |
| → robattila256 joined | 15:25 |
| → notebox joined | 15:25 |
| → Gravious joined | 15:26 |
|
Gravious
| hi | 15:26 |
|
gitinfo
| Gravious: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 15:26 |
| → Kulrak joined | 15:26 |
| ← Kulrak left | 15:26 |
| → Kulrak joined | 15:26 |
| ← dsdeiz left | 15:26 |
|
Gravious
| wow nice thanks gitinfo :D | 15:26 |
|
gitinfo
| Gravious: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 15:26 |
|
Gravious
| ok! | 15:26 |
|
| why do some git commands return an exit code of 128? | 15:27 |
| ← Guest9 left | 15:27 |
|
moritz
| example? | 15:27 |
|
Gravious
| according to http://www.tldp.org/LDP/abs/html/exitcodes.html this is reserved for invalid arg to exit | 15:27 |
|
| moritz, here, http://git.baserock.org/cgit/delta/git.git/tree/builtin/apply.c#n29 | 15:27 |
| ← pur3eval left | 15:28 |
|
moritz
| Gravious: sounds about right | 15:29 |
|
Gravious
| seems pretty deliberate that they're returning 128 there, so i wondered if there's maybe some obscure reason for it | 15:29 |
| → d1z joined | 15:30 |
| → shgysk8zer0_ joined | 15:31 |
| → DBag joined | 15:32 |
|
moritz
| Gravious: the documentation you've found refers to bash's built-in exit() function, not to the C exit function | 15:32 |
|
Gravious
| this is true | 15:32 |
|
| but still, it seems that perhaps it's not the best choice of exit code? | 15:33 |
| ← kaldoran left | 15:33 |
|
moritz
| dunno | 15:34 |
| ← efeuska left | 15:35 |
| → kaldoran joined | 15:36 |
| → tmk joined | 15:38 |
| → dcy joined | 15:39 |
| → grayjoc joined | 15:39 |
| → j7k6 joined | 15:41 |
| → Levex joined | 15:44 |
| ← alexandre9099 left | 15:45 |
| ← sbulage left | 15:46 |
|
nedbat
| Gravious: why do you mind that error code? | 15:47 |
| ← j7k6 left | 15:47 |
| ← santagada left | 15:47 |
|
Gravious
| because in bash it's ambiguous | 15:47 |
|
| nedbat, http://www.tldp.org/LDP/abs/html/exitcodes.html | 15:47 |
|
nedbat
| Gravious: as moritz said, that's just saying what the exit builtin will return. | 15:48 |
|
| Gravious: it has no bearing on other commands | 15:49 |
|
Gravious
| so now i have to know what something was implemented in to interpret the exit code? | 15:49 |
|
moritz
| Gravious: there's no global convention that you can rely on for exit code meaning, ecept 0 == success, 1 == some sort of error/failure | 15:50 |
| → sgen joined | 15:50 |
|
moritz
| erm, != 0 implies some sort of error/failure | 15:50 |
|
Gravious
| if it's ok to return 128 why not start returning 139 which is what bash will give you if a program segfaults? | 15:51 |
| ← jimi_ left | 15:51 |
| → Tobbi joined | 15:51 |
|
moritz
| Gravious: if you care so deeply, make a pull request that changes the exit code to something that you find more tasteful. It's likely that it'll either be merged, or somebody explains why it's like it is right now | 15:52 |
|
| Gravious nods | 15:52 |
|
nedbat
| Gravious: there is not a strong convention for the meaning of status codes across applications. | 15:52 |
|
Gravious
| okay cool, i'll make a patch :) | 15:52 |
|
| nedbat, sure but we may as well at least *try* :) | 15:52 |
|
moritz
| but I find that fascination with a simple number in a pretty big code base quite puzzling | 15:52 |
|
nedbat
| Gravious: i agree that uniform status codes would be better, and hardcoded 128 seems strange. | 15:53 |
|
Gravious
| moritz, i just happened across it is all, and some of us were surprised by a return value of 128 | 15:53 |
| → souther joined | 15:53 |
| ← theoceaniscool left | 15:55 |
| → jnavila joined | 15:56 |
| → SteffanW joined | 15:58 |
| → cojack joined | 15:59 |
| ← raijin left | 16:00 |
| ← MineCoins left | 16:00 |
| → MineCoins joined | 16:01 |
| → _sfiguser joined | 16:02 |
|
_sfiguser
| hello all, a question about merge management... | 16:03 |
|
| if i'm working on a git repo, i just downloaded it... then i work and make some modifications... then i want to merge with a remote branch ... but at this point another one has already modified the branch, how should i manage ? | 16:04 |
| ← diogenese left | 16:06 |
| ← pbrewczynski left | 16:06 |
| ← venmx left | 16:07 |
|
moritz
| _sfiguser: that depends on the upstream branch; some prefer that you merge the changes, others that you rebase | 16:08 |
|
| *upstream project | 16:08 |
| → madewokherd joined | 16:10 |
|
_sfiguser
| moritz, but if we rebase we lose the changes made by someone else... | 16:10 |
| ← SteffanW left | 16:11 |
|
moritz
| _sfiguser: a rebase generally doesn't lose any changes, you just have to be careful with tracking meta data when multiple people work on the same branch | 16:11 |
| → cagomez joined | 16:11 |
| ← re1 left | 16:14 |
|
osse
| st. moritz | 16:15 |
| ← cojack left | 16:15 |
| ← cagomez left | 16:16 |
|
osse
| _sfiguser: And after cloning you use fetch to update the remote branches later | 16:16 |
| → FiveBroDeepBook joined | 16:17 |
| → mischat joined | 16:20 |
| ← Levex left | 16:21 |
|
_sfiguser
| ok guys but should i use rebase or merge ? | 16:21 |
|
^7heo
| Either or | 16:22 |
|
moritz
| _sfiguser: ask the developers of the upstream project what they prefer | 16:22 |
| → mehola joined | 16:22 |
| → j7k6 joined | 16:23 |
| → pur3eval joined | 16:23 |
| ← dcy left | 16:23 |
| ← ThunderChicken left | 16:24 |
| ← mischat left | 16:25 |
| → ThunderChicken joined | 16:25 |
| → diogenese joined | 16:26 |
| ← Gsham left | 16:26 |
| ← wrouesnel1 left | 16:26 |
| → efeuska joined | 16:26 |
| ← jnavila left | 16:27 |
| ← pur3eval left | 16:28 |
| ← mehola left | 16:28 |
| → Limes joined | 16:31 |
| ← grayjoc left | 16:31 |
| ← FiveBroDeepBook left | 16:32 |
| ← Wulf left | 16:32 |
| → Levex joined | 16:34 |
| → Wulf joined | 16:34 |
| ← Bizkit left | 16:34 |
| → skinkitten joined | 16:36 |
| → skinkitten_ joined | 16:36 |
| → arnoldoree joined | 16:36 |
|
_sfiguser
| hello all i have a github account and working on my project... i want another user to be allowed to push to my repo... how can i do this ? | 16:36 |
| → TomyLobo joined | 16:37 |
| → prg318 joined | 16:39 |
|
moritz
| _sfiguser: in the github web interface: settings -> Collaborators | 16:41 |
| → Guest9 joined | 16:41 |
| → ash_workz joined | 16:42 |
| → Gsham joined | 16:44 |
| ← d1z left | 16:44 |
| → noteness joined | 16:45 |
|
_sfiguser
| moritz once i do a git pull, how can i fix conflicts ? | 16:45 |
| ← cs_shadow left | 16:46 |
| → FiveBroDeepBook joined | 16:46 |
| ← FiveBroDeepBook left | 16:46 |
|
moritz
| _sfiguser: !conflict | 16:46 |
|
gitinfo
| _sfiguser: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II | 16:46 |
| → [Brain] joined | 16:54 |
| → mikecmpbll joined | 16:55 |
| ← mda1 left | 16:56 |
| → mda1_ joined | 16:56 |
| ← tmk left | 16:57 |
| → Brain joined | 16:58 |
| → FiveBroDeepBook joined | 16:59 |
| → Bizkit joined | 17:00 |
| ← FiveBroDeepBook left | 17:00 |
| → mda1 joined | 17:01 |
| ← [Brain] left | 17:02 |
| ← mda1_ left | 17:03 |
| ← cdg_ left | 17:03 |
| ← Levex left | 17:09 |
| → JanC_ joined | 17:10 |
| JanC → Guest86017 | 17:10 |
| ← Guest86017 left | 17:10 |
| JanC_ → JanC | 17:10 |
| → Levex joined | 17:11 |
| → muldover joined | 17:12 |
| ← muldover left | 17:12 |
| → muldover joined | 17:13 |
| ← muldover left | 17:13 |
| → muldover joined | 17:14 |
| ← muldover left | 17:14 |
| ← PioneerAxon left | 17:14 |
| → Jellyg00se joined | 17:15 |
| → muldover joined | 17:16 |
| ← muldover left | 17:16 |
| → IntruderSRB joined | 17:19 |
| → PioneerAxon joined | 17:19 |
| → mischat joined | 17:21 |
| → muldover01 joined | 17:23 |
| ← muldover01 left | 17:23 |
| → nowhereman joined | 17:24 |
| ← PioneerAxon left | 17:24 |
| ← DBag left | 17:24 |
| ← Jellyg00se left | 17:25 |
| ← sarri left | 17:25 |
| ← mischat left | 17:25 |
| ← xbob left | 17:26 |
| → navidr joined | 17:27 |
| → clemf joined | 17:28 |
| → PioneerAxon joined | 17:29 |
| → thiago joined | 17:30 |
| → Starky joined | 17:30 |
| → d1z joined | 17:33 |
| ← cyphase left | 17:33 |
| ← dyce[m] left | 17:33 |
| ← Remramm left | 17:34 |
| ← dikiaap left | 17:34 |
| ← j7k6 left | 17:34 |
| ← flo[m]1 left | 17:34 |
| → dreiss joined | 17:36 |
| ← jon-mac left | 17:36 |
| → jost_ joined | 17:37 |
| → cyphase joined | 17:38 |
| ← SwiftMatt left | 17:38 |
| → GT4066 joined | 17:38 |
| → nettoweb joined | 17:39 |
| ← jost__ left | 17:39 |
| ← Levex left | 17:41 |
| → Levex joined | 17:44 |
| ← dviola left | 17:44 |
| → vdv joined | 17:45 |
| → menip joined | 17:46 |
| ← BackEndCoder left | 17:46 |
| → halpmi joined | 17:48 |
| gitinfo set mode: +v | 17:48 |
| → BackEndCoder joined | 17:48 |
| → santagada joined | 17:49 |
| → djb-irc joined | 17:49 |
| → meZee joined | 17:50 |
|
halpmi
| is there a way to run a diff between a previous commit on the master branch (eg jd29dh3h) and the final commit on a separate branch? | 17:50 |
|
_ikke_
| halpmi: git diff master~ branchname | 17:50 |
|
halpmi
| hi _ikke_, thanks. what does the ~ represent? | 17:52 |
|
_ikke_
| The first 'ancestor' of the commit (ie, it's parent) | 17:52 |
| → jnavila joined | 17:52 |
|
_ikke_
| halpmi: see man gitrevisions | 17:53 |
|
gitinfo
| halpmi: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html | 17:53 |
| ← atomi left | 17:53 |
| → atomi joined | 17:54 |
| ← djb-irc left | 17:54 |
| ← d1z left | 17:56 |
| → rgrinberg joined | 17:57 |
|
halpmi
| _ikke_: got it, thanks again! | 17:57 |
| → YuGiOhJCJ joined | 18:00 |
| → DBag joined | 18:00 |
| → xall joined | 18:01 |
| → DDBag joined | 18:01 |
| ← ertes left | 18:03 |
| ← DBag left | 18:03 |
| ← mda1 left | 18:04 |
| ← loopsmark left | 18:05 |
| → cdown joined | 18:07 |
| → djb-irc joined | 18:07 |
| → mda1 joined | 18:08 |
| → pur3eval joined | 18:12 |
| → ozmage joined | 18:13 |
| ← pur3eval left | 18:17 |
| ← Nilesh_ left | 18:19 |
| → mischat joined | 18:21 |
| → j7k6 joined | 18:23 |
| ← halpmi left | 18:25 |
| → mehola joined | 18:26 |
| ← mischat left | 18:27 |
| ← Gsham left | 18:28 |
| ← Levex left | 18:29 |
| ← mehola left | 18:30 |
| → astrofog joined | 18:32 |
| → kasual joined | 18:32 |
| → raijin joined | 18:34 |
| → qguv joined | 18:35 |
| → jon-mac joined | 18:36 |
| → Noldorin joined | 18:36 |
| ← jnavila left | 18:37 |
| ← notebox left | 18:38 |
| ← skinkitten_ left | 18:39 |
| ← skinkitten left | 18:39 |
| → notebox joined | 18:40 |
| → phantombeta joined | 18:41 |
| ← PioneerAxon left | 18:41 |
| ← phantombeta left | 18:41 |
| → PioneerAxon joined | 18:46 |
| ← xall left | 18:47 |
| → Levex joined | 18:48 |
| ← notebox left | 18:52 |
| → Whiskey joined | 18:55 |
| ← raijin left | 18:56 |
| → notebox joined | 18:57 |
| → raijin joined | 18:57 |
| → mda1_ joined | 18:57 |
| → eb0t joined | 18:57 |
| → Derperperd joined | 18:57 |
| ← ozmage left | 18:59 |
| ← mda1 left | 18:59 |
| → Anonymous2016 joined | 19:00 |
|
Whiskey
| Hay everyone | 19:00 |
|
| I try to ignore folders in my gitignore but i don´t get it to work | 19:00 |
| ← nettoweb left | 19:01 |
| → cagomez joined | 19:01 |
|
Whiskey
| the folders are "Backup|Old|Deleted" and are in diffrent folders in the source | 19:01 |
|
rewt
| have they been committed already? | 19:01 |
|
Whiskey
| rewt i have just try to start use git so no not really, its just not start to ignore it when i do my first comment | 19:02 |
|
| i did try to ignore them whit "**/Backup/* | 19:02 |
|
rewt
| so in `git status`, they show under "Untracked files"? | 19:02 |
|
Whiskey
| well i don´t have that option i just don´t see it in my git status | 19:03 |
|
| but i guss thats the same | 19:03 |
|
| i have another thing i ignore that works and don´t show under git status so thats work | 19:03 |
|
rewt
| if they don't show up at all, then they're ignored | 19:04 |
|
Whiskey
| I told about others now | 19:04 |
|
| to just say how i see it | 19:04 |
|
rewt
| pastebin the output of `git status` | 19:04 |
|
Whiskey
| No i know what it does | 19:04 |
| ← cagomez left | 19:05 |
| → tmk joined | 19:05 |
|
rewt
| you're not being clear, so the easiest way to help is to see exactly what you see | 19:05 |
|
Whiskey
| but something i don´t know about is that i addded a new folder in my root directory of my git | 19:06 |
|
| "Test/Delete/testfile.something" and "git add -A" and "git status" don´t show it at all hmmm | 19:06 |
| → Sheogorath[m] joined | 19:07 |
|
Whiskey
| it just ignore the the "Delete" folder if it works right? and show test as empty folder | 19:07 |
|
| I don´t take images | 19:08 |
|
| upload it somewhere jesus | 19:08 |
|
rewt
| if it doesn't show in git status, it's ignored (or same as the committed version) | 19:09 |
|
Whiskey
| rewt, is it someway to make git always do git add -A automatic and always be indexed before a commit insted of do it manuall? | 19:10 |
|
| yeh it was ignored strange | 19:11 |
| ← e01 left | 19:11 |
| → e01 joined | 19:11 |
| ← e01 left | 19:11 |
| → e01 joined | 19:11 |
| ← ChiLL_SurF left | 19:13 |
| → pur3eval joined | 19:13 |
| ← tmk left | 19:15 |
| ← Anonymous2016 left | 19:15 |
| ← arnoldoree left | 19:16 |
| → tmk joined | 19:16 |
| → alexandre9099 joined | 19:16 |
| ← pur3eval left | 19:17 |
| → Gsham joined | 19:18 |
| → mohabaks joined | 19:19 |
| ← menip left | 19:19 |
| → blokeybloke joined | 19:22 |
| → Spuri0us joined | 19:22 |
| → sprremix joined | 19:22 |
| ← kasual left | 19:23 |
| → Somelauw joined | 19:24 |
|
Somelauw
| git doesn't respect locale, because doing git commit prints date as Feb 12 instead of printing the date normally. | 19:25 |
| → loopsmark joined | 19:26 |
| ← e01 left | 19:26 |
| ← Timvde left | 19:26 |
| → e01 joined | 19:27 |
| ← e01 left | 19:27 |
| → e01 joined | 19:27 |
| → elijah joined | 19:27 |
| → peterR`` joined | 19:27 |
| → d1z joined | 19:28 |
| → LiftLeft joined | 19:28 |
|
peterR``
| can you work on two "experimental" branches at the same time and switch between then with wild abandon? | 19:28 |
| ← j7k6 left | 19:28 |
| → Timvde joined | 19:28 |
| ← e01 left | 19:29 |
|
Hello71
| peterR``: why not | 19:29 |
|
nedbat
| peterR``: it be better to switch between them with discipline and care, but sure. | 19:29 |
| → e01 joined | 19:29 |
| ← e01 left | 19:29 |
| → e01 joined | 19:29 |
|
peterR``
| lol, OK | 19:29 |
|
| but is it just one command to switch? | 19:29 |
|
Hello71
| git checkout | 19:30 |
|
nedbat
| peterR``: you have to commit your changes if you are changing files. | 19:30 |
| ← loopsmark left | 19:30 |
|
peterR``
| oh | 19:30 |
|
| so you can't have two branches with uncommitted changes right? | 19:30 |
| ← matoro left | 19:31 |
|
Hello71
| you can't put "uncommited changes" on a branch | 19:31 |
|
| branches hold commits (sort of) | 19:31 |
|
rewt
| or stash them temporarily | 19:31 |
|
Hello71
| that's not really a good example of something wrong with what I said | 19:32 |
|
rewt
| yeah, misread the can't for can | 19:32 |
|
Hello71
| it's that you can put a commit on multiple branches, and branches technically only *point* to cmmits | 19:32 |
|
| I see. | 19:32 |
|
peterR``
| OK, I see | 19:32 |
|
| thanks | 19:32 |
| ← BlessJah left | 19:32 |
|
Hello71
| you can use git stash to make a "temporary commit" | 19:32 |
|
Whiskey
| How do i remove a commit=? | 19:32 |
|
Hello71
| which is stored on a sort of 'git stash branch' | 19:33 |
|
| (in this context) | 19:33 |
|
| !undo | 19:33 |
|
gitinfo
| [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 19:33 |
| → SwiftMatt joined | 19:33 |
| ← raijin left | 19:33 |
| → dviola joined | 19:33 |
|
peterR``
| I will just commit - I just didn't know what I was doing :) | 19:33 |
|
Whiskey
| like if i do "git commit -a -m "some commit" and then need to remove it | 19:34 |
|
| most be a easy way to remove last commit | 19:34 |
|
Hello71
| git reset HEAD^ | 19:35 |
| ← SwiftMatt left | 19:35 |
|
Whiskey
| but is it always first commit that be deleted if lets say i have made 5 | 19:35 |
|
| git revert commit-id maybe? | 19:36 |
|
Hello71
| !undo | 19:37 |
|
gitinfo
| [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 19:37 |
| → j7k6 joined | 19:37 |
| → stevenbenner joined | 19:37 |
| → danemacmillan joined | 19:38 |
| ← Vgr left | 19:38 |
| → WayToDoor joined | 19:39 |
| ← mohabaks left | 19:39 |
| ← mda1_ left | 19:41 |
| → Vgr joined | 19:42 |
| ← Vgr left | 19:42 |
| → Vgr joined | 19:42 |
| ← Vgr left | 19:42 |
| → Vgr joined | 19:42 |
| ← Vgr left | 19:42 |
| → Vgr joined | 19:42 |
| → spinningarrow[m] joined | 19:43 |
| → dyce[m] joined | 19:43 |
| → M-meznak joined | 19:43 |
| → Sri[m] joined | 19:43 |
| → kikijiki[m] joined | 19:43 |
| → am2on joined | 19:43 |
| → KevinMGranger[M] joined | 19:43 |
| → saintaquinas[m] joined | 19:43 |
| → elwan7[m] joined | 19:43 |
| → unclechu joined | 19:43 |
| → alaeri[m] joined | 19:43 |
| → aviraldg joined | 19:43 |
| → srkrishna[m] joined | 19:43 |
| → Jarrah[m] joined | 19:43 |
| → anand[m] joined | 19:44 |
| → dikiaap joined | 19:44 |
| → Remramm joined | 19:44 |
| → SpEcHiDe joined | 19:44 |
| → musicmatze[m] joined | 19:44 |
| → monomon[m] joined | 19:44 |
| → Salander27 joined | 19:44 |
| → unilovelight[m] joined | 19:44 |
| → Guest17683 joined | 19:44 |
| → daopu[m] joined | 19:44 |
| → UncleCJ joined | 19:44 |
| → patrickr[m] joined | 19:44 |
| → flo[m] joined | 19:44 |
| → hiq[m] joined | 19:44 |
| → hallogallo[m] joined | 19:44 |
| → matoro joined | 19:45 |
| → nettoweb joined | 19:46 |
| → mehola joined | 19:46 |
| → mellernoia joined | 19:47 |
| → mda1 joined | 19:47 |
| → zeroed joined | 19:48 |
| ← zeroed left | 19:48 |
| → zeroed joined | 19:48 |
| → Shakeel_ joined | 19:48 |
| → onmeac joined | 19:48 |
| ← Vgr left | 19:49 |
| → valize joined | 19:49 |
| ← onmeac left | 19:49 |
| ← j7k6 left | 19:50 |
| → SwiftMatt joined | 19:51 |
| → jagob joined | 19:52 |
| ← djb-irc left | 19:52 |
| ← WayToDoor left | 19:53 |
| ← clemf left | 19:53 |
| ← dersand left | 19:53 |
| ← Levex left | 19:53 |
| ← Gravious left | 19:54 |
| → b3kN joined | 19:54 |
| → Motoko joined | 19:59 |
| → j7k6 joined | 20:01 |
| ← mehola left | 20:01 |
| → Levex joined | 20:01 |
| → mehola joined | 20:03 |
| ← Lunatrius left | 20:04 |
| → Lunatrius joined | 20:05 |
| → BlessJah_ joined | 20:05 |
| BlessJah_ → BlessJah | 20:05 |
| ← matoro left | 20:07 |
| ← nettoweb left | 20:09 |
| → denisMone joined | 20:10 |
| → durham joined | 20:10 |
| → levex_ joined | 20:11 |
| → clemf joined | 20:11 |
| → nettoweb joined | 20:11 |
| ← durham left | 20:11 |
| ← Levex left | 20:12 |
| → durham joined | 20:12 |
| ← BlessJah left | 20:12 |
| → BlessJah joined | 20:12 |
| ← mellernoia left | 20:15 |
| ← pR0Ps left | 20:16 |
| ← tmk left | 20:17 |
| ← _ng left | 20:18 |
| ← notebox left | 20:19 |
| → matoro joined | 20:20 |
| → Gravious joined | 20:23 |
| → mischat joined | 20:23 |
| ← mda1 left | 20:24 |
| → snits joined | 20:25 |
| ← Spuri0us left | 20:26 |
| ← blokeybloke left | 20:26 |
| ← b3kN left | 20:26 |
| → pR0Ps joined | 20:27 |
| → anuxivm joined | 20:27 |
| ← mischat left | 20:28 |
| → chipotle joined | 20:28 |
| ← sagerdearia left | 20:29 |
| → mischat joined | 20:30 |
| ← j7k6 left | 20:31 |
| ← e01 left | 20:32 |
| ← acetakwas left | 20:32 |
| → e01 joined | 20:33 |
| ← e01 left | 20:33 |
| → e01 joined | 20:33 |
| → mda1 joined | 20:33 |
| ← d1z left | 20:33 |
| ← byte512 left | 20:33 |
| → helmet33 joined | 20:35 |
| → Guest93151 joined | 20:36 |
| → d1z joined | 20:36 |
| ← e01 left | 20:37 |
| ← duderonomy left | 20:39 |
| → Doow joined | 20:40 |
| → j7k6 joined | 20:41 |
| ← Gsham left | 20:42 |
| → menip joined | 20:43 |
| → jnavila joined | 20:43 |
| → Orbitrix joined | 20:45 |
| ← Orbitrix left | 20:45 |
| → Orbitrix joined | 20:45 |
| → Gsham joined | 20:47 |
|
nedbat
| the help for git clone says, "--no-single-branch [will] fetch the histories near the tips of all branches." It seems like it also fetches the histories near tags. Is this true? | 20:48 |
| ← Gsham left | 20:48 |
| ← clemf left | 20:49 |
| → Phylock joined | 20:49 |
| → Balliad joined | 20:52 |
| → msonntag joined | 20:52 |
| ← DDBag left | 20:52 |
| ← pks left | 20:54 |
| → DBag joined | 20:54 |
| ← Timvde left | 20:55 |
| ← Guest93151 left | 20:55 |
| → raynold joined | 20:55 |
| → pks joined | 20:56 |
| ← ismithers left | 20:56 |
| ← YuGiOhJCJ left | 20:57 |
| ← DBag left | 20:58 |
| → Timvde joined | 20:59 |
| ← Balliad left | 21:01 |
| → pur3eval joined | 21:02 |
| ← afuentes left | 21:05 |
| ← d1z left | 21:05 |
| → borkr joined | 21:05 |
| ← zeroed left | 21:06 |
| ← pur3eval left | 21:07 |
| → jimklo joined | 21:11 |
| ← GavinMagnus left | 21:14 |
| ← CheckDavid left | 21:14 |
| → Balliad joined | 21:15 |
| ← levex_ left | 21:16 |
| → canuk joined | 21:16 |
| ← madduck left | 21:17 |
| ← mehola left | 21:19 |
| → BSAlb joined | 21:20 |
| ← BSaboia left | 21:21 |
| ← Balliad left | 21:22 |
| → d1z joined | 21:23 |
| ← Electrometro left | 21:23 |
| ← Glooomy left | 21:24 |
| → Electrometro joined | 21:25 |
| → Balliad joined | 21:26 |
| → l4v2 joined | 21:27 |
| → notebox joined | 21:29 |
| ← dviola left | 21:29 |
| ← dreiss left | 21:29 |
| → mehola joined | 21:30 |
| → Goplat joined | 21:31 |
| ← d1z left | 21:32 |
| ← Starky left | 21:33 |
| ← jnavila left | 21:34 |
| ← l4v2 left | 21:34 |
| → askb joined | 21:34 |
| → Jellyg00se joined | 21:36 |
| → elsevero joined | 21:39 |
| ← elsevero left | 21:39 |
| ← santagada left | 21:39 |
| → elsevero joined | 21:39 |
| → dreaddymck joined | 21:39 |
| → nettoweb1 joined | 21:39 |
| ← notebox left | 21:39 |
| ← elsevero left | 21:39 |
| ← nettoweb left | 21:40 |
| ← flavius left | 21:40 |
| ← Jellyg00se left | 21:42 |
| → Gsham joined | 21:44 |
| → Keverw joined | 21:45 |
| ← Keverw left | 21:45 |
| ← Tobbi left | 21:45 |
| → boombatower joined | 21:47 |
| ← Balliad left | 21:48 |
| → Tobbi joined | 21:48 |
| → d1z joined | 21:49 |
| → arecaceae joined | 21:51 |
| ← arecaceae left | 21:52 |
| ← jon-mac left | 21:54 |
| → miicha joined | 21:54 |
| ← jimklo left | 21:57 |
| → jimklo joined | 21:57 |
| → Vampire0_ joined | 21:58 |
| ← Vampire0 left | 21:59 |
| ← BSAlb left | 21:59 |
| → tristanp joined | 22:00 |
| ← SwiftMatt left | 22:00 |
| ← Doow left | 22:00 |
| ← boombatower left | 22:02 |
| ← jimklo left | 22:02 |
| → pur3eval joined | 22:02 |
| → jlawall joined | 22:04 |
| ← Gsham left | 22:06 |
| gitinfo set mode: +v | 22:06 |
| ← pur3eval left | 22:07 |
| ← Murii left | 22:07 |
|
jlawall
| Hello, I have the impression that it is not possible to recover line numbers reliably with word diff. I am looking at an example where a blank line is added. There are no words, so there is just a blank line, with no indication of whether it is added or removed. Is there any way to get the line numbers just be printed on each line, so one doesn't have to try to infer them? | 22:09 |
| → justan0theruser joined | 22:10 |
| ← justanotheruser left | 22:10 |
| ← diogenese left | 22:10 |
| → madduck joined | 22:12 |
| → diogenese joined | 22:12 |
| → SiliconDon joined | 22:13 |
| → ISmithers joined | 22:13 |
| ← ISmithers left | 22:13 |
| → ISmithers joined | 22:14 |
| → mda1_ joined | 22:16 |
| → zzz joined | 22:18 |
| ← nettoweb1 left | 22:19 |
| ← mda1 left | 22:19 |
| ← SiliconDon left | 22:23 |
| ← rgrinberg left | 22:24 |
| → SiliconDon joined | 22:25 |
| ← thiago left | 22:25 |
| → WayToDoor joined | 22:27 |
| → rgrinberg joined | 22:28 |
| ← IntruderSRB left | 22:29 |
| ← sgen left | 22:30 |
| → clemf joined | 22:30 |
| → Levex joined | 22:33 |
| → Jellyg00se joined | 22:34 |
| ← Jellyg00se left | 22:34 |
| ← Jackneill_ left | 22:34 |
| → WaReZ joined | 22:35 |
| ← valize left | 22:35 |
| ← SiliconDon left | 22:36 |
| → thiago joined | 22:36 |
| → SiliconDon joined | 22:37 |
| ← Levex left | 22:37 |
| ← SiliconDon left | 22:38 |
| ← matoro left | 22:38 |
| → SiliconDon joined | 22:38 |
| → Levex joined | 22:38 |
| ← zzz left | 22:39 |
| → LBV_User joined | 22:39 |
| ← _sfiguser left | 22:39 |
| → aidalgol joined | 22:40 |
| ← Levex left | 22:40 |
| ← SiliconDon left | 22:40 |
| → SiliconDon joined | 22:41 |
| → CheckDavid joined | 22:41 |
| ← canuk left | 22:42 |
| → nettoweb joined | 22:42 |
| ← SiliconDon left | 22:42 |
| ← nowhereman left | 22:43 |
| → nowhereman joined | 22:43 |
| → SiliconDon joined | 22:43 |
| ← SiliconDon left | 22:45 |
| ← miicha left | 22:45 |
| → Levex joined | 22:45 |
| → SiliconDon joined | 22:46 |
| ← jlawall left | 22:51 |
| → _sfiguser joined | 22:51 |
| ← _sfiguser left | 22:51 |
| → _sfiguser joined | 22:52 |
| ← madduck left | 22:52 |
| → madduck joined | 22:52 |
| → ubuntu joined | 22:53 |
| ubuntu → Guest90633 | 22:53 |
| → matoro joined | 22:54 |
| gitinfo set mode: +v | 22:56 |
| Guest90633 → _Marek_ | 22:56 |
| → Naan joined | 22:57 |
| → raijin joined | 22:58 |
| → Oatmeal joined | 22:59 |
| ← Levex left | 22:59 |
| ← fmeerkoetter left | 23:01 |
| → fmeerkoetter joined | 23:01 |
| ← SiliconDon left | 23:02 |
| ← raijin left | 23:02 |
| ← sprremix left | 23:02 |
| → raijin joined | 23:02 |
| → SiliconDon joined | 23:02 |
| ← Noldorin left | 23:05 |
| → Noldorin joined | 23:06 |
| ← SiliconDon left | 23:08 |
| ← raijin left | 23:08 |
| → raijin joined | 23:09 |
| → ertes joined | 23:09 |
| ← LiftLeft left | 23:09 |
| ← raijin left | 23:10 |
| → raijin joined | 23:11 |
|
_Marek_
| /#join lfs | 23:13 |
| → geoid_ joined | 23:14 |
| ← vdv left | 23:15 |
| → Gsham joined | 23:16 |
| ← WaReZ left | 23:16 |
| ← j7k6 left | 23:17 |
| → zzz joined | 23:17 |
| ← apotry left | 23:18 |
| ← Noldorin left | 23:18 |
| ← johnny56 left | 23:18 |
| → moei joined | 23:19 |
| ← satifant left | 23:19 |
| ← denisMone left | 23:19 |
| Vampire0_ → Vampire0 | 23:19 |
| → Gloomy joined | 23:20 |
| → johnny56 joined | 23:20 |
| → Taikibansei joined | 23:20 |
| → Levex joined | 23:21 |
| ← _Marek_ left | 23:21 |
| → LiftLeft joined | 23:22 |
| ← Guest85 left | 23:23 |
| → Noldorin joined | 23:24 |
| ← borkr left | 23:24 |
| → DolpheenDream joined | 23:25 |
| ← Levex left | 23:26 |
| ← jagob left | 23:26 |
| → gry joined | 23:26 |
|
gry
| so i have two branches, and i would like to review commits from the one which is ahead one by one and add these commits to the one which is behind | 23:26 |
|
| what are the keywords to search for to find a good tutorial? | 23:26 |
| ← m4sk1n left | 23:27 |
| ← WayToDoor left | 23:27 |
| → Levex joined | 23:27 |
|
Vampire0
| gry, if you want to look at each commit and decide whether you want to copy it over, look at the commits and then use man git cherry-pick | 23:29 |
|
gitinfo
| gry: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html | 23:29 |
|
Vampire0
| gry, if you want to copy all commits over, but still look at each and probably modify it, you could make an interactive rebase, choosing edit stanza for all lines | 23:29 |
| ← raijin left | 23:29 |
| → raijin joined | 23:30 |
| ← Levex left | 23:30 |
| → levex_ joined | 23:31 |
| → Sasazuka joined | 23:31 |
| → ubuntu_ joined | 23:31 |
| ← Sasazuka left | 23:33 |
| ← TomyLobo left | 23:33 |
| → pur3eval joined | 23:33 |
| → bernardio joined | 23:34 |
| → Sasazuka joined | 23:34 |
| ← bernardio left | 23:34 |
|
gry
| ok | 23:35 |
| → BSaboia joined | 23:35 |
| → justanotheruser joined | 23:36 |
| ← elijah left | 23:36 |
| → F0rTh3J3st joined | 23:36 |
| → Raed|Mobile joined | 23:37 |
| ← justan0theruser left | 23:37 |
| → l4v2 joined | 23:37 |
| → fatalhalt joined | 23:38 |
| ← pur3eval left | 23:38 |
| ← LBV_User left | 23:39 |
| ← raijin left | 23:39 |
| ← Sasazuka left | 23:40 |
| ← Limes left | 23:42 |
| ← t0by left | 23:44 |
| ← c0c0 left | 23:45 |
|
gry
| the cherrypick man page is a bit overwhelming; say, if i am in 'master' and i have a few commits in branch 'vampire', and branch 'vampire' has two fresh commits which are absent in 'master' | 23:46 |
|
| how do i cherrypick the first commit from the 'vampire' branch? | 23:47 |
| ← _sfiguser left | 23:47 |
|
Gravious
| gry, cherry picking a commit to master is literally just, git checkout master; git cherry-pick <sha of commit you want> | 23:48 |
|
gry
| how do i tell it which branch the commit is in? | 23:48 |
|
Gravious
| it doesn't matter | 23:48 |
|
gry
| or does it take the sha and looks for it in all branches? | 23:49 |
|
Gravious
| the sha of a commit uniquely identifies it within the repo | 23:49 |
| ← MonsterKiller left | 23:50 |
|
gry
| thank you so much for clarifying that, Gravious :-) appreciated | 23:50 |
|
Gravious
| no worries :) | 23:50 |
| ← souther left | 23:50 |
| → MonsterKiller joined | 23:51 |
| → souther joined | 23:51 |
| → pbrewczynski joined | 23:53 |
| ← Emperor_Earth left | 23:53 |
| → bernardio joined | 23:54 |
| ← bernardio left | 23:54 |
| ← Gloomy left | 23:56 |