| 2015-07-23 |
| → Lyqyd joined | 00:00 |
| ← ClearC2 left | 00:00 |
| ← devoldmx left | 00:00 |
| → espindola joined | 00:01 |
| ← imachuchu left | 00:02 |
| → clarkpan_ joined | 00:02 |
| ← hexagoxel left | 00:02 |
| → hexagoxel joined | 00:04 |
| ← HelloShitty left | 00:05 |
| ← sentriz left | 00:05 |
| ← clarkpan left | 00:05 |
| → j` joined | 00:07 |
| ← j` left | 00:07 |
| → j` joined | 00:07 |
| → theskillwithin joined | 00:08 |
| ← eletuchy left | 00:08 |
| ← EricPoe left | 00:09 |
| → mizu_no_oto joined | 00:11 |
| ← pm90_ left | 00:12 |
| → zumba_ad_ joined | 00:12 |
| ← yqt left | 00:14 |
| → modocache joined | 00:14 |
| → yqt joined | 00:14 |
| ← m0viefreak left | 00:17 |
| ← Juxtapositional left | 00:17 |
| ← emulator_ left | 00:18 |
| ← modocache left | 00:18 |
| → m0viefreak joined | 00:18 |
| zumba_ad_ → zumba_addict_ | 00:20 |
| ← thiago left | 00:21 |
| → Pookz joined | 00:21 |
| ← gambl0re left | 00:23 |
| → taru joined | 00:24 |
| ← VictorCL left | 00:24 |
| ← bronson left | 00:24 |
| → Tobarja joined | 00:24 |
| ← d10n-work left | 00:25 |
| → xudongz joined | 00:25 |
| ← Fernando-Basso left | 00:25 |
| ← mizu_no_oto left | 00:26 |
| ← duderonomy left | 00:26 |
| → Kaisyu joined | 00:26 |
| ← maestrojed left | 00:27 |
| → pm90_ joined | 00:28 |
| ← nofxx left | 00:28 |
| ← nfk left | 00:29 |
| ← tyreld left | 00:30 |
| ← ToBeCloud left | 00:30 |
| → FunkyELF joined | 00:30 |
| ← tristanp left | 00:31 |
| → tristanp joined | 00:31 |
|
FunkyELF
| damn... cloning cpython using "git clone hg::https://hg.python.org/cpython" is painfully slow. Been running for 7 minutes and only 36800/90222 | 00:32 |
| ← tang^ left | 00:35 |
| ← tristanp left | 00:36 |
| → dsantiago joined | 00:36 |
| → CKyle joined | 00:36 |
| → nda_ joined | 00:37 |
| → jwhisnant joined | 00:38 |
| ← jwhisnant left | 00:38 |
| ← eggoez left | 00:39 |
| → variable joined | 00:40 |
|
nda_
| For some reason, when I run the command "git gc --aggressive", I just get this error eventually: fatal: Out of memory, malloc failed (tried to allocate 2199486 bytes) | 00:41 |
| ← mattcen left | 00:41 |
| → mizu_no_oto joined | 00:41 |
|
nda_
| Is that a known issue with large repos? | 00:42 |
| → eggoez joined | 00:42 |
|
nda_
| By the way, I use Git v1.9.5 on Windosw. | 00:42 |
| ← blackwind_123 left | 00:44 |
| ← Mathiasdm left | 00:45 |
| → strull joined | 00:45 |
| ← harish_ left | 00:46 |
| → maestrojed joined | 00:47 |
| ← lindenle left | 00:47 |
| → arescorpio joined | 00:48 |
| → Wetmelon joined | 00:48 |
| ← lucha left | 00:49 |
| → ccolorado joined | 00:49 |
| ← pm90_ left | 00:50 |
| → jwhisnant joined | 00:50 |
|
ccolorado
| Hi I have a git repo with hundreds maybe thousand of branches however git fetch --all doesn't bring up all of them ( git branch -av only shouws around 10 branches ) | 00:50 |
| ← mellernoia-work left | 00:50 |
| ← jwhisnant left | 00:50 |
| → mweshi_ joined | 00:50 |
| → pm90_ joined | 00:51 |
| ← eggoez left | 00:53 |
| ← mweshi left | 00:53 |
| ← elementalest_ left | 00:53 |
| → kpease joined | 00:53 |
| ← mizu_no_oto left | 00:55 |
| ← pm90_ left | 00:56 |
| ← leo60228 left | 00:56 |
| ← m0viefreak left | 00:56 |
| ← xlegoman left | 00:56 |
| → ahr3n joined | 00:57 |
| ← Obfuscate left | 00:58 |
| → mattcen joined | 00:58 |
| → dgutierrez1287 joined | 00:59 |
| ← Sasazuka left | 01:00 |
| ← SimonNa left | 01:00 |
| ← kpease left | 01:01 |
| → EricPoe joined | 01:02 |
| ← dgutierrez1287 left | 01:03 |
| ← diegoaguilar left | 01:05 |
| → eggoez joined | 01:07 |
| → diegoaguilar joined | 01:08 |
| → m0viefreak joined | 01:10 |
| ← dougsland left | 01:12 |
| → daito joined | 01:12 |
| → modocache joined | 01:13 |
| → Vampire0 joined | 01:15 |
|
osse
| ccolorado: --all only means fetch from all remotes. do you have more than one | 01:17 |
| ← clarkpan_ left | 01:17 |
|
osse
| ? | 01:17 |
| ← modocache left | 01:18 |
| ← Vampire0_ left | 01:18 |
|
ccolorado
| I only have one remote "origin" | 01:18 |
| ← pks left | 01:18 |
| ← kfoonamalik left | 01:19 |
|
osse
| what does git config remote.origin.fetch say ? | 01:19 |
| ← m0viefreak left | 01:19 |
| → pks joined | 01:21 |
| → robbyoconnor joined | 01:21 |
| → clarkpan joined | 01:22 |
| → bronson joined | 01:25 |
| ← durham left | 01:25 |
|
ccolorado
| +refs/heads/development:refs/remotes/origin/development | 01:26 |
|
osse
| there's the problem | 01:26 |
| ← gebjgd left | 01:27 |
|
osse
| run git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' and fetch again | 01:27 |
|
ccolorado
| what does that means ? | 01:27 |
|
osse
| it means that by default fetch will only fetch the branch named development | 01:28 |
|
ccolorado
| I mean what I have, ( cause development is the parent of all those hundreds of branches ) | 01:28 |
|
osse
| but if you change it it will fetch all | 01:28 |
|
ccolorado
| cool! | 01:28 |
|
| seems is actually doing stuff | 01:28 |
| → ryez joined | 01:29 |
|
ccolorado
| osse: thanks so much :) | 01:29 |
|
| i dont remember configuring that | 01:29 |
| ← bronson left | 01:29 |
|
osse
| ccolorado: it happens by default if you use clone --single-branch for example | 01:30 |
|
ccolorado
| well i rembmer doing a shallow clone | 01:30 |
|
osse
| that too | 01:30 |
| ← mscook left | 01:30 |
| → gopar joined | 01:31 |
| ← gargola left | 01:31 |
| → mscook joined | 01:31 |
|
osse
| --shallow --depth x implies --single-branch | 01:31 |
| → mizu_no_oto joined | 01:32 |
|
ccolorado
| but i did eventually unshallowed it | 01:32 |
| ← akushner_ left | 01:32 |
|
ccolorado
| would that still matter ( sorry internet went out for a bit ) | 01:32 |
|
osse
| yes | 01:33 |
| → gargola joined | 01:33 |
| ← gargola left | 01:33 |
| → gargola joined | 01:34 |
|
ccolorado
| osse: thanks ill have to investigate more how this all works but this was really helpful | 01:36 |
| ← espindola left | 01:36 |
| ← shinnya left | 01:36 |
|
osse
| it's just a setting in .git/config | 01:37 |
| ← whitby left | 01:37 |
| ← ryez left | 01:37 |
| → Goplat joined | 01:39 |
| → emulator_ joined | 01:40 |
| ← a3Dman left | 01:41 |
| → SleePy joined | 01:42 |
| → modocache joined | 01:42 |
| → a3Dman joined | 01:44 |
| → thiago joined | 01:45 |
| → gamename joined | 01:46 |
| ← gamename left | 01:46 |
| ← modocache left | 01:46 |
| ← d125q left | 01:47 |
| → harish joined | 01:48 |
| → lindenle joined | 01:48 |
| ← Phoenixz left | 01:49 |
| → Phoenixz joined | 01:51 |
| → linux_dream joined | 01:51 |
|
linux_dream
| hi guys . I'd like to know how to update a file on github if locally i have a newer version. git add file , then git push origin master says everything is up to date and there's nothing to do | 01:52 |
| → ehmatthes joined | 01:56 |
| ← ahr3n left | 01:56 |
| ← lindenle left | 01:56 |
| → ClearC2 joined | 01:56 |
| → smw_ joined | 01:56 |
| kush → wowaname | 01:57 |
| ← tvw left | 01:57 |
| → espindola joined | 02:00 |
| ← ClearC2 left | 02:01 |
| ← pheaver left | 02:02 |
| → franl joined | 02:02 |
| → fenugrec joined | 02:03 |
| ← CKyle left | 02:03 |
| → cavallari joined | 02:04 |
| → nofxx joined | 02:04 |
| ← nofxx left | 02:04 |
| → nofxx joined | 02:04 |
| ← ehmatthes left | 02:05 |
| → _Atom_ joined | 02:07 |
|
fenugrec
| Hi, I'm sabotaging (a.k.a. merging) a few dirty commits from a remote branch. My goal is to squash 2-3 of these commits into 1. I need to do some manual editing at each step. I'm on a separate branch, and I just did "git fetch <remote_branch_1>; git merge --no-commit <dirty_commit_1>", and I've just finished solving conflicts, so "git status" shows every modification in green. Question is : can I do another "git merge --no-commit <dirty_commit_2>" directly ? | 02:08 |
| → zacts joined | 02:08 |
|
fenugrec
| Or git stash / pop ? | 02:08 |
| → faux___ joined | 02:08 |
| → CKyle joined | 02:08 |
| ← emulator_ left | 02:09 |
| ← mizu_no_oto left | 02:09 |
| → xcesariox joined | 02:10 |
| ← xcesariox left | 02:10 |
| → emulator_ joined | 02:10 |
| → pwnz0r joined | 02:11 |
| → tomog999_ joined | 02:12 |
| ← JanC left | 02:12 |
| → macabre joined | 02:12 |
| → xcesariox joined | 02:13 |
| ← CKyle left | 02:13 |
| ← emulator_ left | 02:13 |
| → emulator_ joined | 02:14 |
| → xlegoman joined | 02:14 |
| ← tomog999 left | 02:14 |
| ← maletor left | 02:14 |
| → Ryanar joined | 02:15 |
| ← gfixler left | 02:15 |
| ← franl left | 02:15 |
| ← yqt left | 02:15 |
| ← faux___ left | 02:15 |
| ← Corey84 left | 02:16 |
| ← emulator_ left | 02:17 |
| ← linux_dream left | 02:19 |
| → CKyle joined | 02:19 |
| ← showaz left | 02:21 |
| → emulator_ joined | 02:21 |
| ← Phoenixz left | 02:22 |
| → iamjarvo joined | 02:23 |
| ← [Saint] left | 02:24 |
| ← tmager left | 02:25 |
| → Phoenixz joined | 02:25 |
| ← mweshi_ left | 02:25 |
| → [Saint] joined | 02:26 |
| → JanC joined | 02:27 |
| ← Kully3xf left | 02:27 |
| ← strull left | 02:27 |
| → icosa1 joined | 02:28 |
| ← Saturn812 left | 02:28 |
| ← clarkpan left | 02:28 |
| → clarkpan joined | 02:28 |
| ← Phoenixz left | 02:31 |
| → cmoneylulz joined | 02:34 |
| → Phoenixz joined | 02:36 |
| → Matthew-S joined | 02:37 |
|
Matthew-S
| Why does exempting extensions in gitignore not work recursively and what is a way to do so? | 02:38 |
| ← eggoez left | 02:38 |
|
Matthew-S
| Currently my gitignore is something like this: | 02:39 |
|
| * | 02:39 |
|
| ~*.cpp | 02:39 |
|
| I mean !*.cpp | 02:39 |
|
| But git still ignores folder/test.cpp | 02:39 |
| ← _Atom_ left | 02:40 |
|
fenugrec
| !man gitignore | grep "\*\*" | 02:40 |
|
gitinfo
| The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ? | 02:40 |
|
| the gitignore manpage is available at http://jk.gs/gitignore.html | 02:40 |
|
fenugrec
| Matthew-S ^ you need two * | 02:41 |
|
Matthew-S
| so, !**.cpp | 02:41 |
|
| ? | 02:41 |
|
fenugrec
| !give | 02:41 |
|
| oops, wrong bot. man gitignore | 02:41 |
|
gitinfo
| the gitignore manpage is available at http://jk.gs/gitignore.html | 02:41 |
| ← Phoenixz left | 02:42 |
| ← CheckDavid left | 02:42 |
| → _Atom_ joined | 02:43 |
| ← iamjarvo left | 02:44 |
| → iamjarvo joined | 02:45 |
| → tristanp joined | 02:45 |
| → Phoenixz joined | 02:46 |
| ← bitkiller left | 02:48 |
|
Matthew-S
| Looking at the manpage, I would think this would work but it doesn't: !/**/*.cpp | 02:48 |
| ← clarkpan left | 02:49 |
| ← Ryanar left | 02:50 |
| ← cavallari left | 02:50 |
|
fenugrec
| Matthew-S try !**/*.cpp | 02:50 |
| → axisys joined | 02:50 |
| ← s00pcan left | 02:51 |
|
Matthew-S
| That only gets new cpp files in the relative root directory | 02:51 |
| ← oojacoboo left | 02:51 |
|
fenugrec
| oops !/**/*.cpp | 02:52 |
|
| didn't work ? | 02:52 |
| ← iamjarvo left | 02:52 |
| → SocialBlunder joined | 02:53 |
| → s00pcan joined | 02:53 |
|
Matthew-S
| Nope | 02:53 |
|
| fenugrec, I'm on git 1.9.1 | 02:53 |
| ← tristanp left | 02:54 |
|
Matthew-S
| And I've made sure the ignore-everything asterisk is above the exclusion. | 02:54 |
| → tristanp joined | 02:54 |
| ← terminal_echo left | 02:55 |
|
Matthew-S
| I've also tried using different types of asterisks such as **, /**, **/, and /**/ | 02:55 |
| → terminal_echo joined | 02:55 |
| ← Noldorin left | 02:56 |
| ← Phoenixz left | 02:56 |
| ← terminal_echo left | 02:57 |
| ← fenugrec left | 02:57 |
| ← cmoneylulz left | 02:58 |
|
Wetmelon
| Any recommended GUIs? I just downloaded SourceTree, gonna see if it's any better than the GitHub gui >.> | 02:58 |
|
Matthew-S
| Could it have something to do with this?: " It is not possible to re-include a file if a parent directory of that file is excluded" | 02:58 |
| ← tristanp left | 02:59 |
|
theskillwithin
| Werring are you on a mac or windows? | 02:59 |
|
| Wetmelon --^ | 02:59 |
|
Wetmelon
| Windows 8.1 | 03:00 |
|
theskillwithin
| oh sorry to hear that | 03:00 |
| → ryez joined | 03:00 |
|
theskillwithin
| mac terminal just makes things so much easeir | 03:00 |
| ← daivyk left | 03:00 |
|
theskillwithin
| iterm + oh my zsh | 03:00 |
|
Wetmelon
| zsh? Huh? | 03:00 |
| → BooMShanKerX joined | 03:01 |
| → LearningCN joined | 03:01 |
|
Wetmelon
| Oh. Z shell. Never heard of it | 03:01 |
|
theskillwithin
| pretty cool, it has themes that show what branch ur on right in ur terminal | 03:02 |
|
| also if its dirty | 03:02 |
| → terminal_echo joined | 03:02 |
| ← BooMShanKerX left | 03:03 |
| ← darkbasic left | 03:04 |
| → darkbasic joined | 03:04 |
|
Matthew-S
| It seems as if I cannot use ** and then exclude something from a subfolder | 03:05 |
|
| Essentially meaning it's impossibly to exclusively include only certain file types. | 03:06 |
| → pheaver joined | 03:06 |
| → eggoez joined | 03:06 |
| → BooMShanKerX joined | 03:07 |
| → Orbitrix joined | 03:10 |
| ← Orbitrix left | 03:10 |
| ← emulator_ left | 03:11 |
| → Orbitrix joined | 03:11 |
| ← bahar left | 03:12 |
| → meatmanek joined | 03:13 |
| → Dragooon joined | 03:14 |
| → franl joined | 03:14 |
| → gfixler joined | 03:14 |
| ← cagedwisdom left | 03:14 |
| ← bollullera left | 03:15 |
| ← Dragooon left | 03:16 |
| → d0lph1n98 joined | 03:16 |
| → arup_r joined | 03:17 |
| ← mscook left | 03:18 |
| → durham joined | 03:18 |
| → mscook joined | 03:18 |
| ← arup_r left | 03:19 |
| → theCole joined | 03:19 |
| ← durham left | 03:21 |
| → devoldmx joined | 03:21 |
| → durham joined | 03:21 |
| ← pwnz0r left | 03:22 |
| ← franl left | 03:22 |
| ← pheaver left | 03:23 |
| ← mscook left | 03:23 |
| ← theCole left | 03:23 |
| ← smw_ left | 03:24 |
| ← CKyle left | 03:26 |
| → eletuchy joined | 03:27 |
| ← gopar left | 03:28 |
| → devoldmx_ joined | 03:28 |
| ← devoldmx left | 03:28 |
| → waveclaw joined | 03:29 |
| ← eletuchy left | 03:30 |
| → eletuchy joined | 03:30 |
| ← baxx left | 03:31 |
| → cagedwisdom joined | 03:31 |
| ← eletuchy left | 03:33 |
| → pm90_ joined | 03:33 |
| → pwnz0r joined | 03:33 |
| → eletuchy joined | 03:33 |
| ← s00pcan left | 03:34 |
|
Matthew-S
| Finally, I've stumbled upon a solution. I can only exclude *.* within each level of subdirectories so that the whole folder is not ignored. And then the !/**/*.cpp works. Here's an example: | 03:34 |
|
| https://gist.github.com/Wolfgange3311999/91c671f5e4d3c56cf5a1 | 03:35 |
| ← eletuchy left | 03:35 |
| → eletuchy joined | 03:35 |
| ← eletuchy left | 03:35 |
| → s00pcan joined | 03:35 |
| → harish_ joined | 03:44 |
| ← madewokherd left | 03:46 |
| ← espindola left | 03:46 |
| ← harish left | 03:47 |
| ← ryez left | 03:48 |
| → mscook joined | 03:49 |
| ← Matthew-S left | 03:49 |
| ← mscook left | 03:51 |
| → eletuchy joined | 03:52 |
| → mscook joined | 03:52 |
| ← mscook left | 03:53 |
| → mscook joined | 03:53 |
| → Shentino2 joined | 03:53 |
| ← Shentino left | 03:53 |
| → skorgon_ joined | 03:54 |
| ← sarri left | 03:54 |
| → sarri joined | 03:57 |
| → ClearC2 joined | 03:57 |
| ← mscook left | 03:58 |
| → modocache joined | 03:58 |
| ← d0lph1n98 left | 03:59 |
| ← eletuchy left | 04:00 |
| ← daito left | 04:02 |
| ← ClearC2 left | 04:02 |
| ← modocache left | 04:03 |
| ← unholycrab left | 04:03 |
| → unholycrab joined | 04:03 |
| ← cdown left | 04:04 |
| → eletuchy joined | 04:04 |
| → GryAway joined | 04:04 |
| → Muhannad joined | 04:05 |
| ← GryAway left | 04:05 |
| ← _Atom_ left | 04:05 |
| ← Tobarja left | 04:06 |
| → Sasazuka joined | 04:06 |
| → emulator_ joined | 04:07 |
| ← gargola left | 04:08 |
| ← Nooutlet left | 04:08 |
| → gargola joined | 04:08 |
| → MajorPayne joined | 04:08 |
| → Nooutlet joined | 04:09 |
| → whomp joined | 04:09 |
| ← Sasazuka left | 04:10 |
| → mscook joined | 04:12 |
| → cdown_ joined | 04:14 |
| → ckruczek joined | 04:14 |
| ← ccolorado left | 04:15 |
| cdown_ → cdown | 04:16 |
| → Obfuscate joined | 04:17 |
| → SimonNa joined | 04:22 |
| ← pwnz0r left | 04:24 |
| → bronson joined | 04:26 |
| ← cdown left | 04:29 |
| → ResidentBiscuit joined | 04:29 |
| ← Shentino2 left | 04:29 |
| ← LearningCN left | 04:29 |
| → elsevero joined | 04:30 |
| ← bronson left | 04:31 |
| ← elsevero left | 04:31 |
| ← sdothum left | 04:31 |
| ← knownasilya left | 04:31 |
| ← xudongz left | 04:32 |
| → Shentino joined | 04:32 |
| → LearningCN joined | 04:32 |
| ← harish_ left | 04:32 |
| ← Shentino left | 04:32 |
| → jceb joined | 04:33 |
| ← ResidentBiscuit left | 04:34 |
| → Shentino joined | 04:34 |
| → sabgenton joined | 04:35 |
| → dreiss joined | 04:36 |
| → danzilio joined | 04:36 |
| → iamjarvo joined | 04:37 |
| ← xlegoman left | 04:37 |
| ← whomp left | 04:38 |
| → xlegoman joined | 04:38 |
| → happy-dude joined | 04:38 |
| ← Plotinuz left | 04:39 |
| ← LearningCN left | 04:40 |
| → beautifulmind joined | 04:41 |
| → Trow joined | 04:42 |
| ← xlegoman left | 04:42 |
| ← [Saint] left | 04:43 |
| → blackwind_123 joined | 04:43 |
| → clarkpan joined | 04:44 |
| → pwnz0r joined | 04:44 |
| → [Saint] joined | 04:45 |
| ← eletuchy left | 04:48 |
| ← jceb left | 04:48 |
| → t2mkn joined | 04:52 |
| ← bket left | 04:52 |
| → modocache joined | 04:53 |
| ← modocache left | 04:53 |
| → Mathiasdm joined | 04:54 |
| → bket joined | 04:54 |
| → nnyk joined | 04:56 |
| → scarabx joined | 04:57 |
| ← Gamecubic left | 04:57 |
| → daito joined | 05:00 |
| ← mikecmpbll left | 05:00 |
| → MechtiIde joined | 05:01 |
|
nda_
| Is it a common problem that "git gc --aggressive" fails with " fatal: Out of memory, malloc failed ..."? | 05:03 |
|
| Might add on Windows. | 05:03 |
| → lindenle joined | 05:04 |
| → tristanp joined | 05:05 |
| ← danzilio left | 05:08 |
| → Plotinuz joined | 05:08 |
| ← blackwind_123 left | 05:11 |
| → elementalest joined | 05:13 |
| ← elementalest left | 05:13 |
| → elementalest joined | 05:13 |
| → rgb-one joined | 05:14 |
| ← tristanp left | 05:15 |
| → tristanp joined | 05:16 |
| ← emulator_ left | 05:18 |
| → harish_ joined | 05:20 |
| ← tristanp left | 05:20 |
| ← [Saint] left | 05:21 |
| ← harish_ left | 05:21 |
| ← scarabx left | 05:23 |
| → harish_ joined | 05:23 |
| → [Saint] joined | 05:23 |
|
ckruczek
| well a out of memory exception is always not a common problem :D | 05:25 |
|
| but obviously on windows it is : http://stackoverflow.com/questions/10292903/git-on-windows-out-of-memory-malloc-failed | 05:26 |
| → awkwardusername joined | 05:27 |
| ← [Saint] left | 05:28 |
| ← Trow left | 05:29 |
| ← iamjarvo left | 05:29 |
| ← durham left | 05:29 |
| ← BooMShanKerX left | 05:34 |
| → tarkus joined | 05:35 |
| ← awkwardusername left | 05:36 |
| → iamjarvo joined | 05:38 |
| → TomyLobo joined | 05:39 |
| ← the_cybersphinx left | 05:39 |
| → mehola joined | 05:41 |
| → fullstack joined | 05:42 |
|
fullstack
| How should I go about deploying a website from my local git to a remote server and restarting the service and stuff? | 05:42 |
|
_ikke_
| fullstack: !deploy | 05:42 |
|
gitinfo
| fullstack: 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 | 05:42 |
|
_ikke_
| fullstack: You want an actual deploy system for that | 05:42 |
|
| fullstack: tools like capistrano | 05:43 |
|
fullstack
| thanks. capistrano, is that what everyone uses then? | 05:43 |
|
| reading git as a deployment tool thanks again | 05:44 |
| → mark06 joined | 05:44 |
| → eletuchy joined | 05:44 |
|
_ikke_
| fullstack: Everybody is a lot of people | 05:44 |
| ← MechtiIde left | 05:44 |
| ← Lyqyd left | 05:44 |
| ← arescorpio left | 05:47 |
|
iamtakingiteasy
| git has a number of different hooks, including commit ones, enabling you to write a simple script to perform actual deloy on commit into repository | 05:47 |
|
_ikke_
| You rarely want to deploy on commit | 05:48 |
|
iamtakingiteasy
| you may have a special 'production' brnach where commits are interepreted as deploys | 05:49 |
|
| branch* | 05:49 |
|
bremner
| sounds like a contortion around some strange setup with only git acess, but ok, it could happen | 05:50 |
| → Silmarilion joined | 05:50 |
|
iamtakingiteasy
| not only git; it requires access to filesystem as well | 05:50 |
|
| to install the hook you need | 05:50 |
|
| but yeah, it is kinda a hipster-ish solution | 05:51 |
|
| better to use an application container and deploy properly to one from your build system | 05:51 |
| ← iamjarvo left | 05:51 |
|
iamtakingiteasy
| (e.g. java servlet container + maven deploy in local project) | 05:51 |
| ← harish_ left | 05:53 |
| ← ramsub07 left | 05:54 |
| → ThomasLocke joined | 05:54 |
| ← lindenle left | 05:55 |
| → rzeka joined | 05:55 |
| → keroro520 joined | 05:57 |
| ← EricPoe left | 05:57 |
| → ClearC2 joined | 05:58 |
| ← icosa1 left | 05:58 |
|
nda_
| ckruczek: You were right! Changing the config actually helped. Thank you! :D | 05:59 |
|
ckruczek
| nda_, cool, you are welcome. !next | 06:00 |
|
gitinfo
| nda_: Another satisfied customer. NEXT! | 06:00 |
| → nerd joined | 06:02 |
| → mutbuerger joined | 06:03 |
| ← ClearC2 left | 06:03 |
| ← rgb-one left | 06:03 |
| ← SimonNa left | 06:04 |
| → icosa1 joined | 06:04 |
| ← mark06 left | 06:04 |
| → leeN joined | 06:05 |
| ← tpollard left | 06:05 |
| → ayaz joined | 06:06 |
| ← sheilong left | 06:06 |
| ← mscook left | 06:08 |
| ← clarkpan left | 06:08 |
| → mscook joined | 06:08 |
| ← mscook left | 06:11 |
| ← skorgon_ left | 06:11 |
| → mscook joined | 06:11 |
| → jceb_ joined | 06:13 |
| ← CEnnis91 left | 06:14 |
| ← daito left | 06:15 |
| ← mscook left | 06:16 |
| → hahuang65 joined | 06:17 |
| → sinkensabe joined | 06:18 |
| → Kelzier joined | 06:18 |
| ← pm90_ left | 06:18 |
| → jiqissc joined | 06:19 |
| → lindenle joined | 06:19 |
| ← phantombeta left | 06:19 |
| ← sinkensabe left | 06:19 |
| → sinkensabe joined | 06:20 |
| → eGGsha joined | 06:20 |
| → ilmgb joined | 06:20 |
| → Corey84 joined | 06:24 |
| ← hahuang65 left | 06:25 |
| → mscook joined | 06:25 |
| ← Corey84 left | 06:26 |
| → clarkpan joined | 06:27 |
| ← nnyk left | 06:27 |
| ← lindenle left | 06:28 |
| → muhaha03__ joined | 06:28 |
| → elsevero joined | 06:28 |
| → fracting joined | 06:29 |
| → Corey84 joined | 06:29 |
| → johnkevinmbasco joined | 06:29 |
| → arup_r joined | 06:30 |
| → phantombeta joined | 06:33 |
| → mscook__ joined | 06:33 |
| ← mscook left | 06:34 |
| ← Wetmelon left | 06:34 |
| → Alienpruts joined | 06:35 |
| ← fracting left | 06:35 |
| → daito joined | 06:35 |
| ← clarkpan left | 06:35 |
| → ehmatthes joined | 06:36 |
| ← kadoban left | 06:37 |
| → xlegoman joined | 06:39 |
| → johnkevi_ joined | 06:40 |
| ← TomyLobo left | 06:41 |
| → clarkpan joined | 06:41 |
| ← variable left | 06:42 |
| → fluter_ joined | 06:42 |
| ← johnkevinmbasco left | 06:43 |
| → devoldmx joined | 06:43 |
|
fluter_
| hi | 06:43 |
|
gitinfo
| fluter_: 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. | 06:43 |
|
fluter_
| anyone configured gerrit? | 06:44 |
| ← xlegoman left | 06:44 |
| → Darcidride joined | 06:46 |
| ← devoldmx_ left | 06:47 |
| → harish_ joined | 06:48 |
| ← harish_ left | 06:48 |
| → fracting joined | 06:48 |
| → hahuang65 joined | 06:50 |
| → duderonomy joined | 06:50 |
| ← fracting left | 06:51 |
| → fracting joined | 06:51 |
| ← mutbuerger left | 06:51 |
| ← dreiss left | 06:52 |
| → mutbuerger joined | 06:54 |
| → Spriz joined | 06:54 |
| → arez joined | 06:55 |
| → Sceorem joined | 06:56 |
| ← Spriz left | 06:57 |
| → Spriz joined | 06:57 |
| → thalleralexander joined | 06:59 |
| → b80905 joined | 06:59 |
| ← beautifulmind left | 07:01 |
| ← fracting left | 07:01 |
| → nnyk joined | 07:02 |
| ← Goplat left | 07:02 |
| → tcurdt_ joined | 07:02 |
| → tumulte joined | 07:03 |
| ← mscook__ left | 07:03 |
| → mscook joined | 07:04 |
|
b80905
| How do I checkout the first commit? | 07:04 |
| → DistantStar joined | 07:05 |
| → barduck joined | 07:06 |
|
Bombe
| b80905, the same way you check out any other commit. | 07:06 |
| → pihpah joined | 07:08 |
| ← netj left | 07:09 |
| → netj joined | 07:09 |
|
fluter_
| if I delete a branch, will the commits on that branch also get delelted? | 07:10 |
| → psoo joined | 07:12 |
|
Bombe
| fluter_, not immediately. They are subject to Git’s garbage collection that is executed every once in a while, though. | 07:13 |
|
fluter_
| Bombe: How can I remove a branch safely, yet preserve the commit it has? | 07:14 |
|
Bombe
| fluter_, I don’t understand what you are trying to do. | 07:14 |
| ← pihpah left | 07:14 |
| ← tarkus left | 07:14 |
| → pihpah joined | 07:14 |
|
Bombe
| fluter_, if you have no references to the commits (either a branch or a tag) the commits are unreachable (= useless) and can be deleted. | 07:15 |
|
fluter_
| Bombe: it's about gerrit, I imported an existing repo into gerrit, but gerrit can't run because it reqires refs/meta/config to be a commit of its config | 07:15 |
|
| so I created a orphan branch, and commit the project.config, and manually update refs/meta/config into that commit | 07:15 |
|
Bombe
| Sounds reasonable. | 07:16 |
|
fluter_
| and pushed, now there is unnecessary config branch, I want to remove it, and preserve the commit | 07:16 |
|
Bombe
| How is that unnecessary? I think Gerrit needs it? | 07:16 |
|
fluter_
| Bombe: gerrit needs refs/meta/config to be a commit of project.config, it does not needs the branch I created | 07:16 |
|
Bombe
| fluter_, refs/meta/config _is_ a branch. | 07:17 |
|
fluter_
| because the branch with single commit is shown on the gui, and will be cloned by clients, I don't want to cause confusion | 07:17 |
|
| Bombe: really? git clone does not get this branch | 07:17 |
|
Bombe
| fluter_, “will be cloned by clients” vs “git clone does not get this branch” – which is it? | 07:18 |
|
b80905
| Is there another way to refer to commits other than by specifying a hash? | 07:18 |
| ← heroux left | 07:18 |
|
Bombe
| b80905, sure. Branch names and tag names are two that come to mind. | 07:18 |
| → heroux joined | 07:19 |
| ← thalleralexander left | 07:19 |
| ← pihpah left | 07:19 |
|
fluter_
| Bombe: for normal repo created by gerrit, git clone does not get this meta/config branch, but server has it | 07:19 |
| → PCatinean joined | 07:19 |
| → fracting joined | 07:19 |
|
fluter_
| Bombe: for this imported project, because I created the config branch, client will see it when cloneing | 07:19 |
|
| and I don't want that to happen, | 07:19 |
|
Bombe
| b80905, man git-rev-parse has more. | 07:19 |
|
gitinfo
| b80905: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html | 07:19 |
|
fluter_
| I want make it looks other project created by gerrit | 07:20 |
|
Bombe
| I have no idea how repos created by Gerrit look like. | 07:20 |
|
fluter_
| Bombe: ok, let me ask this, the branches I created are at refs/heads/config | 07:21 |
|
b80905
| Bombe: Can I refer to a commit by its number? | 07:21 |
|
fluter_
| but for gerrit created project, it's ref/meta/config, why? | 07:21 |
|
| is refs/meta/config a branch? | 07:22 |
|
Bombe
| b80905, there is no commit number. You can refer to “n commits before this commit/branch/tag.” | 07:22 |
| ← mscook left | 07:22 |
|
Bombe
| fluter_, I have no idea how Git treats refs that are not somewhere in refs/{heads,remotes,tags}. | 07:23 |
| → mscook joined | 07:23 |
|
fluter_
| me too, I don't know why it's refs/meta/config :( | 07:23 |
| → tristanp joined | 07:24 |
| → Brain joined | 07:24 |
| ← t2mkn left | 07:24 |
|
ashnur
| hi. is there an easy way to debug post-receive hooks? i am trying to sync a checked out dir with it and i suspect there are some permission errors happening but I am not 100% sure and don't want to start giving write access without checking first if that's the problem | 07:24 |
| ← TomyWork left | 07:25 |
| → flowinho joined | 07:26 |
| ← ilmgb left | 07:26 |
| ← mscook left | 07:27 |
| → codetroll joined | 07:28 |
| ← encod3 left | 07:28 |
| ← tristanp left | 07:28 |
|
Bombe
| fluter_, hmm. I just created a repository, hand-crafted refs/meta/config, cloned the repository, and refs/meta/config does not get cloned. | 07:28 |
| → kcj joined | 07:28 |
| → skylite joined | 07:29 |
|
fluter_
| Bombe: right, that's what I meant. | 07:29 |
|
| Bombe: the normally created branch will at refs/heads/config, and will get cloned | 07:29 |
|
| so if I copy refs/heads/config into refs/meta/config, can I safely delete the config branch? | 07:29 |
| ← codetroll left | 07:30 |
|
Bombe
| I could not create refs/meta/config with git-branch. | 07:30 |
|
| Ah. | 07:30 |
|
| Hmm. | 07:30 |
|
| No idea, actually. | 07:30 |
|
| You could remove refs/heads/config and use git-fsck to see if it’s a dangling blob now. | 07:30 |
|
| If it is, it will be deleted on git-gc, if it isn’t Git still considers it reachable. | 07:31 |
|
Seveas
| Bombe: default clones only copy refs/heads/* and refs/tags/* refs/meta isn't a branch. | 07:31 |
|
Bombe
| Seveas, noticed that already. :) | 07:31 |
| → soc42 joined | 07:31 |
| → mithenks joined | 07:31 |
|
fluter_
| Seveas: what is refs/meta/* ? | 07:32 |
|
Seveas
| fluter_: something Bombe came up with that nobody else does :) | 07:32 |
|
fluter_
| Seveas: No, it's in every gerrit repo | 07:32 |
|
Seveas
| but hey, it's a free worls, you're free to name your refs however you want | 07:32 |
|
| fluter_: ah. Never having used gerrit, I didn't know that | 07:33 |
| → p4trix joined | 07:33 |
|
fluter_
| ok, | 07:33 |
| → dreiss joined | 07:35 |
| → modocache joined | 07:36 |
| → ilmgb joined | 07:36 |
| ← modocache left | 07:36 |
| → howlymowly joined | 07:37 |
|
Bombe
| fluter_, apparently git considers refs/meta/config to be reachable, my small test repository did not report any dangling blobs. | 07:37 |
| ← Muhannad left | 07:37 |
|
fluter_
| Bombe: after delete the config branch? | 07:37 |
|
Bombe
| fluter_, well, I deleted the “master” branch in my test repository. :) | 07:37 |
|
fluter_
| Bombe: okay :p and refs/meta/config is the head commit of master? | 07:38 |
|
Bombe
| Yes. | 07:38 |
|
fluter_
| ok, it means git considers refs/meta/config to be something. :) | 07:38 |
| → petersr joined | 07:38 |
|
Bombe
| I’m pretty confident it does. | 07:39 |
|
fluter_
| let me do that too, I will remove refs/heads/config :p | 07:39 |
| ← eGGsha left | 07:39 |
| ← ehmatthes left | 07:41 |
| → apfeluser joined | 07:42 |
| ← tcurdt_ left | 07:43 |
| → PeterBooker joined | 07:43 |
| → tcurdt_ joined | 07:43 |
| ← howlymowly left | 07:43 |
| ← Corey84 left | 07:43 |
| → howlymowly joined | 07:44 |
| → eGGsha joined | 07:45 |
| ← unholycrab left | 07:46 |
| ← tcurdt_ left | 07:47 |
| → bonswouar joined | 07:48 |
| ← p4trix left | 07:49 |
| ← happy-dude left | 07:49 |
| → voodo joined | 07:49 |
| ← IanWizard left | 07:49 |
| ← thiago left | 07:50 |
| → settermjd joined | 07:50 |
| ← apfeluser left | 07:50 |
| → Kartagis joined | 07:51 |
|
Kartagis
| hi | 07:51 |
| ← SocialBlunder left | 07:51 |
|
Kartagis
| how can I git add -A minus one file? | 07:51 |
| → pantsman- joined | 07:52 |
| ← pwnz0r left | 07:53 |
| → bongjovi joined | 07:54 |
| → tcurdt_ joined | 07:55 |
| ← sabgenton left | 07:56 |
| ← tcurdt_ left | 07:58 |
| → tcurdt_ joined | 07:58 |
| ← fahadash left | 07:58 |
| → tumulte_ joined | 07:58 |
| → SocialBlunder joined | 07:58 |
| → encod3 joined | 07:59 |
| ← felipedvorak left | 07:59 |
| → ClearC2 joined | 07:59 |
| ← devoldmx left | 07:59 |
| ← aspiers left | 07:59 |
| → apfeluser joined | 07:59 |
| ← apfeluser left | 08:00 |
| → Hounddog joined | 08:00 |
| ← tumulte left | 08:00 |
| → white_bear joined | 08:00 |
| → tcurdt__ joined | 08:00 |
| → creep joined | 08:01 |
| → fahadash joined | 08:01 |
| ← tcurdt_ left | 08:01 |
| ← nerd left | 08:01 |
| ← fahadash left | 08:02 |
| → Corey84 joined | 08:02 |
| → mikecmpbll joined | 08:02 |
| → th3mis joined | 08:02 |
| ← tcurdt__ left | 08:03 |
| ← SocialBlunder left | 08:03 |
| ← eGGsha left | 08:03 |
| ← ClearC2 left | 08:03 |
| → tcurdt_ joined | 08:03 |
| ← Hounddog left | 08:04 |
| ← arez left | 08:04 |
| ← NeverDie left | 08:04 |
| → Hounddog joined | 08:04 |
| → eGGsha joined | 08:05 |
| → marcogmonteiro joined | 08:06 |
| → nerd joined | 08:07 |
| → harish_ joined | 08:07 |
| ← genbattle left | 08:07 |
| ← clarkpan left | 08:09 |
| ← th3mis left | 08:10 |
| → felipedvorak joined | 08:13 |
| → aspiers joined | 08:13 |
| ← boombatower left | 08:17 |
| → Balliad joined | 08:17 |
| ← daito left | 08:18 |
| ← petersr left | 08:19 |
| → freestyl3r joined | 08:19 |
| → Bruno_ joined | 08:21 |
| ← bonswouar left | 08:22 |
| → bonswouar joined | 08:22 |
| ← mutbuerger left | 08:22 |
| ← Shentino left | 08:23 |
| → notebox joined | 08:23 |
| ← arup_r left | 08:24 |
| → arup_r joined | 08:25 |
| ← Arokh left | 08:26 |
| ← dr_lepper left | 08:26 |
| ← white_bear left | 08:26 |
| ← Gege left | 08:26 |
| ← Olipro left | 08:26 |
| ← meatmanek left | 08:26 |
| ← diegoaguilar left | 08:26 |
| ← BSaboia left | 08:26 |
| ← Chex left | 08:26 |
| ← icosa1 left | 08:26 |
| ← macabre left | 08:26 |
| → Arokh joined | 08:26 |
| → Gege joined | 08:26 |
| → icosa1 joined | 08:26 |
| → dr_lepper joined | 08:26 |
| ← michael_mbp left | 08:26 |
| → diegoaguilar joined | 08:26 |
| ← voodo left | 08:27 |
| → fumihiro joined | 08:27 |
| → beautifulmind joined | 08:28 |
| → Olipro joined | 08:29 |
| → skullcrasher joined | 08:29 |
| → michael_mbp joined | 08:30 |
| → jost joined | 08:30 |
| → King_Hual joined | 08:30 |
| → Chex joined | 08:30 |
| → modocache joined | 08:31 |
| ← compac left | 08:31 |
| ← arup_r left | 08:32 |
| → daito joined | 08:33 |
| ← Gizburdt left | 08:34 |
| ← modocache left | 08:35 |
| → meatmanek joined | 08:36 |
| ← nydew07 left | 08:36 |
| ← ayaz left | 08:37 |
| → Guest1932 joined | 08:39 |
| ← beautifulmind left | 08:40 |
| → beautifulmind joined | 08:41 |
| → netcarver joined | 08:42 |
| → CustosL1men joined | 08:43 |
| → unholycrab joined | 08:45 |
| ← netcarver left | 08:46 |
| → white_bear joined | 08:51 |
| → Shentino joined | 08:51 |
| → dangerousdave joined | 08:51 |
| ← xcesariox left | 08:52 |
| ← Guest1932 left | 08:52 |
| → courrier joined | 08:52 |
| ← dangerousdave left | 08:52 |
| ← courrier left | 08:52 |
| → courrier joined | 08:53 |
| → strull joined | 08:53 |
| → wicope joined | 08:53 |
|
_rgn
| maybe with shell expansion that excludes the file | 08:53 |
| → arup_r joined | 08:56 |
| ← arup_r left | 08:56 |
| → imdsm joined | 08:56 |
| → sanct joined | 08:57 |
|
Bombe
| Kartagis, git add -A, followed by git reset? | 08:57 |
| ← fracting left | 08:58 |
| ← eGGsha left | 08:58 |
|
Kartagis
| what does that do? | 08:58 |
| ← harish_ left | 08:58 |
|
j416
| Kartagis: git add -A && git reset -- <path> | 08:59 |
|
Kartagis
| oh | 08:59 |
| → SocialBlunder joined | 08:59 |
| → kongthap joined | 09:00 |
|
kongthap
| i use clone --depth to clone a project e.g. phpmyadmin, but when i want to keep it up-to-date, i use "git fetch" it fetch all object new and old, what should i do in this case ? | 09:02 |
| → zadock joined | 09:03 |
| ← soc42 left | 09:03 |
| fluter_ → fluter | 09:04 |
| ← SocialBlunder left | 09:04 |
| ← johnkevi_ left | 09:04 |
| → Fiouz joined | 09:04 |
| → Zadruga joined | 09:05 |
|
jast
| kongthap: not completely sure, but fetch has a --depth option, too | 09:05 |
|
PCatinean
| If I try git push origin -f after resetting I get (pre-receive hook declined) | 09:06 |
|
| anyoe know why's that? | 09:06 |
| ← dreiss left | 09:06 |
|
kongthap
| jast, yeah you're right :) | 09:06 |
|
jast
| PCatinean: that means there is a custom check installed on the server that is rejecting your push | 09:06 |
|
| contact your server admin | 09:06 |
| → Dragooon joined | 09:07 |
|
jast
| the hook may be outputting more details above that message | 09:07 |
|
PCatinean
| I prevented history re-writes apparently on the 8.0 branch | 09:08 |
|
| I am the creator though 0_o | 09:08 |
|
| and owner and admin and all that | 09:08 |
|
| But I cannot add myself as an exception for history-rewrite | 09:08 |
|
| Yup, that was it thank you jast :D | 09:09 |
| ← sparetire_ left | 09:09 |
| → fracting joined | 09:10 |
| → mutbuerger joined | 09:11 |
| → tristanp joined | 09:12 |
| → Armitage joined | 09:13 |
| ← mehola left | 09:14 |
| gitinfo set mode: +v | 09:14 |
|
Armitage
| hi there | 09:14 |
|
gitinfo
| Armitage: 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. | 09:14 |
| ← Dragooon left | 09:15 |
| ← diegoaguilar left | 09:16 |
| → Zariel joined | 09:16 |
| ← tristanp left | 09:17 |
|
Armitage
| I have a git server on linux system and I add ssh key in authorized_keys file. How can I use it on client? I just write "git remote add origin ssh://git@gitserver:/opt/git/project.git" and then I asked enter password | 09:17 |
| ← nnyk left | 09:18 |
|
Armitage
| Client is mingw32 | 09:18 |
|
| I create pair keys with GIT Gui | 09:18 |
| → eGGsha joined | 09:21 |
| ← neanderslob left | 09:21 |
| ← daito left | 09:24 |
| → corellian joined | 09:25 |
| → kongthap_ joined | 09:25 |
| ← tcurdt_ left | 09:25 |
| → tcurdt__ joined | 09:25 |
| ← beautifulmind left | 09:25 |
| → hithard_ joined | 09:26 |
| → kongthap__ joined | 09:26 |
| ← tcurdt__ left | 09:27 |
| → stamina joined | 09:27 |
| → tcurdt_ joined | 09:27 |
| ← kongthap left | 09:27 |
| ← icosa1 left | 09:28 |
| ← tcurdt_ left | 09:29 |
| → tcurdt_ joined | 09:30 |
| ← kongthap_ left | 09:30 |
| ← Balliad left | 09:31 |
| ← tcurdt_ left | 09:31 |
| → tcurdt_ joined | 09:32 |
| → Balliad joined | 09:32 |
| → fenugrec joined | 09:33 |
| → niels_ joined | 09:33 |
| ← tcurdt_ left | 09:34 |
| → tcurdt__ joined | 09:34 |
| → Dragooon joined | 09:35 |
| ← tcurdt__ left | 09:36 |
| → tcurdt_ joined | 09:36 |
| ← Bruno_ left | 09:37 |
| → ddr2 joined | 09:38 |
| ← tcurdt_ left | 09:38 |
| → tcurdt__ joined | 09:39 |
| → coredumb joined | 09:39 |
| ← tcurdt__ left | 09:40 |
| → tcurdt_ joined | 09:40 |
| → tomek joined | 09:46 |
| ← fracting left | 09:46 |
| ← settermjd left | 09:46 |
| → settermjd joined | 09:47 |
| → troulouliou_div2 joined | 09:47 |
| ← tcurdt_ left | 09:48 |
| → tcurdt__ joined | 09:48 |
| ← troulouliou_div2 left | 09:49 |
| → marienz joined | 09:51 |
|
guardian
| hello, is there a way to make "git fetch" always fetch tags, maybe with an option in .gitconfig ? | 09:51 |
| → h3xc0d3r joined | 09:51 |
| → Zeedox joined | 09:52 |
| ← Dragooon left | 09:52 |
| → Nick-S joined | 09:53 |
| ← stamina left | 09:54 |
| ← sarri left | 09:54 |
| ← eletuchy left | 09:55 |
| ← MattMaker left | 09:57 |
| → sarri joined | 09:57 |
| → sdothum joined | 09:57 |
| ← h3xc0d3r left | 09:58 |
|
tsunamie
| hello hello, is there a way to checkin one file to a specific location without cloning the whole repo? I want to programaticly push backup text files 1kb | 09:58 |
|
| and really don't want the hassel of doing a whole clone | 09:59 |
| → fracting joined | 09:59 |
| → h3xc0d3r joined | 09:59 |
| → ClearC2 joined | 10:00 |
| ← ilmgb left | 10:00 |
| → SocialBlunder joined | 10:00 |
| → ilmgb joined | 10:02 |
|
Zeedox
| Is there any good way to check if a branch on all remotes points to the same commit? | 10:02 |
|
| I'm thinking something like: `git remote update; git remote | xargs git show`, but I'm not sure where to go after that. | 10:03 |
| ← terminal_echo left | 10:03 |
|
Zeedox
| `git remote update && git remote | xargs -I{} git show {}/master` I mean | 10:04 |
| ← SocialBlunder left | 10:04 |
| ← ClearC2 left | 10:04 |
| ← ilmgb left | 10:06 |
| ← Corey84 left | 10:06 |
| ← eGGsha left | 10:06 |
| ← Dorf left | 10:07 |
| → voodo joined | 10:07 |
| → _0xc6_ joined | 10:10 |
| → VictorCL joined | 10:10 |
|
jast
| Zeedox: something something git show-ref | 10:11 |
| → gua_ould joined | 10:11 |
| ← elsevero left | 10:12 |
| → elsevero_ joined | 10:12 |
| ← s00pcan left | 10:12 |
| ← h3xc0d3r left | 10:13 |
| → jolg42 joined | 10:13 |
| ← jolg42 left | 10:14 |
| → reveredge joined | 10:14 |
| → ArchRogem joined | 10:14 |
| → s00pcan joined | 10:14 |
| → eGGsha joined | 10:15 |
| ← Plotinuz left | 10:17 |
| → arup_r joined | 10:18 |
| → Corey84 joined | 10:18 |
| ← VictorCL left | 10:19 |
| ← s00pcan left | 10:19 |
| → VictorCL joined | 10:20 |
| → modocache joined | 10:20 |
| ← modocache left | 10:20 |
| → s00pcan joined | 10:20 |
| ← encod3 left | 10:25 |
| → encod3 joined | 10:25 |
| ← jiqissc left | 10:26 |
| → SimonNa joined | 10:27 |
| ← nofxx left | 10:27 |
| → Saturn812 joined | 10:29 |
| → jiqissc joined | 10:30 |
| → d3m0n joined | 10:31 |
| ← mithenks left | 10:32 |
|
d3m0n
| What's the different between "git add ." and "git add *" ? | 10:32 |
| → Vadimus joined | 10:32 |
| → eVRiAL joined | 10:32 |
|
moritz_s
| d3m0n: * gets expanded by your shell so it (probably) won't add files that start with a dot, while git add . while add all files recursively in the current directory | 10:33 |
|
| s/while/will/ | 10:33 |
|
d3m0n
| moritz: expanded by shell? What's that mea? | 10:33 |
|
| mean* | 10:33 |
|
moritz_s
| d3m0n: if you type for example "echo *" your shell will turn this into "echo fileA fileB fileC" if those three files are in your current directory before calling echo | 10:34 |
|
osse
| replaces by a list of files | 10:34 |
|
_ikke_
| d3m0n: it means the shell will handle the * and git never even sees it | 10:35 |
|
| d3m0n: it's the same as if you manually specified each file and directory in the current directory, excluding the ones starting with a . | 10:35 |
| ← Darcidride left | 10:36 |
| → baxx joined | 10:37 |
| ← JanC left | 10:38 |
| → JanC_ joined | 10:39 |
| ← CussBot left | 10:39 |
| → CussBot joined | 10:39 |
|
d3m0n
| ikke_ for some reason my coworker can use "git add *" to add files but I cannot | 10:40 |
|
moritz
| d3m0n: I'm not moritz_s, fwiw | 10:40 |
| → freimatz joined | 10:41 |
| ← CussBot left | 10:42 |
| → CussBot joined | 10:42 |
|
fenugrec
| Hi, what happens if I "git merge --no-commit <X>" while I have uncommitted changes ? i.e. I modified some files + "git add *" so they're all listed in "Changes to be committed:" when I run git status | 10:42 |
| ← tcurdt__ left | 10:43 |
|
fenugrec
| Does the merge apply to the current state of the files, or the previous commit (HEAD) ? | 10:43 |
| → tcurdt_ joined | 10:43 |
| ← pantsman- left | 10:43 |
|
d3m0n
| moritz: WOuld you know why? | 10:44 |
| → mithenks joined | 10:44 |
|
d3m0n
| I cant seem to add modified files via "git add *" | 10:44 |
|
| I have 1.8.3 version of GIT | 10:44 |
|
j416
| d3m0n: what does git status say? | 10:45 |
|
d3m0n
| j416: Remains unadded | 10:45 |
|
j416
| d3m0n: full output | 10:45 |
|
d3m0n
| j416" fatal: no files added | 10:45 |
|
j416
| answer my question and I will help you | 10:45 |
|
| fenugrec: !tias | 10:46 |
|
gitinfo
| fenugrec: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS. | 10:46 |
|
j416
| :) | 10:46 |
| ← niels_ left | 10:46 |
|
j416
| fenugrec: but why would you want to merge with uncommitted changes? | 10:46 |
| ← keroro520 left | 10:47 |
| → niels_ joined | 10:47 |
|
fenugrec
| j416 yeah I could do a backup and try...I really don't want to trash my progress. I'm manually merging complicated commits to squash them into 1 | 10:47 |
|
d3m0n
| j416: > git add * "The following paths are ignored by one of your .gitignore files: Grunt.js node_mudules package.json. Use -f if you really want to add them. fatal: no files added" | 10:47 |
| → TomyWork joined | 10:47 |
|
fenugrec
| I consider them more patches than commits | 10:47 |
|
moritz
| d3m0n: and there's your answer. | 10:48 |
|
| d3m0n: just read the full message | 10:48 |
|
j416
| d3m0n: ^ | 10:48 |
|
d3m0n
| moritz: why would git want to add ignored files and halt | 10:48 |
|
| I would assume it would skip over them | 10:48 |
| ← niels_ left | 10:48 |
|
fenugrec
| d3m0n !man gitignore | 10:48 |
|
gitinfo
| The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ? | 10:48 |
|
| the gitignore manpage is available at http://jk.gs/gitignore.html | 10:48 |
| → niels_ joined | 10:48 |
|
j416
| d3m0n: you never answered my question | 10:49 |
|
| fenugrec: merge will not do anything if it would overwrite your uncommitted changes | 10:52 |
| → ncd|leeN joined | 10:52 |
|
j416
| fenugrec: is the answer | 10:52 |
|
fenugrec
| j416 nice, thanks | 10:52 |
|
j416
| fenugrec: you still have a very weird workflow and it seems like you will shoot yourself in the foot at some point. | 10:53 |
|
| might want to revise that | 10:53 |
|
fenugrec
| j416 it's very unusual. I don't like what I'm doing | 10:53 |
|
j416
| I see. | 10:54 |
| → eletuchy joined | 10:55 |
| ← leeN left | 10:56 |
| → okanck joined | 10:56 |
| ← VictorCL left | 10:56 |
| → achadwick joined | 10:58 |
| ← rasto left | 10:59 |
| ← eletuchy left | 11:00 |
| ← Zariel left | 11:01 |
| → SocialBlunder joined | 11:01 |
| → tristanp joined | 11:01 |
| → MattMaker joined | 11:01 |
| → ilmgb joined | 11:01 |
| → beautifulmind joined | 11:03 |
| → VictorCL joined | 11:03 |
| ← arcanin left | 11:05 |
| ← SocialBlunder left | 11:05 |
| ← tristanp left | 11:05 |
| → mizu_no_oto joined | 11:05 |
| ← MattMaker left | 11:06 |
| ← ilmgb left | 11:06 |
| → clarkpan joined | 11:07 |
| ← ncd|leeN left | 11:07 |
| ← mizu_no_oto left | 11:08 |
| → Oebele joined | 11:09 |
| ← fracting left | 11:10 |
| ← clarkpan left | 11:11 |
| → awkwardusername joined | 11:12 |
| ← awkwardusername left | 11:12 |
| → rasto joined | 11:12 |
| ← zadock left | 11:13 |
| JanC_ → JanC | 11:13 |
| ← d3m0n left | 11:14 |
| ← sanct left | 11:14 |
| ← elsevero_ left | 11:14 |
| → sanct joined | 11:15 |
| → elsevero joined | 11:16 |
| → kukks joined | 11:16 |
| ← bongjovi left | 11:16 |
| ← SimonNa left | 11:16 |
| → harish_ joined | 11:17 |
| ← Corey84 left | 11:18 |
| → Darcidride joined | 11:19 |
| ← kcj left | 11:21 |
| ← voodo left | 11:21 |
| ← Shentino left | 11:21 |
| ← phantombeta left | 11:22 |
| → bongjovi joined | 11:23 |
| ← harish_ left | 11:23 |
| → fracting joined | 11:23 |
| → harish_ joined | 11:23 |
| ← lala left | 11:23 |
| → phantombeta joined | 11:24 |
| → Ranhir joined | 11:24 |
| ← fracting left | 11:26 |
| → fracting joined | 11:26 |
| → HZun joined | 11:28 |
| → Zariel joined | 11:30 |
| → reactormonk joined | 11:31 |
|
reactormonk
| is there a way I can cherry-pick a commit onto another branch without checking that one out? | 11:32 |
| → skylite_ joined | 11:33 |
| ← kongthap__ left | 11:33 |
| → mscook joined | 11:33 |
| → mweshi joined | 11:33 |
| → Gonzo89 joined | 11:34 |
| → Shentino joined | 11:34 |
| ← VictorCL left | 11:35 |
| ← mweshi left | 11:35 |
| ← eGGsha left | 11:35 |
| → mweshi joined | 11:36 |
|
Seveas
| reactormonk: no. | 11:37 |
| ← Sceorem left | 11:38 |
|
Seveas
| as a cherry-pick can cause conflicts, it needs a worktree | 11:38 |
|
reactormonk
| ok, so just create a local clone and do the work there | 11:38 |
| ← _0xc6_ left | 11:38 |
| ← King_Hual left | 11:39 |
| → rnsanchez joined | 11:39 |
| ← Nick-S left | 11:39 |
| → _0xc6_ joined | 11:39 |
| → VictorCL joined | 11:39 |
| ← Zariel left | 11:40 |
| → mixandgo joined | 11:41 |
| → King_Hual joined | 11:43 |
| → eGGsha joined | 11:44 |
| ← k_sze[work] left | 11:44 |
| → gabriela_ joined | 11:44 |
| → Sceorem joined | 11:44 |
| → hahuang61 joined | 11:44 |
| ← hahuang65 left | 11:44 |
| → marscher joined | 11:45 |
| → ilmgb joined | 11:45 |
| ← VictorCL left | 11:45 |
| ← Kelzier left | 11:45 |
| ← eVRiAL left | 11:45 |
| → Kelzier joined | 11:46 |
| → MarkyC joined | 11:47 |
| ← jiqissc left | 11:48 |
| ← jceb_ left | 11:48 |
| ← ckruczek left | 11:48 |
| → _Atom_ joined | 11:48 |
| ← hithard_ left | 11:49 |
| → LBV_User joined | 11:50 |
| → a-l-e joined | 11:51 |
| → dgutierrez1287 joined | 11:53 |
| → s8321414 joined | 11:54 |
| → dougsland joined | 11:54 |
| → pilif joined | 11:55 |
| → Nick-S joined | 11:56 |
| → creep_ joined | 11:59 |
| ← fstd left | 11:59 |
| → fstd joined | 11:59 |
| → ClearC2 joined | 12:01 |
| → SocialBlunder joined | 12:02 |
| → VictorCL joined | 12:02 |
| ← a-l-e left | 12:02 |
| ← eGGsha left | 12:02 |
| → eGGsha joined | 12:02 |
| → jceb_ joined | 12:03 |
| ← creep left | 12:03 |
| eGGsha → eGGshke | 12:03 |
| → Dorf joined | 12:05 |
| ← ClearC2 left | 12:05 |
| ← tcurdt_ left | 12:06 |
| ← SocialBlunder left | 12:06 |
| → cavallari joined | 12:06 |
| → tcurdt_ joined | 12:06 |
| eGGshke → eGGsha | 12:07 |
| → wwwald joined | 12:07 |
| → olso joined | 12:08 |
| ← VictorCL left | 12:08 |
| ← beautifulmind left | 12:08 |
| → nnyk joined | 12:08 |
| → modocache joined | 12:09 |
| ← modocache left | 12:09 |
| → holodoc joined | 12:10 |
| → rwb joined | 12:10 |
| ← holodoc left | 12:10 |
| → holodoc joined | 12:10 |
| → AugustoCesar joined | 12:11 |
| ← wwwald left | 12:13 |
| ← olso left | 12:13 |
| → wwwald joined | 12:14 |
| ← fracting left | 12:15 |
| ← holodoc left | 12:15 |
| ← MarkyC left | 12:15 |
| → holodoc joined | 12:16 |
| ← wwwald left | 12:16 |
| → olso joined | 12:16 |
| ← hfp left | 12:16 |
| → wwwald joined | 12:17 |
| → benborges joined | 12:17 |
| ← saintcajetan left | 12:17 |
| ← hfp_work left | 12:17 |
| → saintcajetan joined | 12:19 |
| → sgli joined | 12:20 |
| → Dragooon joined | 12:22 |
| ← sgli left | 12:23 |
| ← jceb_ left | 12:23 |
| ← Dragooon left | 12:24 |
| ← dougsland left | 12:25 |
| → daivyk joined | 12:25 |
| → beautifulmind joined | 12:26 |
| → mizu_no_oto joined | 12:27 |
| → theCole joined | 12:27 |
| ← nda_ left | 12:27 |
| → dougsland joined | 12:27 |
| → hfp joined | 12:28 |
| → Zariel joined | 12:28 |
| ← Darcidride left | 12:28 |
| → Corey84 joined | 12:28 |
| → hfp_work joined | 12:28 |
| ← theCole left | 12:29 |
| → VictorCL joined | 12:29 |
| → dsdeiz_ joined | 12:29 |
| → nda_ joined | 12:30 |
| ← Corey84 left | 12:30 |
| ← VictorCL left | 12:30 |
| ← ilmgb left | 12:31 |
| ← dsdeiz left | 12:32 |
| ← beautifulmind left | 12:32 |
| ← Zariel left | 12:32 |
| → beautifulmind joined | 12:32 |
| → VictorCL joined | 12:33 |
| → theCole joined | 12:33 |
| → pk-john joined | 12:33 |
| → ilmgb joined | 12:33 |
| → MarkyC joined | 12:34 |
| → Zariel joined | 12:34 |
| ← pk-john left | 12:34 |
| ← dsdeiz_ left | 12:34 |
| → sanketdg joined | 12:34 |
| → pk-john joined | 12:35 |
| ← _Atom_ left | 12:35 |
| → Corey84 joined | 12:35 |
| ← Spriz left | 12:35 |
| → livingstn joined | 12:36 |
| → sgli joined | 12:37 |
| ← ilmgb left | 12:38 |
| ← harish_ left | 12:38 |
| ← theCole left | 12:38 |
| → harish joined | 12:39 |
| ← harish left | 12:40 |
| → harish joined | 12:40 |
| → KeelOfSteel joined | 12:41 |
| → sazed joined | 12:41 |
| ← niels_ left | 12:41 |
| ← dougsland left | 12:41 |
| → niels_ joined | 12:42 |
| → theCole joined | 12:42 |
| → Darcidride joined | 12:43 |
| → dougsland joined | 12:43 |
| → mintux joined | 12:45 |
| ← niels_ left | 12:46 |
| → EricPoe joined | 12:47 |
| → ilmgb joined | 12:48 |
| → Spriz joined | 12:48 |
| ← EricPoe left | 12:48 |
| ← VictorCL left | 12:49 |
| → mellernoia joined | 12:49 |
| → kblin joined | 12:50 |
|
kblin
| hi folks | 12:50 |
| → mbrzuzy joined | 12:50 |
|
kblin
| is there a trick to get git send-email to work on ubuntu 14.04 (v 1.9.1) with a mail server that requires TLS? | 12:50 |
| ← D-Boy left | 12:50 |
| → MattMaker joined | 12:50 |
| → jceb joined | 12:51 |
|
mintux
| what this is this? http://codepad.org/0G6oM3O7 error: RPC failed; result=56, HTTP code = 0 | 12:51 |
|
kblin
| I'm getting "Command unknown: 'AUTH' at /usr/lib/git-core/git-send-email line 1262.", but all I can find on google for that is people suggesting to turn off authentication | 12:51 |
| ← mutbuerger left | 12:53 |
| ← jceb left | 12:55 |
| ← MattMaker left | 12:55 |
| ← fenugrec left | 12:55 |
| ← mscook left | 12:56 |
| → GT4066 joined | 12:57 |
| → macabre joined | 12:57 |
| → mscook joined | 12:57 |
| ← faheem_ left | 12:58 |
| ← mscook left | 13:01 |
| ← eGGsha left | 13:01 |
| → fracting joined | 13:01 |
| → D-Boy joined | 13:02 |
| → SocialBlunder joined | 13:02 |
| → mscook joined | 13:03 |
| → modocache joined | 13:03 |
| ← modocache left | 13:03 |
|
spaceone
| do i need to have a branch called 'master'? can i rename it? or link it to another branch? | 13:03 |
| → Spacew00t joined | 13:04 |
|
BtbN
| It's the default name and accepted standard for the main development branch. | 13:04 |
| → ClearC2 joined | 13:04 |
| → astrofog joined | 13:04 |
|
_rgn
| it's just a default name, and doesn't have any special semantics | 13:04 |
| → Doxin joined | 13:07 |
|
Doxin
| I need to search a git repo for the first mention of "bagels", how do I? | 13:07 |
|
_rgn
| in the message or code? | 13:07 |
|
Doxin
| code | 13:07 |
|
_rgn
| something like git log -Sbagels | 13:07 |
| ← SocialBlunder left | 13:07 |
| → jceb joined | 13:07 |
|
Doxin
| _rgn: no results. | 13:07 |
|
| which is odd, since bagels is in the code at least once currently | 13:07 |
|
_rgn
| uncommitted? | 13:08 |
| → eGGsha joined | 13:08 |
| ← sgli left | 13:08 |
| ← s8321414 left | 13:08 |
| ← fracting left | 13:08 |
|
Doxin
| _rgn: most definitely committed. | 13:08 |
| → s8321414 joined | 13:09 |
|
corellian
| Doxin: why not use grep tool? | 13:09 |
| → jerius joined | 13:09 |
| → _Atom_ joined | 13:09 |
| ← dl9pf_ left | 13:09 |
|
Doxin
| corellian: I need to find the earliest occurence | 13:09 |
| ← jerius left | 13:09 |
|
_rgn
| git log -Sbagels works for me | 13:09 |
|
Doxin
| doing that on this repo fails: https://github.com/simtr/The-Powder-Toy/search?utf8=%E2%9C%93&q=bagels | 13:09 |
| → fracting joined | 13:09 |
| → jerius joined | 13:10 |
| → knownasilya joined | 13:10 |
| → dl9pf joined | 13:10 |
|
_rgn
| Doxin: seems to work for me | 13:10 |
| ← fluter left | 13:10 |
| → IrishPrime joined | 13:11 |
| → fluter joined | 13:11 |
|
Doxin
| _rgn: awesome. so why not for me? | 13:11 |
|
| oh case sensitive | 13:11 |
|
| ofc | 13:11 |
|
_rgn
| yeah | 13:12 |
| → mikewintermute joined | 13:12 |
| → hithard_ joined | 13:12 |
| ← hithard_ left | 13:13 |
| ← fluter left | 13:13 |
| → CEnnis91 joined | 13:13 |
| → fluter joined | 13:14 |
| → fumihiro_ joined | 13:14 |
| → hithard_ joined | 13:14 |
| ← hithard_ left | 13:15 |
| → hithard_ joined | 13:15 |
| → islalobo joined | 13:15 |
| ← wwwald left | 13:16 |
| ← hithard_ left | 13:16 |
| → bitkiller joined | 13:16 |
| → hithard_ joined | 13:16 |
| ← fluter left | 13:16 |
| → fluter joined | 13:17 |
| → Phoenixz joined | 13:17 |
| ← fumihiro left | 13:17 |
| → jargan joined | 13:17 |
| ← kukks left | 13:17 |
| ← jast left | 13:18 |
| → King_Hual` joined | 13:18 |
| jargan → jast | 13:18 |
| → gregsmith joined | 13:19 |
| ← hithard_ left | 13:19 |
| ← fluter left | 13:19 |
| ← King_Hual left | 13:19 |
| ← mintux left | 13:19 |
| → fluter joined | 13:20 |
| → tvw joined | 13:20 |
| ← DrNick left | 13:21 |
| ← freestyl3r left | 13:21 |
| → Nizumzen joined | 13:21 |
| → hithard_ joined | 13:22 |
| → sgli joined | 13:22 |
| → gerv joined | 13:25 |
|
gerv
| Hey. | 13:25 |
|
gitinfo
| gerv: 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. | 13:25 |
|
gerv
| Sort of a git question, sort of not :-) | 13:26 |
| ← cagedwisdom left | 13:26 |
| ← tvw left | 13:26 |
| ← Spriz left | 13:26 |
|
gerv
| There is an open source codebase. At one point, a couple of years ago, I branched off from the stable version. Since then, I've been doing some development on it, and merging in security fixes from the stable branch. | 13:26 |
|
| Now, I want to move my changes to the new stable branch. | 13:26 |
| → Spriz joined | 13:27 |
|
gerv
| What's the right way to do this merge? | 13:27 |
| ← Oebele left | 13:27 |
| ← okanck left | 13:27 |
|
gerv
| (I can explain what I've tried, if that would help.) | 13:27 |
| → King_Hual_ joined | 13:27 |
| → tristanp joined | 13:28 |
| → mtscout6 joined | 13:29 |
| ← King_Hual` left | 13:30 |
| ← evie_hammond left | 13:31 |
| ← dgutierrez1287 left | 13:31 |
| → basiclaser joined | 13:31 |
| ← mweshi left | 13:31 |
| → tvw joined | 13:31 |
| → clmsy joined | 13:31 |
| → BSaboia joined | 13:32 |
|
MarkyC
| gerv: Let's call the open source codebase upstream. You want to merge your changes to upstream? | 13:33 |
|
gerv
| MarkyC: yes. | 13:33 |
|
| But the changes are based on a stable branch which may well have changes which weren't in the trunk, | 13:33 |
|
| which the current stable branch is based on. | 13:33 |
|
MarkyC
| gerv: Pull Request. | 13:33 |
|
gerv
| Er, perhaps I'm not explaining myself very well. | 13:34 |
|
BtbN
| usualy pull requests against stable branches aren't accepted | 13:34 |
|
gerv
| Let me be more specific. | 13:34 |
|
BtbN
| rebase them ontop of the latest master. | 13:34 |
|
MarkyC
| gerv: The way I pull request is to rebase on the latest master | 13:34 |
| ← hithard_ left | 13:34 |
| → modocach_ joined | 13:34 |
|
gerv
| Let me try asking the question again. | 13:34 |
|
| I took Bugzilla 4.2.3 and started doing some development on it for a client. | 13:34 |
|
| 4.2.x is now reaching end of life. | 13:34 |
|
| Over the years, I've made a lot of changes, | 13:35 |
| ← modocach_ left | 13:35 |
|
gerv
| but I've also merged in security and other fixes from the upstream 4.2.x branch. | 13:35 |
|
| So the changes in the development line are not just mine. | 13:35 |
|
| They are mixed in with other ones. | 13:35 |
|
| Some of those may have been applied to Bugzilla trunk, | 13:35 |
|
| but some of them may not. | 13:35 |
| → pk-john_ joined | 13:35 |
|
gerv
| Now Bugzilla has released a 5.0 stable release, | 13:35 |
| → modocache joined | 13:35 |
|
BtbN
| well, take the ones that don't, rebase them ontop of master. | 13:35 |
| → abrrs joined | 13:36 |
|
gerv
| and I want to figure out how to extract all the changes that were _mine_ and stick them on top of the 5.0 branch. | 13:36 |
|
BtbN
| there is no magic to automate that. | 13:36 |
|
| go through all of them, and apply them ontop of master. | 13:36 |
| ← tcurdt_ left | 13:36 |
| → Guest91042 joined | 13:36 |
|
gerv
| "Go through" how, exactly? | 13:36 |
|
| git cherry-pick? | 13:36 |
| → evie_hammond joined | 13:36 |
|
BtbN
| open the log, and read it. | 13:36 |
|
gerv
| That's my question. | 13:36 |
|
Seveas
| gerv: can "mine" be reasonable defined as "with this committer ident"? | 13:36 |
|
gerv
| Seveas: not quite. | 13:36 |
| → m0nkmaster joined | 13:37 |
|
gerv
| That would probably produce a small superset. | 13:37 |
|
| But it would be fairly close. | 13:37 |
| → CKyle joined | 13:37 |
|
gerv
| I'd really like an interactive process, | 13:37 |
| → tcurdt_ joined | 13:37 |
|
gerv
| where git would say "<commit msg> Y/N?" | 13:37 |
|
| and I could say | 13:37 |
|
| Y | 13:37 |
|
| N | 13:37 |
|
| N | 13:37 |
|
Seveas
| gerv: an interactive rebase perhaps? :) | 13:37 |
|
gerv
| etc. | 13:37 |
|
MarkyC
| git rebase -i | 13:37 |
|
gerv
| But doesn't rebase take _all_ changes? | 13:37 |
|
Seveas
| it's not quite Y/N but "edit list of commits to exclude the ones you don't want" | 13:38 |
|
gerv
| As in, if I have a branch and I rebase it on top of master, | 13:38 |
|
| OK. | 13:38 |
|
Seveas
| interactive rebase is different. You can exclude commits, edit commits, rearrange them and squash them | 13:38 |
|
gerv
| So I check out the target branch, | 13:38 |
|
| and then do git rebase -i <source branch> | 13:38 |
|
Seveas
| the other way around | 13:38 |
|
| you check out bugzilla-4-2-3-gerv | 13:38 |
| ← pk-john left | 13:38 |
| ← Spriz left | 13:38 |
|
Seveas
| and git rebase -i bugzilla-5-0 | 13:38 |
|
gerv
| OK, I'll try that. | 13:39 |
|
| Thank you :-)) | 13:39 |
|
Seveas
| you're welcome. Good luck! | 13:39 |
|
| also, if rebase finds conflicts and you solve them: DON'T COMMIT! Just git add the solved conflicts and git rebase --continue | 13:39 |
| ← theCole left | 13:40 |
|
gerv
| Seveas: OK, thanks. | 13:40 |
|
| Can I use git mergetool on the conflicts at that point? | 13:41 |
|
| I've been using meld as my mergetool, | 13:41 |
| ← jerius left | 13:41 |
|
gerv
| but seemed to have a problem that it presented me with every change, including the ones which should be auto-mergeable, | 13:41 |
|
| which was a pain. | 13:41 |
|
Seveas
| you can do anything you want that does not create commits or updates refs | 13:41 |
|
gerv
| OK, thanks. | 13:41 |
|
Seveas
| (actually, you can do all that, but that doesn't have the intended effect :) | 13:41 |
| → lucianangelus joined | 13:42 |
| → dling joined | 13:42 |
| → AaronMT joined | 13:43 |
| → jerius joined | 13:43 |
| ← fracting left | 13:43 |
| → kadoban joined | 13:45 |
| ← m0nkmaster left | 13:45 |
| → mutbuerger joined | 13:45 |
| ← fumihiro_ left | 13:46 |
| ← benborges left | 13:46 |
| → troulouliou_div2 joined | 13:47 |
|
gerv
| Seveas: I'm hitting a problem. | 13:48 |
| → andrewvttran joined | 13:48 |
|
gerv
| I do git rebase -i <branch> and edit the list, which is great | 13:48 |
|
| But then I save it, and it says: | 13:48 |
| ← Guest18818 left | 13:48 |
| → skorgon_ joined | 13:49 |
|
gerv
| error: could not apply e002b3f... Bump version number post-release. | 13:49 |
| ← sgli left | 13:49 |
|
gerv
| But that's not one of the commits in my list, it's one I removed. | 13:49 |
|
Seveas
| hmm. Is it still in .git/git-rebase-todo? | 13:50 |
|
MarkyC
| you can re-edit that file using vim ^ and double check that e002b3f... isn't in there | 13:51 |
|
| (removing is just removing the line) | 13:51 |
| ← mizu_no_oto left | 13:51 |
| ← mixandgo left | 13:51 |
|
j416
| better: git rebase --edit-todo | 13:51 |
| z4zz_ → z4zz | 13:51 |
|
MarkyC
| j416: knew there was another way, thanks | 13:51 |
|
gerv
| I'm pretty sure it's not there. | 13:51 |
|
| I told it to skip that one, using --skip, | 13:51 |
| ← s8321414 left | 13:52 |
|
gerv
| and now it's doing the first one on my list. | 13:52 |
|
| Let me play some more. | 13:52 |
|
Seveas
| are you perhaps on windows? | 13:52 |
|
| thins kinda smells like 'virsus scanner holds the file open too long, and git reopens too fast, not seeing the change' | 13:52 |
| ← wicope left | 13:52 |
| ← arup_r left | 13:52 |
| ← asti left | 13:54 |
|
ashnur
| hi. is there an easy way to debug post-receive hooks? i am trying to sync a checked out dir with it and i suspect there are some permission errors happening but I am not 100% sure and don't want to start giving write access without checking first if that's the problem | 13:55 |
| → denver joined | 13:55 |
| → Spriz joined | 13:56 |
| → hsekami joined | 13:56 |
| → fracting joined | 13:56 |
|
Seveas
| ashnur: call it manually. Just cd /path/to/repo.git and execute the hook | 13:56 |
|
ashnur
| oh, i am so stupid | 13:57 |
|
| i even set the +x on it and didn't realize | 13:57 |
|
| thanks | 13:57 |
| → Maerc joined | 13:58 |
| ← _Atom_ left | 13:58 |
|
Seveas
| ashnur: well, not all hooks can be run this way, so it's not *that* stupid :) | 13:58 |
| ← fracting left | 13:59 |
|
ashnur
| yeah, it could be worse :D | 13:59 |
| → Noriandir joined | 13:59 |
|
MarkyC
| as someone who's never used git hooks, do those get checked in? | 13:59 |
|
gerv
| Seveas: Nope, Linux. | 13:59 |
| ← LBV_User left | 13:59 |
| ← rzeka left | 13:59 |
| → fracting joined | 13:59 |
|
ashnur
| got a lot of permission denies :( | 14:00 |
| ← Maerc left | 14:00 |
|
Noriandir
| hi. i'm trying to create a public git server for my local network, but i'm having some issues. I've got the git-daemon working with the --export-all flag, but everytime the other pc in the network tries to get the repo, i get a message for the ssh user password | 14:00 |
| → sfeinste joined | 14:00 |
| ← Darcidride left | 14:01 |
| ← Kelzier left | 14:02 |
| ← islalobo left | 14:03 |
| ← notebox left | 14:03 |
| ← sfeinste left | 14:05 |
| → LBV_User joined | 14:05 |
| ← reim left | 14:05 |
| ← fracting left | 14:06 |
| → sfeinste joined | 14:06 |
| → islalobo joined | 14:07 |
| ← islalobo left | 14:07 |
| → islalobo joined | 14:08 |
| → lindenle joined | 14:08 |
| → Dougie187 joined | 14:08 |
| ← islalobo left | 14:08 |
| → pk-john joined | 14:09 |
| ← pk-john_ left | 14:09 |
| → beaconwriter joined | 14:12 |
| → gutocarvalho joined | 14:12 |
| ← beaconwriter left | 14:13 |
|
j416
| Noriandir: what url are you using? | 14:14 |
| → cdown joined | 14:14 |
|
j416
| Noriandir: try git:// | 14:14 |
| ← Nooutlet left | 14:16 |
| → beaconwriter joined | 14:16 |
| ← hsekami left | 14:16 |
| → Nick-S_ joined | 14:17 |
|
Noriandir
| j416, it worked thanks. | 14:17 |
|
j416
| Noriandir: git will assume ssh if you don't specify protocol | 14:17 |
|
| iirc | 14:17 |
| → pk-john_ joined | 14:18 |
|
Noriandir
| j416, the problem wasn't only that | 14:18 |
|
| j416, i was connecting with user@server:/path | 14:18 |
|
j416
| yes, that is an url without protocol specified | 14:18 |
| → thedodd joined | 14:18 |
|
j416
| you can do ssh://user@server.. | 14:18 |
|
| ssh:// is the protocol part | 14:18 |
| → fracting joined | 14:18 |
| ← Nick-S left | 14:19 |
| ← mscook left | 14:19 |
|
j416
| although the syntax may differ slightly, I forget. | 14:19 |
|
| for port spec | 14:19 |
| → neurodrone_ joined | 14:19 |
| → Vinnie_win joined | 14:19 |
| → diegoaguilar joined | 14:20 |
|
CalimeroTeknik
| I have a local branch that's not tracking the origin, it seems, how can I make it? I ran for remote in `git branch -r`; do git branch --track $remote; done but now I just have more useless branches in git branch | 14:20 |
| → islalobo joined | 14:20 |
| ← pk-john left | 14:20 |
| ← andrewvttran left | 14:22 |
| → h4ml3t joined | 14:22 |
| ← alexsystemf left | 14:23 |
| → mscook_ joined | 14:23 |
| → alexsystemf joined | 14:23 |
| ← eGGsha left | 14:24 |
| ← Zariel left | 14:24 |
| → Zariel joined | 14:24 |
|
moritz_s
| CalimeroTeknik: what do you mean by "useless branches"? | 14:25 |
|
j416
| CalimeroTeknik: the easiest is to simply delete it and run git checkout again | 14:25 |
| ← beautifulmind left | 14:25 |
|
CalimeroTeknik
| well, I could git branch -d them | 14:26 |
|
j416
| CalimeroTeknik: it's what I usually do if that happens, because I always forget how to configure it | 14:26 |
| → mixandgo joined | 14:26 |
|
CalimeroTeknik
| hm | 14:26 |
|
j416
| if it happens often, you may have a workflow problem | 14:26 |
| ← Noriandir left | 14:26 |
| → Darcidride joined | 14:27 |
|
CalimeroTeknik
| no, it's just now, and it's automated | 14:27 |
|
| I use a clone as the production website | 14:27 |
|
| deployment is `git pull` there | 14:27 |
|
j416
| alright | 14:27 |
| → victortyau joined | 14:27 |
| → VictorCL joined | 14:27 |
|
CalimeroTeknik
| I can't wipe the production environment each time there is a new development branch to deploy next to it | 14:28 |
|
j416
| I'm not sure what the problem is | 14:28 |
|
| say you have branch 'master' and that exists as a local branch on your server | 14:29 |
|
| then you just 'git pull' with that checked out et voilà. | 14:29 |
|
CalimeroTeknik
| there is a branch 'dev' | 14:29 |
|
| and to save disk space and a new connection, the development clone is a clone of the production | 14:30 |
|
j416
| I'm not following | 14:30 |
| → xudongz joined | 14:30 |
| ← VictorCL left | 14:30 |
|
CalimeroTeknik
| bare repo ←ssh- prod clone ←fs- dev clone | 14:30 |
|
| ← indicates origin | 14:31 |
| → notebox joined | 14:31 |
|
j416
| hm | 14:31 |
|
| english? | 14:31 |
|
CalimeroTeknik
| production is a clone, and development is a clone of production | 14:31 |
|
j416
| you have two repos, is that what you mean? | 14:31 |
| ← notebox left | 14:32 |
|
CalimeroTeknik
| yes, two clones | 14:32 |
| ← Darcidride left | 14:32 |
|
j416
| and the server has the dev repo as its remote? | 14:32 |
|
| or do you mean that you have three repos, one of which is bare that serves as the central repo for both dev and prod? | 14:33 |
|
CalimeroTeknik
| yes, there are three. the central bare repository, and a clone of it (prod), and a clone of prod (dev) | 14:33 |
|
| ah. in prod I see in git branch -vvv: dev 3ff92f2 [origin/dev: behind 1] | 14:34 |
|
| why isn't it syncing it | 14:34 |
| → rzeka joined | 14:34 |
|
CalimeroTeknik
| I ran git pull --all | 14:34 |
| → duduxz joined | 14:34 |
|
CalimeroTeknik
| that is the issue | 14:34 |
| ← lindenle left | 14:34 |
|
MarkyC
| In a git rebase, is there an option to see the committer as well as the commit ID? | 14:34 |
| ← islalobo left | 14:35 |
| → devol joined | 14:35 |
|
_ikke_
| What part of the rebase? | 14:35 |
| → wrouesnel4 joined | 14:35 |
| → chitopunk joined | 14:35 |
| → lindenle_ joined | 14:37 |
|
j416
| CalimeroTeknik: ah, now I get it | 14:37 |
|
| CalimeroTeknik: you seem to have a local branch "dev" on the prod server | 14:37 |
|
CalimeroTeknik
| I do | 14:37 |
|
| otherwise how could the clone of it follow anything? | 14:37 |
|
| could it, actually? | 14:37 |
|
j416
| CalimeroTeknik: "git fetch" fetches everything from the remote | 14:38 |
|
| CalimeroTeknik: "git pull" == "git fetch" + ("git merge" for the current branch) | 14:38 |
|
CalimeroTeknik
| yes, sure | 14:38 |
| → endiruna joined | 14:38 |
|
CalimeroTeknik
| I understand these concepts, however I'm not clear with how origin and following branches work | 14:39 |
|
j416
| CalimeroTeknik: so running "git pull" while master is checked out, means it will update origin/master, origin/dev, etc., and from that it knows that your local dev is behind origin/dev when you look at it | 14:39 |
| ← rzeka left | 14:39 |
|
CalimeroTeknik
| of course | 14:39 |
| ← olso left | 14:39 |
|
j416
| CalimeroTeknik: then you don't understand those concepts | 14:39 |
|
| CalimeroTeknik: git fetch fetches all data from the remote, and updates origin/* | 14:39 |
|
CalimeroTeknik
| I do understand these for one jump | 14:39 |
| → MattMaker joined | 14:39 |
| → EricPoe joined | 14:39 |
|
CalimeroTeknik
| but I have two jumps | 14:39 |
|
| I know the data exists in the clone of the clone | 14:39 |
|
j416
| but it won't touch your local branches | 14:40 |
|
CalimeroTeknik
| well, I'd like it to, with --all I'd expect it to | 14:40 |
| ← gurki_ left | 14:40 |
|
CalimeroTeknik
| alas! nope. | 14:40 |
| → irc-52251 joined | 14:40 |
| → olso joined | 14:40 |
|
j416
| CalimeroTeknik: if you have a branch "foo" on your dev machine, then you push that to your bare repo, then do "git pull" on your server, then the server will have a remote branch called origin/foo and it will have all the data from it. | 14:40 |
| ← irc-5225225 left | 14:41 |
|
j416
| CalimeroTeknik: but no local branch will be created just because you did a fetch (through pull or not, doesn't matter) | 14:41 |
|
CalimeroTeknik
| remotes/origin/foo as it seems, yes | 14:41 |
|
j416
| yes | 14:41 |
| → VictorCL joined | 14:41 |
|
j416
| that is the correct full name | 14:41 |
|
CalimeroTeknik
| and then I clone that cloned repository and want to follow foo | 14:41 |
|
j416
| so you want to clone prod and keep foo? | 14:42 |
|
| for whatever reason you are unable to clone from the bare repo? | 14:42 |
| ← TinkerTyper left | 14:42 |
| ← Alienpruts left | 14:42 |
|
CalimeroTeknik
| I succeeded! | 14:42 |
|
j416
| CalimeroTeknik: in that case, git clone --mirror | 14:42 |
|
CalimeroTeknik
| git pull origin remotes/origin/foo in the clone of the clone | 14:42 |
|
j416
| I have no idea what you want to achiee | 14:43 |
|
| ve | 14:43 |
|
| sorry | 14:43 |
|
CalimeroTeknik
| ah, that was one-shot | 14:43 |
| → TinkerTyper joined | 14:43 |
|
MarkyC
| _ikke_: Sorry I missed that, in interactive rebase, where you can pick/squash | 14:43 |
| ← cdown left | 14:43 |
| ← skorgon_ left | 14:43 |
|
j416
| I'm off to get food | 14:43 |
|
| o/ | 14:43 |
| ← MattMaker left | 14:44 |
| → sgli joined | 14:44 |
| → tang^ joined | 14:44 |
| ← duduxz left | 14:44 |
| ← astrofog left | 14:44 |
| ← Polyatomic left | 14:45 |
| → edward__ joined | 14:45 |
| ← troulouliou_div2 left | 14:45 |
| → Darcidride joined | 14:47 |
| ← mixandgo left | 14:47 |
| → thiago_ joined | 14:48 |
| ← mithenks left | 14:48 |
|
MarkyC
| _ikke_: basically I'd like to squash a few of my commits. I know by the commit message, but there's probably a better way | 14:49 |
| → pm90_ joined | 14:49 |
| → tang^^ joined | 14:50 |
| → fumihiro joined | 14:50 |
| ← tang^ left | 14:50 |
| tang^^ → tang^ | 14:50 |
| ← barduck left | 14:50 |
|
BSaboia
| I did a git reset --hard head~1 | 14:51 |
|
| how can I go back to the head? | 14:51 |
| → cmoneylulz joined | 14:52 |
|
moritz_s
| BSaboia: use git reflog to find the hash of the old head and the do git reset --hard <hash> | 14:52 |
| ← VictorCL left | 14:53 |
|
BSaboia
| moritz_s, thanks | 14:53 |
|
| solved :) | 14:53 |
| → gambl0re joined | 14:54 |
| → VictorCL joined | 14:54 |
| ← Darcidride left | 14:54 |
| → Texan joined | 14:55 |
| ← edward__ left | 14:57 |
| → edward__ joined | 14:57 |
| ← VictorCL left | 14:58 |
| ← tcurdt_ left | 14:58 |
| → tcurdt_ joined | 14:59 |
| → mixandgo joined | 14:59 |
| → islalobo joined | 14:59 |
| ← Guest16789 left | 14:59 |
| → VictorCL joined | 15:00 |
| ← mscook_ left | 15:00 |
| ← gambl0re left | 15:01 |
| → higuys joined | 15:01 |
| ← psoo left | 15:02 |
| → Guest44340 joined | 15:03 |
| ← islalobo left | 15:03 |
| ← Silmarilion left | 15:03 |
| → SocialBlunder joined | 15:04 |
| → Bootinbull joined | 15:04 |
| → Darcidride joined | 15:04 |
| ← pm90_ left | 15:05 |
| ← cloudcell_ left | 15:05 |
| ← sinkensabe left | 15:06 |
| → cloudcell_ joined | 15:06 |
| → Wetmelon joined | 15:07 |
| ← SocialBlunder left | 15:08 |
| ← VictorCL left | 15:08 |
| ← Sceorem left | 15:09 |
| → VictorCL joined | 15:09 |
| → Kully3xf joined | 15:10 |
| ← supay left | 15:10 |
| → supay joined | 15:11 |
| ← Darcidride left | 15:11 |
| ← skylite left | 15:11 |
| ← VictorCL left | 15:11 |
| → VictorCL joined | 15:12 |
| ← gua_ould left | 15:12 |
| ← settermjd left | 15:12 |
| ← synthmeat left | 15:12 |
| → tennis_ joined | 15:13 |
| → kpease joined | 15:13 |
| ← VictorCL left | 15:13 |
| ← thiago_ left | 15:13 |
| ← Zadruga left | 15:13 |
| → [H]unt3r joined | 15:13 |
| → devoldmx joined | 15:14 |
| → ghibourg joined | 15:14 |
| ← IrishPrime left | 15:14 |
| ← jceb left | 15:14 |
| → tang^^ joined | 15:15 |
| ← strull left | 15:15 |
| ← jlewis_ left | 15:16 |
| → jlewis joined | 15:16 |
| → synthmeat joined | 15:17 |
| ← tang^ left | 15:17 |
| → the_cybersphinx joined | 15:18 |
| → islalobo joined | 15:18 |
| → Dragooon joined | 15:18 |
| → omegamike joined | 15:18 |
| ← israelpattison left | 15:18 |
| ← Brain left | 15:19 |
| → editshare-ericf joined | 15:19 |
| → eme joined | 15:19 |
| → sfeinste_ joined | 15:19 |
| ← modocache left | 15:21 |
| ← sfeinste left | 15:23 |
| ← sgli left | 15:23 |
| ← bonswouar left | 15:24 |
| → bakhtiya joined | 15:25 |
| ← jlewis left | 15:25 |
| ← supay left | 15:25 |
| ← Gonzo89 left | 15:25 |
| ← eme left | 15:25 |
| → IrishPrime joined | 15:26 |
| → cbonobo joined | 15:27 |
| → modocache joined | 15:29 |
| ← Balliad left | 15:29 |
| ← Milos left | 15:30 |
| → blahdodo joined | 15:30 |
| → ascarter joined | 15:33 |
| → MinetestForFun joined | 15:35 |
| ← sfeinste_ left | 15:35 |
| ← edward__ left | 15:35 |
| → mizu_no_oto joined | 15:36 |
| → sfeinste joined | 15:36 |
| ← CustosL1men left | 15:36 |
| → jlewis joined | 15:36 |
| → reim joined | 15:36 |
| → CustosL1men joined | 15:37 |
| ← bitonic left | 15:37 |
| → dreiss joined | 15:37 |
| → bitonic joined | 15:37 |
| ← abrrs left | 15:38 |
| ← howlymowly left | 15:39 |
| ← Guest91042 left | 15:39 |
| → MattMaker joined | 15:40 |
| ← Hounddog left | 15:40 |
| ← dreiss left | 15:41 |
| ← jlewis left | 15:41 |
| ← basiclaser left | 15:42 |
| ← maestrojed left | 15:42 |
| → cdown joined | 15:42 |
| → dgutierrez1287 joined | 15:43 |
| ← elsevero left | 15:43 |
| → jorj joined | 15:43 |
| → eGGsha joined | 15:44 |
| ← MattMaker left | 15:44 |
| → inamoriti joined | 15:45 |
| ← corellian left | 15:45 |
| → pm90_ joined | 15:45 |
| eGGsha → eGGshke | 15:46 |
| ← nnyk left | 15:46 |
| ← eGGshke left | 15:46 |
| → relipse joined | 15:46 |
| → jlewis joined | 15:47 |
| → nnyk joined | 15:47 |
| → sgli joined | 15:47 |
| → eGGsha joined | 15:47 |
| → pm90__ joined | 15:47 |
| → Technocrat7 joined | 15:47 |
|
relipse
| The easiest way to remove ALL history is by copying the files to another folder and deleting the .git directory right? | 15:47 |
|
| and then doing git init | 15:47 |
|
phroa`
| I'd say yes | 15:47 |
| → hobodave joined | 15:47 |
| ← dgutierrez1287 left | 15:47 |
|
relipse
| or just deleting the .git folder and doing .git init right? | 15:48 |
| ← sgli left | 15:48 |
|
phroa`
| you don't HAVE to copy it, but if you need a backup, boy will you be sorry :P | 15:48 |
| ← clmsy left | 15:48 |
|
relipse
| ok i'll make a backup thanks | 15:48 |
| ← hobodave left | 15:48 |
| → m0viefreak joined | 15:48 |
| → VictorCL joined | 15:48 |
| → hobodave joined | 15:49 |
| ← pm90_ left | 15:50 |
| ← sfeinste left | 15:51 |
| ← VictorCL left | 15:51 |
| → dudoom joined | 15:51 |
| → VictorCL joined | 15:52 |
| → israelpattison joined | 15:52 |
| eGGsha → eGGshke | 15:52 |
| eGGshke → eGGsha | 15:52 |
|
relipse
| ok i deleted the .git directory and now I am trying to add the files back and one of my submodules is screwing up: fatal: Not a git repository: public_html/lib/JKElasticEmail/../../../.git/module | 15:53 |
|
| s/public_html/lib/JKElasticEmail | 15:53 |
|
phroa`
| delete and readd the submodules in your new repo | 15:54 |
|
| as in, rm the folder, then git submodule add .. | 15:54 |
|
ojacobson
| Is that submodule in some repo you can re-clone? If so, nuke the `public_html/lib/JKElasticEmail` subdir and use `git submodule add` to recreate it | 15:54 |
|
| if not, welp | 15:54 |
|
phroa`
| (meant to be an ellipsis, I don't mean literally add "..") | 15:54 |
|
ojacobson
| time for repo surgery | 15:54 |
|
phroa`
| ojacobson: he already did the surgery. with a chainsaw. :) | 15:54 |
| ← gfixler left | 15:55 |
| ← white_bear left | 15:56 |
| ← Technocrat7 left | 15:56 |
| ← Dragooon left | 15:56 |
| ← King_Hual_ left | 15:57 |
| ← VictorCL left | 15:57 |
| ← tvw left | 15:58 |
| → King_Hual joined | 15:58 |
| → VictorCL joined | 15:58 |
| → tvw joined | 15:58 |
| ← cdown left | 15:59 |
| eGGsha → eGGshke | 15:59 |
| ← VictorCL left | 15:59 |
| ← cstrahan left | 16:01 |
| → cdown joined | 16:01 |
| → cstrahan joined | 16:01 |
| → tyreld joined | 16:01 |
| ← modocache left | 16:03 |
| ← multi_io left | 16:04 |
| ← tumulte_ left | 16:04 |
| → SocialBlunder joined | 16:05 |
| → MechtiIde joined | 16:05 |
|
relipse
| how do I move a submodule, last time I tried i ran into a ton of problems | 16:05 |
| → multi_io joined | 16:06 |
|
phroa`
| move or remove | 16:06 |
|
_ikke_
| !submodule_rm | 16:07 |
|
gitinfo
| [!submodules_rm] To delete a submodule, do this in the superproject: Edit/delete .gitmodules to remove the submodule, and `git add .gitmodules`. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove. Possible alternatives to submodules: "!gitslave" or "!subtree" | 16:07 |
| → CorySimmons joined | 16:07 |
| ← tcurdt_ left | 16:08 |
| → andrewvttran joined | 16:08 |
|
phroa`
| not gonna lie, that really should be scripted | 16:08 |
|
| may just have to send a patch for that myself >.> | 16:08 |
|
_ikke_
| might have come up once or twice | 16:09 |
|
relipse
| yeah it's a pain | 16:09 |
| ← SocialBlunder left | 16:09 |
|
relipse
| move btw | 16:09 |
|
_ikke_
| http://permalink.gmane.org/gmane.comp.version-control.git/267009 | 16:10 |
| → imachuchu joined | 16:10 |
|
_ikke_
| git rm submodule already does much of the work | 16:10 |
|
| and git submodule deinit the rest | 16:10 |
| ← zumba_addict_ left | 16:11 |
| ← israelpattison left | 16:11 |
| ← zumba_addict left | 16:12 |
| ← h4ml3t left | 16:12 |
| ← reim left | 16:12 |
| → madewokherd joined | 16:12 |
| → troulouliou_div2 joined | 16:13 |
| eGGshke → eGGsha | 16:13 |
| ← cdown left | 16:14 |
| ← macabre left | 16:14 |
|
_ikke_
| relipse: doesn't git mv path newpath work? | 16:14 |
| → cdown joined | 16:14 |
|
relipse
| doubtful | 16:15 |
|
| probably spews out a bunch of submodule errors | 16:15 |
|
phroa`
| relipse: did you git init yet? | 16:15 |
|
_ikke_
| relipse: you sure? | 16:15 |
| → maletor joined | 16:16 |
| → macabre joined | 16:16 |
| → madewokherd` joined | 16:16 |
| ← maletor left | 16:16 |
| ← gutocarvalho left | 16:16 |
|
_ikke_
| There are git tests that that for git mv and git rm submodules | 16:16 |
| ← madewokherd left | 16:17 |
| → khrm joined | 16:17 |
|
relipse
| ok thanks i'll try to give it a shot later | 16:17 |
| ← khrm left | 16:17 |
| → maletor joined | 16:17 |
| ← olso left | 16:18 |
| → khrm joined | 16:18 |
| ← khrm left | 16:18 |
| → Cata|Work joined | 16:18 |
| → khrm joined | 16:19 |
| ← khrm left | 16:19 |
| → tcurdt_ joined | 16:20 |
| → khrm joined | 16:20 |
| ← khrm left | 16:20 |
| ← casual___ left | 16:20 |
| → casual___ joined | 16:20 |
| → israelpattison joined | 16:21 |
| → NeverDie joined | 16:21 |
| → khrm joined | 16:21 |
| ← tHEMtZ left | 16:21 |
| ← khrm left | 16:21 |
| ← LBV_User left | 16:21 |
| → khrm joined | 16:22 |
| ← khrm left | 16:22 |
| → sfeinste joined | 16:22 |
| → Dragooon joined | 16:22 |
| → pheaver joined | 16:22 |
| → khrm joined | 16:22 |
| ← khrm left | 16:23 |
| → yqt joined | 16:23 |
| → khrm joined | 16:23 |
| eGGsha → eGGshke | 16:23 |
| ← jost left | 16:24 |
| ← nnyk left | 16:24 |
| ← sfeinste left | 16:25 |
| eGGshke → eGGsha | 16:25 |
| → sfeinste joined | 16:25 |
| ← johtso left | 16:25 |
| → nnyk joined | 16:25 |
| → johtso joined | 16:26 |
| → dreiss joined | 16:27 |
| → akushner_ joined | 16:27 |
| eGGsha → eGGshke | 16:27 |
| ← doener left | 16:27 |
| → Tyrannosaur joined | 16:28 |
| ← Dragooon left | 16:28 |
| → durham joined | 16:28 |
| → Dragooon joined | 16:28 |
|
relipse
| i have a website which is a git repo now I want to somehow merge another repo into it, how is this possible? | 16:29 |
| → olso joined | 16:29 |
| eGGshke → eGGsha | 16:31 |
| → modocache joined | 16:32 |
| → ASOLAr joined | 16:33 |
| ← alexsystemf left | 16:33 |
| → Technocrat7 joined | 16:33 |
| → mingwandroid_ joined | 16:34 |
| ← HZun left | 16:34 |
| ← TomyWork left | 16:34 |
| → maestrojed joined | 16:34 |
| → Motoko joined | 16:34 |
| ← knownasilya left | 16:34 |
| ← mikecmpbll left | 16:35 |
| → Scriptonaut joined | 16:35 |
| → BooMShanKerX joined | 16:35 |
|
Scriptonaut
| hey guys, how do I see who the current uthor is? | 16:35 |
| ← Zeedox left | 16:35 |
|
Scriptonaut
| author* | 16:35 |
| → knownasilya joined | 16:36 |
| → freestyl3r joined | 16:36 |
| ← modocache left | 16:36 |
| ← mingwandroid left | 16:36 |
| → happy-dude joined | 16:36 |
| ← ASOLAr left | 16:38 |
| → ASOLAr joined | 16:38 |
| ← Wetmelon left | 16:39 |
| ← hfp left | 16:39 |
| → Noldorin joined | 16:39 |
| ← paulweb515 left | 16:39 |
| ← ashnur left | 16:40 |
| ← xudongz left | 16:40 |
|
phroa`
| Scriptonaut: you can enter git config commands and if you leave off the value to set it to, it'll print what it currently is | 16:40 |
| ← bongjovi left | 16:40 |
| → ashnur joined | 16:40 |
| ← tcurdt_ left | 16:40 |
|
phroa`
| e.g. git config --global user.name | 16:40 |
| → sheilong joined | 16:41 |
| ← hfp_work left | 16:41 |
| ← m0viefreak left | 16:41 |
| → tang^ joined | 16:41 |
| → MattMaker joined | 16:41 |
|
Scriptonaut
| Ah, I figured out the issue | 16:41 |
| → lucha joined | 16:41 |
|
Scriptonaut
| I wanted to set the local author, the global was overriding it because it was commented out | 16:41 |
|
| thanks | 16:41 |
| ← achadwick left | 16:42 |
| ← inamoriti left | 16:42 |
| ← freestyl3r left | 16:43 |
| ← ASOLAr left | 16:43 |
| ← bb010g left | 16:43 |
| → bb010g joined | 16:43 |
| gitinfo set mode: +v | 16:43 |
| → sfeinste_ joined | 16:43 |
| ← sfeinste left | 16:43 |
| → ASOLAr joined | 16:43 |
| → linuxboytoo joined | 16:44 |
| ← mattcen left | 16:45 |
| ← MattMaker left | 16:45 |
| → jerius_ joined | 16:45 |
| → angelsl joined | 16:45 |
| ← endiruna left | 16:46 |
| → mweshi joined | 16:47 |
| ← JanC left | 16:47 |
| → mattcen joined | 16:48 |
| ← jerius left | 16:48 |
| ← mweshi left | 16:48 |
| → gfixler joined | 16:49 |
| → mweshi joined | 16:49 |
| → paddymahoney joined | 16:50 |
| → teran joined | 16:51 |
| ← przemoc left | 16:52 |
| ← islalobo left | 16:53 |
| ← thedodd left | 16:54 |
| → ehmatthes joined | 16:54 |
| ← dudoom left | 16:55 |
| → hfp joined | 16:55 |
| ← skullcrasher left | 16:56 |
| ← devhost left | 16:56 |
| ← dreiss left | 16:56 |
| → devhost joined | 16:56 |
| → hfp_work joined | 16:56 |
| → blackwind_123 joined | 16:56 |
| ← pizzaops left | 16:57 |
| ← pk-john_ left | 16:57 |
| → pizzaops joined | 16:57 |
| ← CorySimmons left | 16:57 |
| ← someara left | 16:58 |
| → someara joined | 16:58 |
| → modocache joined | 16:58 |
| → MattMaker joined | 17:00 |
| → przemoc joined | 17:01 |
| ← parshap left | 17:02 |
| ← ArchRogem left | 17:02 |
| → JanC joined | 17:02 |
| → parshap joined | 17:02 |
| → bbhoss joined | 17:04 |
| ← skyres left | 17:04 |
| → SocialBlunder joined | 17:05 |
| ← CustosL1men left | 17:06 |
| → pantsman- joined | 17:06 |
| ← huhlig left | 17:07 |
| → huhlig joined | 17:07 |
| → tHEMtZ joined | 17:09 |
| ← SocialBlunder left | 17:10 |
| → faheem_ joined | 17:10 |
| ← BooMShanKerX left | 17:10 |
| ← freimatz left | 17:11 |
| ← Kully3xf left | 17:11 |
| ← Zariel left | 17:11 |
| → SimonNa joined | 17:11 |
| → Sasazuka joined | 17:11 |
| → TomyLobo joined | 17:11 |
| ← sazed left | 17:12 |
| → sentriz joined | 17:12 |
| ← Gitzilla left | 17:13 |
| ← ASOLAr left | 17:13 |
| → flashpoint9 joined | 17:13 |
| ← lebster left | 17:14 |
| → lebster joined | 17:14 |
| ← hellschreiber left | 17:15 |
| → ASOLAr joined | 17:15 |
| → mikecmpbll joined | 17:16 |
| ← wrouesnel4 left | 17:16 |
| → hellschreiber joined | 17:17 |
| ← adambrenecki left | 17:17 |
| ← kwmiebach left | 17:17 |
| → zumba_addict joined | 17:17 |
| → adambrenecki joined | 17:17 |
| → kwmiebach joined | 17:18 |
| → Gitzilla joined | 17:18 |
| → Jackneill joined | 17:19 |
| ← marscher left | 17:19 |
| ← Technocrat7 left | 17:19 |
| ← higuys left | 17:20 |
| → gambl0re joined | 17:20 |
| ← troulouliou_div2 left | 17:20 |
| → Molp joined | 17:21 |
| ← tang^^ left | 17:22 |
| → ril joined | 17:23 |
| ← teran left | 17:23 |
| ← sfeinste_ left | 17:24 |
| → sfeinste joined | 17:24 |
| → Balliad joined | 17:24 |
| ← howdoi_ left | 17:25 |
| ← kpease left | 17:25 |
| ← tang^ left | 17:25 |
| → islalobo joined | 17:26 |
| ← Balliad left | 17:26 |
| → sazed joined | 17:27 |
| → kpease joined | 17:27 |
| ← denver left | 17:28 |
| ← imdsm left | 17:29 |
| ← fumihiro left | 17:29 |
| → imdsm joined | 17:29 |
| ← kjnilsson left | 17:29 |
| → kjnilsson joined | 17:29 |
| → d10n-work joined | 17:29 |
| ← marcogmonteiro left | 17:30 |
| → tcurdt_ joined | 17:30 |
| → Tirzah joined | 17:30 |
| ← eggoez left | 17:30 |
| ← Tirzah left | 17:31 |
| ← mixandgo left | 17:31 |
| ← Molp left | 17:31 |
| → fumihiro joined | 17:31 |
| ← angelsl left | 17:31 |
| ← islalobo left | 17:31 |
| → Molp joined | 17:32 |
| ← EricPoe left | 17:32 |
| ← fracting left | 17:33 |
| → wheeei joined | 17:33 |
| → eggoez joined | 17:33 |
| → teran joined | 17:33 |
| → bronson joined | 17:34 |
| ← paddymahoney left | 17:34 |
| ← baxx left | 17:35 |
| → sinkensabe joined | 17:36 |
| ← Molp left | 17:36 |
| ← ASOLAr left | 17:36 |
| ← mweshi left | 17:36 |
| → Molp joined | 17:37 |
| → mixandgo joined | 17:37 |
| ← yqt left | 17:38 |
| ← Nizumzen left | 17:38 |
| → Zariel joined | 17:38 |
| ← bronson left | 17:38 |
| → sgambino joined | 17:39 |
| → Trow joined | 17:40 |
| → bronson joined | 17:41 |
| ← Zariel left | 17:41 |
| ← andrewvttran left | 17:41 |
| → kukks joined | 17:42 |
| ← joki left | 17:42 |
| → paddymahoney joined | 17:42 |
| → tmartin joined | 17:42 |
| → BooMShanKerX joined | 17:43 |
| eGGsha → eGGshke | 17:43 |
|
ctag
| Hi, I just pushed a commit which was missing a line from one file. I understand that messing with the history is bad once public, is my only recourse to create a new commit with a message "Whoops, forgot this line." ? | 17:43 |
|
phroa`
| if you don't want to force push an amended commit, then yeah | 17:43 |
| ← sgambino left | 17:44 |
|
ctag
| Ok, thanks! | 17:44 |
| ← tmartin left | 17:44 |
| → tang^ joined | 17:44 |
| ← kpease left | 17:45 |
| → skyres joined | 17:45 |
| eGGshke → eGGsha | 17:46 |
| ← jan left | 17:46 |
| → Technocrat7 joined | 17:46 |
|
relipse
| how do I populate my submodule | 17:46 |
|
| it came empty | 17:46 |
| ← tcurdt_ left | 17:47 |
|
phroa`
| git submodule update --init --recursive is my fav | 17:47 |
| → tcurdt_ joined | 17:47 |
|
relipse
| perfect thanks | 17:47 |
| ← sinkensabe left | 17:48 |
| ← theskillwithin left | 17:48 |
| → joki- joined | 17:48 |
| ← tcurdt_ left | 17:49 |
| ← eGGsha left | 17:49 |
| → tcurdt_ joined | 17:49 |
| → akushner__ joined | 17:49 |
| ← courrier left | 17:50 |
| ← skyres left | 17:50 |
| ← hobodave left | 17:50 |
| → islalobo joined | 17:50 |
| ← tcurdt_ left | 17:51 |
| ← Scriptonaut left | 17:51 |
| → paulweb515 joined | 17:51 |
| → tcurdt_ joined | 17:51 |
| → kpease joined | 17:52 |
| → Kully3xf joined | 17:52 |
| → t-mart joined | 17:52 |
| ← akushner_ left | 17:52 |
| → skyres joined | 17:53 |
| ← t-mart left | 17:53 |
| → Balliad joined | 17:53 |
| ril → ril[away] | 17:54 |
| → t-mart joined | 17:54 |
| → jimmyeatworld joined | 17:55 |
| ← Technocrat7 left | 17:56 |
| ← paulweb515 left | 17:56 |
| ← ivan\ left | 17:56 |
| ← tang^ left | 17:56 |
| → ilmgb_ joined | 17:57 |
| → tang^ joined | 17:57 |
| → EricPoe joined | 17:57 |
| ← skyres left | 17:57 |
| → macrover joined | 17:57 |
| ← TheTeapot left | 17:58 |
| ← ilmgb left | 17:58 |
| → ivan\ joined | 17:59 |
| ← Dragooon left | 17:59 |
| → FunkyAss joined | 17:59 |
| → whomp joined | 18:00 |
| ← Molp left | 18:01 |
| ← mixandgo left | 18:02 |
| → Dragooon joined | 18:02 |
| → StuartMI joined | 18:02 |
| ← akushner__ left | 18:02 |
| → akushner__ joined | 18:03 |
| → ap3r7ur3 joined | 18:03 |
| ap3r7ur3 → Guest79581 | 18:04 |
| ← Guest79581 left | 18:04 |
| → ap3r7ur3_ joined | 18:04 |
| → liri joined | 18:05 |
| → theskillwithin joined | 18:05 |
| → SocialBlunder joined | 18:06 |
| ← teran left | 18:07 |
| ← chitopunk left | 18:07 |
| ← akushner__ left | 18:08 |
| ← MechtiIde left | 18:08 |
| → skyres joined | 18:08 |
| ← Fiouz left | 18:08 |
| → nofxx joined | 18:08 |
| ap3r7ur3_ → ap3r7ur3 | 18:08 |
| → kfoonamalik joined | 18:08 |
| → relipse2 joined | 18:09 |
| → eme joined | 18:09 |
| → paulweb515 joined | 18:09 |
| → nydew07 joined | 18:09 |
| ← SocialBlunder left | 18:10 |
| ← relipse left | 18:10 |
| → m0viefreak joined | 18:12 |
| ← kukks left | 18:12 |
| ← skyres left | 18:12 |
| → herpaliederp joined | 18:13 |
| → ASOLAr joined | 18:13 |
| ← jerius_ left | 18:14 |
| → skyres joined | 18:14 |
| → skylite joined | 18:15 |
| ← relipse2 left | 18:15 |
| → refried_ joined | 18:15 |
| → relipse2 joined | 18:15 |
| ← Kully3xf left | 18:15 |
| → Fiouz joined | 18:15 |
| → barduck joined | 18:16 |
| ← skylite_ left | 18:16 |
| ← fumihiro left | 18:16 |
| → Texan_ joined | 18:16 |
| → HelloShitty joined | 18:17 |
| ← ThomasLocke left | 18:17 |
| → skylite_ joined | 18:17 |
| ← Texan left | 18:17 |
| → fumihiro joined | 18:17 |
| ← relipse2 left | 18:17 |
| → relipse2 joined | 18:17 |
| ← kpease left | 18:18 |
| ← olso left | 18:18 |
| → sgambino joined | 18:18 |
| → sfeinste_ joined | 18:18 |
| → dreiss joined | 18:18 |
| → hobodave joined | 18:18 |
| ← fumihiro left | 18:18 |
| ← gargola left | 18:19 |
| ← skyres left | 18:19 |
| → fumihiro joined | 18:19 |
| ← sfeinste left | 18:19 |
| ← skylite left | 18:20 |
| → gargola joined | 18:21 |
| → skyres joined | 18:21 |
| → relipse3 joined | 18:22 |
| → Zariel joined | 18:22 |
| → jerius joined | 18:23 |
| ← BooMShanKerX left | 18:23 |
| ← relipse2 left | 18:23 |
| → dudoom joined | 18:23 |
| → BooMShanKerX joined | 18:23 |
| → wwwald joined | 18:24 |
| ← Trow left | 18:24 |
| ← BooMShanKerX left | 18:24 |
| ← Zariel left | 18:25 |
| → BooMShanKerX joined | 18:25 |
| → TheTeapot joined | 18:25 |
| ← BooMShanKerX left | 18:25 |
| ← skyres left | 18:26 |
| → X67r joined | 18:26 |
| ← nerd left | 18:26 |
| → terminal_echo joined | 18:27 |
| → skyres joined | 18:27 |
| → BooMShanKerX joined | 18:28 |
| ← Spacew00t left | 18:28 |
| → Spacew00t joined | 18:28 |
| ← zumba_addict left | 18:28 |
| ← Texan_ left | 18:28 |
| → sargas joined | 18:28 |
| ← sargas left | 18:28 |
| → freestyl3r joined | 18:29 |
| → Texan joined | 18:29 |
| → rockstar_ joined | 18:29 |
| ← macrover left | 18:30 |
| ← Gitzilla left | 18:31 |
| ← Mekkis left | 18:31 |
| ← Corey84 left | 18:32 |
| ← skyres left | 18:32 |
| ← BooMShanKerX left | 18:33 |
| → BooMShanKerX joined | 18:33 |
| ← relipse3 left | 18:34 |
| ← Kartagis left | 18:34 |
| → skyres joined | 18:34 |
| → rockstar__ joined | 18:35 |
| → dfaught joined | 18:35 |
| ← MinetestForFun left | 18:36 |
| → c0mrad3 joined | 18:38 |
| ← skyres left | 18:38 |
| → akushner__ joined | 18:39 |
| ril[away] → ril | 18:39 |
| → skyres joined | 18:41 |
| ← HelloShitty left | 18:42 |
| → frankstallone joined | 18:42 |
| → dgutierrez1287 joined | 18:43 |
| ← tcurdt_ left | 18:43 |
|
frankstallone
| Has anyone done, or know of a way to version modular components within a git repo? We are using Gitflow workflow on the repo and the entire repo has a version but there are modular components that we'd like to version separately. | 18:44 |
|
| I am trying to think of ways to do this. | 18:44 |
| → Auuih joined | 18:44 |
|
frankstallone
| One way is to have a txt file in every component folder with version numbers and lists of changes but that seems incredibly time consuming. | 18:44 |
| ← Auuih left | 18:44 |
| → wicope joined | 18:44 |
| ← ascarter left | 18:45 |
| → Fzo joined | 18:45 |
| ← Fzo left | 18:45 |
| ← fumihiro left | 18:45 |
| ← ehmatthes left | 18:45 |
| ← skyres left | 18:46 |
| ← sanketdg left | 18:46 |
| ← gfixler left | 18:46 |
| → Xbat joined | 18:47 |
| ← Xbat left | 18:47 |
| → skyres joined | 18:47 |
| ← dgutierrez1287 left | 18:47 |
| → [H]unt3r_ joined | 18:49 |
| ← [H]unt3r left | 18:49 |
| → elsevero joined | 18:49 |
| ← [H]unt3r_ left | 18:50 |
| ← sazed left | 18:52 |
| ← skyres left | 18:52 |
| → shanson joined | 18:52 |
| → sparetire_ joined | 18:52 |
| ← akushner__ left | 18:52 |
| → ascarter joined | 18:52 |
| → texinwien joined | 18:53 |
| ← pheaver left | 18:53 |
| → skyres joined | 18:54 |
| → Bae joined | 18:55 |
|
texinwien
| I need some help. I have a repository with several branches. I'm trying to move from that setup to one with multiple 'fork' repositories replacing the branches I have at the moment. | 18:55 |
| ← Bae left | 18:55 |
| → Max7676 joined | 18:56 |
| ← hobodave left | 18:56 |
|
Seveas
| that doesn't sound like a good idea | 18:56 |
| → Gitzilla joined | 18:56 |
| → VsyachePuz joined | 18:56 |
|
texinwien
| So, say I have main-repo with branches b1 and b2. I want to end up with main-repo, repo1 and repo2 (where repo1 and repo2 take over the function previously handled by b1 and b2) | 18:56 |
|
VsyachePuz
| how to set merging defaults to not use fast forward? as in this post - http://blog.differential.com/best-way-to-merge-a-github-pull-request/ | 18:57 |
|
Seveas
| still doesn't sound like a good idea texinwien :) | 18:57 |
|
texinwien
| Seveas can you give me a little more detail about why it doesn't sound like a good idea? | 18:57 |
| → thiago joined | 18:57 |
| ← frankstallone left | 18:58 |
|
Seveas
| texinwien: why would you want to work on 3 copies of the same thing? Or are you abusing branches for things they shouldn't be used for? | 18:58 |
| → Chaser joined | 18:58 |
| ← skyres left | 18:58 |
| ← IrishPrime left | 18:58 |
|
texinwien
| 3 copies of what same thing? | 18:58 |
|
| repo1 will be my workspace, repo2 will be another dev's workspace, and main-repo will be the 'central' repository. | 18:59 |
|
Seveas
| VsyachePuz: git config merge.ff false (git config --global merge.ff false for making it the default in all repos) | 18:59 |
| → kpease joined | 18:59 |
|
VsyachePuz
| Seveas: thanks! | 19:00 |
|
Seveas
| texinwien: ok, that sounds like you're abusing branches right now. Moving to clones sounds better. Create a bare clone for the central one and clone that again for your workspaces. Then discard the original. | 19:00 |
|
texinwien
| as opposed to now, where I have main-repo/b1 as my workspace and main-repo/b2 as the other dev's workspace. | 19:00 |
| → Niww joined | 19:00 |
|
texinwien
| Seveas ok, I can live with that, but the repo already has commits and branches in it, so I'm trying to figure out how to get from here to there without losing history. | 19:01 |
| → IrishPrime joined | 19:01 |
| ← mikewintermute left | 19:01 |
| ← Niww left | 19:01 |
|
Seveas
| texinwien: by cloning as I just described | 19:01 |
| → pandeiro joined | 19:01 |
|
Seveas
| I'd also suggest a read of the !book, it explains these things | 19:01 |
|
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 | 19:01 |
| ← IrishPrime left | 19:01 |
| ← devoldmx left | 19:03 |
| → IrishPrime joined | 19:03 |
| → pstodulk joined | 19:03 |
|
texinwien
| ok, I'm familiar with initing a bare repo - I will look into cloning one. And believe me, I've been doing plenty of reading in the !book of late... | 19:03 |
|
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 | 19:03 |
| → devoldmx joined | 19:03 |
| ← VsyachePuz left | 19:03 |
| ← tvw left | 19:04 |
| ← pstodulk left | 19:04 |
| → chitopunk joined | 19:06 |
| ril → ril[away] | 19:06 |
| → Bruno_ joined | 19:06 |
| → SocialBlunder joined | 19:07 |
| ← pandeiro left | 19:07 |
| → ToTheInternet joined | 19:08 |
| ← t-mart left | 19:08 |
| → Ucwj joined | 19:08 |
| ← Ucwj left | 19:08 |
| → cpt-oblivious joined | 19:08 |
|
ToTheInternet
| i wanted to undo a commit on a feature branch so i did: git reset --soft HEAD~1 | 19:09 |
|
| unfortunately i did that on the wrong branch, so now i want to undo that command (i don't want to commit again) | 19:09 |
|
| can someone help? | 19:09 |
| ← BSaboia left | 19:09 |
| ← cpt-oblivious left | 19:09 |
| → matthavard joined | 19:09 |
| → akushner__ joined | 19:10 |
|
ToTheInternet
| ok i pulled again from origin, that did it | 19:10 |
| ← SocialBlunder left | 19:11 |
| ← robbyoconnor left | 19:12 |
| ril[away] → ril | 19:12 |
|
Seveas
| ToTheInternet: that works only because the commit wasn't local. For commits that hadn't been pushed yet, the reflog will save you. | 19:12 |
| → hobodave joined | 19:12 |
|
Seveas
| git reset --hard HEAD@{1} would have done the thing (don't o that now though, it'll be bad) | 19:13 |
| → DrNick joined | 19:13 |
| → troulouliou_dev joined | 19:13 |
| ← Max7676 left | 19:14 |
| ← eme left | 19:15 |
|
ToTheInternet
| Seveas: thanks. one day i want to be able to tell myself when commands will be bad | 19:16 |
|
| git is hard :D | 19:16 |
| ← Bruno_ left | 19:17 |
| → MinetestForFun joined | 19:17 |
| ← ap3r7ur3 left | 19:17 |
| → BSaboia joined | 19:17 |
| ← StuartMI left | 19:17 |
|
Seveas
| ToTheInternet: git's not hard, but it really helps if you understand the basics about its guts (blobs, trees, commts, tags, refs, remotes) | 19:19 |
| ← ToTheInternet left | 19:19 |
| ← j` left | 19:20 |
| ← b80905 left | 19:22 |
| → emulator_ joined | 19:23 |
| ← lucianangelus left | 19:23 |
| ← ASOLAr left | 19:24 |
| → ASOLAr joined | 19:24 |
| ← Nick-S_ left | 19:24 |
| ← knownasilya left | 19:24 |
| → ap3r7ur3 joined | 19:25 |
| → Nick-S joined | 19:26 |
| ← ap3r7ur3 left | 19:26 |
| → Guest91042 joined | 19:27 |
| ← BooMShanKerX left | 19:27 |
| ← Nick-S left | 19:28 |
| → scwizard joined | 19:28 |
|
scwizard
| I'm on git version 2.1.4 | 19:28 |
|
| when I say: git submodule init | 19:28 |
|
| nothing happens, even though there's an entry in .gitmodules | 19:29 |
|
| [submodule "extensions/phpmailernew"] path = extensions/phpmailernew url = https://github.com/PHPMailer/PHPMailer.git | 19:29 |
| ← theskillwithin left | 19:29 |
|
phroa`
| what do you want to happen that hasn't already happened | 19:29 |
| → ytun joined | 19:29 |
| ← ytun left | 19:29 |
| ← mbrzuzy left | 19:29 |
| → Pseudocrat joined | 19:29 |
| → teran joined | 19:29 |
| → Nick-S joined | 19:29 |
| ← dudoom left | 19:30 |
| → ap3r7ur3 joined | 19:30 |
| → Zadruga joined | 19:30 |
| → skyres joined | 19:30 |
| → dudoom joined | 19:30 |
|
scwizard
| phroa`: files to be downloaded | 19:30 |
|
| phroa`: the extensions/phpmailernew folder is empty | 19:31 |
|
phroa`
| git submodule update --init --recursive? | 19:31 |
| ← ap3r7ur3 left | 19:31 |
| ← Nick-S left | 19:31 |
| ← ASOLAr left | 19:31 |
|
scwizard
| phroa`: no output | 19:31 |
|
| nothing seems to happen | 19:31 |
| ← Zadruga left | 19:31 |
| → BooMShanKerX joined | 19:31 |
|
phroa`
| I'm rather unsure then | 19:32 |
| → Zadruga joined | 19:32 |
| → m0v0nage_ joined | 19:33 |
| → Nick-S joined | 19:34 |
| ← skyres left | 19:35 |
|
texinwien
| Seveas: by the way, I already have a bare repository on the server, so it's not really clear to me why I would need to clone a new one. | 19:35 |
| ← Guest91042 left | 19:36 |
| ← GT4066 left | 19:36 |
| ← Nick-S left | 19:36 |
|
scwizard
| eww | 19:36 |
|
texinwien
| I've also already cloned that bare repository, so I already have repo1 and repo2, but I'm trying to get rid of the various branches, etc. | 19:36 |
|
scwizard
| I'm gonna stop using submodules | 19:36 |
|
| i hate that git reset --hard can fail if you have a submodule | 19:37 |
| → skyres joined | 19:37 |
|
scwizard
| that's just gross | 19:37 |
|
| and fucks up bisecting | 19:37 |
|
| that's really the main thing, bisecting being foobared is a very legit reason to not use git submodules | 19:37 |
| → Nick-S joined | 19:37 |
| → pheaver joined | 19:38 |
| ← Nick-S left | 19:39 |
| → Nick-S joined | 19:39 |
| ← sfeinste_ left | 19:40 |
| ← akushner__ left | 19:40 |
| → Mekkis joined | 19:41 |
| ← skyres left | 19:41 |
| → ijee joined | 19:41 |
| ← ijee left | 19:41 |
|
scwizard
| git subtree add —-prefix extensions/phpmailermodern/ phpmailer v5.2.10 | 19:42 |
|
| I get: | 19:42 |
|
| You must provide the --prefix option. | 19:42 |
| ← Nick-S left | 19:43 |
|
scwizard
| same thing if I do: git subtree add —-prefix=extensions/phpmailermodern/ phpmailer v5.2.10 | 19:43 |
| → skyres joined | 19:43 |
| ← nda_ left | 19:43 |
| → Utsy joined | 19:44 |
| → CustosL1men joined | 19:44 |
| ← Utsy left | 19:45 |
| → Nick-S joined | 19:45 |
|
scwizard
| it seems I get this message no matter what I do :( | 19:45 |
| → synthroid joined | 19:46 |
| ← nnyk left | 19:46 |
| ← Mekkis left | 19:46 |
| → Unro joined | 19:46 |
| ← Unro left | 19:46 |
| ← Nick-S left | 19:47 |
| ← islalobo left | 19:47 |
| → Nick-S joined | 19:47 |
| ← refried_ left | 19:47 |
| → theskillwithin joined | 19:47 |
| ← skyres left | 19:48 |
|
scwizard
| this worked: git subtree add --prefix=extensions/phpmailermodern [email@hidden.address] v5.2.10 | 19:48 |
|
| the order of the arguments is important because lolbashlol | 19:48 |
| → Awrru joined | 19:48 |
| ← Awrru left | 19:49 |
| → Jwzb joined | 19:50 |
| ← FunkyAss left | 19:50 |
| → skyres joined | 19:50 |
| ← Jwzb left | 19:51 |
| ← IrishPrime left | 19:52 |
| → sbogg joined | 19:52 |
| ← SimonNa left | 19:52 |
| → szwcq joined | 19:54 |
| → sargas joined | 19:54 |
| ← szwcq left | 19:54 |
| ← skyres left | 19:55 |
| → akushner__ joined | 19:55 |
|
ojacobson
| scwizard: options use ascii dash only | 19:55 |
|
| not, as you're doing, unicode en-dash or em-dash | 19:55 |
|
| — and - are distinct characters :) | 19:55 |
| → robbyoconnor joined | 19:55 |
| → ASOLAr joined | 19:56 |
|
ojacobson
| (I happen to be using a typeface where they also render differently) | 19:56 |
| → Itlnf joined | 19:56 |
| ← Itlnf left | 19:57 |
| ← robbyoconnor left | 19:57 |
|
scwizard
| ojacobson: oh i see | 19:57 |
| → skyres joined | 19:57 |
|
scwizard
| :| | 19:57 |
|
| annoying | 19:57 |
|
ojacobson
| yeah | 19:57 |
|
| lots of stuff out there helpfully replaces " pairs with “” and dash pairs with – or — | 19:57 |
|
| it fucks up copying and pasting code but good | 19:57 |
|
| (fun fact: AppleScript actually allows “” as string delimiters, but only if they're correctly paired) | 19:58 |
| ← gargola left | 19:59 |
| → saval joined | 19:59 |
| → sfeinste joined | 19:59 |
| ← saval left | 19:59 |
| ← jerius left | 20:00 |
| ← Nick-S left | 20:00 |
| → wyxma joined | 20:00 |
| ← wyxma left | 20:00 |
| ← skyres left | 20:02 |
| ← barduck left | 20:02 |
| → JDHawke joined | 20:02 |
| → tomog999 joined | 20:02 |
| ← sargas left | 20:02 |
| ← gvo left | 20:03 |
| ← PeterBooker left | 20:04 |
| → gebjgd joined | 20:04 |
| → skyres joined | 20:04 |
| → kusc joined | 20:04 |
| ← kusc left | 20:04 |
| ← sfeinste left | 20:05 |
| ← bronson left | 20:05 |
| → oojacoboo joined | 20:05 |
| ← tomog999_ left | 20:05 |
| → Ofovp joined | 20:06 |
| ← Ofovp left | 20:06 |
| ← synthroid left | 20:06 |
| → Zariel joined | 20:07 |
| → LBV_User joined | 20:07 |
| ← Zariel left | 20:07 |
| ← Dorf left | 20:07 |
| ← michael_mbp left | 20:07 |
| → Zariel joined | 20:07 |
| → SocialBlunder joined | 20:07 |
| → Dorf joined | 20:08 |
| → fulru joined | 20:08 |
| ← Balliad left | 20:08 |
| ← fulru left | 20:08 |
| ← skyres left | 20:08 |
| → jxpx777 joined | 20:08 |
| ← akushner__ left | 20:09 |
| → Eim joined | 20:10 |
| → michael_mbp joined | 20:10 |
| ← Eim left | 20:10 |
| → cpzu joined | 20:11 |
| ← cpzu left | 20:11 |
| ← Zariel left | 20:11 |
| ← SocialBlunder left | 20:12 |
| ← ril left | 20:12 |
| ← Dorf left | 20:12 |
| → Balliad joined | 20:12 |
| ← qpdb left | 20:12 |
| → qpdb_ joined | 20:13 |
| → skyres joined | 20:13 |
| ← devoldmx left | 20:13 |
| → aouu joined | 20:13 |
| ← heroux left | 20:13 |
| → devoldmx joined | 20:13 |
| ← aouu left | 20:13 |
| → nnyk joined | 20:14 |
| → Milos joined | 20:14 |
| → heroux joined | 20:14 |
| → Bczak joined | 20:14 |
| → SimonNa joined | 20:15 |
| ← Vgr left | 20:15 |
| ← Bczak left | 20:15 |
| → Vgr joined | 20:15 |
| → jerius joined | 20:16 |
| ← maletor left | 20:16 |
| ← Milos left | 20:16 |
| → Qmv joined | 20:16 |
| ← Dragooon left | 20:16 |
| ← Qmv left | 20:17 |
| ← skyres left | 20:17 |
| → astockton joined | 20:17 |
| → Mekkis joined | 20:18 |
| → Txiai joined | 20:18 |
| ← whomp left | 20:18 |
| ← Txiai left | 20:19 |
| ← paddymahoney left | 20:19 |
| → bronson joined | 20:19 |
| ← happy-dude left | 20:19 |
| → drewo joined | 20:20 |
| → KsChoice joined | 20:20 |
| ← Balliad left | 20:20 |
| → neanderslob joined | 20:21 |
| ← herpaliederp left | 20:21 |
| → Bdxs joined | 20:21 |
| → skyres joined | 20:21 |
| ← Bdxs left | 20:22 |
| → Gamecubic joined | 20:22 |
| → shinnya joined | 20:23 |
| → rmie joined | 20:24 |
| ← martinium left | 20:24 |
| ← drewo left | 20:24 |
| ← rmie left | 20:24 |
| ← Mekkis left | 20:24 |
| ← KsChoice left | 20:24 |
| ← Phoenixz left | 20:25 |
| → drewo joined | 20:25 |
| → perrier joined | 20:25 |
| → HelloShitty joined | 20:25 |
| → kmuzd joined | 20:25 |
| → Milos joined | 20:26 |
| ← nadim left | 20:26 |
| ← Milos left | 20:26 |
| → Milos joined | 20:26 |
| → akushner__ joined | 20:26 |
| ← kmuzd left | 20:26 |
| ← skyres left | 20:26 |
| → settermjd joined | 20:26 |
| → Phoenixz joined | 20:26 |
| ← paulweb515 left | 20:27 |
| → hrwu joined | 20:27 |
| ← hrwu left | 20:28 |
| ← Tyrannosaur left | 20:28 |
| ← rwb left | 20:28 |
| ← LBV_User left | 20:28 |
| → paoh joined | 20:29 |
| → chuchunaku joined | 20:29 |
| ← paoh left | 20:29 |
| ← jerius left | 20:30 |
| ← drewo left | 20:30 |
| → Tyrannosaur joined | 20:30 |
| ← flashpoint9 left | 20:30 |
| → skyres joined | 20:30 |
| ← settermjd left | 20:31 |
| → moea joined | 20:33 |
| → HZun joined | 20:34 |
| ← sbogg left | 20:34 |
| ← HelloShitty left | 20:34 |
| ← skyres left | 20:34 |
| → Wetmelon joined | 20:35 |
| → HelloShitty joined | 20:35 |
| ← wwwald left | 20:35 |
| → Zariel joined | 20:35 |
| ← Zariel left | 20:36 |
| ← nofxx left | 20:36 |
| ← ascarter left | 20:36 |
| → Zariel joined | 20:36 |
| → nadim joined | 20:37 |
| → genbattle joined | 20:37 |
| → ascarter joined | 20:37 |
| ← bronson left | 20:38 |
| → skyres joined | 20:38 |
| gitinfo set mode: +v | 20:38 |
| ← nadim left | 20:38 |
|
moea
| I'm on Windows 7 and using Git For Windows 1.9.5-20150319. I'm cloning a repo; most of the repo seems to download except for one particular sub-directory. The clone fails with an error message stating: "Invalid path" for each file in the directory. | 20:38 |
| → nadim joined | 20:39 |
| ← dudoom left | 20:39 |
| → j` joined | 20:39 |
| ← j` left | 20:39 |
| → j` joined | 20:39 |
|
_ikke_
| moea: Does the path name contain illegal characters for windows? | 20:40 |
| ← emulator_ left | 20:40 |
| → dailyherold joined | 20:41 |
| → bronson joined | 20:41 |
| ← Zariel left | 20:42 |
| ← skyres left | 20:42 |
| ← gebjgd left | 20:43 |
| ← chuchunaku left | 20:44 |
|
moea
| It doesn't appear to (me). This is error output. I copied this from a PyCharm window, but I got the exact same error from Git Bash. | 20:44 |
| → endiruna joined | 20:44 |
|
_ikke_
| !transaction | 20:44 |
|
| !transcript | 20:44 |
|
gitinfo
| Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 20:44 |
| → skyres joined | 20:44 |
|
moea
| Yes... I reckon I'll do that. | 20:45 |
| → xk_id joined | 20:45 |
| ← pantsman- left | 20:45 |
|
dailyherold
| Greetings, someone on my team was a couple weeks behind origin, and was somehow able to push a commit (followed by two more). origin/HEAD now points to a snapshot that is missing all the work done since the person last pulled. Having a hard time wrapping my head around how to cleanly fix this? | 20:46 |
| ← a3Dman left | 20:46 |
|
moea
| _ikke_: output is here: https://gist.github.com/anonymous/a6bc154752db41394a98 | 20:46 |
|
dailyherold
| Any help appreciated | 20:47 |
|
_ikke_
| moea: aux is invalid in windows iirc | 20:47 |
|
| moea: http://www.thewindowsclub.com/create-restricted-files-folders-con-aux-nul-click-windows | 20:48 |
| ← ghibourg left | 20:48 |
| ← skyres left | 20:49 |
| ← khrm left | 20:49 |
| → relipse joined | 20:49 |
| ← c74d left | 20:50 |
|
Seveas
| dailyherold: disallow forced updates and use the reflog ro undo the damage | 20:51 |
| → a3Dman joined | 20:51 |
|
moea
| Wow. I never knew particular names or directories were illegal. Mind blown. Thanks _ikke_. | 20:52 |
| → skyres joined | 20:52 |
| ← a3Dman left | 20:53 |
| → c74d joined | 20:53 |
|
Seveas
| moea: yeah, on windows there are a few illegal names. AUX is one of them. I think NULL and LPR are illegal too | 20:53 |
|
_ikke_
| Seveas: that link has a whole list | 20:53 |
|
Seveas
| didn't see the link :) | 20:54 |
| → tpollard joined | 20:54 |
|
Seveas
| google dug up https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx | 20:54 |
| ← X67r left | 20:54 |
| → Mekkis joined | 20:55 |
| ← King_Hual left | 20:55 |
| → a3Dman joined | 20:55 |
| ← modocache left | 20:55 |
| ← a3Dman left | 20:56 |
| → X67r joined | 20:56 |
| ← cavallari left | 20:56 |
| → mweshi joined | 20:57 |
| ← thiago left | 20:57 |
| ← skyres left | 20:57 |
| ← PCatinean left | 20:57 |
| → King_Hual joined | 20:57 |
| ← King_Hual left | 20:57 |
| → King_Hual joined | 20:57 |
| → a3Dman joined | 20:57 |
| ← pm90__ left | 20:58 |
| → zarubin_ joined | 20:58 |
| ← mweshi left | 20:59 |
| → skyres joined | 20:59 |
| ← Mekkis left | 20:59 |
| → NoImNotNineVolt joined | 20:59 |
| ← Mixologic_ left | 20:59 |
|
NoImNotNineVolt
| hey, i'm trying to add a submodule that points to a specific commit in another repo. how do i do that? | 20:59 |
| → mweshi joined | 21:00 |
|
NoImNotNineVolt
| i added the submodule, but i don't know how to point it at a specific commit. | 21:00 |
|
_ikke_
| NoImNotNineVolt: go to the directory, and check out that commit | 21:00 |
| ← zarubin_ left | 21:00 |
|
NoImNotNineVolt
| well that was easy :P | 21:01 |
|
| thanks | 21:01 |
| ← Texan left | 21:01 |
|
_ikke_
| Don't forget to commit it | 21:02 |
| ← liri left | 21:02 |
| ← dfaught left | 21:03 |
| ← CustosL1men left | 21:03 |
| ← skyres left | 21:03 |
|
NoImNotNineVolt
| do i need to delete all the files in that submodule directory now? (for there not to be duplicate code) | 21:04 |
|
dailyherold
| Seveas: Okay, so I reset to the snapshot I would like origin/HEAD to point to. If origin/HEAD still though points to the commit from my co-worker (which stemmed from a snapshot a couple weeks ago), what can I do? | 21:04 |
|
NoImNotNineVolt
| trying to copy a pattern that i see in another repo, where the submodule directory is init in the main repo.. | 21:04 |
|
| sorry, is *empty* in the main repo. brain fart. | 21:04 |
|
_ikke_
| NoImNotNineVolt: No, you should not empty it | 21:05 |
|
| if it's empty, it means it hasn't been initialized, checked out yet | 21:05 |
| ← ASOLAr left | 21:06 |
| → skyres joined | 21:06 |
| ← mweshi left | 21:06 |
| ← X67r left | 21:07 |
| → X67r joined | 21:07 |
| ← AaronMT left | 21:07 |
|
dailyherold
| Seveas: Also checked my repo and non ff pushes is disabled, so don't even know how the coworker was able to push in the first place... | 21:07 |
|
NoImNotNineVolt
| no, i mean... | 21:08 |
| ← evie_hammond left | 21:08 |
|
NoImNotNineVolt
| now if i clone the main repo, i don't need to --recursive for there to be files in the submodule directory. | 21:08 |
| → SocialBlunder joined | 21:08 |
|
NoImNotNineVolt
| that somewhat defeats the point of using a submodule, no? | 21:08 |
|
_ikke_
| It's strange if that happens | 21:09 |
|
NoImNotNineVolt
| scratch that, false. nevermind, works great. | 21:09 |
|
| thanks. | 21:09 |
| → modocache joined | 21:10 |
|
NoImNotNineVolt
| stash is lying to me. | 21:10 |
| → Abbey joined | 21:10 |
| → dgutierrez1287 joined | 21:10 |
|
NoImNotNineVolt
| thanks again. | 21:10 |
| ← NoImNotNineVolt left | 21:10 |
| ← skyres left | 21:10 |
| ← troulouliou_dev left | 21:11 |
| → paulweb515 joined | 21:11 |
| → ehmatthes joined | 21:11 |
| → gfixler joined | 21:12 |
| → dsdeiz joined | 21:12 |
| → danzilio joined | 21:12 |
| → Zariel joined | 21:12 |
| ← SocialBlunder left | 21:13 |
| → skyres joined | 21:13 |
| ← jimmyeatworld left | 21:13 |
| → FernandoBasso joined | 21:13 |
| ← shanson left | 21:13 |
| ← nadim left | 21:13 |
| ← beaconwriter left | 21:14 |
| → ASOLAr joined | 21:14 |
| → IronicBadger joined | 21:14 |
| ← dgutierrez1287 left | 21:14 |
| ← mquin left | 21:15 |
|
IronicBadger
| somebody has just made a pull request on my repository. i want to merge their changes but not before i make some other changes myself. what's the best way to do this? accept the pull and then change or change and the accept the pull and merge? | 21:15 |
| → mquin joined | 21:16 |
| ← MarkyC left | 21:16 |
|
phroa`
| IronicBadger: imo I would make your changes if they truly can't wait until after you merge the pr, then fetch the PR and see if it still merges | 21:17 |
|
Seveas
| IronicBadger: fetch the PR and do whatever you want with the commits | 21:17 |
|
| (assuming github here..) | 21:17 |
|
IronicBadger
| yes it is github | 21:17 |
| ← skyres left | 21:17 |
|
IronicBadger
| so the commands would look ? | 21:17 |
| → yn5 joined | 21:17 |
|
IronicBadger
| git fetch > do some work > git add -A > git commit -m "blah" > .... ? | 21:17 |
| ← Jackneill left | 21:18 |
| ← c0mrad3 left | 21:18 |
| → mscook joined | 21:18 |
|
IronicBadger
| not worked with a pull request before | 21:18 |
|
Seveas
| git fetch origin refs/pull/pull-number-here/head:refs/heads/bracnh-for-pull-request | 21:19 |
| → isomorphismes joined | 21:19 |
| → Mixologic_ joined | 21:19 |
| ← Dougie187 left | 21:19 |
|
Seveas
| and cherry-pick, merge or do what you want with the new branch :) | 21:19 |
| → skyres joined | 21:19 |
|
isomorphismes
| How do I prevent a large file from wanting to upload to github? | 21:19 |
| → espindol_ joined | 21:19 |
|
isomorphismes
| It's already in my .gitignore file. | 21:19 |
| _0xc6_ → {0xc6} | 21:19 |
|
kadoban
| isomorphismes: .gitignore has no effect on history, or on anything that's already being tracked. | 21:20 |
|
IronicBadger
| thanks Seveas | 21:20 |
|
kadoban
| isomorphismes: You'd have to remove it from being tracked and from history if it's too big to put on github. | 21:20 |
|
isomorphismes
| kadoban: Thanks. How do I do that? | 21:20 |
|
| I don't want to git rm | 21:20 |
|
| or, rather I want git rm without rm | 21:20 |
|
Seveas
| git rm --cached | 21:21 |
|
kadoban
| isomorphismes: 'git rm --cached' is git rm without the rm | 21:21 |
|
isomorphismes
| thanks Seveas kadoban | 21:21 |
|
Seveas
| but you'll also need to remove it from history, with a rebase, filter-branch or bfg | 21:21 |
|
kadoban
| isomorphismes: But that won't change history. You need filter-branch for that. | 21:21 |
|
isomorphismes
| oh no | 21:22 |
|
| I tried BFG a couple months ago and couldn't figure it out. | 21:22 |
| → shanson joined | 21:22 |
| ← rnsanchez left | 21:24 |
| ← skyres left | 21:24 |
| ← Wetmelon left | 21:24 |
| ← ASOLAr left | 21:25 |
| → Mixologi- joined | 21:25 |
| ← HZun left | 21:26 |
| → skyres joined | 21:26 |
| → bahar joined | 21:26 |
| ← Mixologic_ left | 21:26 |
| ← bahar left | 21:26 |
| → bahar joined | 21:26 |
| ← BooMShanKerX left | 21:27 |
| → Balliad joined | 21:28 |
| ← s00pcan left | 21:29 |
| ← TomyLobo left | 21:30 |
|
dailyherold
| I made a gist of the current state of my repo: https://gist.github.com/dailyherold/3b1684a7e2bbcc07b6ba . Somehow I need to undo what ca7282a (4th from bottom), 02b69bc, and 40f3103 (now where origin/HEAD is) did. Let me know if anyone has ideas, my normal git guru in office is on vacation | 21:30 |
| ← skyres left | 21:30 |
| → s00pcan joined | 21:31 |
|
dailyherold
| (above gist straight from a fresh clone) | 21:31 |
| ← CKyle left | 21:31 |
|
phroa`
| git help revert | 21:31 |
|
kadoban
| !revert | 21:31 |
|
gitinfo
| That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]? | 21:31 |
| ← mscook left | 21:31 |
|
phroa`
| gosh | 21:31 |
| ← shanson left | 21:32 |
| → Mekkis joined | 21:32 |
| → lala joined | 21:32 |
|
Motoko
| Heh | 21:32 |
| ← modocache left | 21:33 |
| ← Balliad left | 21:33 |
|
Motoko
| Well, revert can indicate a lot of different things. | 21:33 |
| → modocache joined | 21:33 |
| → skyres joined | 21:33 |
| ← modocache left | 21:34 |
| → Guest91042 joined | 21:34 |
| → modocache joined | 21:34 |
| → Nick-S joined | 21:34 |
| ← modocache left | 21:35 |
| → matthava` joined | 21:35 |
| ← chitopunk left | 21:35 |
|
dailyherold
| It just seems strange because each of those three commits, which were pushed, only show changes for the files they touched, nothing about the "37 files changed, 232 insertions, 710 deletions" I got when I pulled this morning | 21:35 |
| ← Bootinbull left | 21:36 |
| → BooMShanKerX joined | 21:36 |
| → btree_ joined | 21:36 |
| → Bootinbull joined | 21:36 |
|
dailyherold
| Each commit only touched a single file, and the commits were mistakes to begin with. I'll try out gitinfo's suggestions regardless | 21:36 |
| ← bronson left | 21:37 |
| ← Mekkis left | 21:37 |
| ← mizu_no_oto left | 21:37 |
| → bronson joined | 21:37 |
| ← skyres left | 21:37 |
| → thiago joined | 21:38 |
| ← pheaver left | 21:38 |
| ← daivyk left | 21:38 |
| ← Nick-S left | 21:38 |
| ← btree left | 21:38 |
| ← akurilin left | 21:38 |
| → daivyk joined | 21:38 |
| ← matthavard left | 21:38 |
| → pheaver joined | 21:39 |
| ← Zariel left | 21:39 |
|
isomorphismes
| https://rtyley.github.io/bfg-repo-cleaner/ ←so he says "make a backup at this point". Isn't the clone mirror already a backup? | 21:39 |
| → Mixologic joined | 21:39 |
| → skyres joined | 21:40 |
|
Seveas
| no | 21:40 |
|
| a clone doesn't have hooks or configs | 21:40 |
|
phroa`
| nor stashes, right? | 21:41 |
| → drewo joined | 21:41 |
|
isomorphismes
| How do you back up the entire thing? | 21:41 |
| → carlll joined | 21:41 |
|
Seveas
| tar, rsync | 21:41 |
|
phroa`
| $ cp -r .git ../git-backup | 21:41 |
| → _Atom_ joined | 21:41 |
|
isomorphismes
| So now I will have three directories: one to follow @rtyley's instructions, one that's a backup, and the one I work in. Correct? | 21:41 |
| → tomasm- joined | 21:41 |
|
isomorphismes
| I should tar my working directory or one of the clones? | 21:42 |
| ← Mixologi- left | 21:42 |
| ← endiruna left | 21:42 |
| → Mixologic_ joined | 21:43 |
|
tomasm-
| hey how can I get a diff (perhaps the commit id?) between my local master and a remote's master? | 21:43 |
|
phroa`
| off the top of my head, git diff master..origin/master | 21:43 |
| → LaptopBrain joined | 21:43 |
|
phroa`
| where origin is your remote | 21:43 |
| → [Saint] joined | 21:44 |
|
texinwien
| I have a remote repository with a Head branch other than master. | 21:44 |
| ← skyres left | 21:44 |
|
tomasm-
| hmmm it says fatal: ambiguous argument 'origin/master': unknown revision or path not in the working tree | 21:44 |
|
| git diff master origin/master | 21:45 |
|
texinwien
| I would like to end up with a copy of the repository with HEAD branch: master | 21:45 |
|
tomasm-
| (origin shows up in git remote, btw) | 21:45 |
| ← hobodave left | 21:45 |
| ← drewo left | 21:45 |
| ← Mixologic left | 21:45 |
|
texinwien
| how can I manage that? | 21:46 |
|
tomasm-
| ok i gotta do git fetch origin first | 21:46 |
| ← carlll left | 21:46 |
|
Seveas
| texinwien: you need filesystem access to the remote repo and use git symbolic-ref to change the HEAD symref to point to the correct branch | 21:46 |
|
phroa`
| tomasm-: include the ".." between them (no spaces around "..") | 21:46 |
| → skyres joined | 21:46 |
|
phroa`
| and yeah you may have to fetch | 21:47 |
|
tomasm-
| phroa`, that doesnt work either | 21:47 |
|
phroa`
| shucks | 21:47 |
|
tomasm-
| ambiguous argument, unknown revision | 21:47 |
| → robbyoconnor joined | 21:47 |
|
texinwien
| Seveas: I don't have filesystem access, but I can make a local copy of the repo, fix it locally, then put the copy on the server. | 21:48 |
|
phroa`
| afk | 21:48 |
|
texinwien
| Seveas: Somehow, I managed to start with a repo on the server that had HEAD branch: master and end up with a repo on the server that has HEAD branch: dumb-name-that-i-chose | 21:49 |
|
| without ever having filesystem access to the server | 21:49 |
|
Seveas
| texinwien: how do you transfer the repo? | 21:49 |
|
texinwien
| I can archive it into a tarball and download it. | 21:50 |
|
Seveas
| and how would you upload it? | 21:50 |
|
texinwien
| I can also tell the server to create a repo from a local archive | 21:50 |
| → ASOLAr joined | 21:50 |
|
Seveas
| you could try that. What's the hosting setup for that? | 21:51 |
| ← skyres left | 21:51 |
|
texinwien
| This is on Kiln | 21:51 |
|
cbreak
| you could upload a fixed HEAD | 21:51 |
| → Mixologic joined | 21:51 |
|
cbreak
| it's a text file | 21:51 |
| → chitopunk joined | 21:52 |
|
texinwien
| I can't do that, unfortunately - I don't have FTP access or any other sort of access other than: git access, archive and download and create new remote repository from existing local repository | 21:52 |
| ← xxcooljesusxx left | 21:52 |
|
Seveas
| doesn't kiln have an option to "set default branch"? | 21:53 |
| → skyres joined | 21:53 |
|
Seveas
| GitHub does that and it has the same effect as the git symbolic-ref command I gave. | 21:53 |
| ← israelpattison left | 21:53 |
|
texinwien
| I've looked for that option (and am looking again now). I managed to change it somehow in the past, so there has to be some way to do it. | 21:54 |
| ← Mixologic_ left | 21:54 |
| → thedodd joined | 21:55 |
| → evie_hammond joined | 21:55 |
| ← ClearC2 left | 21:55 |
| ← matthava` left | 21:55 |
|
kadoban
| You can't do it with /just/ git access AFAIK. So look for something outside of git itself, like the web interface if that's what you have … | 21:56 |
| → Mixologic_ joined | 21:56 |
| ← omegamike left | 21:56 |
| ← astockton left | 21:56 |
| ← skyres left | 21:57 |
| ← tennis_ left | 21:58 |
| → gamename joined | 21:58 |
| → astockton joined | 21:59 |
| → skyres joined | 21:59 |
| ← Mixologic left | 21:59 |
| ← gregsmith left | 21:59 |
| ← macabre left | 21:59 |
| ← editshare-ericf left | 22:00 |
| ← madewokherd` left | 22:01 |
| ← EricPoe left | 22:01 |
| → Mixologi- joined | 22:01 |
| ← victortyau left | 22:02 |
| ChanServ set mode: +o | 22:02 |
| → Balliad joined | 22:02 |
| ← Balliad left | 22:02 |
| ← tomasm- left | 22:02 |
| Eugene changed the topic to: Welcome to #git, the place for git help and serious programming discussions | Current stable version: 2.4.6 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | This is not a joke, it's a commit. | 22:02 |
| ← Mixologic_ left | 22:02 |
|
texinwien
| I've sent the kiln team a support request. | 22:03 |
| Eugene set mode: -o | 22:03 |
|
texinwien
| I was wondering whether it would be possible to download an archive of the repo, fix it locally, then import the fixed repo back into kiln under another name | 22:03 |
| ← ascarter left | 22:03 |
| ← skyres left | 22:04 |
| ← gamename left | 22:04 |
| ← Guest91042 left | 22:05 |
| → akurilin joined | 22:06 |
| → skyres joined | 22:06 |
| ← thiago left | 22:06 |
| ← sgambino left | 22:07 |
| → ascarter joined | 22:07 |
| ← astockton left | 22:08 |
| → Mixologic_ joined | 22:09 |
| → SocialBlunder joined | 22:09 |
| → Mekkis joined | 22:09 |
| ← BooMShanKerX left | 22:09 |
| ← nnyk left | 22:09 |
| → IanWizard joined | 22:09 |
| ← IanWizard left | 22:09 |
| → IanWizard joined | 22:09 |
| ← gfixler left | 22:10 |
| ← Tyrannosaur left | 22:10 |
| ← skyres left | 22:10 |
| ← sentriz left | 22:10 |
| ← Mixologi- left | 22:11 |
| → Tyrannosaur joined | 22:11 |
| → astockton joined | 22:12 |
| → Tyrannosaur1 joined | 22:12 |
| → skyres joined | 22:12 |
| ← SocialBlunder left | 22:13 |
| ← Mekkis left | 22:14 |
| → HZun joined | 22:15 |
| ← Tyrannosaur left | 22:16 |
| ← creep_ left | 22:16 |
| → Voau|2 joined | 22:16 |
|
isomorphismes
| I'm not sure how bad this is. When I try to git push at the end of rtyley's BFG documentation I get three `! [remote rejected] refs/pull/1/head -> refs/pull/1/head (deny updating a hidden ref)` | 22:17 |
| ← dailyherold left | 22:17 |
|
isomorphismes
| the other errors are pretty similar to that ^^ | 22:17 |
| ← skyres left | 22:17 |
|
isomorphismes
| The non-errors say "forced update" | 22:17 |
| → olejorgenb joined | 22:18 |
| ← Vadimus left | 22:19 |
| ← muhaha03__ left | 22:19 |
| → skyres joined | 22:19 |
| → Nizumzen joined | 22:19 |
| → olso joined | 22:20 |
| → Nooutlet joined | 22:21 |
| → modocache joined | 22:21 |
| gitinfo set mode: +v | 22:21 |
|
olejorgenb
| noob question (couldn't find by googling): when staging hunks interactively (git commit -p): is it possible to avoid having to press return after choosing each action? eg. I press 'y' to stage the current hunk, but I have to press return to confirm.. | 22:22 |
|
| this is git on linux | 22:22 |
| ← olejorgenb left | 22:22 |
| → olejorgenb joined | 22:22 |
| ← ASOLAr left | 22:23 |
| ← cmoneylulz left | 22:23 |
| ← skyres left | 22:23 |
|
isomorphismes
| can I undo git reset? | 22:24 |
| → emulator_ joined | 22:24 |
|
isomorphismes
| I did git reset <SHA i thought i wanted>, but it was not what I wanted. | 22:24 |
| ← tristanp left | 22:24 |
| → Mekkis joined | 22:24 |
| → tristanp joined | 22:25 |
| ← modocache left | 22:25 |
| → skyres joined | 22:26 |
| → ASOLAr joined | 22:27 |
| → Guest91042 joined | 22:28 |
| ← gabriela_ left | 22:29 |
| ← Mekkis left | 22:29 |
| ← tristanp left | 22:29 |
| ← skyres left | 22:30 |
| → madewokherd joined | 22:30 |
| → Mekkis joined | 22:30 |
| ← X67r left | 22:31 |
| → rpg joined | 22:31 |
| ← espindol_ left | 22:31 |
| → thiago joined | 22:31 |
| → daviid joined | 22:32 |
| → nofxx joined | 22:32 |
| ← chitopunk left | 22:32 |
| → skyres joined | 22:32 |
| → hekz joined | 22:32 |
| ← hekz left | 22:32 |
| ← AndreSomers left | 22:33 |
| ← Guest91042 left | 22:34 |
|
daviid
| hello. in the follow logs http://git.savannah.gnu.org/cgit/guile-gnome.git/log/?h=devel you see '2014-10-08 2.16.3' where I bumped the version for the next release of guile-gnome. However, I discover a bunch of things to do and ... Is there a way to delete that commit, and how? [ a tutorial somwhere maybe] | 22:34 |
| → Junhw joined | 22:34 |
| → DolpheenDream joined | 22:34 |
| ← Junhw left | 22:34 |
| ← ASOLAr left | 22:34 |
| → drewo joined | 22:35 |
| → whomp joined | 22:35 |
| → ASOLAr joined | 22:36 |
| → Guest91042 joined | 22:36 |
|
whomp
| on the github server, the continuous integration stuff automatically rebased my branch onto the latest tip of master, but my local copy is the same. git tells me that they're out of sync and that i can't push, and suggests using `git branch --set-upstream-to=...`. what do you guys think i should do? | 22:37 |
| ← skyres left | 22:37 |
| ← dsdeiz left | 22:37 |
| ← hagabaka left | 22:37 |
| → Zime joined | 22:37 |
| ← Zime left | 22:37 |
| ← Mekkis left | 22:38 |
| → skyres joined | 22:39 |
| ← Zoddo left | 22:39 |
| → Mekkis joined | 22:39 |
| ← drewo left | 22:39 |
| → yqt joined | 22:40 |
| → Urem joined | 22:42 |
| ← robbyoconnor left | 22:42 |
| ← Urem left | 22:42 |
| ← linuxboytoo left | 22:43 |
| ← skyres left | 22:43 |
| → linuxboytoo joined | 22:43 |
| → Eumi joined | 22:43 |
| ← Eumi left | 22:44 |
| → nnyk joined | 22:44 |
| → daj joined | 22:45 |
| → skyres joined | 22:45 |
| → mscook joined | 22:45 |
| ← daj left | 22:46 |
| ← ASOLAr left | 22:46 |
|
texinwien
| So, one way to do what I was asking about above is to simply create a new, empty repository from scratch in kiln, then push my local branch to master in that repository | 22:46 |
| ← Voau|2 left | 22:46 |
|
texinwien
| et voila, the new repository is a copy of the old one, except that its HEAD points to master. | 22:47 |
| ← livingstn left | 22:47 |
| ← linuxboytoo left | 22:47 |
| ← sdothum left | 22:47 |
| → Aaie joined | 22:48 |
| ← Aaie left | 22:48 |
| → sdothum joined | 22:48 |
| ← relipse left | 22:49 |
| ← mutbuerger left | 22:49 |
|
texinwien
| then delete the old repository in kiln (can be undeleted if necessary), rename the new one to the old one's name and it seems close to perfect. | 22:49 |
| ← ehmatthes left | 22:49 |
| → zendrix joined | 22:49 |
| → Brjb joined | 22:50 |
|
texinwien
| still no idea how I managed to change the branch HEAD pointed to in the original repo, though. Mystery. | 22:50 |
| ← Brjb left | 22:50 |
| → neoseeker191 joined | 22:50 |
| ← skyres left | 22:50 |
| ← neoseeker191 left | 22:51 |
| → israelpattison joined | 22:51 |
| → bli joined | 22:51 |
| ← bli left | 22:52 |
| → skyres joined | 22:52 |
| ← pheaver left | 22:52 |
| → Mixologic joined | 22:52 |
| → Gizburdt joined | 22:53 |
| → ieftu joined | 22:53 |
| ← zendrix left | 22:53 |
| ← ieftu left | 22:54 |
| ← eggoez left | 22:54 |
| → Mixologi- joined | 22:54 |
| ← rpg left | 22:54 |
| → macabre joined | 22:55 |
| → Cmag joined | 22:55 |
| ← Mixologic_ left | 22:55 |
| ← Cmag left | 22:55 |
| ← MinetestForFun left | 22:56 |
| ← skyres left | 22:56 |
| → omegamike joined | 22:56 |
| → aped joined | 22:57 |
| → fenugrec joined | 22:57 |
| ← aped left | 22:57 |
| ← Mixologic left | 22:57 |
| ← ascarter left | 22:57 |
| → eggoez joined | 22:58 |
| → skyres joined | 22:58 |
| ← Mixologi- left | 22:58 |
| → cagedwisdom joined | 22:59 |
| ← Tyrannosaur1 left | 22:59 |
| → mhp joined | 22:59 |
| ← mhp left | 22:59 |
| ← [diecast] left | 23:00 |
| ← jmcantrell left | 23:00 |
| → upene joined | 23:00 |
| → jmcantrell joined | 23:00 |
| → [diecast] joined | 23:00 |
| → ycn joined | 23:01 |
| ← neanderslob left | 23:01 |
| ← mariorz left | 23:01 |
| → sinkensabe joined | 23:01 |
| ← ycn left | 23:01 |
| → mariorz joined | 23:01 |
| → zendrix joined | 23:01 |
| → mizu_no_oto joined | 23:02 |
| ← kapowaz left | 23:02 |
| ← danzilio left | 23:02 |
| → kapowaz joined | 23:02 |
| → neanderslob joined | 23:02 |
| ← skyres left | 23:02 |
| ← omegamike left | 23:03 |
| → fvwy joined | 23:03 |
| ← DolpheenDream left | 23:03 |
| ← fvwy left | 23:03 |
| → teran_ joined | 23:04 |
| → Ibtki joined | 23:05 |
| → skyres joined | 23:05 |
| ← michael_mbp left | 23:05 |
| ← Ibtki left | 23:05 |
| ← teran left | 23:06 |
| → teran joined | 23:06 |
| → uwcdm joined | 23:06 |
| ← uwcdm left | 23:07 |
| → Mixologic_ joined | 23:08 |
| ← teran_ left | 23:08 |
| ← Doxin left | 23:09 |
| ← ELLIOTTCABLE left | 23:09 |
| → michael_mbp joined | 23:09 |
| ← yrashk left | 23:09 |
| → ELLIOTTCABLE joined | 23:09 |
| → clarkpan joined | 23:09 |
| ← skyres left | 23:09 |
| → SocialBlunder joined | 23:10 |
| → yrashk joined | 23:10 |
| ← nnyk left | 23:11 |
| → tristanp joined | 23:11 |
| ← yn5 left | 23:11 |
| → skyres joined | 23:11 |
| → Mixologi- joined | 23:11 |
| ← s00pcan left | 23:12 |
| ← tristanp left | 23:12 |
| → tristanp joined | 23:12 |
| ← upene left | 23:13 |
| ← HZun left | 23:13 |
| → s00pcan joined | 23:14 |
| ← NeverDie left | 23:14 |
| → xudongz joined | 23:14 |
| → NeverDie joined | 23:14 |
| ← Mixologic_ left | 23:14 |
| ← SocialBlunder left | 23:14 |
| ← tang^ left | 23:14 |
| ← d10n-work left | 23:15 |
| ← skyres left | 23:15 |
| ← clarkpan left | 23:16 |
| ← Nikhil_D left | 23:17 |
| → Nikhil_D joined | 23:18 |
| → skyres joined | 23:18 |
| ← mscook left | 23:18 |
| → mscook joined | 23:18 |
| ← LaptopBrain left | 23:20 |
| → Mixologic joined | 23:20 |
| → upene joined | 23:20 |
| → LaptopBrain joined | 23:20 |
| → clarkpan joined | 23:20 |
| ← LaptopBrain left | 23:20 |
| → LaptopBrain joined | 23:21 |
| → fracting joined | 23:21 |
| → WifiBrain joined | 23:21 |
| → Veag joined | 23:22 |
| → benkai joined | 23:22 |
| ← skyres left | 23:22 |
| ← Guest91042 left | 23:22 |
| ← Veag left | 23:22 |
| ← Mixologi- left | 23:22 |
| ← mizu_no_oto left | 23:23 |
| → jjai joined | 23:23 |
| ← freestyl3r left | 23:23 |
| ← jjai left | 23:23 |
| → dsdeiz joined | 23:23 |
| ← clarkpan left | 23:23 |
| → Technocrat7 joined | 23:23 |
| ← upene left | 23:24 |
| ← {0xc6} left | 23:24 |
| ← zendrix left | 23:24 |
| → clarkpan joined | 23:24 |
| → skyres joined | 23:24 |
| ← LaptopBrain left | 23:25 |
| → Mixologic_ joined | 23:25 |
| → tcurdt_ joined | 23:26 |
| ← clarkpan left | 23:26 |
| → Tdiw joined | 23:27 |
| → upene joined | 23:27 |
| ← Tdiw left | 23:27 |
| → ascarter joined | 23:27 |
| → tcurdt__ joined | 23:27 |
| ← tcurdt__ left | 23:27 |
| → dudoom joined | 23:27 |
| → modocache joined | 23:28 |
| ← tyreld left | 23:28 |
| ← skyres left | 23:28 |
| → clarkpan joined | 23:28 |
| ← Mixologic left | 23:29 |
| → drewo joined | 23:29 |
| → zendrix joined | 23:29 |
| ← wicope left | 23:30 |
| ← fstd left | 23:30 |
| → fstd joined | 23:30 |
| → mikecmpb_ joined | 23:30 |
| → robbyoconnor joined | 23:30 |
| ← elsevero left | 23:30 |
| ← tcurdt_ left | 23:30 |
| → skyres joined | 23:31 |
| → tomog999_ joined | 23:31 |
| → zumba_addict joined | 23:32 |
| → LaptopBrain joined | 23:32 |
| → pm90_ joined | 23:32 |
| ← Outsider__ left | 23:32 |
| → reim joined | 23:32 |
| → Outsider__ joined | 23:33 |
| ← WifiBrain left | 23:33 |
| ← mikecmpbll left | 23:33 |
| ← ahf left | 23:33 |
| ← tomog999 left | 23:33 |
| → moritz joined | 23:33 |
| → ahf joined | 23:34 |
| ← drewo left | 23:34 |
| → preilly joined | 23:34 |
| → biertie joined | 23:34 |
| → EvilJStoker joined | 23:34 |
| preilly → Guest20908 | 23:34 |
| → bhws joined | 23:34 |
| ← maestrojed left | 23:34 |
| → pm90__ joined | 23:35 |
| ← skyres left | 23:35 |
| ← bhws left | 23:35 |
| → ecraven joined | 23:35 |
| → dgutierrez1287 joined | 23:37 |
| ← tristanp left | 23:37 |
| → skyres joined | 23:37 |
| ← pm90_ left | 23:38 |
| → Guest91042 joined | 23:38 |
| → tristanp joined | 23:38 |
| ← dudoom left | 23:38 |
| ← bronson left | 23:38 |
| ← astockton left | 23:38 |
| ← sr____ left | 23:40 |
| → bollullera joined | 23:40 |
| → sr____ joined | 23:40 |
| ← sinkensabe left | 23:41 |
| → felixjet_ joined | 23:41 |
| ← FernandoBasso left | 23:41 |
| ← neersighted left | 23:41 |
| ← dgutierrez1287 left | 23:41 |
| → neersighted joined | 23:41 |
| ← skyres left | 23:42 |
| ← Guest91042 left | 23:42 |
| ← tristanp left | 23:42 |
| → wxl joined | 23:43 |
| ← ascarter left | 23:44 |
| → skyres joined | 23:44 |
|
wxl
| hey folks. i just noticed an older commit got rid of some code we had no intention of doing. comments, but still… how can i restore *SOME* of the changes on the associated commit while not messing up later commits? is this easily done, or do i just need to do it manually? | 23:45 |
| → eletuchy joined | 23:45 |
|
wxl
| (the associated commit had some crucial additions as well) | 23:45 |
| → EricPoe joined | 23:46 |
| ← King_Hual left | 23:47 |
| ← fracting left | 23:48 |
|
Seveas
| wxl: revert -n, followed by a reset to remove the changes from the index, an add -p to only add the changes you want to revert, commit, and reset --hard to get rid of the unwanted changes. | 23:48 |
| ← skyres left | 23:48 |
| → danzilio joined | 23:49 |
|
wxl
| thx seveas, i'll give it a go | 23:49 |
| ← modocache left | 23:49 |
| ← thedodd left | 23:50 |
| → Lyqyd joined | 23:50 |
| → skyres joined | 23:50 |
|
texinwien
| git branch -r displays several branches. One is origin/deleteme | 23:50 |
|
| now, if I try git push origin --delete deleteme , I get an error: | 23:51 |
| → bronson joined | 23:51 |
| ← wxl left | 23:51 |
|
texinwien
| unable to delete 'deleteme': remote ref does not exist | 23:52 |
|
Seveas
| maybe someone else has deleted it already. Do a git fetch. | 23:52 |
|
| git fetch --prune | 23:52 |
| → espindola joined | 23:52 |
| ← mingwandroid_ left | 23:53 |
|
texinwien
| Seveas: thanks | 23:53 |
|
| Although the someone else had to be me, somehow, since I'm the only one working on it. | 23:53 |
| ← LaptopBrain left | 23:53 |
|
Seveas
| I think we've already established that your repos change on their own as well :-) | 23:53 |
|
texinwien
| finally got this horrific repository switched from one branch per dev to one fork per dev. | 23:53 |
| → espindol_ joined | 23:54 |
|
texinwien
| yes - I would love to know how I got the HEAD to point to something other than master. | 23:54 |
| ← mscook left | 23:54 |
| → mscook joined | 23:54 |
| → modocache joined | 23:55 |
| ← skyres left | 23:55 |
| → ClearC2 joined | 23:56 |
| ← espindola left | 23:57 |
| → skyres joined | 23:57 |
| → livingstn joined | 23:58 |
| → hexagoxel_ joined | 23:58 |
| ← fstd left | 23:59 |
| → omegamike joined | 23:59 |
|
Eugene
| !default | 23:59 |
|
| Hrm, thought we had one for that. | 23:59 |
| → fstd joined | 23:59 |
| ← modocache left | 23:59 |
|
Eugene
| !master | 23:59 |
|
gitinfo
| [!master_branch] 'master' is the default name for the first branch created by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first. | 23:59 |