IRCloggy #git 2015-11-14

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2015-11-14

→ lab_ joined00:01
← astockton left00:02
← blr_ left00:02
→ lindenle joined00:03
← astockto_ left00:03
→ DaddyEric_DESK joined00:04
← lab_ left00:05
→ lab_ joined00:05
← Arsonide left00:07
← cspotcode left00:07
← acetakwas left00:07
→ Arsonide joined00:07
→ locksmith2 joined00:08
← DaddyEric left00:08
← daito left00:08
← locksmith2 left00:11
← lab_ left00:11
→ thinkxl_ joined00:11
→ Lyqyd joined00:12
← waspinator left00:12
andrybak hello, is there a way to add repositories to gitweb without moving the repo into $projectroot00:13
Seveas symlink it00:14
→ lab_ joined00:14
→ lewellyn joined00:14
andrybak Seveas this doesn't work00:15
→ Puffball_ joined00:15
→ nidr0x joined00:16
→ nivag joined00:17
← mathys left00:18
→ StuartMI joined00:19
← lewellyn left00:19
← lindenle left00:19
bremner it has worked for me in the past. check permissions00:20
→ hexagoxel joined00:21
→ blimpse joined00:21
andrybak gitweb is very weird with permissions00:21
← otter768 left00:21
← skirk left00:22
bremner I don't think so. It's just unforgiving and bad a reporting errors.00:22
Seveas no its not. It needs read permissions and you need to create the export ok file.00:22
andrybak i have a user www-data that runs apache200:22
→ lindenle joined00:23
← nnyk_ left00:24
← andrybak left00:26
→ dviola joined00:27
→ Noldorin joined00:30
→ lewellyn joined00:31
→ crayon joined00:31
→ lemonpepper24 joined00:33
← lab_ left00:34
← lindenle left00:35
← jteneyck left00:35
→ akkad joined00:36
← CausaMortis left00:36
→ lindenle joined00:36
→ _cyril_ joined00:37
← josuebrunel left00:38
← Oculus left00:40
→ Oculus joined00:40
→ lab_ joined00:40
← Karkus left00:43
← oojacoboo left00:44
Celelibi I would like to make a script that take the patches from a ML and try to build them on top of master and all on top of each other (and automatically send a report if it fails).00:45
ojacobson Sorry to hear about your impending combinatorial explosion00:46
Celelibi My question might not be directly related to git, but here it is: How could I handle when people send a new version of a given patch?00:46
→ snthsnth joined00:46
Celelibi No, no combinatorial explosion. 1 branch per patch series, and just one branch that group them all.00:47
qsuscs ONE BRANCH TO GROUP THEM ALL00:47
scnr.00:47
Celelibi: if you have large amounts of patches, i’d use !gerrit00:47
gitinfo Celelibi: Gerrit is a web-based code review system, built by Google. https://www.gerritcodereview.com/00:47
Celelibi Trying to find which patches are incompatible is, indeed an combinatorial problem.00:47
← Oculus left00:48
Celelibi There's not many patches, but the time to merge (or to review) is long.00:48
Oh, and I don't know either how to detect when a patch is rejected.00:49
qsuscs i like gerrit, even despite being written in java00:49
← lindenle left00:50
→ ome joined00:50
Celelibi I'll look into that.00:51
→ scarabx joined00:51
← Ahmed90 left00:51
→ oojacoboo joined00:52
← lab_ left00:52
→ lindenle joined00:53
← cagedwisdom left00:53
← sbogg left00:54
→ devoldmx joined00:55
→ tgunr joined00:56
→ lab_ joined00:56
→ k4rtik joined00:57
← hahuang65 left00:57
← iatkotep left00:57
→ iatkotep joined00:58
← TobyP_ left00:58
→ fstd joined00:59
→ pozitrono joined00:59
← devoldmx left00:59
→ TobyP_ joined01:00
← viljaste left01:00
→ viljaste joined01:01
→ tubaman joined01:01
← Noldorin left01:02
← imachuchu left01:02
→ CKyle joined01:05
→ daito joined01:05
← iatkotep left01:06
← lindenle left01:07
← dantix left01:07
← lab_ left01:07
→ lindenle joined01:08
← dviola left01:09
← kilo_bravo left01:09
→ Dumle29 joined01:10
← thiago left01:11
→ heroux joined01:14
← EvilPenguin left01:15
→ boombatower joined01:15
← durham left01:17
← livingstn left01:18
→ Lor_ joined01:19
→ ilmgb joined01:19
← kadoban left01:21
→ samw joined01:22
→ Neozonz joined01:23
← cdg left01:24
← lindenle left01:25
← heroux left01:27
← Neozonz left01:27
→ Neozonz joined01:27
→ lindenle joined01:28
← Sasazuka left01:30
→ Technocrat7 joined01:31
→ meLon_ joined01:32
← meLon_ left01:32
→ Gamecubic__ joined01:32
← meLon left01:32
← daito left01:33
← neanderslob left01:33
→ neanderslob joined01:35
← Dumle29 left01:36
← Gamecubic_ left01:36
→ fracting__ joined01:36
→ lab_ joined01:36
← scarabx left01:37
← timvisher left01:38
→ timvisher joined01:38
← bitkiller left01:40
← lindenle left01:41
← nidr0x left01:41
← lab_ left01:41
→ lindenle joined01:42
→ heroux joined01:43
← heroux left01:48
→ lab_ joined01:48
← tgunr left01:49
← blimpse left01:49
→ circa joined01:51
→ d5sx43 joined01:52
← vigintas left01:52
← lab_ left01:52
→ cromero joined01:52
← alex_johnson left01:52
→ Noldorin joined01:54
→ JDHawke joined01:54
← d5sx43 left01:54
← lindenle left01:55
→ otter768 joined01:56
← cromero left01:57
→ lindenle joined01:58
→ madewokherd joined02:01
← HelloShitty left02:01
→ polyzen joined02:03
→ roygbiv joined02:03
← CKyle left02:03
thinkxl_ → thinkxl02:03
→ DolpheenDream joined02:04
→ Vampire0 joined02:05
← DaddyEric_DESK left02:05
→ DaddyEric joined02:06
→ shinnya joined02:06
→ ch3mical joined02:08
← viljaste left02:09
→ CKyle joined02:09
→ thesquib joined02:09
→ erichmenge joined02:10
→ vigintas joined02:10
→ viljaste joined02:10
→ Dumle29 joined02:11
→ __name__ joined02:12
→ alex_johnson joined02:12
→ AlbinoGeek joined02:13
← Radivarig left02:13
AlbinoGeek Hello git wizards :). I have a remote that (due to power failure) lost all knowledge of master existing, but my local copy is fine. I can't just push though! (shows an empty object, and an SHA1 collision?) The local reflog, local log, and even remote commit history (via webUI) show all commits as expected...02:14
→ EvilPenguin joined02:14
Eugene man git-fsck; run that first02:14
gitinfo the git-fsck manpage is available at http://jk.gs/git-fsck.html02:14
AlbinoGeek Eugene: I did, and no output.02:14
Sorry*** 100% done output, all normal *02:14
Eugene Next, verify you've got a commit with `git show <SHA1ofwhatyouwantmastertobe>`02:15
AlbinoGeek 256/256 dirs, 1573/1573 objects.02:15
Eugene Then man git-update-ref for how to set master to that SHA02:15
gitinfo the git-update-ref manpage is available at http://jk.gs/git-update-ref.html02:15
Eugene If it gives you shit, wipe out .git/refs/heads/master and the matching .git/reflogs/ entry(with rm) and try again02:15
→ Sasazuka joined02:16
AlbinoGeek I pick the first commit shown in `git log` (the latest), and then `git show <hash>` gives me a diff as expected.02:16
I tried to update the remote head to that SHA, but it didn't let me push.02:16
Eugene You should be running this on a shell on the remote itself02:16
AlbinoGeek There is no `git\refs\heads\master`02:16
Eugene It doesn't matter what you have locally ;-)02:17
AlbinoGeek Shame, I just wanted to overwrite the remote with a copy working somewhere else.02:17
I have a staging server that didn't get power loss, that always cloned the whole repo.02:17
It has a fully sane copy that still works.02:17
← lindenle left02:17
Eugene So fix he remote using update-ref, per above02:17
→ mizu_no_oto joined02:17
AlbinoGeek Eugene: I did, then upon pushing git told me I had one empty object, and a SHA Colision..02:18
I can post the whole error somewhere, what's the pastbin accepted here?02:18
Eugene !paste02:18
gitinfo Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.02:18
← Sasazuka left02:18
Eugene .trigger_edit paste Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.02:19
gitinfo Eugene: Okay.02:19
Eugene shamelessly plugs his own domains some more02:19
→ heroux joined02:19
qsuscs <insert perl rant here>02:20
← rforgione left02:20
qsuscs <also rant about poorly documented software>02:20
→ lindenle joined02:20
AlbinoGeek Eugene: Thanks, here's the output : https://gist.github.com/AlbinoGeek/91d479c0f83c3792fb6202:20
Eugene Again on the remote itself, `git rev-parse master` may be interesting02:20
→ blimpse joined02:20
Eugene documents qsuscs a new one02:20
→ s8321414 joined02:20
→ ag4ve joined02:20
qsuscs i’ll try weird gnu software02:20
well at least it’s not french.02:20
← apotry left02:20
Eugene AlbinoGeek - cool. Nuke the object it's talking about, run fsck on the remote again02:20
AlbinoGeek Eugene: Ahh, right. Moment while I figure out where GitLab puts the actual projects to do it on the remote...02:21
Eugene qsuscs - zifbin is open source, and welcomes documentation patches.02:21
Plus the author is a good friend of mine02:21
Gamecubic__ → Gamecubic02:22
qsuscs no02:22
i was trying to setup sympa02:22
Eugene Ah, totally unrelated rantng02:22
Carry on!02:22
qsuscs but it is poorly documented (“you have to setup the database first”, i see, how?) and some things are just wrong02:22
./configure --help simply lies to me02:23
AlbinoGeek Eugene: Huh, it splits the files a bit... I have two paths to work with here on the remote.02:23
qsuscs “yeah i will put the files here if you don’t specify a thing” “mommy i can’t write to /etc!”02:23
→ skcin7 joined02:23
Eugene Yes, the objects dir uses subdirs to keep `ls` from freaking out02:23
qsuscs you ever tried to debug a TWO HUNDRED FIFTY THOUSAND LINES PERL SCRIPT?02:23
i mean, perl. that’s just too much02:24
i’ll give mailman 3 another shot, that’s python 302:24
Eugene Use the perl debugger: /bin/rm02:24
← CKyle left02:24
qsuscs i just did.02:24
Eugene That's a bit nuts though02:24
AlbinoGeek Eugene: The remote only has a git-data section. Is everything just in "objects" or? It's not like a repo.02:24
→ MattMaker joined02:25
← weox left02:25
Eugene AlbinoGeek - today you get to read the !bare page02:25
gitinfo AlbinoGeek: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/02:25
Eugene Not to be confused with the bears page, which is an entirely different adventure02:25
AlbinoGeek Eugene: Remote is a directory containing " config description HEAD hooks hooks.old.1446782382 info objects "02:25
Reading...02:25
Eugene tl;dr: repos you push to are just the stuff inside of .git/02:25
AlbinoGeek Eugene: Alright, so for the better; the server is bare, and mine isn't. So I get a working tree, etc.02:26
Eugene: Alright, so I'll start working in the remote's dir with fsck / repeat and get back to you, Thankd :D02:26
Eugene Enjoy02:26
AlbinoGeek Eugene: Root cause: fatal: loose object 2f5091955099000da33757eb09359bd0c6c1f84f (stored in ./objects/2f/5091955099000da33757eb09359bd0c6c1f84f) is corrupt02:28
Eugene Tada!02:29
AlbinoGeek That matches the hash with the supposed SHA collision02:29
← daivyk left02:29
AlbinoGeek That's a... wrong error I'd think02:29
Eugene: Right, so that file is empty (the objects/2f/...) ; does that mean I lost some data somewhere?02:29
Eugene Yup02:30
AlbinoGeek Can I tell what? I have many non-bare repos with full copies.02:30
← MattMaker left02:30
Eugene But, because git is awesome, every clone of the repo will have that object02:30
Sure, `git show` the hash02:30
AlbinoGeek (on a working client, or on the remote?)02:30
Eugene On any other repo02:30
.trigger_edit A bare repository is used for pushing-to, and contains only git's repodata, which is kept in .git/ for working repos. More reading: .trigger_edit A bare repository is used for pushing-to, and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/02:30
gitinfo Eugene: Okay.02:30
Eugene Damnit02:30
.trigger_edit bare A bare repository is used for pushing-to, and contains only git's repodata, which is kept in .git/ for working repos. More reading: .trigger_edit A bare repository is used for pushing-to, and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/02:30
gitinfo Eugene: Okay.02:30
Eugene .trigger_edit A -02:31
gitinfo Eugene: Okay.02:31
→ pks joined02:31
AlbinoGeek Ahh kk, and the object/2f/5 hash, or the "loose object 2" hash ?02:31
Those are tow different hash length strings02:31
Eugene 2f50919blahblah02:31
AlbinoGeek Oh, the / is just a02:31
wow lol02:31
nvm I'm dumb :P02:31
→ jteneyck joined02:31
AlbinoGeek Remote says it's loose and can't find it (if I do git show) ,and I'll start finding it on clients.02:32
Eugene .trigger_edit bear Bear repos are very dangerous. Approach with caution! https://youtu.be/DvduCPXO_FE02:32
gitinfo Eugene: Okay.02:32
AlbinoGeek A working client outputs a file, do I upload that to replace the empty one on remote, then re-fsck or?02:32
Eugene If you rm the bad file on the remote you should be able to just `git push` to update and fix it02:33
Otherwise, scp/rsync the objects dir from a client onto the remote02:33
AlbinoGeek OH! So the SHA collision is literally colliding with the temporary corruption handle02:33
← chucky_z left02:33
AlbinoGeek the objects/2f/5 (empty) file02:33
Eugene Yeah, incomplete write02:33
AlbinoGeek Thanks on that one, sorry I ask so many questions; just want to figure out how to repair in future too.02:34
← mniip left02:34
← madewokherd left02:34
AlbinoGeek Hmm, remote has collisions now (reported from client doing `git push origin master`)02:34
It's a new one, repeating the same process.02:34
Eugene Re-paste02:34
→ MattMaker joined02:35
AlbinoGeek Eugene: Eww, it's doing it for hundreds.02:35
→ QwertyDragon joined02:35
Eugene Cool, it ate a significant portion of the repo.02:35
AlbinoGeek Can I force objects from client -> rewrite remote02:35
Eugene You say you've got a full, good clone of the repo somewhere?02:35
← cyphase_ left02:35
AlbinoGeek Eugene: Yup,. a non-bare with a working dir02:35
→ mniip joined02:35
AlbinoGeek the remote still has the entire commit history for some reaosn02:35
just no file contents02:35
Eugene `rm`(or `mv`) it away, re-create with `git init`02:35
→ frivol joined02:35
← msonntag left02:35
→ cyphase_ joined02:35
AlbinoGeek then push empty ?02:35
Eugene Then git push everything up all fresh-like02:35
Yuuuup.02:36
AlbinoGeek And should retain all histories etc from the good client I guess?02:36
Eugene Yup.02:36
You may be interested in man git-push; particularly --all02:36
gitinfo the git-push manpage is available at http://jk.gs/git-push.html02:36
AlbinoGeek Anything a bare repo stores that a non-bare doesn't? or identical + working tree of current checked out branch02:36
→ madewokherd joined02:36
← lindenle left02:36
AlbinoGeek (also, should be git init --bare to recreate remote, right?)02:36
← jteneyck left02:36
← Neozonz left02:36
Eugene You won't lose anything important. Reflogs, mostly02:37
Yeah, --bare flag. You're learning!02:37
← MattMaker left02:37
→ msonntag joined02:37
Eugene Gitlab /may/ have some special stuff in the hooks/ dir. I don't use that product myself02:37
AlbinoGeek Right, GitLab died (whatever, don't need it now that I know how to create a bare repo :P)02:37
→ MattMaker joined02:37
Eugene You may like !gitolite too ;-)02:37
gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/02:37
AlbinoGeek I only ever used git software because I didn't know what a non-working-tree git was02:37
Eugene It's less likely to eat its own HEAD02:37
AlbinoGeek I'm fine with just making a "git" user and pushing into bare repos02:38
Eugene Definitely use gitolite if that' what you want. There's some rough edges to that approach, and it's low effort to set up02:38
→ lindenle joined02:38
→ jokester joined02:38
AlbinoGeek Even after re-init on the remote, "remote collisions" reported on client push.02:38
Eugene That's.... weird02:39
`git fetch` from it02:39
And did you move the old copy of the remote out of the way?02:40
AlbinoGeek Yeah.02:40
Now the remote can't write files, permissions, etc; that's my/gitlab problem.02:40
→ livingstn joined02:41
AlbinoGeek fixed up, examining the remote repo via GitLab now to see if files have expected contents...02:41
Eugene That'll be a result of using sudo. Look at the permissions02:41
→ vikas027 joined02:41
AlbinoGeek Shows all 240 commits / 1 branch expected (I only ever pushed master, all other branches are just local to me.)02:41
→ NeeleshKorade joined02:42
AlbinoGeek Eugene: Is there a sane/safe way to pull and diff the current remote with my working directory?02:42
← livingstn left02:42
Eugene `git fetch` and then !lol02:42
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all02:42
AlbinoGeek Nice command there :D02:42
Eugene Thanks02:43
AlbinoGeek * c6bc5ac (HEAD -> master, origin/master, origin/master) Last Commit Message02:43
That's all good?02:43
Eugene Yup, you're good02:43
AlbinoGeek (that's the expected commiit)02:43
Nice.02:43
qsuscs umph02:44
mailman documentation is better02:44
Eugene Also, if you've had a power loss that caused data to disappear, remember to fsck your filesystem itself02:44
qsuscs but they wrote it as modular as possible02:44
Eugene Who knows what evil lurks within02:44
→ sbogg joined02:44
qsuscs so you actually have three or more programs that you have to setup02:44
preaction the shadow knows!02:44
AlbinoGeek Eugene: For whatever reason, I had nothing wrong on any of my FS.02:44
qsuscs ezmlm was indeed easy, albeit not for my users.02:44
→ jalopez joined02:45
AlbinoGeek on Windows (client), only one lost-found, and it was a desktop.ini copy.02:45
on CentOS 7 (server), fsck had nothing to repair / prompt02:45
NeeleshKorade Hi, I am looking for git cli design and source code. Could someone give a pointer as to where I can find it? I am looking at https://github.com/git/git but unable to find what I am looking for02:45
Eugene Lucky02:45
← vrishab left02:45
← alhamdulillah left02:45
Eugene NeeleshKorade - you're looking for where argument parsing is done in the `git` application? Or something more general?02:46
→ vrishab joined02:46
← Froziph left02:46
← vigintas left02:47
← k4rtik left02:47
→ Neozonz joined02:48
← Neozonz left02:48
→ Neozonz joined02:48
← xaa left02:48
NeeleshKorade Eugene - Thanks for your response. Am specifically looking for the 'git' command source code and some design artifacts to help understand how it is designed02:48
← gfixler1 left02:49
Eugene NeeleshKorade - git is a great example of evolution, rather than intelligent design. That being said, look at git.c as a starting point02:49
qsuscs Eugene: do you know linus’ rant on monotone?02:50
Eugene No, I don't study psychoses02:50
qsuscs .search linus monotone02:50
← lindenle left02:50
→ rpdprd joined02:50
← yqt left02:50
gitinfo Monotone (software) - Wikipedia, the free encyclopedia <http://jk.gs/t/9u> | Linus played with Monotone before [LWN.net] <http://jk.gs/t/9v> | Monotone, Git, Linus and Marty McFly <http://jk.gs/t/9w> | ...02:50
→ xcesariox joined02:51
← Neozonz left02:52
→ skirk joined02:53
→ lindenle joined02:54
→ SimonNaa joined02:55
→ apeiros joined02:55
→ timthowtdi joined02:55
→ Davey joined02:55
← Davey left02:55
→ Davey joined02:55
→ livingstn joined02:56
← StuartMI left02:56
→ devoldmx joined02:56
← jokester left02:56
→ harv joined02:56
← livingstn left02:56
→ ChrisWarrick joined02:56
← thesquib left02:57
→ vigilvindex joined02:57
→ nacsurte joined02:58
← timthowtdi left02:58
→ Mathiasdm joined02:58
→ Pieter_ joined02:58
→ timthowtdi joined02:58
→ Goplat joined02:58
→ lab_ joined02:58
→ thesquib joined02:58
← johtso left02:58
→ VoidFox joined02:59
→ jokester joined02:59
→ livingstn joined03:00
← devoldmx left03:01
← mizu_no_oto left03:02
→ arescorpio joined03:02
← fscala left03:03
SimonNaa → SimonNa03:03
→ Neozonz joined03:03
← Neozonz left03:03
→ Neozonz joined03:03
← Pieplay left03:04
AlbinoGeek Eugene: Thanks! I ended up cloning into a new bare repo on my computer, then uploading that to the server and overwriting everything (moving away, replacing.)03:05
I could clone the working repo into a new bare repo, then uploaded that.03:05
→ fscala joined03:05
Eugene Who clones the cloners?03:05
AlbinoGeek Since server was screwed.03:05
← jalopez left03:06
← alanwill left03:06
→ alanwill joined03:07
← griotspeak left03:08
← Technocrat7 left03:08
← DaddyEric left03:08
← Neozonz left03:09
→ ril joined03:09
← NeeleshKorade left03:09
← lab_ left03:10
→ lab_ joined03:11
← lindenle left03:11
← QwertyDragon left03:12
→ QwertyDragon joined03:13
→ lindenle joined03:13
→ cagedwisdom joined03:14
→ Oculus joined03:15
← QwertyDragon left03:16
← ShapeShifter499 left03:16
← AlbinoGeek left03:18
← weeza_ left03:19
← toothrot left03:20
→ DaddyEric joined03:21
← lab_ left03:21
← sgambino left03:21
← ag4ve left03:21
← polyzen left03:22
← jagob left03:22
→ lab_ joined03:23
→ waspinator joined03:23
← ilmgb left03:23
→ ilmgb joined03:24
→ ytl joined03:25
→ moop joined03:26
→ polyzen joined03:28
→ daito joined03:30
← ome left03:30
→ mizu_no_oto joined03:31
← lindenle left03:32
→ Pieplay joined03:32
→ jteneyck joined03:32
→ lindenle joined03:34
→ wxg joined03:35
← nvahalik left03:36
← jteneyck left03:37
→ safe joined03:37
← circa left03:38
→ moei joined03:38
← xcesariox left03:39
← timvisher left03:40
→ viljaste_ joined03:42
→ vigintas joined03:43
→ xcesariox joined03:43
→ timvisher joined03:44
← s8321414 left03:45
← viljaste left03:46
← vigintas left03:47
← lindenle left03:47
→ hahuang65 joined03:49
→ lindenle joined03:52
← vikas027 left03:52
→ PaulCape_ joined03:52
→ tristanp joined03:53
← fracting__ left03:54
← FireArrow133 left03:55
← PaulCapestany left03:55
← waspinator left03:58
→ tomog999 joined03:58
← daito left03:58
→ NeeleshKorade joined04:00
→ gfixler joined04:00
NeeleshKorade Thanks Eugene04:00
← MistahKurtz left04:00
← ytl left04:00
← Oculus left04:02
→ jalopez joined04:03
← lindenle left04:03
→ Oculus joined04:03
→ toothrot joined04:05
← SimonNa left04:06
→ fracting__ joined04:07
→ Manikandan joined04:07
← harish left04:08
← lab_ left04:08
→ lab_ joined04:09
→ lindenle joined04:09
← Noldorin left04:10
→ devoldmx joined04:12
← samw left04:12
→ Qudit314159 joined04:14
→ M4r3nz-work joined04:16
→ samw joined04:17
→ namecantbe joined04:18
← samw left04:19
← frivol left04:21
← Puhe left04:21
→ joako joined04:23
← arescorpio left04:26
← lindenle left04:26
→ lindenle joined04:27
← jalopez left04:29
→ sysanthrope joined04:30
→ samw joined04:31
→ rubyonrailed joined04:33
← PaulCape_ left04:33
→ jteneyck joined04:33
← jteneyck left04:33
→ jteneyck joined04:33
← livingstn left04:33
→ PaulCapestany joined04:33
→ tinajohnson joined04:34
→ randomA joined04:35
randomA how do I diff an old version of my repository?04:35
I really need to do this right now04:35
it's by branches right?04:35
preaction git diff <old_version>..04:36
← samw left04:36
randomA how do i get a reference to the old version?04:36
preaction so, if your old version is a tag like v1.0.0: git diff v1.0.004:36
randomA no like and old version of the same respotory04:36
preaction or if your old version is just a commit id: git diff abcd234f04:36
yes, that's what i'm saying04:36
randomA oh, how can i view commit ids?04:36
preaction look in the log?04:37
a tag is just a pointer to a commit04:37
← EvilPenguin left04:37
← jteneyck left04:38
randomA ok, so i do git diff 648 whatever?04:39
preaction does it work?04:39
randomA yes thanks!04:39
← mizu_no_oto left04:41
← lindenle left04:43
→ vigintas joined04:44
← joako left04:44
← cagedwisdom left04:44
→ lindenle joined04:45
→ ngladitz joined04:46
→ joako joined04:46
← MattMaker left04:47
→ jalopez joined04:47
→ dima5 joined04:47
← vigintas left04:48
dima5 Hi. Does anybody know of a way to encode a branch into a git://.... url? I'd like to be able to check out a particular branch without any extra options. Thanks!04:48
→ jagob joined04:48
→ Steadfast joined04:50
← randomA left04:50
→ Hink joined04:51
preaction you mean clone a branch? because that isn't possible04:52
dima5 preaction: Well, you always end up with SOME branch. Usually master. I just want something else04:52
preaction from what i understand, you end up with the default branch, which can be anything04:53
you can change that, but you can't make it arbitrary from the cloning side04:53
dima5 preaction: Nah, it's configured on the remote server. I just want to find a way to put this into the url insteaed of passing 'git clone -b'04:53
preaction to my knowledge, you can't. that'd be magic, and magic is bad04:54
→ thiago joined04:55
→ The_Phoenix joined04:56
← The_Phoenix left04:56
← sbogg left04:56
→ The_Phoenix joined04:57
→ cagedwisdom joined04:57
→ samw joined04:58
← otter768 left05:00
← lindenle left05:01
← a3Dman left05:01
← samw left05:03
← ril left05:03
→ lindenle joined05:04
← dima5 left05:05
← lab_ left05:05
→ Joseph__Silber joined05:05
← DolpheenDream left05:05
→ lab_ joined05:05
→ a3Dman joined05:05
→ mingwandroid_ joined05:05
→ cromero joined05:06
→ The_Phoenix1 joined05:06
→ skcin7_ joined05:06
→ \toothrot joined05:06
← crayon left05:07
→ goles_ joined05:07
→ sorenb joined05:08
→ ehennis joined05:08
→ shinnya_ joined05:08
→ jteneyck joined05:09
→ juvenal_ joined05:09
→ heroux_ joined05:09
→ sts__ joined05:09
→ kanzure_ joined05:09
→ neurodam1ge joined05:09
→ FilipNor1ic joined05:09
→ mikap joined05:09
→ suffice_ joined05:09
→ cYmen joined05:09
→ argoneus_ joined05:09
→ linagee_ joined05:09
→ gusnan_ joined05:09
→ jonasdk90 joined05:09
→ vigilvindex_ joined05:10
→ diget_ joined05:10
→ Chipzz_ joined05:10
→ ejnahc_ joined05:10
→ abyss43_ joined05:10
→ wwalker_ joined05:10
→ tureba_ joined05:10
→ a__ joined05:10
→ Soliton joined05:10
→ jedix__ joined05:10
→ SWAT_ joined05:10
← juvenal left05:10
→ kolobyte_ joined05:10
→ tbsaunde_ joined05:10
→ exceion joined05:11
→ durham joined05:12
→ swilsonau joined05:12
→ yazdmich joined05:13
→ SirCmpwn_ joined05:13
→ sdh joined05:13
← durham left05:13
→ abh_ joined05:13
→ salamanderrake_ joined05:14
→ ekleog_ joined05:14
→ Telvana2 joined05:14
→ Esya_ joined05:14
→ rxc_ joined05:14
→ artgoeshere_ joined05:14
← The_Phoenix left05:14
← toothrot left05:14
← vigilvindex left05:14
← skcin7 left05:14
← heroux left05:14
← shinnya left05:14
← mingwandroid left05:14
← edhennis left05:14
← linuxmint left05:14
← githogori left05:14
← leeN left05:14
← sts left05:14
heroux_ → heroux05:14
← jalopez left05:14
abh_ → abh05:14
→ durham joined05:14
→ gavlee_ joined05:14
mikap → mika05:14
→ platforms joined05:14
← roygbiv left05:14
← Manikandan left05:14
→ AKPWD joined05:14
→ tomek2 joined05:14
tomek2 → tomek05:14
← tomek left05:14
→ tomek joined05:14
→ githogori_ joined05:15
→ linuxmint joined05:15
→ marlun joined05:15
← lab_ left05:15
← sdothum left05:16
→ lab_ joined05:16
→ bahar joined05:16
→ dcpc007 joined05:16
SirCmpwn_ → SirCmpwn05:17
← lindenle left05:18
→ peitera joined05:18
→ jab416171 joined05:18
→ hyperdrive joined05:18
→ leeN joined05:18
→ Kuukunen joined05:18
→ BeerSerc joined05:18
→ same_ol_geez joined05:18
← jab416171 left05:18
← rpdprd left05:19
→ lindenle joined05:19
← fracting__ left05:22
→ samw joined05:25
← jteneyck left05:26
← _cyril_ left05:27
→ jab416171 joined05:28
→ variable joined05:29
→ jteneyck joined05:30
→ gravitron joined05:30
← gravitron left05:30
→ gravitron joined05:30
← samw left05:30
← heroux left05:31
← jteneyck left05:31
→ jalopez joined05:32
← lindenle left05:34
→ lindenle joined05:35
yazdmich → BytesAndCoffee05:36
→ MistahKurtz joined05:36
→ otter768 joined05:37
→ blr_ joined05:37
→ skorgon joined05:38
→ josuebrunel joined05:39
← lindenle left05:42
→ Fijit joined05:42
→ fracting__ joined05:42
→ lindenle joined05:43
→ viljaste__ joined05:44
→ vigintas joined05:45
→ srcerer_ joined05:46
→ d4rklit3 joined05:46
→ nickthetait1 joined05:46
→ Peng_ joined05:47
→ roflincopter joined05:48
→ wcypierreme joined05:48
→ neunon_ joined05:49
variable → function05:49
→ rideh- joined05:49
← vigintas left05:49
→ abra0_ joined05:49
→ Liam- joined05:49
→ deltab_ joined05:49
→ BooK_ joined05:49
→ imdsm_ joined05:49
→ DuncanT_ joined05:49
→ rishi` joined05:49
→ eagles05- joined05:50
→ LoganG_ joined05:50
→ nacsurte_ joined05:50
→ addshore_ joined05:50
→ nickzxcv_ joined05:50
→ ohm`_ joined05:50
→ martinbjeldbak_ joined05:50
→ MLM_ joined05:50
→ PinealGl1ndOptic joined05:50
→ ec_ joined05:50
→ ChrisWar1ick joined05:50
→ tobyx_ joined05:51
→ heftig_ joined05:51
← VoidFox left05:51
← Meow-J left05:51
← tubbo left05:51
neunon_ → neunon05:51
← viljaste_ left05:51
← moop left05:51
← vstoniest left05:51
← rishi left05:51
← happy-dude left05:51
← abh left05:51
← nacsurte left05:51
← ChrisWarrick left05:51
← tinajohnson left05:51
LoganG_ → LoganG05:51
→ Wolf481pl joined05:51
abra0_ → abra005:51
← alex_johnson left05:51
→ ketas- joined05:51
→ DistantS1ar joined05:51
→ gandolf joined05:51
→ ohcibi joined05:51
→ Nickeeh joined05:51
→ Neico joined05:51
→ ciaranm joined05:51
→ kwmiebach_ joined05:51
→ manitu joined05:51
→ martinklepsch joined05:51
Liam- → Liam`05:51
→ tapout joined05:51
→ doppo_ joined05:51
→ Blkt joined05:51
gandolf → Guest6925805:51
→ canton7 joined05:51
→ i_ron joined05:51
→ berndj joined05:51
→ KnightsOfNi joined05:51
→ WakiMiko joined05:51
→ weltall joined05:51
→ deepy joined05:51
→ xnrand joined05:51
→ batrick joined05:51
→ zifnab joined05:51
MLM_ → MLM05:51
→ nemesit|znc joined05:51
→ ddr2 joined05:51
→ tubbo joined05:51
doppo_ → doppo05:51
→ shymega joined05:52
→ tuor joined05:52
→ antispaceman joined05:52
→ vstoniest joined05:52
→ Ovsyanka joined05:52
→ indieross joined05:52
→ narendraj9 joined05:52
→ nioncode joined05:52
→ Bombe joined05:52
→ dx joined05:52
→ pacmanfan joined05:52
→ AlHafoudh joined05:52
→ Nikoli joined05:52
→ damwdan joined05:52
→ vishal joined05:52
→ jasom joined05:52
→ Deltanic joined05:52
→ varesa_ joined05:52
→ duckson joined05:52
→ bjornars joined05:52
→ Kulrak joined05:52
← Kulrak left05:52
→ Kulrak joined05:52
→ woodruffw joined05:52
→ slixpk joined05:52
→ abh joined05:52
→ aytic joined05:53
→ SegFaultAX joined05:53
→ AlexanderS joined05:53
→ johntramp joined05:53
→ VoidFox joined05:53
→ anantu joined05:53
→ moop joined05:53
→ Seveas joined05:53
→ hplar joined05:53
kwmiebach_ → kwmiebach05:53
→ yohnnyjoe joined05:53
→ Kicer86 joined05:54
→ xhip joined05:54
← lindenle left05:54
→ daito joined05:54
→ sea-gull joined05:55
← fahadash left05:55
→ abec0 joined05:55
→ Hobbyboy joined05:55
imdsm_ → imdsm05:55
← timvisher left05:55
addshore_ → addshore05:55
→ lindenle joined05:55
→ bauruine joined05:56
→ daleharvey joined05:56
DuncanT_ → DuncanT05:56
ec_ → ec05:56
→ Ziber joined05:56
→ epic joined05:56
→ noahsussman joined05:57
→ manuel____ joined05:58
→ tejasmanohar joined05:58
→ pizzaops joined05:58
→ martin_g joined05:58
→ heroux joined05:58
→ cstrahan joined05:58
→ kapowaz joined05:58
← blimpse left05:58
→ henriquev joined05:59
→ eliasp joined05:59
→ yoyoyo_ joined05:59
→ mjbrender joined05:59
← josuebrunel left05:59
→ yena joined05:59
→ pcarrier joined05:59
→ shennyg joined05:59
→ happy-dude joined05:59
← addshore left05:59
→ stealthii joined05:59
→ lebster joined06:00
→ bbhoss joined06:00
→ tinajohnson joined06:01
→ bttf joined06:01
→ mehdi joined06:02
→ zeller joined06:02
→ akitada joined06:02
← lab_ left06:02
Peng_ → Peng06:03
→ addshore joined06:03
→ Outsider__ joined06:03
→ clone1018 joined06:03
← lindenle left06:04
→ josuebrunel joined06:04
→ [diecast] joined06:04
→ Meow-J joined06:05
→ infernix joined06:06
→ DaddyEric_DESK joined06:06
→ lamont joined06:06
→ lindenle joined06:08
← DaddyEric left06:10
← ilmgb left06:11
→ kadoban joined06:12
← sparetire_ left06:12
← heroux left06:12
→ Walex2 joined06:13
→ skcin7 joined06:15
← devoldmx left06:15
→ codeflavour joined06:15
← Walex left06:16
← githogori_ left06:17
→ ioremap_ joined06:18
→ ilmgb joined06:18
→ fugi joined06:18
→ bravespear|2 joined06:18
→ hagebake joined06:19
→ jlewis_ joined06:19
→ mudiarto joined06:19
→ neanderslob_ joined06:19
→ talin___ joined06:19
← skcin7_ left06:19
← maqr left06:19
fugi → fugiman06:19
← Davey left06:19
← neanderslob left06:19
→ hvoigt_ joined06:19
→ diprotic joined06:19
← Gamecubic left06:19
→ PerlJam joined06:20
→ masak joined06:20
→ rezrov joined06:20
masak → Guest4729106:20
→ kegster joined06:20
→ vigilancer joined06:20
→ watabou joined06:20
→ jave joined06:20
→ syntaxfree joined06:20
→ bipolar joined06:20
→ githogori_ joined06:20
→ snits joined06:20
→ |ifei5g00d joined06:20
→ BennyPlayboy joined06:21
→ likewhoa joined06:21
→ boblee joined06:21
→ renoirb joined06:21
deltab_ → deltab06:21
→ unforgiven512_ joined06:21
→ jan___ joined06:21
→ cite_ joined06:21
← josuebrunel left06:21
→ _W joined06:21
→ Davey joined06:21
→ johnny56 joined06:21
← lindenle left06:21
→ ngrud joined06:21
→ jrm joined06:21
← jrm left06:21
→ jrm joined06:21
← daito left06:22
unforgiven512_ → unforgiven51206:22
→ maqr joined06:22
→ waveclaw joined06:22
← Davey left06:22
→ Davey joined06:22
→ _cyril_ joined06:23
→ lindenle joined06:24
← Bombe left06:25
→ MattMaker joined06:26
← NeverDie left06:27
← TobyP_ left06:27
← _cyril_ left06:27
→ MechtiIde joined06:27
→ Bombe joined06:28
→ TobyP joined06:28
→ MeltedLux joined06:28
← wxg left06:28
TobyP → Guest1262406:28
← blr_ left06:29
→ xaxxon joined06:30
← xaxxon left06:30
→ xaxxon_ joined06:30
← lindenle left06:30
→ elsevero joined06:30
→ lindenle joined06:32
→ neanderslob joined06:33
← neanderslob_ left06:33
← function left06:34
← \toothrot left06:39
→ phaleth joined06:39
ec → ELLIOTTCABLE06:40
→ cdown joined06:40
← adgtl left06:41
← elsevero left06:41
→ mwhooker joined06:43
← fracting__ left06:46
← lemonpepper24 left06:47
→ Cyclohexane joined06:47
← otter768 left06:47
→ ac3takwas joined06:48
→ irqq joined06:48
→ elsevero joined06:48
→ nnyk_ joined06:49
← elsevero left06:49
→ elsevero joined06:50
→ timvisher joined06:52
→ dreiss joined06:52
← lindenle left06:53
← safe left06:54
→ a-l-e joined06:55
→ lindenle joined06:56
← elsevero left06:56
→ mish42 joined06:59
→ fracting__ joined06:59
→ jon joined06:59
→ David1977 joined06:59
← MechtiIde left06:59
jon → Guest2920006:59
← roentgen left07:00
→ M-ou-se_ joined07:00
← snthsnth left07:00
→ beagleGuy_ joined07:01
→ pspletinckx joined07:01
→ Timvde| joined07:01
→ salparad1se joined07:01
→ ungojellym joined07:01
→ cite joined07:01
→ sjokkis_ joined07:02
→ thinkxl_ joined07:02
→ tm512` joined07:02
→ dfrank_ joined07:02
→ BugeyeD_ joined07:03
→ Arm0rAttAk joined07:03
→ pigeon_ joined07:03
→ ironGiant joined07:03
→ _W_ joined07:03
→ LilSusieCrabCake joined07:03
← _W left07:03
← Samual left07:03
← cite_ left07:03
← tubbo left07:03
← timthowtdi left07:03
← johntramp left07:03
← unforgiven512 left07:03
← Pieplay left07:03
← thinkxl left07:03
← Davey left07:03
→ livcd joined07:04
← madewokherd left07:04
→ moritz joined07:04
→ KronTMX joined07:04
→ unforgiven512 joined07:04
→ likecolacola joined07:04
→ sleezd joined07:04
→ Sc0rpius joined07:04
→ zyxep joined07:04
→ timthowtdi joined07:04
→ Samual joined07:04
→ leTali joined07:04
→ daynaskully joined07:04
← ac3takwas left07:04
→ tubuliferous joined07:04
→ johntramp joined07:04
→ fkm joined07:04
→ madewokherd joined07:04
→ thibaultcha joined07:04
→ leptonix joined07:04
→ CustosLimen joined07:05
→ Bigcheese joined07:05
→ ffualo joined07:05
→ Davey joined07:05
← Davey left07:05
→ Davey joined07:05
→ lungaro joined07:05
→ danemacmillan joined07:05
→ belak joined07:05
→ ninsei joined07:05
→ ollien joined07:05
→ doop joined07:05
→ RickyB98 joined07:05
→ ghormoon joined07:05
→ Kronuz joined07:05
→ thebwt joined07:05
← RickyB98 left07:05
→ RickyB98 joined07:05
tm512` → tm51207:05
→ Kobaz joined07:05
→ joelsmith joined07:05
→ Afforess joined07:05
→ evie_hammond joined07:05
→ SJr joined07:06
→ tubbo joined07:06
→ AustinMatherne joined07:06
→ Milhouse joined07:06
→ Ravana joined07:06
→ warthog9 joined07:06
→ agile_prg joined07:06
→ heroux joined07:06
→ awx joined07:06
→ lolmac joined07:06
→ Kamilion joined07:06
→ Chunk2 joined07:06
→ mattcen joined07:06
→ fk joined07:07
→ michael_mbp joined07:07
← githogori_ left07:08
→ absence joined07:09
→ MrC joined07:09
← lindenle left07:09
→ King_Hual joined07:10
← dreiss left07:10
← tristanp left07:10
→ lindenle joined07:10
← King_Hual left07:10
→ King_Hual joined07:11
→ githogori_ joined07:11
← a-l-e left07:11
→ ribasushi joined07:12
← heroux left07:14
→ elementalest joined07:14
← King_Hual left07:14
← Lyqyd left07:16
→ King_Hual joined07:16
← rubyonrailed left07:16
→ devoldmx joined07:16
← gopar left07:16
← cdown left07:16
← King_Hual left07:16
← cromero left07:17
→ King_Hual joined07:17
→ tristanp joined07:17
← kadoban left07:17
→ bvi joined07:19
← MattMaker left07:20
← devoldmx left07:21
→ JSullivan joined07:22
← Hink left07:22
→ StuartMI joined07:22
→ sazed joined07:22
→ _cyril_ joined07:23
← JSullivan left07:24
← skirk left07:25
← lindenle left07:25
→ wxg joined07:27
→ lindenle joined07:28
← _cyril_ left07:28
→ nsuke joined07:29
← strayPuppy left07:37
→ heroux joined07:40
→ lab_ joined07:42
→ seg joined07:42
← lindenle left07:43
← lab_ left07:46
→ lindenle joined07:46
→ lab_ joined07:46
→ liamonade joined07:46
→ roentgen joined07:46
→ PaulCape_ joined07:47
→ griotspeak joined07:48
← griotspeak left07:48
← lab_ left07:50
← PaulCapestany left07:50
← Wetmelon left07:51
← happy-dude left07:51
← heroux left07:52
→ Nizumzen joined07:53
← durham left07:53
→ cheako joined07:53
cheako Hello, I've a question about bisect. I'm looking for a commit that's most like a tarball. I've found two commits giving a range of where this might be, can I use bisect and say "diff -r" to find the closest match?07:55
← ilmgb left07:55
→ ilmgb joined07:55
← lindenle left07:57
→ dopesong joined07:57
→ lindenle joined07:58
_ikke_ I don't think so07:59
How do you determine good/bad at each step?07:59
This could only work if the diff became consistently smaller towards your goal08:00
← liamonade left08:00
cheako that would at least get me closer.08:01
← d4rklit3 left08:01
← tristanp left08:02
cheako It would be odd for something that match and then stop matching, so yes I think the assertion that consistently smaller is about right.08:02
What I did to get this far is I bisected by hand on a version string.08:02
→ tristanp joined08:03
← watabou left08:03
cheako So I'll save the size of diff output and then compare against last run.08:04
→ Evlq joined08:05
← Evlq left08:05
→ MattMaker joined08:07
→ anchorite joined08:07
← tristanp left08:07
← nnyk_ left08:08
← skorgon left08:08
_ikke_ You can even automate that08:08
ELLIOTTCABLE → ec08:09
ec → ELLIOTTCABLE08:09
→ nnyk_ joined08:10
← timvisher left08:11
→ timvisher joined08:11
← David1977 left08:12
→ faux___ joined08:14
← NeeleshKorade left08:14
← alanwill left08:14
faux___ i'm just getting to know git hooks. my goal is to automatically deploy a docker container to heroku upon a merge to master. to do this locally, i run `heroku docker:release`. is this possible as a git hook?08:15
→ jay-m joined08:16
← lindenle left08:16
→ lindenle joined08:18
→ daito joined08:18
← mac_ified left08:18
→ heroux joined08:19
→ dc5ala joined08:20
← wxg left08:22
→ _cyril_ joined08:26
← StuartMI left08:27
→ Wetmelon joined08:29
← _cyril_ left08:30
← lindenle left08:31
→ blr_ joined08:33
→ lindenle joined08:33
← Wetmelon left08:33
← jalopez left08:34
→ vigintas joined08:35
← thiago left08:35
← bvi left08:36
→ StuartMI joined08:37
← texasmynsted left08:39
← vigintas left08:39
→ texasmynsted joined08:40
← jay-m left08:44
← pspletinckx left08:44
← daito left08:45
← PaulCape_ left08:46
← Goplat left08:46
→ PaulCapestany joined08:46
← irqq left08:46
← lindenle left08:47
→ irqq joined08:47
← dopesong left08:48
→ elsevero joined08:48
→ otter768 joined08:48
→ lindenle joined08:49
← theskillwithin left08:50
→ skirk joined08:51
← cerkauskas left08:52
← elsevero left08:53
← otter768 left08:53
← StuartMI left08:53
Seveas sure, but !deploy08:55
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html08:55
← faux___ left08:55
Seveas merging code to master and deploying said code are not the same thing and shouldn't be treated as such.08:55
→ mathys joined08:56
→ cerkauskas joined08:57
← iota_pi left08:58
← jagob left08:59
← blr_ left09:01
→ Jackneill joined09:03
→ StuartMI joined09:04
cyphase_ → cyphase09:04
→ nidr0x joined09:05
← skirk left09:06
← lindenle left09:07
→ sanketdg joined09:07
→ DaddyEric_ joined09:08
→ lab_ joined09:08
→ lindenle joined09:08
← cerkauskas left09:09
j416 Seveas: that gave me some food for thought. Thanks.09:10
Seveas enjoy your brain breakfast :)09:10
← DaddyEric_DESK left09:12
→ daito joined09:12
Guest47291 → masak09:13
← sazed left09:13
masak → Guest1019909:14
→ sazed joined09:14
← sazed left09:14
Guest10199 → masak_grr09:14
→ sazed joined09:15
→ adac joined09:15
→ devoldmx joined09:17
cheako I got it :)09:21
thanx.09:21
← cheako left09:21
← fscala left09:21
← devoldmx left09:21
→ xaa joined09:21
ChrisWar1ick → ChrisWarrick09:22
→ fscala joined09:23
sdh → steve09:26
→ _cyril_ joined09:26
← lindenle left09:28
→ lindenle joined09:28
→ Technocrat7 joined09:29
← _cyril_ left09:31
← mathys left09:33
→ mathys1 joined09:33
← daito left09:33
← lindenle left09:35
mathys1 → mathys09:35
→ lindenle joined09:37
← roentgen left09:41
→ lubarch joined09:43
← lubarch left09:45
→ lubarch joined09:45
← oojacoboo left09:46
← lindenle left09:46
→ viljaste_ joined09:47
← viljaste__ left09:51
→ tristanp joined09:51
← skcin7 left09:52
← MistahKurtz left09:53
← xcesariox left09:53
→ skcin7 joined09:54
→ Radivarig joined09:54
← tristanp left09:56
→ julius joined09:56
julius hi09:57
can i abort a git push and recover from that?09:57
ive added some big files by accident09:57
grawity abort as in it's still running?09:57
Ctrl+C would do that09:58
julius i know it would....but would it be wise10:01
grawity this isn't CVS10:01
either the push updates everything, or not10:01
julius ok10:01
just amking sure, went a bit careless with "reset" and lost some data10:02
→ Neozonz joined10:03
← Neozonz left10:03
→ Neozonz joined10:03
→ SimonNa joined10:05
→ TomyLobo joined10:06
← ilmgb left10:08
→ irqq_ joined10:09
← irqq left10:10
→ Oebele joined10:11
→ jost joined10:11
→ Henryabcd joined10:14
→ irqq joined10:15
→ rvsjoen joined10:15
← rvsjoen left10:15
→ rvsjoen joined10:15
→ cpt-oblivious_ joined10:15
→ tomek2 joined10:17
→ HelloShitty joined10:17
→ gr_wity joined10:17
→ cust_ joined10:17
gr_wity → grawity10:17
← mwhooker left10:18
→ nasso_ joined10:18
→ solomon56_ joined10:18
→ shauna_ joined10:19
→ jaafar_ joined10:19
HelloShitty → HelloAtMega10:19
← mathys left10:19
→ zizzfizzix_ joined10:19
← zizzfizzix_ left10:19
→ zizzfizzix_ joined10:19
→ Miesco joined10:19
→ mathys joined10:19
→ prosodyCagain_ joined10:19
→ chigang_ joined10:19
→ lebster_ joined10:19
→ evanc_ joined10:19
→ da5id_ joined10:19
→ huhlig_ joined10:19
← mehdi left10:19
→ rom1504_ joined10:19
→ mehdi__ joined10:19
→ scarcry_ joined10:19
← Meow-J left10:19
→ mariorz_ joined10:19
→ faheem___ joined10:19
→ ArmOrAttAk joined10:19
→ tvl joined10:19
→ UmbraMalison_ joined10:19
→ Roconda_ joined10:19
→ Zuqschlus joined10:19
→ martinklepsch|BN joined10:19
→ jamick_ joined10:19
→ ioremap joined10:20
→ iokill joined10:20
→ Phtes_ joined10:20
→ BinGOs_ joined10:20
→ webmeister_ joined10:20
→ wpkeg joined10:20
→ talin joined10:20
mehdi__ → mehdi10:20
→ edenist_ joined10:20
→ dfrank joined10:20
→ raenk joined10:20
→ bakingbread joined10:20
→ angelsl_ joined10:20
→ argoneus joined10:20
→ errr_ joined10:20
→ ManneW_ joined10:20
→ Pieter joined10:20
→ KaibaCorp joined10:20
→ Fiouz joined10:20
→ nopf_ joined10:20
→ Ph__ joined10:20
→ yazdmich joined10:20
→ akitada_ joined10:20
→ edhennis joined10:20
← tomek left10:20
← daynaskully left10:20
← SegFaultAX left10:20
← BytesAndCoffee left10:20
← ehennis left10:20
← faheem__ left10:20
← Milhouse left10:20
← RickyB98 left10:20
← hplar left10:20
← i_ron left10:20
← martinklepsch left10:20
← scarcry left10:20
← rivarun left10:20
← zyxep left10:20
← ioremap_ left10:20
← lebster left10:20
← Seveas left10:20
← yohnnyjoe left10:20
← moop left10:20
← gv left10:20
← Roconda left10:20
← irqq_ left10:20
← sazed left10:20
← Arm0rAttAk left10:20
← dfrank_ left10:20
← kegster left10:20
← talin___ left10:20
← akitada left10:20
← nioncode left10:20
← argoneus_ left10:20
← Pieter_ left10:20
← jamick left10:20
← DolphinDream left10:20
← UmbraMalison left10:20
← jaafar left10:20
← Learath2 left10:20
← Henryabcd left10:20
← infernix left10:20
→ barq joined10:20
→ GarethAdams joined10:20
→ mroth joined10:20
→ devhost joined10:20
→ toydestroyer joined10:20
→ SegFaultAX joined10:20
→ guyz joined10:20
tomek2 → tomek10:20
← toydestroyer left10:20
→ toydestroyer joined10:20
← barq left10:20
→ barq joined10:20
← mroth left10:20
→ mroth joined10:20
← SegFaultAX left10:20
→ SegFaultAX joined10:20
← GarethAdams left10:20
→ GarethAdams joined10:20
Zuqschlus → Zugschlus10:20
→ Chaser_ joined10:20
→ skapunker_ joined10:20
→ blahdodo_ joined10:20
→ Ankhers_ joined10:20
← devhost left10:20
→ devhost joined10:20
← barq left10:20
→ barq joined10:20
← mroth left10:20
→ mroth joined10:20
jamick_ → jamick10:20
← tomek left10:20
→ tomek joined10:20
tvl → tobiasvl10:20
→ cloudcell__ joined10:20
martinklepsch|BN → martinklepsch10:20
→ Olipro_ joined10:20
→ zyxep joined10:20
→ iv4nnunes joined10:20
angelsl_ → angelsl10:20
→ rivarun joined10:20
→ WillMoogle joined10:20
→ rzeka joined10:21
← rzeka left10:21
→ rzeka joined10:21
→ sQVe joined10:21
→ mkoskar joined10:21
→ Spinkzeit joined10:21
→ i_ron joined10:21
→ hplar joined10:21
→ spr0tsuki joined10:21
→ SupaHam joined10:21
→ Henryabcd joined10:21
→ ValicekB_ joined10:21
→ _rgn joined10:21
→ ORiON-- joined10:21
→ denimsoft joined10:21
→ nioncode joined10:21
→ aspiers joined10:21
→ Learath2 joined10:21
blahdodo_ → blahdodo10:21
← Henryabcd left10:21
→ gv joined10:21
→ RickyB98 joined10:21
→ Segfault_ joined10:21
guyz → daynaskully10:21
← RickyB98 left10:21
→ RickyB98 joined10:21
→ Remram joined10:22
→ skelterjohn joined10:22
→ sazed joined10:22
→ Khisanth joined10:22
→ markovh joined10:22
→ DolphinDream joined10:22
→ moop joined10:22
→ Takumo joined10:22
← Takumo left10:22
→ Takumo joined10:22
→ gitinfo joined10:22
ChanServ set mode: +o10:22
→ D-Boy joined10:22
→ tchan joined10:22
→ dantix joined10:22
→ ruduran joined10:22
chigang_ → chigang10:22
Olipro_ → Olipro10:22
evanc_ → evanc10:22
da5id_ → da5id10:22
Phtes_ → Phtes10:22
cloudcell__ → cloudcell_10:23
→ kriskropd joined10:23
→ yohnnyjoe joined10:23
→ vigintas joined10:23
→ Seveas joined10:23
→ Ceber joined10:23
← mathys left10:24
huhlig_ → huhlig10:24
← timvisher left10:24
lebster_ → lebster10:24
→ kalz joined10:24
→ twisted`_ joined10:24
→ timvisher joined10:24
← johnny56 left10:24
prosodyCagain_ → prosodyCagain10:24
tureba_ → tureba10:24
→ mathys joined10:25
← Miesco left10:25
← eliasp left10:25
→ blr_ joined10:25
→ johnny56 joined10:26
twisted`_ → twisted`10:26
→ pfg joined10:26
← texasmynsted left10:26
→ eggoez joined10:26
→ infernix joined10:26
akitada_ → akitada10:26
→ _cyril_ joined10:27
ValicekB_ → ValicekB10:27
mariorz_ → mariorz10:27
→ eliasp joined10:27
→ TheMoonMaster joined10:28
← vigintas left10:28
→ texasmynsted joined10:29
→ cerkauskas joined10:30
← mathys left10:30
BinGOs_ → BinGOs10:31
→ {AS} joined10:31
← _cyril_ left10:31
← BinGOs left10:31
→ BinGOs joined10:31
→ Milhouse joined10:32
← johnny56 left10:32
→ mission712 joined10:32
← nidr0x left10:33
← adac left10:33
→ Miesco joined10:33
Seveas julius: data that you committed, or even just 'git add'ed isn't really lost after a git reset10:33
→ johnny56 joined10:34
← johnny56 left10:35
→ leprechau joined10:35
← MattMaker left10:35
→ stamina joined10:36
← dantix left10:36
← cerkauskas left10:37
→ johnny56 joined10:37
→ jost_ joined10:38
→ vurma joined10:38
← johnny56 left10:39
→ johnny56 joined10:40
← johnny56 left10:41
← jost left10:42
← pozitrono left10:43
← skcin7 left10:44
→ johnny56 joined10:45
← Miesco left10:47
→ josuebrunel joined10:47
← jost_ left10:48
→ jost joined10:48
→ dantix joined10:48
→ otter768 joined10:49
← SimonNa left10:49
→ tarkus joined10:51
← nanga left10:52
→ nanga joined10:52
→ intellix joined10:53
← otter768 left10:54
→ acetakwas joined10:54
← acetakwas left10:54
← nanga left10:54
→ nanga joined10:55
← nanga left10:55
→ nanga joined10:55
→ weeza joined10:55
→ acetakwas joined10:55
← acetakwas left10:56
→ acetakwas joined10:56
← nanga left10:57
julius Seveas, you can kill data with git reset hard or something like that10:57
→ nanga joined10:57
→ youngbaks joined10:57
← acetakwas left10:57
nedbat julius: it isn't lost.10:57
julius hm ok10:58
→ acetakwas joined10:58
← acetakwas left10:59
julius its been some time, but i did not add my changes and some sort of git reset resetted them back to the upstream version10:59
it was my fault10:59
→ acetakwas joined10:59
← acetakwas left11:00
← nanga left11:00
→ nanga joined11:00
→ del joined11:00
→ acetakwas joined11:00
Seveas if you didn't 'git add' them, they'll be lost indeed11:00
nedbat :(11:01
→ MattMaker joined11:01
← acetakwas left11:01
← lab_ left11:02
→ lab joined11:02
← nanga left11:02
→ nanga joined11:02
← nanga left11:03
→ MistahKurtz joined11:04
← MattMaker left11:05
→ ivanelson__ joined11:08
← MistahKurtz left11:09
→ govg joined11:09
→ mischat joined11:11
← iv4nnunes left11:12
→ vigintas joined11:12
← mischat left11:12
→ Henryabcd joined11:13
→ mischat joined11:13
← Henryabcd left11:13
← cagedwisdom left11:16
← intellix left11:16
→ devoldmx joined11:17
→ acetakwas joined11:17
← acetakwas left11:18
→ acetakwas joined11:19
← acetakwas left11:20
→ acetakwas joined11:20
← devoldmx left11:22
→ ghostlines joined11:22
← acetakwas left11:24
→ _cyril_ joined11:28
→ happy-dude joined11:29
→ daito joined11:31
→ s8321414 joined11:32
← _cyril_ left11:33
← nnyk_ left11:33
→ Jhogece joined11:34
← Jhogece left11:35
→ pozitron joined11:36
← a3Dman left11:39
← LilSusieCrabCake left11:39
→ a3Dman joined11:40
→ tristanp joined11:40
→ roentgen joined11:40
← leprechau left11:41
→ SimonNa joined11:41
← abec0 left11:41
→ leprechau joined11:42
→ endiruna joined11:42
← xaa left11:43
← boombatower left11:43
← tristanp left11:44
→ David1977 joined11:45
→ dv_ joined11:47
← dv__ left11:47
→ lindenle joined11:48
← a3Dman left11:49
← lindenle left11:52
→ a3Dman joined11:52
→ nidr0x joined11:57
← daito left11:59
→ treaki joined11:59
→ zacts joined12:00
tbsaunde_ → tbsaunde]12:01
→ Karkus joined12:03
← SimonNa left12:09
→ DaddyEric_DESK joined12:09
→ sdothum joined12:11
← DaddyEric_ left12:13
→ Henryabcd joined12:18
→ nvahalik joined12:19
← Henryabcd left12:20
masak_grr → masak12:23
→ skalpin joined12:24
skalpin hi12:24
gitinfo skalpin: 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.12:24
→ andrybak joined12:28
→ _cyril_ joined12:29
→ skirk joined12:31
← TomyLobo left12:32
← _cyril_ left12:33
← StuartMI left12:33
→ ilmgb joined12:34
→ strayPuppy joined12:34
← Karkus left12:36
← nvahalik left12:37
← ilmgb left12:38
← roentgen left12:40
← blr_ left12:41
← {AS} left12:41
← vigilvindex_ left12:45
→ Karkus joined12:45
→ vigilvindex joined12:45
← neanderslob left12:45
→ StuartMI joined12:46
→ paddyez joined12:48
← skirk left12:48
← timvisher left12:50
→ timvisher joined12:50
→ otter768 joined12:50
→ JanC joined12:52
→ MistahKurtz joined12:52
→ pspletinckx joined12:53
→ weox joined12:54
← texasmynsted left12:54
← otter768 left12:55
→ texasmynsted joined12:56
→ bitkiller joined12:56
← MistahKurtz left12:57
← linuxmint left12:57
← denimsoft left12:58
← fstd left12:59
→ fstd joined12:59
→ monty joined13:01
→ mase-tech joined13:04
→ gavit joined13:08
→ mezod joined13:12
← dc5ala left13:12
← endiruna left13:13
M-ou-se_ → M-ou-se13:15
← texasmynsted left13:16
← sazed left13:16
→ texasmynsted joined13:17
rom1504_ → rom150413:18
← leeN left13:20
← Guest12624 left13:22
← strayPuppy left13:23
← David1977 left13:24
→ sazed joined13:24
→ leeN joined13:25
→ {AS} joined13:26
→ doener joined13:27
← sazed left13:27
← dantix left13:27
→ Cork joined13:27
← texasmynsted left13:28
→ melter joined13:28
→ tristanp joined13:29
→ _cyril_ joined13:30
→ cvanball joined13:31
← tristanp left13:33
→ cerkauskas joined13:34
← _cyril_ left13:34
← eka left13:35
→ intellix joined13:39
→ sgambino joined13:39
→ SonikBoom joined13:40
→ mathys joined13:40
→ Imaginativeone joined13:40
← sgambino left13:41
→ marlinc joined13:42
← cvanball left13:47
← Oebele left13:48
→ skinux joined13:49
skinux For some reason, Git is saying everything is up to date when I try to add a file, when in fact I just changed the file.13:49
← bahar left13:49
→ bahar joined13:49
→ lindenle joined13:50
osse skinux: what does git status say?13:51
→ ag4ve joined13:51
← intellix left13:52
→ cvanball joined13:52
→ waspinator_ joined13:52
← lindenle left13:54
→ daito joined13:56
← oxsyn left13:56
→ johtso joined13:57
← julius left13:57
→ MechtiIde joined13:57
skinux Says nothing to commit13:58
← D-Boy left13:59
→ oxsyn joined14:00
← ghostlines left14:01
skinux But I know that is false because I made a change to a file. Two files in fact.14:02
It said it had commited the changes, then I pushed to GitHub, but the changes are NOT reflected in GitHub.14:03
→ rpdprd joined14:03
→ xaa joined14:03
skinux Can I force Git to commit even though it thinks there is nothing to commit?14:03
← s8321414 left14:05
← nidr0x left14:05
→ p[a]ddy joined14:06
← paddyez left14:07
p[a]ddy → paddyez14:07
osse skinux: does 'update-index --assume-unchanged' ring a bell ?14:08
→ D-Boy joined14:08
skinux Didn't solve anything14:08
→ Impaloo joined14:08
skinux Am I going to have to delete the repo, re-init and then commit the changes?14:09
← unreal_ left14:10
osse I asked if it rang a bell14:11
try 'git update-index --no-assume-unchanged path/to/file'14:11
→ nidr0x joined14:11
← madewokherd left14:12
← Imaginativeone left14:13
→ justanotheruser joined14:14
→ JrCs joined14:15
→ ncd|leeN joined14:16
skinux Still didn't help14:16
← govg left14:16
→ unreal joined14:17
osse skinux: hmm, did you commit and push a different branch than the one github displays maybe?14:17
skinux Nope. There is only one branch14:18
Git just seems to have decided it is God or something14:18
→ s00pcan joined14:19
← youngbaks left14:19
← leeN left14:19
osse skinux: can you run these commands and show me the output? git status; git check-ignore -v path/to/file; git rev-parse master origin/master HEAD HEAD:path/to/file ?14:19
→ grift joined14:20
← bitkiller left14:21
skinux status returned nothing to change, check-ignore didn't return anything, last command returned 4 lines random characters14:21
← happy-dude left14:21
skinux Looks like 3 lines are the same, then 4th one is different14:21
grift i have this issue where , when i use this "/bin/git --git-dir=$pathtomyrepo/.git pull --recurse-submodules https://github.com/myname/myrepo && /bin/git --git-dir=$pathtomyrepo/.git submodule foreach '/bin/git submodule update --recursive;'" i end up with a detached head in my git submodule14:22
any idea what is causing that , and maybe any other hints ?14:22
do it need to update the submodule at all when i do a pull --recurse-submodules?14:23
osse skinux: they are far from random, but ok. sounds good. when you go to the repo on github, does it say "Latest commit abcd1234" and it's the same string as the three equal ones ?14:24
skinux As far as GitHub is concerned, I haven't updated the file in six months14:25
← _W_ left14:25
← cerkauskas left14:25
skinux This is ridiculous tbh.14:26
Maybe if I pull from GitHub, re-save my changes and then push back to GitHub?14:26
osse you can't trick git that way14:27
← daito left14:27
skinux Okay14:27
osse git remote -v origin14:27
← UmbraMalison_ left14:27
skinux Git says that command doesn't exist14:27
osse ahh14:28
just git remote -v14:28
skinux Two GitHub references, fetch and push14:28
osse and the url is the same one that you're visiting right14:28
skinux Yeah.14:29
They say origin, so I don't know why Git couldn't find origin14:29
→ endiruna joined14:29
osse that was just bad syntax on my part14:29
skinux Okay14:29
osse is the repo public ?14:30
skinux Yes14:30
→ youngbaks joined14:30
osse which one is it14:30
skinux https://github.com/skinuxgeek/candilog14:30
→ _cyril_ joined14:30
osse says latest commit an hour ago14:31
124a9dd14:32
→ freestyl3r joined14:32
skinux Okay...so TODO.txt is the only file that didn't get updated14:32
→ zeroed joined14:33
skinux Maybe if I rename it to TODO.md14:33
→ zadock joined14:34
→ jimmyeatworld joined14:34
skinux I can solve this by deleting the local repo, recreating it, right?14:34
osse not if there is no problem and it's just a misunderstanding14:34
→ ilmgb joined14:35
← _cyril_ left14:35
skinux Well...I'd sure like to know how to tell Git that it doesn't know what its talking about.14:35
← vigilancer left14:36
→ MattMaker joined14:37
← Lor_ left14:38
osse skinux: what does git rev-parse HEAD:TODO.txt and git hash-object TODO.txt say14:38
← nidr0x left14:38
→ nidr0x joined14:39
← seg left14:39
← zadock left14:40
→ MistahKurtz joined14:41
→ Puhe joined14:41
← Puhe left14:41
→ Puhe joined14:41
← del left14:42
→ intellix joined14:42
← MattMaker left14:42
skinux Both say the same thign14:43
Ending in 36f8f14:44
ekleog_ → ekleog14:45
skinux Wish I knew a good remote desktop software which allowed me to press a key combo to disconnect the remoter. I'd try to let you remote me to figure it out.14:45
→ pxdr joined14:45
← MistahKurtz left14:45
Nevik_ teamviewer.com14:46
skinux Is that free?14:46
osse skinux: well then.. that means that the current commit contains the exact same file as it is on disk14:47
skinux: but that is not the same number as I see when I cloned the repo14:47
skinux: what does git rev-parse master:TODO.txt say ?14:47
skinux Hmm. Well, it's free for private use. Technically this project I intend to earn with some kind of advertising or something, so I think it counts as commercial.14:47
← Nikhil_D left14:47
osse oh14:48
ENDING in 36f8f14:48
yes I see the same thing14:48
Git is correct. you are wrong.14:48
skinux That last command returned the same as well.14:48
How so?14:48
osse the file is up to date14:48
skinux Okay, check out TODO.txt on GitHub. At the top it should say --- Errors and problems --- and list two things14:48
→ Nikhil_D joined14:48
osse it doesn't14:49
← waspinator_ left14:50
→ daivyk joined14:50
skinux Well, then it DOESN'T have the most up to date version. While git THINKS it does!14:50
osse but if you really did 'git hash-object TODO.txt' and it really printed 'c00e8ddc287a46b3d94c04d03f80c05370236f8f' then the TODO.txt you have on your disk does not contain that either14:50
you're looking at a different file. or maybe you just didnt save it14:50
skinux And FFS!!!!14:51
I forgot I created a second project to use JS, so Git is spot on!14:51
→ otter768 joined14:51
skinux Damn I feel stupid14:51
osse :-)14:51
skinux kicks himself in the ass14:51
osse you're not alone14:52
Nevik_ business as usual in this channel14:52
skinux Okay...I need to fork my project on GitHub somehow14:52
→ CKyle joined14:52
← paulweb515 left14:53
skinux Maybe if I hook a set of jumper cables to my head my brain will move faster :P14:53
Is there a command to fork my project on GitHub, or do I just create a new repo on GitHub and push to it?14:54
← timvisher left14:55
→ timvisher joined14:55
osse hmm14:55
← otter768 left14:56
osse github seems to offer the "fork this repo" button even for ones own repos14:56
skinux Yeah, but that will require me to use different than skinuxgeek for it. I don't want to do that, so I'll have to just create another repo and push to it.14:57
← youngbaks left14:57
skinux So, I'll need to know how to push to a different repo, since 'git push' automatically uses the current one?14:57
osse hmm yeah that button doesn't do anything14:57
← Nikhil_D left14:57
skinux Do I just do git push https://github.com/skinuxgeek/new-repo-here ?14:58
osse create a new repo on github, add the new repo as a remote14:58
git remote add newrepo https://github.com/skinuxgeek/new-repo-here; git push newrepo master14:58
→ Nikhil_D joined14:58
skinux That first command doesn't work14:59
osse liar14:59
← ilmgb left14:59
skinux Yup, sorry. I did the command wrong15:00
→ ilmgb joined15:00
→ franl joined15:00
→ CheckDavid joined15:02
→ youngbaks joined15:02
→ aevitas joined15:03
→ bitkiller joined15:03
skinux Pushing failed because it says GitHub has stuff I don't have locally. That would be the README file I let GitHub create. So, how do I solve that?15:04
← lubarch left15:04
→ alex_johnson joined15:05
→ LBV_User joined15:05
← nidr0x left15:05
→ nidr0x joined15:06
← negaduck left15:08
← intellix left15:09
→ DaddyEric_ joined15:10
→ smemsh joined15:11
→ jteneyck joined15:12
grift no one?15:13
qsuscs skinux: do you care about the README file on github?15:13
grift i want to be able to update my submodule without having to cd to the repository first15:13
← DaddyEric_DESK left15:14
skinux Well, I'll make use of README eventually.15:14
smemsh hello, i have a [include] section in .gitconfig, it has several "path = /foo/bar" lines. however "git config --get include.path" does not show all, or even the last path line, it's one in the middle? how could that be? are they read in parallel or something?15:14
← ilmgb left15:14
qsuscs skinux: sure, but the one on github specificially?15:14
→ ilmgb joined15:14
skinux I guess not.15:14
qsuscs skinux: then !force_push (which you usually should not)15:15
gitinfo skinux: If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.15:15
← Nizumzen left15:15
← sarri left15:15
→ benborges joined15:16
→ tristanp joined15:18
← ilmgb left15:18
← grift left15:18
→ sarri joined15:19
← aevitas left15:20
← tristanp left15:22
→ intellix joined15:24
← _rgn left15:25
→ _rgn joined15:25
← HelloAtMega left15:25
→ paulweb515 joined15:25
kanzure_ → kanzure15:26
→ dantix joined15:27
← treaki left15:30
→ grift joined15:30
→ yarnfive8 joined15:31
→ _cyril_ joined15:31
← endiruna left15:32
← youngbaks left15:32
→ griotspeak joined15:33
→ _W_ joined15:34
→ ryoshu joined15:35
→ vigilancer joined15:35
← grift left15:35
ryoshu how to checkout default remote branch15:35
← ketas- left15:35
← _cyril_ left15:36
ryoshu git ls-remote and parse HEAD pointer?15:36
→ endiruna joined15:36
← Oculus left15:38
→ ril joined15:39
→ Oculus joined15:40
← Oculus left15:40
→ Oculus joined15:40
→ HelloAtMega joined15:40
← jimmyeatworld left15:42
→ GT4066 joined15:42
Impaloo ryoshu: git checkout @{u}15:42
← Steadfast left15:43
→ jimmyeatworld joined15:43
→ sparetire_ joined15:45
→ youngbaks joined15:46
ryoshu Impaloo: it doesn't work15:46
→ ShapeShifter499 joined15:46
qsuscs ryoshu: $remote/HEAD15:46
← s00pcan left15:48
→ toothrot joined15:48
← cvanball left15:48
→ s00pcan joined15:50
→ ketas joined15:51
← GT4066 left15:52
→ madewokherd joined15:52
← skinux left15:52
→ lindenle joined15:52
→ Oebele joined15:53
← Technocrat7 left15:53
→ Ahmed90 joined15:55
→ waspinator_ joined15:56
→ jagob joined15:56
← lindenle left15:57
→ xcesariox joined15:58
← xcesariox left15:59
→ xcesariox joined16:00
→ cvanball joined16:00
← mathys left16:00
← pxdr left16:00
→ Ldip joined16:02
→ Chill_Surf joined16:03
← endiruna left16:06
→ DaddyEric_DESK joined16:07
→ Wetmelon joined16:09
← jagob left16:10
→ jagob joined16:10
→ pxdr joined16:11
← DaddyEric_ left16:11
→ User458764 joined16:11
→ Gamecubic joined16:11
ril → ril[away]16:12
→ DarkSpectrum joined16:12
← aytic left16:12
→ NeverDie joined16:12
→ Infamous joined16:13
→ cdg joined16:14
← MechtiIde left16:14
← Karkus left16:15
→ brandonw joined16:16
→ devoldmx joined16:16
→ skinux joined16:17
← DarkSpectrum left16:18
→ Nizumzen joined16:18
→ deostroll_ joined16:21
→ tanuck joined16:22
→ happy-dude joined16:22
← franl left16:22
← irqq left16:23
→ daito joined16:24
→ mathys joined16:24
→ irqq joined16:24
→ Noldorin joined16:24
→ ytl joined16:25
← zeroed left16:25
→ MattMaker joined16:26
ril[away] → ril16:27
→ lemondom joined16:27
→ Goplat joined16:28
← robbyoconnor left16:28
lemondom So when a git branch is merged into another one (let's say master), then only the branch "end point" is really merged - hence one can still see the history separately in most git GUIs, so those are not just commits put on top of the commit merged onto?16:28
← josuebrunel left16:28
← irqq left16:29
→ MistahKurtz joined16:29
→ irqq joined16:29
→ Daxaar joined16:31
← MattMaker left16:31
→ _cyril_ joined16:32
deostroll_ in tree-ish language - what does ^ mean? E.g. mybranch^16:32
how is it different from mybranch~316:32
qsuscs deostroll_: man gitrevisions16:33
gitinfo deostroll_: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html16:33
lemondom and nobody can answer me? :(16:33
← jagob left16:33
bremner lemondom: personally, I didn't understand the last part16:33
lemondom bremner: when I can see something as coming from another branch in git log - like in a git GUI16:34
then this means that git still knows that those commits come from another branch16:34
how? is this saved in commit metadata?16:34
← sentriz left16:34
← MistahKurtz left16:34
lemondom or is just the commit of branch glued to a commit in the other branch?16:35
→ jagob joined16:35
← _cyril_ left16:36
bremner lemondom: git knows what the parent commits of a commit are. that's all.16:36
!gcs16:36
gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html16:36
← cdg left16:37
← smemsh left16:38
← lemondom left16:42
→ lemondom joined16:42
ketas → ketas-16:43
deostroll_ Then I have an issue: https://gist.github.com/deostroll/9159f98fd555b008772b#file-foo-md16:43
Unable to cat-file that specific version of file...16:44
ril → ril[away]16:44
thinkxl_ → thinkxl16:45
→ jutr8 joined16:45
→ ketas joined16:46
→ kermit joined16:47
← alex_johnson left16:47
← jagob left16:49
→ jeffmjack joined16:49
→ josuebrunel joined16:49
← youngbaks left16:50
← ribasushi left16:51
← jutr8 left16:51
← acti0nman left16:51
→ jagob joined16:51
→ mac_ified joined16:52
→ otter768 joined16:52
→ treaki joined16:53
→ acti0nman joined16:53
← intellix left16:54
← daito left16:56
← otter768 left16:57
← timvisher left16:57
→ timvisher joined16:58
→ endiruna joined16:58
likecolacola to hold the birthdate of somebody and then use a function which calculate its age, what would be better, date or calendar?16:59
→ trewe joined16:59
Nevik_ likecolacola, wrong channel?16:59
likecolacola ups..16:59
sorry16:59
Nevik_ happens ;)16:59
yazdmich → BytesAndCoffee17:00
← jagob left17:01
→ dviola joined17:01
likecolacola :]17:01
→ jagob joined17:03
← ag4ve left17:03
← CheckDavid left17:03
← josuebrunel left17:03
← ketas- left17:05
← Daxaar left17:06
→ reaverb joined17:06
→ Daxaar joined17:06
→ krawchyk joined17:06
← endiruna left17:06
← krawchyk left17:06
→ tristanp joined17:07
→ krawchyk joined17:07
→ josuebrunel joined17:07
→ ncthom91 joined17:10
→ dancer_ joined17:10
← tristanp left17:11
→ FireArrow133 joined17:11
← ril[away] left17:11
← pxdr left17:13
← deostroll_ left17:13
← ncthom91 left17:14
→ gsingh93 joined17:14
→ pantsman- joined17:15
→ Phoenixz joined17:17
← treaki left17:17
→ gsingh93_ joined17:17
→ thiago joined17:18
→ muthu joined17:18
→ ril joined17:19
← elementalest left17:19
→ elementalest joined17:20
→ t0by joined17:23
Oculus → Jaja17:23
Jaja → Oculus17:23
Oculus → Jaja17:23
Jaja → Oculus17:24
→ scarabx joined17:24
← cvanball left17:25
→ mu123 joined17:26
← pantsman- left17:26
mu123 !list17:26
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist17:26
← mu123 left17:28
→ bernalex joined17:30
← Oculus left17:30
→ Oculus joined17:30
→ ciampix joined17:30
← jost left17:32
→ _cyril_ joined17:33
← s00pcan left17:33
← StuartMI left17:33
→ Darcidride joined17:33
← xaa left17:34
← Noldorin left17:34
→ StuartMI joined17:34
→ s00pcan joined17:35
→ ribasushi joined17:37
← vurma left17:37
→ alex_johnson joined17:38
→ troulouliou_div2 joined17:38
← _cyril_ left17:38
→ pantsman- joined17:38
→ MattMaker joined17:39
← devoldmx left17:39
→ devoldmx joined17:41
→ romankl joined17:41
← jteneyck left17:42
← romankl left17:42
→ romankl joined17:42
→ dreiss joined17:42
← MattMaker left17:43
← Darcidride left17:44
→ skirk joined17:44
← devoldmx left17:45
→ devoldmx joined17:45
→ roentgen joined17:46
← StuartMI left17:47
→ roygbiv joined17:48
← devoldmx left17:48
← fscala left17:48
→ fscala joined17:49
← NeverDie left17:49
→ joufflu joined17:52
→ gopar joined17:54
← jagob left17:54
→ Darcidride joined17:56
→ khmarbaise joined17:56
→ jagob joined17:57
→ fedexo joined17:59
← mathys left18:00
→ elsevero joined18:01
← gopar left18:02
→ gopar joined18:03
→ ydann joined18:03
→ khmarbaise_ joined18:05
← khmarbaise left18:07
khmarbaise_ → khmarbaise18:07
skinux qsuscs: Git says !force-push is not a command18:08
← Qudit314159 left18:08
qsuscs skinux: well of course not, read what the trigger says.18:08
→ khmarbaise_ joined18:11
← khmarbaise left18:12
khmarbaise_ → khmarbaise18:12
→ NeverDie joined18:12
ril → ril[away]18:12
← SonikBoom left18:13
→ DaddyEric joined18:13
← DaddyEric_DESK left18:15
← Daxaar left18:16
← User458764 left18:16
← roygbiv left18:18
→ Miesco joined18:19
Miesco Hi. What user do hooks run under?18:19
→ MechtiIde joined18:20
→ lubarch joined18:20
← ydann left18:21
← elsevero left18:21
Miesco I am getting this: error: insufficient permission for adding an object to repository database .git/objects18:21
→ Daxaar joined18:22
← freestyl3r left18:22
← heroux left18:24
Miesco Hmm... I have to keep doing this: chmod -R g+w .git18:25
→ blackwind_123 joined18:26
Sc0rpius git config core.sharedRepository group18:28
← Daxaar left18:29
Mathiasdm sdf18:29
Nevik_ jkl?18:30
→ _cyril_ joined18:32
← s00pcan left18:33
→ lindenle joined18:34
→ s00pcan joined18:35
← Darcidride left18:36
← Nizumzen left18:37
← muthu left18:38
→ skcin7 joined18:38
← dreiss left18:39
← KaibaCorp left18:39
← lindenle left18:40
→ kaiza joined18:40
→ skinux_ joined18:40
← |ifei5g00d left18:41
→ dsantiago joined18:41
→ |ifei5g00d joined18:42
← skinux left18:43
→ lindenle joined18:44
← lubarch left18:44
← Neozonz left18:45
→ Technocrat7 joined18:45
→ tristanp joined18:46
→ youngbaks joined18:49
← youngbaks left18:49
→ skorgon joined18:49
← skorgon left18:49
→ skorgon joined18:49
→ otter768 joined18:50
← stamina left18:50
→ CheckDavid joined18:50
→ kadoban joined18:50
→ LilSusieCrabCake joined18:51
← lindenle left18:53
→ firelegend joined18:53
→ daito joined18:53
← skinux_ left18:54
← timvisher left18:54
→ timvisher joined18:54
→ lindenle joined18:55
→ apotry joined18:55
→ nfk joined18:56
→ Neozonz joined18:56
→ endiruna joined18:57
← Oculus left18:58
→ Oculus joined18:58
← Oebele left18:59
Mathiasdm oh, sorry18:59
wrong terminal window19:00
← beagleGuy_ left19:00
→ beagleGuy joined19:01
← Neozonz left19:01
→ eka joined19:01
← gv left19:01
← vigilancer left19:02
→ acbg joined19:02
← lindenle left19:03
← mkoskar left19:03
← joki left19:03
→ lindenle joined19:04
→ dreiss joined19:04
→ sundev70 joined19:07
Nevik_ ha19:07
#AccidentalGitPodcast19:07
→ InfoTest joined19:07
→ joki joined19:08
← kadoban left19:08
→ youngbaks joined19:10
← dreiss left19:10
andrybak wait, are you using hashtags in irc?19:10
→ elsevero joined19:11
→ beastd joined19:12
→ Neozonz joined19:12
← Neozonz left19:12
→ Neozonz joined19:12
→ heroux joined19:13
→ cagedwisdom joined19:14
← lindenle left19:14
→ safe joined19:15
milki Miesco: hooks run as the user who is making changes.19:16
→ lindenle joined19:16
← Neozonz left19:17
← mischat left19:17
← youngbaks left19:18
← reaverb left19:19
→ billybonks joined19:19
→ mischat joined19:20
→ righton joined19:22
← dviola left19:22
→ Meow-J joined19:23
← mischat left19:24
→ roygbiv joined19:24
Nevik_ andrybak, since this is IRC, it's a channel name and predates hashtags #hipster19:25
andrybak but there <s>is</s> was no channel #AccidentalGitPodcast19:26
bremner did you /join it?19:26
andrybak yep, why?19:26
bremner so it existed ;)19:26
Nevik_ self=fulfilling prophecy19:26
bremner and this is only the second stupidest discussion I'm currently involved in!19:27
→ MattMaker joined19:27
→ DrShoggoth joined19:27
Nevik_ bremner, care to share the stupidest one?19:28
→ Neozonz joined19:28
bremner umm. better not. Someone complains "clearly this option is safe or the authors would not have included it"19:28
Nevik_ ah19:28
← dsantiago left19:28
→ dreiss joined19:28
roygbiv hey guys can you help me understand the reasoning why tags aren’t pushed by default? are they meant to be thought of as a strictly local reference? just trying to understand the git philosophy19:30
← daito left19:30
← MattMaker left19:32
← lindenle left19:32
← cagedwisdom left19:32
Seveas tags are very often used for quick local things. You can make git push annotated tags (which are much less likely to be local-only) by default by setting push.followtags=true19:32
← Neozonz left19:32
← dreiss left19:33
→ lindenle joined19:33
→ lemonpepper24 joined19:34
roygbiv Seveas how would you mark milestone points in your repo? like say a version release? i’ve always used tags19:35
← viljaste_ left19:35
Seveas annotated tags19:35
roygbiv I see19:36
→ bb010g joined19:36
gitinfo set mode: +v19:36
roygbiv I just have to remember to push both my changes and my tags. seems to me they kind of naturally belong together.19:36
← weeza left19:37
→ Daxaar joined19:38
← Oculus left19:38
roygbiv thanks for the insight Seveas19:38
→ Oculus joined19:38
→ MatriX_ joined19:39
→ weeza joined19:40
→ Diitto joined19:42
Seveas roygbiv: set push.followtags=true and use annotateed tags, then you don't need to remember :)19:43
→ mizu_no_oto joined19:43
← lindenle left19:43
← jagob left19:43
roygbiv Ah nice! Ok thank you again. I’ll do that19:43
→ Neozonz joined19:44
→ cagedwisdom joined19:45
→ lindenle joined19:45
→ jalopez joined19:47
← lindenle left19:47
→ intellix joined19:48
→ mkopriva joined19:48
← Neozonz left19:49
← irqq left19:49
← Oculus left19:50
→ lindenle joined19:50
heftig_ → heftig19:50
→ Oculus joined19:50
→ irqq joined19:50
→ nerdynav joined19:51
← Goplat left19:51
← MatriX_ left19:52
← waspinator_ left19:52
→ durham joined19:52
→ armyriad joined19:53
→ nnyk_ joined19:54
← mizu_no_oto left19:55
← lindenle left19:55
← LBV_User left19:56
→ lindenle joined19:57
→ mizu_no_oto joined19:57
← mkopriva left19:58
← billybonks left19:58
rxc_ → rxc19:59
← rxc left19:59
→ rxc joined19:59
→ Neozonz joined20:00
← Neozonz left20:00
→ Neozonz joined20:00
→ QwertyDragon joined20:00
← roygbiv left20:01
→ hide joined20:02
→ lindenle_ joined20:02
← lindenle left20:02
← Oatmeal left20:03
← Dumle29 left20:04
← righton left20:04
← Neozonz left20:04
← andrybak left20:05
← skorgon left20:06
← intellix left20:07
← |ifei5g00d left20:07
→ lindenle joined20:07
→ d4rklit3 joined20:08
→ cdg joined20:08
← lindenle_ left20:08
← d4rklit3 left20:08
→ d4rklit3 joined20:09
→ yqt joined20:09
→ Mattx joined20:09
Mattx Hello! When I do git push I'm getting: HEAD detached from b64901d - nothing to commit, working directory clean20:10
← Chill_Surf left20:10
Mattx git branch effectively says I'm on a detached branch, for whatever reason20:10
how do I fix it without losing any line of code?20:11
← d4rklit3 left20:11
→ lindenle_ joined20:12
Nevik_ Mattx, `git checkout -b mynewfancybranch`20:12
→ d4rklit3 joined20:12
← lindenle left20:12
→ jteneyck joined20:13
Mattx Nevik_, now I have two branches, I don't want to push the new one20:13
← mchelen left20:13
Nevik_ so dont20:13
Mattx but the changes now are on the fancy new branch20:13
→ diosmiux joined20:14
Nevik_ you did not say that you wanted the changes to be anywhere specific20:14
i cannot know the layout of your repo or branches ;)20:14
Mattx it's just one branch on the repo20:14
with the whole code20:14
← endiruna left20:15
Mattx (master)20:15
I guess I need to merge branches now or something20:15
ril[away] → ril20:15
Nevik_ `git checkout master && git merge myfancynewbranch`20:15
→ Neozonz joined20:15
→ Oatmeal joined20:16
← griotspeak left20:16
→ mathys joined20:17
← lindenle_ left20:18
← krawchyk left20:18
→ viljaste joined20:19
→ lindenle joined20:19
← Neozonz left20:20
← Miesco left20:21
→ mischat joined20:21
← cdg left20:21
→ User458764 joined20:22
→ weaksauce joined20:22
→ cdg joined20:22
← cdg left20:23
← durham left20:23
← lindenle left20:23
→ durham joined20:23
→ lindenle joined20:24
← MechtiIde left20:24
→ robbyoconnor joined20:26
→ rubyonrailed joined20:27
← lindenle left20:28
→ krawchyk joined20:28
→ StuartMI joined20:29
→ |ifei5g00d joined20:29
→ lindenle joined20:30
→ survi joined20:30
→ psafarcik joined20:31
→ Neozonz joined20:31
← skirk left20:31
→ Karkus joined20:32
← lindenle left20:33
← tarkus left20:34
Mattx thanks Nevik_, it's fixed!20:34
Nevik_ sure :)20:34
→ lindenle joined20:35
← rubyonrailed left20:35
→ bombdiggity joined20:36
→ Dumle29 joined20:36
← Neozonz left20:36
→ rubyonra_ joined20:37
← bernalex left20:37
→ bernalex joined20:37
← Dumle29 left20:38
← mizu_no_oto left20:39
← Mattx left20:39
→ Dumle29 joined20:39
→ endiruna joined20:39
Karkus Is there a way to see how many of the lines added in a commit still exist in the code atm?20:40
← lindenle left20:40
Nevik_ git-blame includes that information20:40
if you want to use it programmatically, you'll have to extract it or look into plumbing commands instead20:40
← Radivarig left20:41
→ youngbaks joined20:41
→ lindenle joined20:41
→ Brando753 joined20:42
← mischat left20:42
Karkus Nevik_: How do I use git blame?20:43
→ psafarcik_ joined20:43
← ril left20:44
← lindenle left20:44
→ del1 joined20:45
Nevik_ Karkus, http://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git#File-Annotation and man git blame20:45
gitinfo Karkus: the git-blame manpage is available at http://jk.gs/git-blame.html20:45
Nevik_ github also has a blame view, if your repo is there20:45
→ oojacoboo joined20:45
← del1 left20:46
→ nanga joined20:46
← Oculus left20:47
→ lindenle joined20:47
← psafarcik left20:47
→ Oculus joined20:47
→ Neozonz joined20:47
← Neozonz left20:47
→ Neozonz joined20:47
Wolf481pl → Wolf480pl20:47
← troulouliou_div2 left20:48
→ cdg joined20:50
Karkus Okay thanks20:50
→ ghostlines joined20:51
← timvisher left20:51
← lindenle left20:51
→ timvisher joined20:51
→ lindenle joined20:51
→ troulouliou_div2 joined20:52
← Neozonz left20:52
← jrm left20:54
→ damarusama joined20:54
damarusama I have multiple git project on the local, I have a ssh server where I would like to put all my git project, do I have to initialize all the folder remotly20:55
← Daxaar left20:55
→ freestyl3r joined20:55
Seveas damarusama: yes, you need to git init --bare a bunch or repos and then push to them.20:56
← lindenle left20:56
damarusama right20:56
→ ag4ve joined20:56
damarusama I guess I can do a scp with all the folders only then go around the folder20:56
Seveas nope.20:56
just do a bunch of git inits and push.20:57
→ lindenle joined20:57
→ nemix joined20:57
← ghostlines left20:57
damarusama yeah I meant to get it started, I have 20 projects, I'd start with scp these 20 folder without any files, then ssh in an git init bare each of them20:57
→ nemix__ joined20:57
→ arup_r joined20:57
Seveas nope20:57
damarusama :(20:57
Seveas that's extra effort20:57
ssh your.host20:58
git init --bare project1.git20:58
git init --bare project2.git20:58
etc...20:58
no scp'ing needed20:58
damarusama but you need to create these folder (project1.git)20:58
?20:58
Seveas nope20:58
git init does that for you20:58
← phaleth left20:58
damarusama ha ok20:58
← lemonpepper24 left20:58
damarusama that's the part I was missing20:58
Seveas even if it wouldn't do that, why on earth would you scp instead of mkdir?20:59
damarusama cause scp will copy all the folder names20:59
so that I don't need to type them all20:59
Seveas won't work anyway, as you need the .git suffix21:00
damarusama you need that absolutly?21:00
Seveas no. But you really should do that to avoid confusion.21:00
foo.git -> bare rpo21:01
foo/.git -> repo with workdir21:01
and on your server you need bare repos21:01
damarusama will do thanks21:01
← nemix left21:01
← lindenle left21:02
→ adendrag joined21:02
→ lindenle joined21:02
→ jay-m joined21:03
→ Neozonz joined21:03
← Neozonz left21:03
→ Neozonz joined21:03
← alex_johnson left21:04
← toothrot left21:05
→ snthsnth joined21:06
← lindenle left21:06
← Neozonz left21:08
→ roygbiv joined21:08
→ lindenle joined21:08
→ Zoddo joined21:08
← johtso left21:08
← krawchyk left21:08
← irqq left21:09
→ toothrot joined21:09
← josuebrunel left21:10
← sanketdg left21:11
→ psafarcik__ joined21:12
→ Boniche joined21:12
→ DaddyEric_DESK joined21:12
→ slimane joined21:13
← lindenle left21:14
← robbyoconnor left21:14
← arup_r left21:14
← troulouliou_div2 left21:14
→ lindenle joined21:15
← psafarcik_ left21:16
← youngbaks left21:16
← DaddyEric left21:16
→ eertl joined21:17
← sundev70 left21:17
← lindenle left21:18
→ Steadfast joined21:19
→ Neozonz joined21:19
← Neozonz left21:19
→ Neozonz joined21:19
← InfoTest left21:19
← survi left21:21
← User458764 left21:21
→ lindenle joined21:21
SWAT_ → SWAT21:23
← sysanthrope left21:23
→ jmckind joined21:23
← Neozonz left21:24
← jmckind left21:25
→ sysanthrope joined21:26
→ daito joined21:27
→ livingstn joined21:27
→ arup_r joined21:28
← lindenle left21:28
→ meLon joined21:28
arup_r → Guest5092621:28
→ waspinator_ joined21:28
→ lindenle joined21:28
← Guest50926 left21:29
→ zeroed joined21:30
← tristanp left21:31
← t0by left21:32
← lindenle left21:32
→ lemondom_ joined21:34
→ lindenle joined21:35
→ Neozonz joined21:35
→ mizu_no_oto joined21:36
→ systmkor joined21:37
← lemondom left21:38
← lindenle left21:39
→ troulouliou_div2 joined21:39
→ mischat joined21:39
← troulouliou_div2 left21:39
← Neozonz left21:39
→ robbyoconnor joined21:40
→ lindenle joined21:40
→ Lyqyd joined21:40
→ aevitas joined21:41
← jteneyck left21:42
→ jteneyck joined21:43
← lindenle left21:44
← mischat left21:44
→ lindenle joined21:46
← nnyk_ left21:46
→ stamina joined21:46
→ PaulCape_ joined21:46
→ negaduck joined21:47
← jteneyck left21:47
← PaulCapestany left21:49
→ mkoskar joined21:49
→ Neozonz joined21:51
← lindenle left21:52
← Ahmed90 left21:52
← kenansul- left21:53
→ kenansul- joined21:53
→ lindenle joined21:53
kenansul- → kenansulayman21:53
← CKyle left21:55
← Neozonz left21:56
← _cyril_ left21:57
← rpdprd left21:57
→ CKyle joined21:58
→ linuxmint joined21:58
← lindenle left21:59
→ lindenle joined21:59
← fscala left21:59
← mizu_no_oto left22:00
← freestyl3r left22:01
← oojacoboo left22:01
← jay-m left22:01
→ fscala joined22:01
← snthsnth left22:04
← lindenle left22:04
solomon56_ → solomon5622:05
→ lindenle joined22:05
→ aboseley_ joined22:05
→ mwhooker joined22:06
→ Neozonz joined22:07
← daito left22:07
← mwhooker left22:09
← ciampix left22:09
← anchorite left22:09
→ mwhooker joined22:09
← Meow-J left22:09
← lindenle left22:10
→ lindenle joined22:11
← tobyx_ left22:11
→ tristanp joined22:11
← mathys left22:12
← Phoenixz left22:12
← durham left22:12
← lindenle left22:14
← Jackneill left22:14
→ tarkus joined22:15
→ Phoenixz joined22:15
→ lindenle joined22:17
→ ghostlines joined22:18
→ MattMaker joined22:18
→ pepperoni joined22:19
← ghostlines left22:20
← zeroed left22:20
← acbg left22:20
→ xudongz joined22:20
→ acbg joined22:21
← tristanp left22:21
← lindenle left22:21
→ tristanp joined22:22
← aboseley_ left22:22
pepperoni after cloning repo A into B, is there a way to just pull modifications that are staged in repo A into B?22:23
→ bollullera joined22:24
→ lindenle joined22:25
← pantsman- left22:25
Celelibi Interesting case. It looks like rebasing is smarter than merging.22:26
Then, maybe a merge strategy that performs the same thing would be nice.22:26
thiago pepperoni: you can only fetch & push commits. Staged stuff doesn't exist yet.22:26
→ fsckd joined22:26
→ jagob joined22:26
← lindenle left22:28
→ ciampix joined22:28
→ bobdel joined22:28
→ ghostlines joined22:28
← ghostlines left22:29
← lemondom_ left22:29
← eertl left22:29
← ciampix left22:29
← bobdel left22:29
← romankl left22:29
→ lemondom joined22:29
→ aboseley_ joined22:30
→ astrofog joined22:30
→ lindenle joined22:30
← jimmyeatworld left22:31
→ jrm joined22:31
← jrm left22:31
→ jrm joined22:31
← PaulCape_ left22:32
→ PaulCapestany joined22:32
← CheckDavid left22:33
→ blr_ joined22:34
← blr_ left22:34
← Oculus left22:34
← lindenle left22:35
→ Noldorin joined22:35
salparad1se → salparadise22:36
→ lindenle joined22:36
← lemondom left22:37
← Karkus left22:37
→ Karkus joined22:37
← ag4ve left22:37
→ kadoban joined22:39
→ mischat joined22:40
← Phoenixz left22:41
← nerdynav left22:41
→ lindenle_ joined22:42
← lindenle left22:42
← Noldorin left22:43
→ jteneyck joined22:43
← mischat left22:45
→ ncthom91 joined22:46
← timvisher left22:46
→ Noldorin joined22:46
← lindenle_ left22:46
→ Oculus joined22:47
← safe left22:47
→ safe joined22:48
→ lindenle joined22:48
→ hashpuppy joined22:48
← elsevero left22:48
← jteneyck left22:49
hashpuppy i did git reset --soft HEAD~ cause i messed up, but i really liked that commit message. how can i see that w/ reflog or whatever that is22:49
← Ldip left22:49
hashpuppy nm22:49
← acbg left22:50
→ acbg joined22:50
← sleezd left22:51
← lindenle left22:51
← slimane left22:51
→ kay joined22:51
→ timvisher joined22:52
← tanuck left22:52
← safe left22:53
→ lindenle joined22:53
→ tanuck joined22:54
← bombdiggity left22:54
← King_Hual left22:54
← acbg left22:55
→ sleezd joined22:56
← lindenle left22:57
→ lindenle joined22:59
Timvde| → Timvde23:02
← lindenle left23:02
pepperoni thiago: bummer, ok, thanks23:04
← stamina left23:04
→ lindenle joined23:05
→ Vote joined23:05
← endiruna left23:05
← NeverDie left23:05
→ NeverDie joined23:08
← astrofog left23:08
← Steadfast left23:08
→ intellix joined23:09
← namecantbe left23:09
← diosmiux left23:09
← beastd left23:10
← lindenle left23:11
→ neodon joined23:11
← neodon left23:11
→ neodon joined23:11
→ acbg joined23:12
→ lindenle joined23:12
→ treaki joined23:12
← CKyle left23:13
→ trpl joined23:14
← lewellyn left23:14
← tristanp left23:15
← StuartMI left23:15
← tinajohnson left23:16
← cdg left23:16
← acbg left23:16
→ acbg joined23:17
← xudongz left23:17
← mwhooker left23:17
← hashpuppy left23:17
← Fijit left23:17
→ hectron joined23:19
→ devoldmx joined23:20
← skcin7 left23:21
← lindenle left23:21
← Oatmeal left23:21
← gopar left23:21
→ lindenle joined23:22
← intellix left23:22
→ mizu_no_oto joined23:23
→ lewellyn joined23:24
→ nvahalik joined23:24
→ namecantbe joined23:25
← marlinc left23:25
← ncthom91 left23:27
← lindenle left23:27
→ lindenle joined23:28
→ endiruna joined23:29
← rubyonra_ left23:29
← mizu_no_oto left23:30
← lindenle left23:31
← happy-dude left23:31
→ lindenle joined23:31
→ marlinc joined23:32
← namecantbe left23:32
→ ncthom91 joined23:32
← kadoban left23:33
← trpl left23:33
← d4rklit3 left23:35
← endiruna left23:35
← aboseley_ left23:35
← lindenle left23:35
→ dreiss joined23:36
→ lindenle joined23:38
→ StuartMI joined23:40
→ mischat joined23:42
← dreiss left23:42
→ alex_johnson joined23:43
← lindenle left23:43
→ flaguy48 joined23:43
→ lindenle joined23:44
← ytl left23:44
→ jteneyck joined23:45
← mischat left23:46
← lindenle left23:49
← jteneyck left23:49
BooK_ → BooK23:49
→ theskillwithin joined23:50
→ lindenle joined23:50
← Kicer86 left23:51
→ phantombeta joined23:52
→ Jodn joined23:53
→ diogenese joined23:54
→ whitby joined23:55
← lindenle left23:56
→ lindenle joined23:57
← ncthom91 left23:58
← khmarbaise left23:58
→ hamsterpower joined23:58

Logs Search ←Prev date Next date→ Channels Documentation