| 2018-04-29 |
|
rain1
| thanks | 00:00 |
|
| what do I do next? | 00:00 |
| → rosa joined | 00:00 |
|
rain1
| if i try to push it says hint: Updates were rejected because the tip of your current branch is behind | 00:00 |
|
| oh git push --force | 00:00 |
|
rafasc
| another dead kitten. Every time you --force, a kitten dies. | 00:01 |
|
| I expected this would remove my commits from showing in the log $ git log --not --author=rafasc | 00:01 |
| ← rain1 left | 00:02 |
|
rafasc
| how do you do reverse in regex? | 00:02 |
| ← Thominus left | 00:02 |
| → Thominus joined | 00:03 |
| ← nowhere_man left | 00:03 |
|
rafasc
| that is, match everything except the string i give | 00:03 |
| → ferdna joined | 00:04 |
| ← Tobbi left | 00:05 |
| → hdon joined | 00:05 |
| ← mel00010 left | 00:06 |
| ← Karyon left | 00:06 |
| → jready joined | 00:07 |
| ← skered left | 00:09 |
| ← hdon left | 00:10 |
| → amirpro joined | 00:12 |
| ← jelmer left | 00:12 |
| → Mattiaslndstrm joined | 00:14 |
| → rosa_ joined | 00:14 |
|
osse
| Are your sure youfe asking in the right channel? :p | 00:14 |
| ← netj left | 00:15 |
| ← rosa left | 00:15 |
| → netj joined | 00:15 |
|
osse
| Maybe youre looking for git grep -v | 00:15 |
| → skered joined | 00:18 |
| → jelmer joined | 00:18 |
| → diogenese joined | 00:20 |
| → hdon joined | 00:20 |
| ← mattcen left | 00:20 |
| ← rosa_ left | 00:21 |
|
rafasc
| heh, I was tring to make log show all commits except ones from a certain user. | 00:22 |
|
| similar to what --author=rafasc does, but in reverse. | 00:22 |
|
| turns out it's not that easy.. | 00:23 |
| ← livingstn left | 00:24 |
|
rafasc
| osse did you see my previous question? | 00:25 |
| → mattcen joined | 00:25 |
|
rafasc
| was just asking the regex question cause --author uses regex :P | 00:26 |
| → menip joined | 00:27 |
| ← menip left | 00:27 |
| ← Regon left | 00:28 |
| ← Mattiaslndstrm left | 00:28 |
|
rafasc
| anyways, I found what I was looking, so feel free to disregard. | 00:28 |
| → nowhere_man joined | 00:29 |
| → m0viefreak joined | 00:30 |
| → nnyk joined | 00:31 |
| → ArcaTech joined | 00:31 |
| → rosa joined | 00:34 |
| → livingstn joined | 00:34 |
| ← sandroqz left | 00:34 |
| ← Singmyr left | 00:36 |
| ← cliluw left | 00:38 |
| → cliluw joined | 00:38 |
| → darkhanb_ joined | 00:42 |
| ← darkhanb left | 00:43 |
| → macrover joined | 00:46 |
| ← macrover left | 00:47 |
| → orbyt_ joined | 00:48 |
| → macrover joined | 00:49 |
| → whatsupdoc_ joined | 00:50 |
| ← tsaka__ left | 00:51 |
| ← cliluw left | 00:51 |
| ← ArcaTech left | 00:51 |
| → cliluw joined | 00:52 |
| → Karyon joined | 00:52 |
| ← rosa left | 00:52 |
| ← livingstn left | 00:53 |
| → rosa joined | 00:55 |
| ← cdown left | 00:55 |
| → cdown joined | 00:57 |
| ← rosa left | 00:59 |
| → Karyon_ joined | 01:01 |
| → sandroqz joined | 01:02 |
| ← Karyon left | 01:04 |
| ← Karyon_ left | 01:11 |
| → justanotheruser joined | 01:13 |
| ← whatsupdoc_ left | 01:13 |
| ← justan0theruser left | 01:14 |
| ← Gurkenglas left | 01:15 |
| ← Persondude left | 01:15 |
| → austin_laptop joined | 01:16 |
| ← austin987 left | 01:16 |
| → Karyon_ joined | 01:18 |
| → jstimm joined | 01:18 |
| → finalbeta joined | 01:19 |
| ← fatalhalt left | 01:22 |
| ← m0viefreak left | 01:24 |
| ← RougeR left | 01:24 |
| → livingstn joined | 01:24 |
| ← livingstn left | 01:28 |
| → livingstn joined | 01:29 |
| ← adamantium left | 01:31 |
| → adamantium joined | 01:32 |
| → ResidentBiscuit joined | 01:33 |
| ← ZyX-I left | 01:35 |
| ← ToBeCloud left | 01:35 |
| ← jready left | 01:35 |
| ← Karyon_ left | 01:37 |
| ← mattcen left | 01:37 |
| ← macrover left | 01:37 |
| ← hdon left | 01:38 |
| → Lyqyd joined | 01:40 |
| ← phinxy left | 01:46 |
| ← tunekey left | 01:46 |
| → tunekey joined | 01:47 |
| → ArcaTech joined | 01:48 |
| ← ArcaTech left | 01:49 |
| ← ilbot3 left | 01:49 |
| → z]bandito joined | 01:52 |
| → Karyon_ joined | 01:52 |
| → mud joined | 01:54 |
| ← z|bandito left | 01:55 |
| → whatsupdoc_ joined | 01:56 |
| → ilbot3 joined | 01:57 |
| ← nowhere_man left | 01:58 |
| ← xaa left | 01:58 |
| → z|bandito joined | 01:58 |
| → nowhere_man joined | 01:58 |
| ← Karyon_ left | 01:59 |
| ← z]bandito left | 02:00 |
| → mattcen joined | 02:01 |
| ← durham left | 02:03 |
| ← Lunatrius left | 02:05 |
| ← jstimm left | 02:07 |
| ← d3r3k left | 02:11 |
| → _antares_ joined | 02:11 |
| → zulutango joined | 02:12 |
| → m0viefreak joined | 02:13 |
| ← nnyk left | 02:19 |
| ← nowhere_man left | 02:20 |
|
Juesto
| How do i permamently remove some commits that look somewhat dumb | 02:20 |
| → Lunatrius joined | 02:20 |
|
Juesto
| such as a merge and some accidental/mistake-y commit | 02:20 |
| ← wootehfoot left | 02:21 |
| ← arecaceae left | 02:22 |
| → winfli joined | 02:22 |
| ← winfli left | 02:22 |
| → arecaceae joined | 02:22 |
| → winfli joined | 02:22 |
| ← winfli left | 02:23 |
| → winfli joined | 02:24 |
| ← mattcen left | 02:24 |
| ← ResidentBiscuit left | 02:26 |
| → mattcen joined | 02:27 |
| ← sentriz left | 02:30 |
| ← a3Dman left | 02:30 |
| ← black_13_ left | 02:31 |
| ← mattcen left | 02:32 |
| → a3Dman joined | 02:33 |
| → cur8or joined | 02:34 |
| → mattcen joined | 02:38 |
| → summi joined | 02:39 |
| ← cur8or left | 02:39 |
| gitinfo set mode: +v | 02:40 |
|
summi
| I've created a new branch locally and wanna push to remote with the same name | 02:40 |
|
| so I do git push -u origin my-branch-name? | 02:40 |
|
| git is suggesting git push --set-upstream origin my-branch-name | 02:40 |
| ← piggah left | 02:42 |
| → lagothri1 joined | 02:47 |
| ← lagothrix left | 02:49 |
| ← cfoch left | 02:51 |
| ← shinnya left | 02:56 |
| → rosa joined | 02:57 |
| ← summi left | 02:57 |
| → nnyk joined | 03:02 |
| → PioneerAxon joined | 03:03 |
| ← PioneerAxon_ left | 03:05 |
| ← rosa left | 03:13 |
| → piggah joined | 03:14 |
| → piggah_ joined | 03:18 |
| ← livingstn left | 03:19 |
| ← piggah left | 03:19 |
| ← piggah_ left | 03:19 |
| → gtristan joined | 03:20 |
| ← Guest21 left | 03:23 |
| → rosa joined | 03:24 |
| → zlsyx joined | 03:26 |
| ← mattcen left | 03:26 |
| → canvon joined | 03:31 |
| ← canvon_ left | 03:32 |
| ← netj left | 03:32 |
| → netj joined | 03:32 |
| ← rosa left | 03:33 |
| → mattcen joined | 03:36 |
| ← pix9 left | 03:37 |
| → pix9 joined | 03:38 |
| ← sleepingforest left | 03:38 |
| ← whatsupdoc_ left | 03:40 |
| ← upperdeck left | 03:43 |
| ← rafasc left | 03:43 |
| → Karyon joined | 03:43 |
| → piggah joined | 03:44 |
| ← stevelitt left | 03:48 |
| ← Noldorin left | 03:50 |
| → Bobdude joined | 03:54 |
| → rosa joined | 03:56 |
| ← mattcen left | 03:58 |
| ← amirpro left | 04:00 |
| → mattcen joined | 04:02 |
| → tsaka__ joined | 04:03 |
|
Eugene
| Juesto - !fixup | 04:05 |
|
gitinfo
| Juesto: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 04:05 |
| ← prg318 left | 04:06 |
| ← dreiss left | 04:06 |
| → prg318 joined | 04:07 |
| ← tsaka__ left | 04:08 |
| → upperdeck joined | 04:12 |
| → hdon joined | 04:20 |
| ← jimmyrcom left | 04:20 |
| ← nnyk left | 04:22 |
| → cur8or joined | 04:23 |
| ← rosa left | 04:24 |
| ← hdon left | 04:25 |
| → rosa joined | 04:25 |
| ← cur8or left | 04:27 |
| ← _antares_ left | 04:31 |
| ← orbyt_ left | 04:36 |
| ← boombatower left | 04:38 |
|
Juesto
| Eugene: i've tried googling and its just overwhelming to find what i want. i've asked a concrete question: how do i delete some mistaken commits? | 04:42 |
|
Eugene
| There is a Choose-Your-Own-Adventure linked by the bot which covers this, and many other, common cases | 04:44 |
|
| !fixup_hints | 04:44 |
|
gitinfo
| Hints for fixing commits are: (1) NOT PUSHED/PUBLISHED: `git rebase -i $COMMIT^` or perhaps `git commit --amend` (or `git reset HEAD^`). (2) OTHERWISE, `git revert $COMMIT` to make a reverse commit. (3) If you have pushed and MUST remove it, use rebase or filter-branch and type !rewrite in IRC to learn about the implications. | 04:44 |
|
Eugene
| That's the tl;dr ^ | 04:44 |
| → hdon joined | 04:45 |
|
Juesto
| !rewrite | 04:48 |
|
gitinfo
| Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 04:48 |
|
Juesto
| yeah.... its already pushed to the hell of it | 04:48 |
| → govg joined | 04:49 |
| ← rosa left | 04:51 |
| → rosa joined | 04:52 |
| → mkalfon_ joined | 04:56 |
| ← rosa left | 04:56 |
| → ka10k joined | 04:57 |
| → rosa joined | 04:58 |
| → ruslangaripov joined | 04:59 |
|
{HD}
| when I "git remote add ssh://user@ip" can I add a location for the private key to auth with? | 04:59 |
| ← ka10k left | 04:59 |
| → Mattiaslndstrm joined | 05:00 |
|
Juesto
| {HD}: your .ssh does that via agent or whatever | 05:01 |
|
| not sure if you can | 05:01 |
|
| or in the git config | 05:01 |
| → pfleck joined | 05:01 |
|
Juesto
| i dont remember | 05:01 |
| ← pks left | 05:02 |
|
{HD}
| I will google around. I hope I can because I have both pass and key auth available but for the sake of pushing I want to use key but it always asks for pass | 05:02 |
| → pks joined | 05:04 |
| ← Mattiaslndstrm left | 05:04 |
| → tsaka__ joined | 05:08 |
| ← mud left | 05:09 |
| ← mattcen left | 05:12 |
| ← rosa left | 05:13 |
| → mattcen joined | 05:17 |
| ← ruslangaripov left | 05:18 |
|
thiago
| you can't choose the key in Git | 05:18 |
|
| you can choose it in .ssh/config | 05:18 |
| → ruslangaripov joined | 05:18 |
|
thiago
| see man ssh_config | 05:18 |
| → KeyJoo joined | 05:19 |
| ← KeyJoo left | 05:19 |
| → KeyJoo joined | 05:19 |
| ← a3Dman left | 05:22 |
|
{HD}
| thiago: I found this: https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/ | 05:23 |
|
| which appears to have worked | 05:23 |
|
thiago
| you can set a key per host | 05:23 |
|
| paranoid people do that... | 05:23 |
|
| note that you can also use fake hosts | 05:24 |
|
{HD}
| well, I just tested my setup with the 2 ssh keys I am currently using and it seems to work. | 05:24 |
|
| I don't know how the agent knows which to use | 05:24 |
| ← hdon left | 05:26 |
| ← sauvin left | 05:29 |
| ← tsaka__ left | 05:30 |
| → sauvin joined | 05:30 |
|
thiago
| ~/.ssh/config | 05:36 |
|
| and, of course, it uses the one that works with the server | 05:36 |
|
| it sends the fingerprint to all of them to the server and the server says which one it accepts | 05:36 |
| ← inovas left | 05:37 |
| → mlopezviedma_ joined | 05:38 |
|
{HD}
| thiago: so. It works for git but it isn’t working for just ssh from cli. Gotta still figure that one out. | 05:39 |
|
thiago
| huh? | 05:39 |
|
| git doesn't do anything special. It just runs ssh. | 05:39 |
| ← mlopezviedma left | 05:40 |
| → hdon joined | 05:41 |
| ← tunekey left | 05:42 |
| → inovas joined | 05:44 |
| ← Karyon left | 05:44 |
| → tsaka__ joined | 05:47 |
| → vovs03 joined | 05:50 |
| ← KeyJoo left | 05:50 |
|
{HD}
| Yea, which is why it doesn’t make sense. I can ssh -i and that works. But it defaults to asking for password. I want it to default to looking at keys. | 05:52 |
|
| ¯\_(ツ)_/¯ | 05:53 |
| ← thiago left | 05:54 |
| → osk joined | 06:00 |
| → navidr joined | 06:01 |
| ← reverse_light left | 06:04 |
| ← tomfarr left | 06:05 |
| → tomfarr joined | 06:06 |
| → cfoch joined | 06:09 |
| → afuentes joined | 06:10 |
| → cur8or joined | 06:11 |
| ← heiler left | 06:12 |
| → heiler joined | 06:12 |
| ← cur8or left | 06:16 |
| → rosa joined | 06:16 |
| → reverse_light joined | 06:22 |
| ← austin_laptop left | 06:24 |
| → piggah_ joined | 06:25 |
| ← mattcen left | 06:26 |
| → James0r2_ joined | 06:26 |
| ← piggah left | 06:28 |
| ← James0r left | 06:29 |
| ← rosa left | 06:29 |
| → a3Dman joined | 06:31 |
| → mattcen joined | 06:31 |
| ← nd left | 06:32 |
| → czart_ joined | 06:33 |
| → nd joined | 06:33 |
| → skisela joined | 06:34 |
| ← Juesto left | 06:34 |
| → piggah joined | 06:35 |
| ← piggah_ left | 06:36 |
| ← czart left | 06:36 |
| → darkbit joined | 06:39 |
| → azur_kind joined | 06:39 |
| → tkore\w joined | 06:40 |
| ← tkore\w left | 06:40 |
| ← darkbit left | 06:40 |
| → tkore\w joined | 06:40 |
| ← tkore\w left | 06:41 |
| → tkore\w joined | 06:41 |
| ← heiler left | 06:41 |
| ← tkore\w left | 06:42 |
| → schleppel joined | 06:42 |
| → tkore\w joined | 06:43 |
| ← govg left | 06:43 |
| → govg joined | 06:44 |
| → heiler joined | 06:45 |
| → fr33domlover joined | 06:46 |
| → shinnya joined | 06:50 |
| ← hdon left | 06:50 |
| → HourGate_ joined | 06:51 |
| → dimi1947 joined | 06:56 |
| → hdon joined | 06:57 |
| ← sandroqz left | 06:58 |
| → piggah_ joined | 06:59 |
| ← piggah left | 07:00 |
| ← pix9 left | 07:02 |
| → pix9 joined | 07:03 |
| → dreiss joined | 07:03 |
| ← tkore\w left | 07:05 |
| ← piggah_ left | 07:08 |
| ← azur_kind left | 07:08 |
| ← heiler left | 07:09 |
| → heiler joined | 07:09 |
| ← mooasaurus left | 07:09 |
| → mooasaurus joined | 07:09 |
| → piggah joined | 07:12 |
| → dsdeiz joined | 07:18 |
| ← dsdeiz left | 07:18 |
| → dsdeiz joined | 07:18 |
| ← mkalfon_ left | 07:20 |
| ← Bobdude left | 07:21 |
| → dsdeiz_ joined | 07:23 |
| ← dsdeiz left | 07:24 |
| → nast joined | 07:26 |
| ← dreiss left | 07:28 |
| → kgrimes joined | 07:29 |
| → nowhere_man joined | 07:30 |
| ← nast left | 07:31 |
| → fatalhalt joined | 07:33 |
| ← heiler left | 07:33 |
| → heiler joined | 07:34 |
| → rosa joined | 07:35 |
| ← dpower left | 07:35 |
| → dreiss joined | 07:35 |
| ← hdon left | 07:36 |
| → hdon joined | 07:38 |
| ← rosa left | 07:39 |
| ← heiler left | 07:39 |
| → heiler joined | 07:40 |
| ← hdon left | 07:42 |
| → rosa joined | 07:43 |
| → pfleck1 joined | 07:44 |
| → Naq joined | 07:46 |
| ← rosa left | 07:46 |
| → hdon joined | 07:47 |
| ← heiler left | 07:47 |
| → heiler joined | 07:48 |
| ← hdon left | 07:52 |
| → rosa joined | 07:55 |
| ← CtrlC left | 07:55 |
| ← heiler left | 07:58 |
| → cur8or joined | 07:59 |
| ← hurricanehrndz left | 08:00 |
| → heiler joined | 08:00 |
| ← osk left | 08:02 |
| → hurricanehrndz joined | 08:03 |
| ← Lyqyd left | 08:03 |
| → oxymoron93 joined | 08:03 |
| ← cur8or left | 08:03 |
| ← VladGh left | 08:04 |
| → mrBen2k2k2k joined | 08:04 |
| → VladGh_ joined | 08:04 |
| ← foul_owl left | 08:04 |
| → oaao joined | 08:05 |
| → sjoshi joined | 08:05 |
| ← rosa left | 08:06 |
| ← heiler left | 08:06 |
| → heiler joined | 08:07 |
| → rosa joined | 08:07 |
| ← sjoshi left | 08:08 |
| ← oaao left | 08:08 |
| ← tsaka__ left | 08:10 |
| ← Naq left | 08:11 |
| → Naq joined | 08:11 |
| ← ferdna left | 08:13 |
| ← rosa left | 08:13 |
| → oaao joined | 08:14 |
| ← oaao left | 08:14 |
| → sjoshi joined | 08:14 |
| ← sjoshi left | 08:15 |
| → taoqy joined | 08:15 |
| ← mattcen left | 08:16 |
| → obi_jan_kenobi joined | 08:16 |
| ← taoqy left | 08:16 |
| → rajat joined | 08:16 |
| → taoqy joined | 08:16 |
| ← fatalhalt left | 08:16 |
| → Nizumzen joined | 08:17 |
| → mattcen joined | 08:17 |
| ← jikz left | 08:17 |
| → foul_owl joined | 08:20 |
| → fatalhalt joined | 08:23 |
| ← pfleck1 left | 08:23 |
| ← taoqy left | 08:23 |
| → taoqy joined | 08:24 |
| → King_Hual joined | 08:24 |
| ← King_Hual left | 08:24 |
| → King_Hual joined | 08:24 |
| ← pfleck left | 08:26 |
| ← bendo left | 08:26 |
| ← King_Hual left | 08:26 |
| ← Nizumzen left | 08:27 |
| → robotroll joined | 08:27 |
| ← zlsyx left | 08:29 |
| → jstein_ joined | 08:29 |
| jstein_ → jstein | 08:29 |
| → pfleck joined | 08:29 |
| ← Goplat left | 08:31 |
| ← heiler left | 08:31 |
| → heiler joined | 08:31 |
| ← heiler left | 08:37 |
| → heiler joined | 08:37 |
| ← dimi1947 left | 08:38 |
| → hdon joined | 08:41 |
| → pfleck1 joined | 08:41 |
| ← piggah left | 08:43 |
| ← govg left | 08:43 |
| → govg joined | 08:45 |
| ← heiler left | 08:45 |
| ← pfleck1 left | 08:46 |
| → heiler joined | 08:51 |
| → Zexaron joined | 08:55 |
| → MutantMahesh joined | 08:56 |
| ← dsdeiz_ left | 08:57 |
| ← heiler left | 08:58 |
| ← MutantMahesh left | 08:59 |
| → sentriz joined | 09:04 |
| → Tobbi joined | 09:05 |
| ← jelmer left | 09:07 |
| ← cfoch left | 09:08 |
| → jelmer joined | 09:08 |
| → plexigras joined | 09:11 |
| → Nizumzen joined | 09:12 |
| ← hdon left | 09:12 |
| ← thinkpad left | 09:15 |
| → jnavila joined | 09:15 |
| ← energizer left | 09:17 |
| ← thxffo left | 09:17 |
| ← hunterlabs left | 09:19 |
| → g00s joined | 09:19 |
| → thinkpad joined | 09:20 |
| ← catsup left | 09:21 |
| → orzo joined | 09:21 |
| → catsup joined | 09:21 |
| ← catsup left | 09:22 |
| → catsup joined | 09:22 |
| → thxffo joined | 09:23 |
| → hunterlabs joined | 09:23 |
| ← Doginal left | 09:27 |
| → zlsyx joined | 09:27 |
| → typedef joined | 09:27 |
| → sameerynho joined | 09:27 |
| ← g00s left | 09:29 |
| ← Thominus left | 09:29 |
| → Thominus joined | 09:30 |
| → manuelschneid3r joined | 09:38 |
| → nnyk_ joined | 09:38 |
| → ok91 joined | 09:39 |
| → mohabaks joined | 09:42 |
| → tkore\w joined | 09:42 |
| ← tkore\w left | 09:42 |
| → tkore\w joined | 09:42 |
| ← nnyk_ left | 09:43 |
| → xaa joined | 09:44 |
| ← taoqy left | 09:46 |
| ← jstein left | 09:46 |
|
gavit
| {HD}: which os are you running | 09:47 |
| → turtletaro joined | 09:47 |
| ← inovas left | 09:53 |
| → nnyk_ joined | 09:54 |
| → dimi1947 joined | 09:54 |
| → Gurkenglas joined | 09:56 |
| → inovas joined | 09:58 |
| ← mohabaks left | 09:59 |
| ← nnyk_ left | 10:01 |
| ← turtletaro left | 10:03 |
| → turtletaro joined | 10:03 |
| ← oxymoron93 left | 10:08 |
| ← pfleck left | 10:09 |
| ← mattcen left | 10:13 |
| → mattcen joined | 10:15 |
| → yeshurun joined | 10:15 |
| ← Nizumzen left | 10:16 |
| → Fernando-Basso joined | 10:18 |
| → tvw joined | 10:18 |
| ← gtristan left | 10:21 |
| → nnyk_ joined | 10:24 |
| ← nnyk_ left | 10:28 |
| ← kgrimes left | 10:28 |
| → routingsparks joined | 10:28 |
| ← turtletaro left | 10:29 |
| → Strepsils joined | 10:31 |
| ← Strepsils left | 10:32 |
| ← ferr left | 10:32 |
| → gareppa joined | 10:37 |
| ← routingsparks left | 10:39 |
| → gtristan joined | 10:42 |
| ← obi_jan_kenobi left | 10:43 |
| ← dpyro left | 10:44 |
| → amirpro joined | 10:44 |
| ← gareppa left | 10:45 |
| ← Fernando-Basso left | 10:45 |
| ← jnavila left | 10:46 |
| → gareppa joined | 10:46 |
| → borkr joined | 10:47 |
| ← jelmer left | 10:48 |
| → jelmer joined | 10:49 |
| ← gareppa left | 10:53 |
| → RougeR joined | 10:55 |
| → Minty_ joined | 10:56 |
|
Minty_
| Hi, I can't believe I'm the only person who is asking this but I can't find anything online about this. I am starting a new project and want to use the git flow workflow. How do I start?! Surely my initial commit should be to the develop branch, not the master. Before my first release, surely there is no master | 10:57 |
|
| but as soon as i do git init locally, i'm in master. if i then do git branch develop; git checkout develop, my local repository will empty | 10:57 |
|
| i would have had to push my local repo first up to master to then checkout to develop and pull from master | 10:57 |
| → peterR`` joined | 10:59 |
|
bremner
| master is usually a branch, not a repo | 11:00 |
|
| I don't know git-flow terminology, but I think you might be mixing it up. | 11:00 |
|
Minty_
| bremner: ok but my point is how do i do my initial commit not to master? | 11:00 |
|
bremner
| create a new branch, and commit there. | 11:01 |
| → gareppa joined | 11:01 |
|
Minty_
| bremner: but as i said above; git branch develop; git checkout develop will cause my local directory to wipe. | 11:01 |
|
| bremner: i already had an empty file structure before git init | 11:01 |
|
| and i want my initial file structure to my commit to develop | 11:01 |
|
bremner
| if you want the new branch to be based on the current one, use git checkout -b develop | 11:02 |
|
Minty_
| bremner: ah thank you! | 11:02 |
| → ferr joined | 11:02 |
| ← gareppa left | 11:03 |
| ← gtristan left | 11:03 |
| ← ferr left | 11:04 |
|
Minty_
| bremner: I got: fatal: Not a valid object name: 'master'. | 11:05 |
|
| when running git branch develop | 11:05 |
|
| is that because i need to add remote origin first? | 11:05 |
|
bremner
| no | 11:05 |
| → Nizumzen joined | 11:05 |
|
bremner
| !repro | 11:05 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see | 11:05 |
| ← amirpro left | 11:08 |
| → amirpro joined | 11:09 |
|
Minty_
| bremner: i don't think that will help. maybe this is because I'm running these commands from within my context-sensitive ide? | 11:10 |
|
| bremner: i just tied git help branch and received this error "fatal: 'web--browse' appears to be a git command, but we were not able to execute it. Maybe git-web--browse is broken?" | 11:10 |
|
bremner
| the bot has an answer for everything... | 11:10 |
|
| !gui | 11:10 |
|
gitinfo
| Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 11:10 |
|
Minty_
| bremner: i am using cli. | 11:10 |
|
| bremner: via a terminal window inside of my editor... | 11:10 |
| → elichai2 joined | 11:13 |
| ← amirpro left | 11:13 |
|
Minty_
| bremner: i've just read up - the reason is i have to create master first | 11:13 |
|
| with an initial commit | 11:13 |
| ← Naq left | 11:13 |
|
Minty_
| so back to my original question, i HAVE to make an initial commit to master? | 11:13 |
|
bremner
| no | 11:13 |
| → amirpro joined | 11:13 |
|
bremner
| "git checkout -b" should work | 11:14 |
|
Minty_
| bremner: oh i can just go and run git checkout -b develop | 11:14 |
|
| bremner: i assumed i had to create the branch first | 11:15 |
|
| bremner: but i realise now that the -b flag does that for me | 11:15 |
| ← n3wborn left | 11:17 |
| → mohabaks joined | 11:19 |
|
j416
| Minty_: fwiw, typically start with a first commit on master anyway. I usually put a readme there to begin with. Then I branch off. | 11:20 |
|
| s/typically/I typically/ | 11:20 |
|
Minty_
| j416: ok | 11:21 |
|
j416
| Minty_: because, you still need branch "master" later, and then you would have to create it. When you create a branch it needs to point to something, or your histories would be unrelated. | 11:23 |
|
Minty_
| geez i am so confused right now | 11:25 |
|
| i'm going to start again | 11:25 |
| ← Zexaron left | 11:25 |
|
Minty_
| Ok, so i have a local project which just has some directories and blank files in it | 11:25 |
|
j416
| Minty_: it's a graph of commits, think of it like that. | 11:25 |
|
Minty_
| i create my repo on github and i put readme, license and .gitignore in it (via the github UI) | 11:25 |
|
j416
| Minty_: branch names are just pointers to commits. DNS entries if you will. | 11:25 |
|
Minty_
| if i then add that origin and pull from it, will it clear out my local directory? | 11:25 |
|
Seveas
| Minty_: nope | 11:26 |
|
Minty_
| why wouldn't it? surely it would find things locally that aren't in the repo and it would delete them? | 11:26 |
|
Seveas
| git doesn't like deleting files it doesn't know about, and only does so when specifically asked | 11:26 |
|
j416
| Minty_: try without github first; remove that from the equation. | 11:26 |
|
Minty_
| j416: ok | 11:27 |
|
j416
| Minty_: github is just a hosting provider with extra features. | 11:27 |
|
| Minty_: git works just fine without it. | 11:27 |
|
Minty_
| j416: ok, so here's what i'm going to do. locally; git init followed by git add .gitignore followed by git commit -m "Initial Commit", then git add .; git commit -m "Second Commit" | 11:28 |
|
| j416: once i've done all that, then i'll add a remote repo and push to it | 11:28 |
|
| that sound sensible? | 11:28 |
|
j416
| Minty_: mkdir foo; cd foo; echo "# My Foo Project" > README.md; git init; git add README.md; git commit -m 'Initiall commit' | 11:28 |
|
| Minty_: yes, sounds sensible. | 11:29 |
|
| Minty_: or just add it all in the first commit. | 11:29 |
|
| s/Initiall/Initial/ | 11:29 |
|
| can't spel today | 11:29 |
|
Minty_
| j416: i have loads of files that i need to exclude which is why i need my first commit to include gitignore | 11:29 |
| ← jelmer left | 11:30 |
|
j416
| Minty_: you don't _need_ .gitignore to not commit files. | 11:30 |
|
Minty_
| j416: i know but i want to use git add . | 11:30 |
|
j416
| Minty_: you can simply choose to not commit them. | 11:30 |
|
| Minty_: right. | 11:30 |
|
Minty_
| because there's quite a few | 11:30 |
|
| but also quite a few i don't want like pycharm files etc. | 11:30 |
| → jelmer joined | 11:30 |
|
j416
| so add whatever makes sense as some boilerplate for your project | 11:30 |
|
| readme, .gitignore, whatnot. | 11:30 |
|
| heck, even a first version of your project. | 11:31 |
|
| I quite like having a first commit with something rather generic, without program-specific things (well, apart from the name). That way I can steal that first commit and re-use it in similar projects and I don't have to reinvent the wheel every time. | 11:32 |
|
Minty_
| j416: i think this is just a warning message rather than an issue as it is working regardless but when i ran git push -u origin master, i got the below: | 11:32 |
|
| error: cannot spawn sh: No such file or directory | 11:32 |
|
j416
| that is unrelated to your workflow | 11:33 |
| ← vovs03 left | 11:33 |
|
j416
| never seen this error before. | 11:33 |
|
Minty_
| j416: ok thanks | 11:33 |
|
j416
| perhaps something with your prompt? | 11:33 |
|
Minty_
| j416: so now i have done 2 commits and pushed to github repo; https://github.com/adamcunnington/DataLake | 11:33 |
|
| j416: locally if i want to continue on develop; is the correct workflow as follows? git branch develop | 11:33 |
|
| git checkout develop | 11:34 |
|
j416
| "git branch dev && git checkout dev" is the same as "git checkout -b dev" | 11:34 |
|
| answer is yes; this will create a new branch. | 11:34 |
|
Minty_
| git pull origin develop | 11:34 |
|
| i need to do a pull right? | 11:34 |
|
j416
| no | 11:34 |
|
Minty_
| i mean i don't need to | 11:35 |
|
| but i want to - right? | 11:35 |
|
j416
| why? | 11:35 |
|
Minty_
| because develop should start off looking like master? | 11:35 |
| → amirpro_ joined | 11:35 |
|
j416
| does github have something you need? | 11:35 |
|
Minty_
| yea, my initial 2 commits | 11:35 |
|
| that i pushed to master | 11:35 |
|
j416
| you have those already | 11:35 |
|
Minty_
| i don't understand | 11:35 |
|
| surely they were commited to my local master branch? | 11:35 |
|
j416
| yes | 11:35 |
|
| so you have them | 11:35 |
|
Minty_
| and when i change branches, my new branch is "empty"? | 11:35 |
|
j416
| you don't need to download them | 11:35 |
|
| no | 11:35 |
|
| try it. | 11:36 |
|
| the new branch points to the current commit by default. | 11:36 |
|
Minty_
| j416: ahhh | 11:36 |
|
j416
| in your case, the last commit of master. | 11:36 |
|
Minty_
| clever | 11:36 |
|
| so git pull is when i want to "get latest changes" from central repo | 11:36 |
|
| which in this case is my github remote origin | 11:36 |
| → gareppa joined | 11:37 |
| ← amirpro left | 11:38 |
| amirpro_ → amirpro | 11:38 |
| ← dimi1947 left | 11:39 |
|
Minty_
| j416: how do i know when to use git push -u origin master vs. git push origin master | 11:39 |
| ← yeshurun left | 11:40 |
| → Regon joined | 11:44 |
|
j416
| man git-push | 11:46 |
|
gitinfo
| the git-push manpage is available at https://gitirc.eu/git-push.html | 11:46 |
|
j416
| Minty_: -u configures your repo so that next time you do 'git push', it knows you mean 'git push origin master' | 11:46 |
|
| Minty_: you can use 'git push origin master' every time if you prefer, but 'git push' suffices if you have given it -u once. | 11:47 |
|
| Minty_: you'd probably benefit from !book | 11:47 |
|
gitinfo
| Minty_: 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 | 11:47 |
|
Minty_
| j416: thanks | 11:50 |
|
j416
| Minty_: also, https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html | 11:50 |
|
| (referring to acde0bc00c02) | 11:50 |
| ← Nizumzen left | 11:50 |
| → taoqy joined | 11:51 |
| ← d^sh left | 11:53 |
| → Nizumzen joined | 11:53 |
| → d^sh joined | 11:53 |
| → cdown_ joined | 11:55 |
| → Singmyr joined | 11:55 |
| ← bwn left | 11:55 |
| ← amirpro left | 11:56 |
| → BouncyKnightMike joined | 11:56 |
| → jnavila joined | 11:57 |
| ← ok91 left | 11:57 |
| ← cdown left | 11:57 |
| cdown_ → cdown | 11:58 |
| ← Nizumzen left | 11:58 |
| ← gareppa left | 11:59 |
| → amirpro joined | 12:03 |
| ← xaa left | 12:05 |
| → tsaka__ joined | 12:05 |
| → gareppa joined | 12:10 |
| ← sunri5e left | 12:10 |
| → jikz joined | 12:11 |
| → sunri5e joined | 12:11 |
| → beefjoe joined | 12:11 |
| → Silenced joined | 12:13 |
| → bwn joined | 12:15 |
| ← jikz left | 12:16 |
| ← BouncyKnightMike left | 12:16 |
| → pfleck joined | 12:17 |
| → jikz joined | 12:17 |
| ← gareppa left | 12:18 |
| ← jikz left | 12:19 |
| → jikz joined | 12:20 |
| → kmt_ joined | 12:20 |
| ← kmt_ left | 12:20 |
| ← jikz left | 12:21 |
| → Halo joined | 12:21 |
| → jikz joined | 12:21 |
| Singmyr → Fraky | 12:22 |
| → ZyX-I joined | 12:22 |
| → dimi1947 joined | 12:24 |
| Fraky → Frakylol | 12:27 |
| ← plexigras left | 12:27 |
| → plexigras joined | 12:28 |
| → linuxmodder joined | 12:28 |
| ← linuxmodder left | 12:29 |
| → linuxmodder joined | 12:30 |
| → Karyon joined | 12:30 |
| ← a3Dman left | 12:34 |
| ← zulutango left | 12:35 |
| ← PioneerAxon left | 12:40 |
| → phinxy joined | 12:41 |
| → PioneerAxon joined | 12:42 |
| ← manuelschneid3r left | 12:43 |
| → Nizumzen joined | 12:47 |
| ← jikz left | 12:48 |
| ← navidr left | 12:48 |
| → _kk22kk_ joined | 12:48 |
| ← tsaka__ left | 12:52 |
| → Naq joined | 12:55 |
| ← Naq left | 12:55 |
|
{HD}
| gavit: its a mac so High Sierra | 12:57 |
| ← pfleck left | 12:58 |
| ← jnavila left | 12:58 |
| ← skisela left | 13:00 |
| ← Karyon left | 13:02 |
| ← amirpro left | 13:03 |
| → amirpro joined | 13:05 |
| ← amirpro left | 13:08 |
| → amirpro joined | 13:09 |
| ← redj_ left | 13:09 |
| ← Nizumzen left | 13:12 |
| ← amirpro left | 13:13 |
| ← linuxmodder left | 13:14 |
| → pfleck joined | 13:14 |
| → amirpro joined | 13:14 |
| ← dimi1947 left | 13:15 |
| ← amirpro left | 13:18 |
| ← pfleck left | 13:19 |
| ← beerdrop left | 13:19 |
| → pfleck joined | 13:20 |
| → Karyon joined | 13:23 |
| → amirpro_ joined | 13:24 |
| → cfoch joined | 13:24 |
| ← frobnic left | 13:24 |
| → frobnic joined | 13:25 |
| → amirpro joined | 13:25 |
| → PioneerAxon_ joined | 13:26 |
| → vovs03 joined | 13:26 |
| ← amirpro_ left | 13:28 |
| ← PioneerAxon left | 13:29 |
| → azur_kind joined | 13:29 |
| → beerdrop joined | 13:31 |
| → livingstn joined | 13:32 |
| ← liori left | 13:32 |
| → liori joined | 13:32 |
| → Plouescat joined | 13:33 |
| ← Plouescat left | 13:34 |
| → ferr joined | 13:35 |
| → Noldorin joined | 13:35 |
| ← vovs03 left | 13:37 |
| ← netj left | 13:37 |
| → netj joined | 13:38 |
| ← pix9 left | 13:46 |
| → pix9 joined | 13:46 |
| → ferdna joined | 13:48 |
| → p0s1x joined | 13:52 |
| ← p0s1x left | 13:53 |
| → skisela joined | 13:54 |
| ← rajat left | 13:57 |
| ← ferr left | 13:58 |
| ← pfleck left | 14:03 |
| → pfleck joined | 14:08 |
| ← inovas left | 14:09 |
| ← shinnya left | 14:09 |
| ← mohabaks left | 14:13 |
| → inovas joined | 14:13 |
| → CheckDavid joined | 14:19 |
| ← winfli left | 14:20 |
| ← typedef left | 14:22 |
| ← livingstn left | 14:27 |
| ← elichai2 left | 14:32 |
| → nnyk_ joined | 14:37 |
| → Nizumzen joined | 14:39 |
| → livingstn joined | 14:39 |
| → Naq joined | 14:41 |
| ← Naq left | 14:43 |
| → tsaka__ joined | 14:43 |
| ← livingstn left | 14:44 |
| → astrofog joined | 14:44 |
| ← amirpro left | 14:45 |
| ← zlsyx left | 14:47 |
| ← ferdna left | 14:47 |
| ← peterR`` left | 14:48 |
| ← jelmer left | 14:49 |
| → Cromulent|2 joined | 14:50 |
| → mud joined | 14:52 |
| ← astrofog left | 14:52 |
| ← Cromulent|2 left | 14:52 |
| ← Nizumzen left | 14:52 |
| → jelmer joined | 14:53 |
| → livingstn joined | 14:53 |
| ← sunri5e left | 14:53 |
| → Cromulent|2 joined | 14:54 |
| → sunri5e joined | 14:55 |
| → amirpro joined | 14:55 |
| ← tkore\w left | 14:59 |
| → zeroed joined | 15:00 |
| → tunekey joined | 15:02 |
| ← MrBiogene left | 15:04 |
| ← crmne left | 15:08 |
| ← pfleck left | 15:11 |
| → crmne joined | 15:12 |
| ← ruslangaripov left | 15:14 |
| → ruslangaripov joined | 15:14 |
| ← Soni left | 15:21 |
| ← czart_ left | 15:25 |
| → czart joined | 15:26 |
| → Soni joined | 15:27 |
| → rafasc joined | 15:28 |
| → ocds joined | 15:33 |
| → peterR`` joined | 15:34 |
| → Puffball joined | 15:35 |
| → moplo joined | 15:35 |
| ← Noldorin left | 15:37 |
| → Noldorin joined | 15:38 |
| ← _kk22kk_ left | 15:39 |
| → Mattiaslndstrm joined | 15:40 |
| → yeshurun joined | 15:41 |
| → al-damiri joined | 15:43 |
| → pfleck joined | 15:43 |
| → ok91 joined | 15:44 |
| ← pfleck left | 15:48 |
| → rosa joined | 15:49 |
| ← Eryn_1983_FL left | 15:49 |
| → thiago joined | 15:50 |
| ← ocds left | 15:51 |
| ← stoopkid left | 15:51 |
| ← nnyk_ left | 15:53 |
| ← moplo left | 15:53 |
| ← czart left | 15:54 |
| → moplo joined | 15:54 |
| ← moplo left | 15:55 |
| → czart joined | 15:55 |
| → pzp joined | 15:55 |
| → czart_ joined | 15:56 |
| ← czart_ left | 15:57 |
| → czart_ joined | 15:58 |
| ← rosa left | 15:59 |
| ← czart left | 16:00 |
| → czart__ joined | 16:00 |
| → Eryn_1983_FL joined | 16:02 |
| ← czart_ left | 16:03 |
| ← dreiss left | 16:06 |
| ← skisela left | 16:07 |
| ← tunekey left | 16:09 |
| ← amirpro left | 16:10 |
| → tunekey joined | 16:10 |
| → jready joined | 16:11 |
| → ki0 joined | 16:11 |
| → jimmyrcom joined | 16:13 |
| → rajat joined | 16:20 |
| → Ontaine joined | 16:21 |
| ← tvw left | 16:25 |
| → tkore\w joined | 16:26 |
| ← nevyn left | 16:27 |
| → amirpro joined | 16:30 |
| ← rajat left | 16:31 |
| → pfleck joined | 16:32 |
| ← pasky` left | 16:35 |
| ← pfleck left | 16:39 |
|
cfoch
| hello | 16:41 |
|
| why may"git submodule update" get stuck? | 16:41 |
|
cbreak
| missing commit in remote? :) | 16:42 |
| → pasky` joined | 16:42 |
|
cfoch
| how do I check that? That's not my repo. | 16:43 |
| ← zeroed left | 16:43 |
|
cbreak
| the error message should tell you | 16:44 |
| → a3Dman joined | 16:45 |
| ← tombusby left | 16:46 |
| → tombusby joined | 16:46 |
|
cfoch
| there is no error message | 16:46 |
|
| it just say "cloning into <some_path>" | 16:46 |
| ← Puffball left | 16:47 |
| → menip joined | 16:49 |
| ← menip left | 16:49 |
| → ocds joined | 16:49 |
|
thiago
| try to git clone manually | 16:49 |
| ← rafasc left | 16:49 |
|
cfoch
| yes, I have done that and it worked | 16:52 |
|
thiago
| did you do of the URL in .gitmodules? | 16:52 |
|
cfoch
| it's still rare that submodule update didn't work | 16:52 |
| ← livingstn left | 16:52 |
|
thiago
| it's unheard of | 16:53 |
| ← ki0 left | 16:57 |
| ← fr33domlover left | 16:58 |
| → livingstn joined | 17:00 |
| → cur8or joined | 17:00 |
| → rosa joined | 17:02 |
| → tymczenko joined | 17:03 |
| ← livingstn left | 17:03 |
| ← cur8or left | 17:04 |
| → stoopkid joined | 17:06 |
| ← rosa left | 17:06 |
| ← amirpro left | 17:07 |
| → zlsyx joined | 17:10 |
| → nnyk_ joined | 17:10 |
| ← zlsyx left | 17:14 |
| → rosa joined | 17:16 |
| → redj joined | 17:16 |
| → orbyt_ joined | 17:16 |
| → phluks joined | 17:16 |
| ← nnyk_ left | 17:18 |
| ← CheckDavid left | 17:18 |
| ← rosa left | 17:19 |
| ← atrigent left | 17:19 |
| → atrigent joined | 17:19 |
| → vdamewood joined | 17:20 |
| → livingstn joined | 17:21 |
| → osse joined | 17:24 |
| ← jready left | 17:26 |
| → jready joined | 17:26 |
| → amirpro joined | 17:27 |
| → hrd_04 joined | 17:28 |
| → energizer joined | 17:29 |
| ← jready left | 17:31 |
| → Karyon_ joined | 17:31 |
| ← Thominus left | 17:32 |
| → Thominus joined | 17:32 |
| ← Karyon left | 17:34 |
| ← livingstn left | 17:35 |
| → jakogut_ joined | 17:36 |
| ← TinkerT left | 17:36 |
| ← ruslangaripov left | 17:37 |
| → TinkerT joined | 17:38 |
| → jakogut__ joined | 17:42 |
| → dreiss joined | 17:42 |
| ← jakogut_ left | 17:43 |
| → Doginal joined | 17:47 |
| → xaa joined | 17:49 |
| → d3r3k joined | 17:51 |
| ← yeshurun left | 17:52 |
| → rosa joined | 17:53 |
| ← dreiss left | 17:53 |
| → hrd04 joined | 17:53 |
| ← hrd_04 left | 17:53 |
| ← Ontaine left | 17:53 |
| ← wget_ left | 17:55 |
| → dege joined | 17:57 |
| → basiclaser joined | 18:00 |
| → wget joined | 18:00 |
| ← raynold left | 18:01 |
| ← rosa left | 18:01 |
| ← orbyt_ left | 18:03 |
| → MACscr|lappy joined | 18:03 |
| ← beefjoe left | 18:05 |
| ← pzp left | 18:05 |
| → Ontaine joined | 18:06 |
| ← amirpro left | 18:08 |
| → hdon joined | 18:08 |
| ← vdamewood left | 18:09 |
| ← MACscr|lappy left | 18:10 |
| → zlsyx joined | 18:12 |
| ← hdon left | 18:13 |
| ← mattcen left | 18:13 |
| → ewitz joined | 18:16 |
| → rajat joined | 18:17 |
| → mattcen joined | 18:18 |
| → MACscr|lappy joined | 18:21 |
| ← Tobbi left | 18:22 |
| → gtristan joined | 18:23 |
| ← rajat left | 18:25 |
| ← sicinthehead left | 18:25 |
| ← MACscr|lappy left | 18:26 |
| → sicinthehead joined | 18:26 |
| → Tobbi joined | 18:28 |
| ← azur_kind left | 18:28 |
| → MACscr|lappy joined | 18:29 |
| → paul424 joined | 18:29 |
| → coumbole joined | 18:33 |
| ← MACscr|lappy left | 18:36 |
| → MACscr|lappy joined | 18:37 |
| ← dege left | 18:37 |
| ← Ontaine left | 18:37 |
| → Ontaine joined | 18:38 |
| ← Ontaine left | 18:38 |
| → Ontaine joined | 18:38 |
| ← Ontaine left | 18:39 |
| → Ontaine joined | 18:39 |
| ← Ontaine left | 18:40 |
| ← phinxy left | 18:40 |
| → Ontaine joined | 18:40 |
| ← Ontaine left | 18:40 |
| ← zlsyx left | 18:41 |
| → Ontaine joined | 18:42 |
| ← crmne left | 18:43 |
| → amatas joined | 18:43 |
| ← ok91 left | 18:44 |
| ← amatas left | 18:44 |
| → ok91 joined | 18:45 |
| → amatas joined | 18:45 |
| → YuGiOhJCJ joined | 18:46 |
| ← amatas left | 18:46 |
| → orbyt_ joined | 18:46 |
| → crmne joined | 18:47 |
| → ok92 joined | 18:47 |
| → pfleck joined | 18:47 |
| ← ok91 left | 18:47 |
| ok92 → ok91 | 18:47 |
| ← MACscr|lappy left | 18:48 |
| ← duke left | 18:48 |
| → Karyon joined | 18:49 |
| → duke joined | 18:50 |
| ← duke left | 18:50 |
| → duke joined | 18:50 |
| → jnavila joined | 18:50 |
| ← mmercer left | 18:52 |
| → ToBeFree joined | 18:52 |
| gitinfo set mode: +v | 18:52 |
| ← Ontaine left | 18:52 |
| ← Karyon_ left | 18:53 |
| → kgrimes joined | 18:54 |
| ← phluks left | 18:55 |
| → shodan` joined | 18:56 |
| → phluks joined | 18:56 |
| → hdon joined | 18:57 |
| ← ToBeFree left | 18:58 |
| ← shodan` left | 18:59 |
| ← Cromulent|2 left | 18:59 |
| → Nizumzen joined | 19:00 |
| ← phluks left | 19:02 |
| → kfoonamalik joined | 19:02 |
| → mkoed joined | 19:04 |
| ← mkoed left | 19:04 |
| → mkoed joined | 19:05 |
| ← Karyon left | 19:05 |
| ← xeno left | 19:05 |
| → Karyon joined | 19:06 |
| → nnyk_ joined | 19:06 |
| ← Karyon left | 19:06 |
| ← watsonjar2 left | 19:06 |
| → zonerd joined | 19:06 |
| ← Nizumzen left | 19:06 |
| gitinfo set mode: +v | 19:08 |
|
zonerd
| hi all | 19:08 |
|
gitinfo
| zonerd: 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. | 19:08 |
| → muelleme joined | 19:09 |
|
zonerd
| i'm such an idiot, I accidentally ran: git reset --hard HEAD^ | 19:09 |
|
| I meant to do soft reset | 19:09 |
|
_ikke_
| auch | 19:09 |
|
zonerd
| is there anyway to recover my uncommited changes | 19:09 |
|
dzho
| ouch | 19:09 |
|
| dzho doesn't know of a way | 19:09 |
|
dzho
| not unless you somehow had backups made some other way | 19:10 |
|
_ikke_
| either because you git added those specific changes, or your editor is smart enough to have those still in ab uffer | 19:10 |
|
| otherwise, your out of luck | 19:10 |
|
| dzho has done that | 19:10 |
|
zonerd
| no smart IDE, just sublime text | 19:10 |
|
dzho
| it's a hard lesson | 19:10 |
| → skisela joined | 19:10 |
|
_ikke_
| zonerd: something like undo perhaps? | 19:10 |
| ← skisela left | 19:11 |
|
zonerd
| I didnt have those files opened in the editor anyway | 19:11 |
| ← cdown left | 19:12 |
| ← thxffo left | 19:12 |
| ← hunterlabs left | 19:12 |
|
zonerd
| damn it, it seems I dont have any recent backups either.. | 19:12 |
| → Lyqyd joined | 19:12 |
|
_ikke_
| did you run git add by chance recently on those changes? | 19:13 |
| ← cfoch left | 19:13 |
|
zonerd
| no | 19:14 |
|
thiago
| if you have done a git diff on those uncommitted changes, then the files are still there | 19:15 |
|
| you can check them out | 19:15 |
|
zonerd
| not indexed nor commited. I know, I'm screwed... | 19:15 |
| → phinxy joined | 19:15 |
|
_ikke_
| thiago: diff does not add things to the index iirc | 19:15 |
|
zonerd
| he meant diff in the console, right? no luck | 19:16 |
|
Kobaz
| git git gitty up | 19:16 |
|
| so i'm having an issue where every time i do a pull, it does a merge | 19:16 |
|
| * 2.0 4f97b0b Merge branch '2.0' of foo.local:/git/Modules/Queue into 2.0 | 19:17 |
|
thiago
| _ikke_: I thought it git add'ed the file. Just checked, it doesn't. | 19:17 |
|
Kobaz
| i'm fully to to date with the remote branch | 19:17 |
| → gareppa joined | 19:17 |
|
| zonerd feels like screaming | 19:19 |
|
thiago
| Kobaz: nothing wrong there | 19:21 |
|
Kobaz
| usually i can just fast forward | 19:22 |
|
thiago
| Kobaz: being up to date does not mean you don't have *more* changes. | 19:22 |
|
| Kobaz: git status will tell you | 19:22 |
|
| git log @{u}.. | 19:22 |
|
Kobaz
| but *every single* pull, is a merge | 19:22 |
|
thiago
| that will show what you have more | 19:22 |
|
| yes | 19:22 |
|
Kobaz
| this is not normal | 19:22 |
| ← tymczenko left | 19:22 |
|
Kobaz
| i should be able to fast-forward, there's nothing fancy going on | 19:22 |
|
thiago
| you have at least one commit that upstream doesn't | 19:23 |
|
| so every pull is a merge, not a fast-forward | 19:23 |
| ← dermoth left | 19:23 |
| ← YuGiOhJCJ left | 19:23 |
| ← _aeris_ left | 19:23 |
| ← ghost43 left | 19:23 |
| ← Thominus left | 19:23 |
| ← _exotime_ left | 19:23 |
| ← tombusby left | 19:23 |
|
thiago
| this is entirely normal | 19:23 |
|
Kobaz
| how do i find that commit | 19:23 |
|
thiago
| 12:22 < thiago> git log @{u}.. | 19:23 |
|
| including the two dots | 19:23 |
|
dzho
| interesting | 19:24 |
|
Kobaz
| from where to where? | 19:24 |
| ← craftyguy left | 19:24 |
| → dermoth joined | 19:24 |
|
thiago
| sorry, what? | 19:24 |
|
zonerd
| you could also fetch first, then rebase manually | 19:24 |
| → YuGiOhJCJ joined | 19:24 |
| → ghost43 joined | 19:24 |
| → tombusby joined | 19:24 |
| → Goplat joined | 19:24 |
|
Kobaz
| git log @{u} --oneline | wc -l -> 2437 | 19:25 |
| → _aeris_ joined | 19:25 |
| → craftyguy joined | 19:25 |
|
Kobaz
| i definitely haven't diverged 2437 commits | 19:25 |
| → exotime joined | 19:25 |
|
thiago
| maybe upstream rebased | 19:25 |
|
| is that possible? | 19:25 |
| ← phinxy left | 19:25 |
|
Kobaz
| i tried a rebase a while ago locally that failed | 19:25 |
|
| i reverted everything | 19:25 |
|
thiago
| do you want to throw away any possible changes you have? | 19:26 |
|
| git reset --hard @{u} | 19:26 |
| → Thominus joined | 19:26 |
|
thiago
| but if upstream rebases, the problem will show up again | 19:26 |
|
Kobaz
| i can make a copy and try that | 19:26 |
| → phinxy joined | 19:26 |
| ← gareppa left | 19:26 |
|
thiago
| if you made a mistake in rebasing, this could also be the cause | 19:26 |
| ← muelleme left | 19:27 |
| ← kfoonamalik left | 19:27 |
| → gareppa joined | 19:28 |
| ← Thominus left | 19:28 |
| ← energizer left | 19:29 |
| → fstd_ joined | 19:29 |
| → energizer joined | 19:29 |
| → linuxmodder joined | 19:29 |
| → tymczenko joined | 19:29 |
| ← energizer left | 19:29 |
| → energizer joined | 19:30 |
| → Thominus joined | 19:31 |
| → hunterlabs joined | 19:32 |
| ← fstd left | 19:32 |
| fstd_ → fstd | 19:32 |
| → thxffo joined | 19:33 |
| → piggah_ joined | 19:34 |
| ← hrd04 left | 19:34 |
| → manuelschneid3r joined | 19:34 |
| → zlsyx joined | 19:34 |
| ← gareppa left | 19:35 |
| ← nnyk_ left | 19:35 |
| ← netj left | 19:38 |
| → netj joined | 19:38 |
| → wootehfoot joined | 19:39 |
| ← zlsyx left | 19:39 |
| → hseg joined | 19:41 |
| → livingstn joined | 19:41 |
|
hseg
| Hi. I accidentally committed a version of a config file with passwords. Have cleaned history so all branches don't point to that history. A) Will git gc throw out that commit? B) How can I check this? | 19:42 |
|
| (e.g. in B) is there some way I can see all stored versions of that path?) | 19:42 |
| → _antares_ joined | 19:43 |
| → jready joined | 19:44 |
|
_ikke_
| hseg: Eventually GC will remove those objects, given they are not referenced anymore | 19:44 |
| → austin987 joined | 19:44 |
|
_ikke_
| The eventually is because 1. objects new than 14 days are not removed, and 2. the reflog keeps a reference to objects for 90 days by default | 19:45 |
|
| newer* | 19:45 |
|
hseg
| Hm. OK. | 19:45 |
|
| Can live with that. Any way to check they've been removed? | 19:46 |
|
| e.g. my point B) above? | 19:46 |
| ← jnavila left | 19:47 |
|
_ikke_
| git log --patch --full-history --all -- path/to/file should show you all commits + diffs for that specific file | 19:48 |
|
| everything that is referenced that is | 19:48 |
|
hseg
| Nope, password commit doesn't show up. | 19:49 |
|
| But if I add --reflog, it shows up | 19:49 |
|
_ikke_
| right, that's expected | 19:50 |
|
| but the reflog is never pushed | 19:50 |
|
| I mean, if objects are just referenced by the reflog | 19:50 |
|
hseg
| Good. Reflog expiry is time-based or entry-based? | 19:50 |
| ← Thominus left | 19:51 |
| → YoungJedi joined | 19:51 |
|
hseg
| I suppose that when this entry expires from the reflog, it won't show up anymore. | 19:51 |
| → snowkidind joined | 19:51 |
|
_ikke_
| time based | 19:51 |
|
| 90 days | 19:51 |
| → Thominus joined | 19:51 |
|
_ikke_
| You can run git reflog --expire-unreachable to expire entries that are no longer reachable anymore | 19:52 |
|
hseg
| Unrecognized argument | 19:52 |
| ← Thominus left | 19:52 |
| → Thominus joined | 19:53 |
|
hseg
| Oh, it needs a timestamp argument | 19:53 |
| → jnavila joined | 19:53 |
|
hseg
| What's the format? YYYY-MM-DDTHH:mm:ss? | 19:56 |
| ← YoungJedi left | 19:59 |
|
hseg
| Nm, found solution. Thanks! | 19:59 |
| ← hseg left | 19:59 |
| ← minionofgozer_ left | 20:00 |
| ← linuxmodder left | 20:00 |
| ← Thominus left | 20:02 |
| → Thominus joined | 20:02 |
| ← hdon left | 20:04 |
| → dege joined | 20:04 |
| → rosa joined | 20:05 |
| → amirpro joined | 20:05 |
| ← jready left | 20:08 |
| → nnyk_ joined | 20:08 |
| ← rosa left | 20:08 |
| → jready joined | 20:08 |
| → ryanjohnstonyyc joined | 20:08 |
| → rosa joined | 20:12 |
| ← nnyk_ left | 20:12 |
| ← jnavila left | 20:12 |
| → hdon joined | 20:12 |
| ← jready left | 20:13 |
| → jready joined | 20:17 |
| → reaper joined | 20:18 |
| → sheeldotme joined | 20:18 |
| → Bobdude joined | 20:19 |
| ← reaper left | 20:20 |
| → reaper joined | 20:21 |
| ← rosa left | 20:22 |
| → rosa joined | 20:23 |
| ← reaper left | 20:24 |
| → YoungJedi joined | 20:24 |
| ← YoungJedi left | 20:25 |
| → jnavila joined | 20:27 |
| ← zonerd left | 20:27 |
| ← rosa left | 20:27 |
| ← jnavila left | 20:27 |
| ← raymond left | 20:28 |
|
sheeldotme
| Hey all, after I create a commit using libgit I still see changes to be committed in "git status". "git add ." resolves this, I'd really appreciate any pointers as to what I may be missing. Thanks! | 20:28 |
| → gloomy joined | 20:29 |
| → raymond joined | 20:29 |
| mlopezviedma_ → mlopezviedma | 20:30 |
| ← pfleck left | 20:30 |
| → rosa joined | 20:30 |
| ← phinxy left | 20:31 |
| ← livingstn left | 20:31 |
| → phinxy joined | 20:32 |
| ← rosa left | 20:33 |
| → ferdna joined | 20:35 |
| ← phinxy left | 20:35 |
|
skered
| I can do 'git log -n1 6e2688872' and I get the proper log message for that commit however I'm trying to find the branch that has this commit. 'git branch --contains 6e2688872' returns nothing. | 20:36 |
| → pfleck joined | 20:36 |
|
skered
| Is this the wrong way to find the branch? Or is there another way? | 20:36 |
|
_ikke_
| sheeldotme: you need to somehow update the index before you commit | 20:36 |
|
| skered: are you sure that commit is still being referenced somehow? | 20:37 |
|
skered
| _ikke_: Yes, because I can get the commit message? | 20:38 |
|
_ikke_
| doesn't mean anything | 20:38 |
|
| as long as that object is still available, you can query it | 20:38 |
|
sheeldotme
| _ikke_ I'm calling the rust equivalent of the c function: git_index_write_tree, should that not be sufficient? https://libgit2.github.com/libgit2/#HEAD/group/index/git_index_write_tree | 20:39 |
|
| "This method will scan the index and write a representation of its current state back to disk; it recursively creates tree objects for each of the subtrees stored in the index, but only returns the OID of the root tree." | 20:39 |
|
_ikke_
| sheeldotme: you need it the other way around | 20:39 |
|
sheeldotme
| _ikke_ even if I'm manually adding the path to the index before hand? | 20:41 |
| → livingstn joined | 20:41 |
| ← Silenced left | 20:42 |
| ← paul424 left | 20:43 |
|
_ikke_
| sheeldotme: I don't know libgit that well | 20:44 |
| → menip joined | 20:44 |
| ← menip left | 20:44 |
|
_ikke_
| sheeldotme: but the symptoms indicate that the changes haven't been added to the index | 20:45 |
|
sheeldotme
| Oh, that's fair, I'll look into your suggestion though, I agree that's what it sounds like. Thanks for your help _ikke_! | 20:45 |
| → zulutango joined | 20:46 |
| ← livingstn left | 20:50 |
| → zlsyx joined | 20:53 |
| ← dege left | 20:54 |
| ← drodger left | 20:55 |
| ← ok91 left | 20:55 |
| ← Thominus left | 20:56 |
| → Thominus joined | 20:56 |
| → minionofgozer joined | 20:57 |
| ← Thominus left | 20:58 |
| → drodger joined | 20:59 |
| ← stevenbenner left | 20:59 |
| ← pasky` left | 21:00 |
| ← jelmer left | 21:01 |
| → jelmer joined | 21:01 |
| → phinxy joined | 21:07 |
| → livingstn joined | 21:08 |
| → NightStrike joined | 21:08 |
| → nnyk_ joined | 21:09 |
| ← minionofgozer left | 21:09 |
| → minionofgozer joined | 21:11 |
| ← borkr left | 21:12 |
| ← Phylock left | 21:13 |
| ← tombusby left | 21:13 |
| → tombusby joined | 21:13 |
| ← gloomy left | 21:16 |
| ← Mattiaslndstrm left | 21:16 |
| ← jast left | 21:18 |
| ← livingstn left | 21:18 |
| → jast joined | 21:19 |
| → Thominus joined | 21:20 |
| ← hdon left | 21:21 |
| → pasky` joined | 21:21 |
| → dege joined | 21:24 |
| → Mattiaslndstrm joined | 21:25 |
| ← phinxy left | 21:27 |
| ← mattcen left | 21:28 |
| ← peterR`` left | 21:28 |
| → Karyon joined | 21:28 |
| ← Thominus left | 21:29 |
| ← zlsyx left | 21:29 |
| → Thominus joined | 21:30 |
| → phinxy joined | 21:30 |
| → kfoonamalik joined | 21:30 |
| → rosa joined | 21:31 |
| ← mkoed left | 21:32 |
| → mkoed joined | 21:33 |
| ← rosa left | 21:33 |
| → derkooh joined | 21:34 |
| → rosa joined | 21:36 |
| → cur8or joined | 21:37 |
| ← pfleck left | 21:37 |
| ← kgrimes left | 21:38 |
| → pfleck joined | 21:38 |
| ← rosa left | 21:38 |
| → ki0 joined | 21:39 |
| ← amirpro left | 21:41 |
| ← cur8or left | 21:41 |
| → barnett joined | 21:42 |
| → amirpro joined | 21:42 |
| ← dege left | 21:42 |
| ← derkooh left | 21:43 |
| → derkooh joined | 21:43 |
| ← amirpro left | 21:44 |
| ← derkooh left | 21:44 |
| → amirpro joined | 21:44 |
| → livingstn joined | 21:46 |
| ← kfoonamalik left | 21:46 |
| ← ki0 left | 21:47 |
| ← sheeldotme left | 21:48 |
| → hdon joined | 21:49 |
| → mattcen joined | 21:50 |
| ← YuGiOhJCJ left | 21:50 |
| ← phinxy left | 21:50 |
| → phinxy joined | 21:52 |
| ← wootehfoot left | 21:52 |
| ← phinxy left | 21:52 |
| ← _antares_ left | 21:52 |
| ← livingstn left | 21:53 |
| ← hdon left | 21:54 |
| → fabioluciano joined | 21:56 |
| ← fabioluciano left | 21:56 |
| → phinxy joined | 21:58 |
| → kgrimes joined | 21:59 |
| ← barnett left | 22:04 |
| ← Karyon left | 22:05 |
| ← govg left | 22:05 |
| → Karyon joined | 22:06 |
| ← nnyk_ left | 22:06 |
| ← Thominus left | 22:07 |
| → govg joined | 22:07 |
| → Thominus joined | 22:07 |
| → kfoonamalik joined | 22:08 |
| ← Thominus left | 22:09 |
| ← kfoonamalik left | 22:09 |
| → hdon joined | 22:10 |
| ← hdon left | 22:11 |
| → hdon joined | 22:11 |
| ← govg left | 22:11 |
| ← phinxy left | 22:12 |
| → govg joined | 22:12 |
| → kn-928 joined | 22:14 |
| ← kn-928 left | 22:15 |
| → nnyk_ joined | 22:15 |
| → phinxy joined | 22:16 |
| → bluepixe1 joined | 22:18 |
| ← nowhere_man left | 22:18 |
| ← bluepixel left | 22:18 |
| → Thominus joined | 22:21 |
| → nowhere_man joined | 22:21 |
| ← schleppel left | 22:25 |
| ← tymczenko left | 22:27 |
| → gkn joined | 22:27 |
| ← comptroller left | 22:31 |
| ← thiago left | 22:32 |
| ← nnyk_ left | 22:33 |
| ← inovas left | 22:33 |
| ← alex_rus left | 22:33 |
| ← Gurkenglas left | 22:35 |
| ← drodger left | 22:35 |
| → fabioluciano joined | 22:36 |
| ← fabioluciano left | 22:36 |
| → drodger joined | 22:37 |
| → inovas joined | 22:39 |
| → CannedSpinach joined | 22:39 |
| → fabioluciano joined | 22:40 |
| → ki0 joined | 22:40 |
| → tymczenko joined | 22:41 |
| ← phinxy left | 22:42 |
| ← wintrytbs left | 22:43 |
| ← Regon left | 22:43 |
| ← manuelschneid3r left | 22:45 |
| → comptroller joined | 22:47 |
| → phinxy joined | 22:47 |
| ← nahtnam left | 22:49 |
| ← ki0 left | 22:51 |
| → venmx joined | 22:51 |
| → cdown joined | 22:54 |
| ← john-34 left | 23:01 |
| ← taoqy left | 23:01 |
| ← fabioluciano left | 23:01 |
| → fabioluciano joined | 23:02 |
| ← fabioluciano left | 23:02 |
| ← stoopkid left | 23:02 |
| → fabioluciano joined | 23:02 |
| → john-34 joined | 23:03 |
| ← jready left | 23:03 |
| ← phinxy left | 23:04 |
| → jready joined | 23:04 |
| ← finalbeta left | 23:04 |
| → phinxy joined | 23:05 |
| ← phinxy left | 23:08 |
| → stoopkid joined | 23:08 |
| ← jready left | 23:08 |
| ← venmx left | 23:10 |
| ← _ikke_ left | 23:10 |
| → goweol joined | 23:11 |
| → zlsyx joined | 23:11 |
| → bluepixel joined | 23:11 |
| → rafasc joined | 23:12 |
| → jready joined | 23:12 |
| ← fabioluciano left | 23:13 |
| → dreiss joined | 23:13 |
| → Gurkenglas joined | 23:14 |
| → phinxy joined | 23:14 |
| ← bluepixe1 left | 23:14 |
| → _ikke_ joined | 23:14 |
| ← phinxy left | 23:17 |
| ← mattcen left | 23:17 |
| → phinxy joined | 23:18 |
| ← snowkidind left | 23:18 |
| ← netj left | 23:19 |
| → netj joined | 23:19 |
| → mel00010 joined | 23:21 |
| ← hdon left | 23:22 |
| ← Karyon left | 23:23 |
| ← amirpro left | 23:23 |
| → t0adst00l joined | 23:24 |
| → dpyro joined | 23:25 |
| → amirpro joined | 23:26 |
| → mattcen joined | 23:26 |
| ← dreiss left | 23:27 |
| ← sameerynho left | 23:28 |
| ← amirpro left | 23:29 |
| → amirpro joined | 23:30 |
| ← wagle left | 23:30 |
| → wagle joined | 23:30 |
| ← _ikke_ left | 23:31 |
| ← kgrimes left | 23:32 |
| ← tymczenko left | 23:32 |
| ← jelmer left | 23:32 |
| → jelmer joined | 23:34 |
| → Karyon joined | 23:34 |
| → kgrimes joined | 23:35 |
| → dviola joined | 23:36 |
| ← coumbole left | 23:36 |
| → _ikke_ joined | 23:37 |
| → barnett joined | 23:38 |
| ← basiclaser left | 23:40 |
| ← ghormoon left | 23:41 |
| ← orbyt_ left | 23:44 |
| → atrigent_ joined | 23:44 |
| ← t0adst00l left | 23:48 |
| ← atrigent left | 23:48 |
| ← barnett left | 23:48 |
| → orbyt_ joined | 23:49 |
| → t0adst00l joined | 23:51 |
| → hdon joined | 23:57 |
| ← phinxy left | 23:58 |
| ← CannedSpinach left | 23:59 |