| 2019-12-12 |
| ← thiago left | 00:00 |
| ← CryptoDavid left | 00:08 |
| ← CarlFK left | 00:13 |
| ← Kremator left | 00:14 |
| ← silverwhitefish left | 00:16 |
| ← feriman left | 00:17 |
| ← Phylock left | 00:18 |
| ← IAmNetx left | 00:19 |
| ← Copenhagen_Bram left | 00:19 |
| → sidetrack joined | 00:19 |
| ← sidetrack left | 00:23 |
| → sidetrack joined | 00:23 |
| → jfariasf joined | 00:24 |
| → Copenhagen_Bram1 joined | 00:24 |
| Copenhagen_Bram1 → Copenhagen_Bram | 00:25 |
| ← fahadash left | 00:26 |
| ← sidetrack left | 00:28 |
| ← n3wborn left | 00:34 |
| → Viridian joined | 00:40 |
| ← Viridian__ left | 00:41 |
| → fphilipe joined | 00:42 |
| ← fphilipe left | 00:47 |
| ← CipherMethod left | 00:48 |
|
foo
| Looking for someone to confirm my understanding: if I'm on branchA and I want to update it with staging, in branchA I do: git rebase staging. In this scenario, I'm rebasing branchA onto staging. When I get a conflict, and it says <<<<<<< HEAD ... it's referring to staging, correct? | 00:50 |
|
| I believe yes on both questions | 00:50 |
| ← mowcat left | 00:56 |
| ← saint_ left | 00:57 |
| → mowcat joined | 00:57 |
| → saint_ joined | 01:00 |
| ← mowcat left | 01:03 |
| → mowcat joined | 01:05 |
|
_0x40_
| How do I delete all local branches from a single remote? I did `git fetch $remote` instead of `git fetch $remote $branch_i_wanted` and now I have like 200 branches. | 01:10 |
| ← agowa338 left | 01:11 |
|
_0x40_
| (I want to delete them ONLY from .git, and not from the remote as well, just to be clear) | 01:11 |
| → physikoi joined | 01:16 |
| → omnireq joined | 01:16 |
| ← Codaraxis left | 01:17 |
| → ethernether joined | 01:20 |
| ChanServ set mode: +o | 01:21 |
| ← physikoi left | 01:21 |
| ← ethernether left | 01:22 |
| Eugene changed the topic to: Welcome to #git | First visit? https://gitirc.eu | Current stable version: 2.24.1 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel is logged: https://gitirc.eu/log | git happens | 01:22 |
| Eugene kicked Eugene (de-op) | 01:22 |
| → Eugene joined | 01:22 |
|
bin_bash
| ... | 01:23 |
|
| Eugene: you know you can just de-op yourself.. right? you don;t have to kick youself from the channel... | 01:23 |
|
Eugene
| If I had a nickel for every time somebody said that, I'd have about three fiddy | 01:23 |
| → ethernether joined | 01:23 |
|
bin_bash
| well you should try it | 01:24 |
| ← ethernether left | 01:25 |
|
bin_bash
| it's not a good look to kick yourself to de-op | 01:25 |
|
phy1729
| you should add a bot trigger to count up the nickles | 01:25 |
| ← Copenhagen_Bram left | 01:25 |
|
bremner
| bin_bash: I think you probably worry too much. Eugene can take care of itself. | 01:25 |
|
bin_bash
| nah it's not a worry | 01:26 |
|
Eugene
| I like how much time people talk about it | 01:26 |
| → ethernether joined | 01:26 |
|
bremner
| craves attention, that bot | 01:26 |
|
bin_bash
| more like it's a bad look for the channel is the operators don't know basic commands, so figured better to say something than nothing | 01:26 |
|
| ¯\_(ツ)_/¯ | 01:26 |
|
Eugene
| OoooOoooh, the operator karma reasoning, that's a new one. | 01:27 |
|
bin_bash
| karma? | 01:27 |
|
| how is it karma in any way? | 01:27 |
| ← ethernether left | 01:27 |
| → milkt joined | 01:28 |
| → ethernether joined | 01:29 |
| → ExeciN joined | 01:31 |
| → orbyt_ joined | 01:33 |
| → thiago joined | 01:39 |
| ← duderonomy left | 01:39 |
| → duderonomy joined | 01:40 |
| → fphilipe joined | 01:42 |
| ← duderonomy left | 01:45 |
| ← fphilipe left | 01:48 |
| → akemhp_ joined | 01:49 |
| ← vrih left | 01:50 |
| → akem__ joined | 01:51 |
| ← akemhp left | 01:52 |
| ← mat001 left | 01:52 |
| ← akemhp_ left | 01:54 |
| ← Sasazuka left | 01:54 |
| ← zalt_ left | 01:56 |
| ← mowcat left | 01:57 |
| → jaziz1 joined | 01:58 |
| ← kerframil left | 02:01 |
| ← jaziz left | 02:01 |
| ← jfariasf left | 02:02 |
| → vrih joined | 02:08 |
| ← Mindi left | 02:10 |
| ← vostok4 left | 02:11 |
| ← ethernether left | 02:13 |
| → ethernether joined | 02:13 |
| ← utrack left | 02:13 |
| ← anddam left | 02:16 |
| → lightstalker joined | 02:17 |
| ← ethernether left | 02:18 |
| → vostok4 joined | 02:18 |
| → ethernether joined | 02:19 |
| → utrack joined | 02:20 |
| → maestrojed joined | 02:23 |
| ← lucasb left | 02:23 |
| → Mindi joined | 02:24 |
| ← maestrojed left | 02:24 |
| ← plasticle left | 02:27 |
|
foo
| fffOB/w 2 | 02:28 |
| → plasticle joined | 02:28 |
| → anddam joined | 02:29 |
| → z8z joined | 02:31 |
| → deltab joined | 02:32 |
| → Copenhagen_Bram joined | 02:32 |
|
Copenhagen_Bram
| Is a wiki on a github project a part of the git repo? | 02:32 |
|
| Or is the wiki purely a github feature? | 02:32 |
|
foo
| Repeat, I believe this is relatively simple for someone experienced: Looking for someone to confirm my understanding: if I'm on branchA and I want to update it with staging, in branchA I do: git rebase staging. In this scenario, I'm rebasing branchA onto staging. When I get a conflict, and it says <<<<<<< HEAD ... it's referring to staging, correct? | 02:33 |
|
| Basically looking for "yes, that's correct" :) | 02:33 |
| → maestrojed joined | 02:34 |
|
foo
| Nevermind. https://stackoverflow.com/questions/23207791/git-rebase-conflict-who-is-head explains it... HEAD is actually neither. This sums it up: "Again, HEAD or local or --ours is a commit that rebase has built by combining your changes and their changes, and the other commit (remote or >>>>>>> or --theirs) is your own commit, which rebase is trying to copy atop HEAD." | 02:37 |
| → physikoi joined | 02:40 |
| ← F0rTex left | 02:40 |
| → F0rTex joined | 02:41 |
| ← dionysus69 left | 02:43 |
| ← howdoi left | 02:44 |
|
thiago
| Copenhagen_Bram: there's no wiki feature in Git. That's a GitHub feature. | 02:46 |
|
Copenhagen_Bram
| ah | 02:46 |
| ← phy1729 left | 02:47 |
|
Copenhagen_Bram
| I discovered you can clone a wiki from github though | 02:47 |
|
thiago
| foo: what does it say in the >>>> line? | 02:47 |
|
Copenhagen_Bram
| Although I tried and it asked me for my github username | 02:47 |
|
foo
| thiago: it says my branch name that is causing the conflict (that's likely in branchA and not in staging) | 02:49 |
|
| thiago: that is what leads me to believe that HEAD is in staging... but it turns out it's not actually in staging) | 02:50 |
| ← omnireq left | 02:51 |
| ← ethernether left | 02:55 |
| ← oatmealraisin left | 02:59 |
| → Sasazuka joined | 03:01 |
| → fstd_ joined | 03:05 |
| → sidetrack joined | 03:06 |
| → Wetmelon joined | 03:09 |
| ← fstd left | 03:09 |
| fstd_ → fstd | 03:09 |
| → Codaraxis joined | 03:11 |
| ← sidetrack left | 03:11 |
| ← dartmouthed left | 03:15 |
|
thiago
| foo: HEAD isi the commit you are right now (staging) | 03:17 |
|
| the remote is what was on your branch and is being re-applied | 03:17 |
| → juhwad__ joined | 03:19 |
|
foo
| thiago: oh, but I thought it wasn't that black-and-white, I thought head was constructed from... hmm. ok | 03:20 |
| ← jaziz1 left | 03:21 |
| ← Cabanossi left | 03:28 |
| → ezzzc joined | 03:32 |
| → def_jam joined | 03:34 |
| → eb0t_ joined | 03:34 |
| ← eb0t left | 03:35 |
| → Cabanossi joined | 03:35 |
| ← eblip left | 03:35 |
| → fphilipe joined | 03:44 |
| ← Viridian left | 03:46 |
| ← physikoi left | 03:48 |
| ← fphilipe left | 03:49 |
| → spacefrog joined | 03:51 |
| ← ezzzc left | 03:58 |
| → sidetrack joined | 03:59 |
| lagothrix → Guest1120 | 03:59 |
| ← Guest1120 left | 03:59 |
| → aw1__ joined | 04:00 |
| → lagothrix joined | 04:00 |
| ← aw1_ left | 04:01 |
| ← caskd left | 04:03 |
| ← sidetrack left | 04:03 |
| → caskd joined | 04:04 |
| → duderonomy joined | 04:04 |
| → alezandro joined | 04:08 |
| ← cbreak left | 04:09 |
| → cbreak joined | 04:10 |
| ← oxguy3 left | 04:10 |
| → nav2002 joined | 04:12 |
| ← Giant81 left | 04:13 |
| ← Codaraxis left | 04:17 |
| ← vostok4 left | 04:18 |
| → vostok4 joined | 04:18 |
| ← maestrojed left | 04:19 |
| → sidetrack joined | 04:24 |
| → maestrojed joined | 04:28 |
| Copenhagen_Bram → Elon_Sat0shi | 04:28 |
| ← fk left | 04:29 |
| ← sidetrack left | 04:29 |
| → fk joined | 04:29 |
| ← maestrojed left | 04:30 |
| ← rafasc left | 04:35 |
| → oxguy3 joined | 04:57 |
| ← Furai left | 04:58 |
| → Furai joined | 05:00 |
| → pks_ joined | 05:01 |
| → igemnace joined | 05:04 |
| ← pks left | 05:04 |
| pks_ → pks | 05:04 |
| ← Sasazuka left | 05:12 |
| ← jlosito left | 05:15 |
| ← bket left | 05:15 |
| → jlosito joined | 05:16 |
| ← bvdw left | 05:18 |
| → bket joined | 05:18 |
| → bvdw joined | 05:19 |
| ← envex left | 05:20 |
|
dysfigured
| i've made myself a "starter-kit" repo to bootstrap web projects from, and i have a few branches on it with various different features (eg master is just plain react, i have an express branch, and an apollo branch with ssr) and levels of "complexity" but i'm pretty much just re-doing the same work in different branches because it's easier than dealing with merge conflicts, and i can't help feeling like | 05:20 |
|
| i'm missing out on crucial git features for this kind of thing but i don't know what i don't know, can anybody point me in the right direction? | 05:20 |
| ← dmc left | 05:32 |
|
_ikke_
| dysfigured: I don't think using branches for these things is the right way tgo | 05:35 |
|
dysfigured
| i mean they're all (supposed to be just) slight variations of the backend for the same react app, which is why it made sense to use branches | 05:37 |
| → planetcall|work joined | 05:37 |
| → crose joined | 05:37 |
| → zalt_ joined | 05:38 |
|
dysfigured
| (at least in my mind anyway) | 05:38 |
| → sidetrack joined | 05:38 |
|
_ikke_
| yes, but like you noticed, it's difficult to keep each branch up-to-date | 05:38 |
|
| you need to costantly either merge or rebase | 05:39 |
|
| for each branch | 05:39 |
|
dysfigured
| so instead of using git branches, i should continue re-doing the same work but in different repositories? | 05:40 |
| ← Inline left | 05:41 |
| ← crose left | 05:42 |
| → crose joined | 05:42 |
| ← sidetrack left | 05:42 |
| → Helenah joined | 05:44 |
| → fphilipe joined | 05:45 |
| ← fphilipe left | 05:50 |
|
dysfigured
| i'm also trying to avoid big giant commits that change too many things, any tips on breaking this habit? | 05:50 |
| → mikami joined | 05:50 |
|
_ikke_
| try to commit early and often (which is hard) | 05:51 |
|
| use tools that let you easily select what the commit | 05:51 |
| → dmc joined | 05:53 |
| → omnireq joined | 05:58 |
| ← axisys left | 06:07 |
| → axisys joined | 06:08 |
| ← ilmostro left | 06:08 |
| → ilmostro joined | 06:11 |
| ← jcbitter left | 06:12 |
| → Mattiaslndstrm joined | 06:24 |
| → IAmNetx joined | 06:26 |
| ← orbyt_ left | 06:26 |
| ← zalt_ left | 06:30 |
| → sauvin joined | 06:30 |
| → Noti joined | 06:30 |
| → sidetrack joined | 06:31 |
| → Stace joined | 06:35 |
| ← sidetrack left | 06:36 |
| ← localhorse left | 06:37 |
|
Stace
| hi all, I'm reviewing a pull request for the first time in github and their code has a couple of errors. Obviously I reject it, but can I make a new commit on their branch to fix it or is that frowned upon? | 06:38 |
|
| reject it as in not merge it | 06:38 |
|
| Stace isn't familiar with the ettiquette of git pull requests. | 06:39 |
| ← Mattiaslndstrm left | 06:39 |
|
pandem1
| depends on your team but i would not make a new commit there, but rather let the original author fix it | 06:39 |
|
| or if they don't have time discuss about it and if you agree then fix it | 06:40 |
| → Mattiaslndstrm joined | 06:40 |
|
Stace
| pandem1: on thanks. They're on a different team from me - I'm actually a hardware designer - so I don't really deal with this stuff often. | 06:49 |
|
| *ok | 06:49 |
| → sidetrack joined | 06:51 |
| ← sidetrack left | 06:56 |
|
Timvde
| Is there a way to easily reset to the origin branch with the same name without actually having to type the branch name? (like you can use `git push origin HEAD` to push) | 06:59 |
| → envex joined | 06:59 |
| ← gxt left | 07:00 |
| ← gavlee left | 07:05 |
| → TomekStano joined | 07:07 |
| → gavlee joined | 07:10 |
| ← oxguy3 left | 07:10 |
| → sidetrack joined | 07:11 |
| ← tmz left | 07:12 |
| → g00s joined | 07:13 |
| → Codaraxis joined | 07:14 |
| → oxguy3 joined | 07:14 |
| ← sidetrack left | 07:16 |
| → omnireq_ joined | 07:19 |
| ← omnireq left | 07:21 |
| ← akem__ left | 07:25 |
| → thevishy joined | 07:25 |
| ← thevishy left | 07:26 |
| → chele joined | 07:30 |
| → gloomy joined | 07:32 |
| → monr0e joined | 07:33 |
| ← maxwilliamson left | 07:34 |
| → maxwilliamson joined | 07:35 |
| → sQVe joined | 07:37 |
| → fphilipe joined | 07:37 |
| → n3wborn joined | 07:42 |
| → sidetrack joined | 07:42 |
| → a-l-e joined | 07:44 |
| ← thiago left | 07:45 |
| → rfuentess joined | 07:45 |
|
a-l-e
| hi... i have a merge conflict after "git stash pop". now, i just want to "reset" the one conflicting file to the master... any hint? | 07:46 |
| → thevishy joined | 07:46 |
|
a-l-e
| can i do "git reset filename"? | 07:47 |
| ← sidetrack left | 07:47 |
|
Moongoodgirl
| `git checkout master -- file` will clobber the file in the working tree with the version from master (make sure you don't have any uncommitted changes) | 07:48 |
| → Phylock joined | 07:49 |
| ← thevishy left | 07:49 |
|
a-l-e
| following the hint to use "git restore --staged" seems to have solved the issue... | 07:50 |
| → TomyLobo2 joined | 07:59 |
| → Belliash joined | 08:03 |
| → Jackneill joined | 08:04 |
| → reprazent joined | 08:05 |
| ← gloomy left | 08:06 |
| → gloomy joined | 08:07 |
| → jayjo joined | 08:08 |
| ← nav2002 left | 08:15 |
| → sidetrack joined | 08:16 |
| ← Wetmelon left | 08:17 |
| → flaviodesousa joined | 08:18 |
| ← shabius_ left | 08:21 |
| ← sidetrack left | 08:21 |
| ← cluelessperson_ left | 08:23 |
| → cluelessperson joined | 08:24 |
| → Fernando-Basso joined | 08:24 |
| → Wetmelon joined | 08:27 |
| ← Ring0` left | 08:28 |
| → EdFletcherT137 joined | 08:33 |
| ← Belliash left | 08:34 |
| → Belliash joined | 08:35 |
| ← causasui left | 08:37 |
| → gxt joined | 08:38 |
| → pastucci joined | 08:43 |
| ← macaronus left | 08:44 |
| ← iam730 left | 08:45 |
| → sbeyer joined | 08:46 |
| → oxymoron93 joined | 08:46 |
| → Paradisee joined | 08:47 |
| → iam730 joined | 08:48 |
| ← z8z left | 08:48 |
| → lacrymology joined | 08:48 |
| → Nozzzle joined | 08:48 |
| → shabius joined | 08:50 |
| → dionysus69 joined | 08:50 |
| ← wagle left | 08:55 |
| ← warthog9 left | 08:55 |
| → warthog19 joined | 08:55 |
| → raven-au_ joined | 08:56 |
| ← raven-au left | 08:56 |
| ← gordonfish left | 08:56 |
| raven-au_ → raven-au | 08:56 |
| warthog19 → warthog9 | 08:57 |
| → wagle joined | 08:57 |
| ← juhwad__ left | 08:57 |
| → mobidrop joined | 08:59 |
| → xall joined | 09:01 |
| ← Wetmelon left | 09:06 |
| → multiproc joined | 09:09 |
| → rajputh54 joined | 09:10 |
| → nivag joined | 09:10 |
| ← SJr left | 09:10 |
|
rajputh54
| I'm using an open source code and then changing url to private repository. | 09:11 |
| ← Helenah left | 09:11 |
|
rajputh54
| But later how to fetch updates from open source repo ? | 09:12 |
| → kanzure joined | 09:12 |
|
_ikke_
| rajputh54: you can have more then one remote | 09:12 |
| → SJr joined | 09:13 |
| → floppydh joined | 09:13 |
|
rajputh54
| _ikke_ Thank you ... I'll try this | 09:14 |
| → feriman joined | 09:14 |
| ← Stoot left | 09:15 |
| ← azwieg103 left | 09:16 |
| → T_UNIX joined | 09:16 |
| → azwieg103 joined | 09:16 |
| → Helenah joined | 09:16 |
| ← oxguy3 left | 09:19 |
| → border_man joined | 09:19 |
| → oxguy3 joined | 09:21 |
|
Moongoodgirl
| As I understand it, the customary names are `origin` and then `upstream`. | 09:25 |
| ← feriman left | 09:25 |
| ← fphilipe left | 09:26 |
| → feriman joined | 09:27 |
| ← babilen left | 09:28 |
| → babilen joined | 09:29 |
| ← oxguy3 left | 09:31 |
| → Tobbi_ joined | 09:35 |
| ← border_man left | 09:37 |
| → oxguy3 joined | 09:38 |
| ← random_yanek left | 09:38 |
| ← Fernando-Basso left | 09:44 |
| ← g00s left | 09:44 |
| → random_yanek joined | 09:45 |
| → dartmouthed joined | 09:47 |
| ← sbeyer left | 09:47 |
| → sbeyer joined | 09:48 |
| → akemhp joined | 09:48 |
| ← akemhp left | 09:52 |
| → fphilipe joined | 09:54 |
| → rfuentess__ joined | 09:57 |
| ← rfuentess left | 09:58 |
| → akemhp joined | 10:00 |
| ← xall left | 10:12 |
| → rfuentess joined | 10:20 |
| ← rfuentess__ left | 10:20 |
| → tmz joined | 10:20 |
| → mikecmpbll joined | 10:27 |
| ← oxguy3 left | 10:28 |
| → figuinhas joined | 10:40 |
| → courrier joined | 10:53 |
| → jmd joined | 10:53 |
| ← oxymoron93 left | 10:53 |
| ← courrier left | 10:53 |
| → oxymoron93 joined | 10:54 |
| ← sauvin left | 10:57 |
| → sauvin joined | 10:59 |
| → xall joined | 10:59 |
| → wrksx_ joined | 11:01 |
| ← wrksx left | 11:02 |
| → enoq joined | 11:05 |
| → mowcat joined | 11:09 |
| ← TomekStano left | 11:11 |
| ← bvdw left | 11:18 |
| → bvdw joined | 11:19 |
| ← rajputh54 left | 11:24 |
| → cdown joined | 11:27 |
| → Sc0tty- joined | 11:35 |
| ← azwieg103 left | 11:35 |
|
Sc0tty-
| what does -u mean with `git push -u origin master` | 11:35 |
| → azwieg103 joined | 11:35 |
|
Sc0tty-
| is it --set-upstream ? | 11:35 |
|
_ikke_
| yes | 11:35 |
|
Sc0tty-
| thank ya | 11:36 |
| ← reprazent left | 11:39 |
| → howdoi joined | 11:42 |
| ← mowcat left | 11:47 |
| → dionysus70 joined | 11:53 |
| ← Phylock left | 11:53 |
| ← dionysus69 left | 11:54 |
| dionysus70 → dionysus69 | 11:54 |
| ← xall left | 11:54 |
| → xmiah joined | 11:56 |
|
xmiah
| file pack at ./git/object/pack/pack-*.pack so big. How to clean cache it? I search git log of pack-name commit but not found | 11:58 |
|
jmd
| Which git command is it that has a --ignore-dates option? | 11:58 |
|
osse
| seems like the answer is none | 11:59 |
| → aw1_ joined | 12:00 |
|
jmd
| perhaps it's --ignore-date (singular) | 12:00 |
| → reprazent joined | 12:00 |
|
xmiah
| jmd: options --ignore-date not found, I checked 'man git' | 12:01 |
|
gitinfo
| jmd: the git manpage is available at https://gitirc.eu/git.html | 12:01 |
|
osse
| jmd: rebase and am | 12:02 |
| ← aw1__ left | 12:02 |
|
jmd
| osse: Thanks. | 12:03 |
|
osse
| jmd: each command has its own man page btw. man git-rebase | 12:03 |
|
gitinfo
| jmd: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html | 12:03 |
| ← multiproc left | 12:05 |
| ← Nozzzle left | 12:06 |
| → multiproc joined | 12:06 |
| → Phylock joined | 12:06 |
| ← lacrymology left | 12:07 |
|
jmd
| osse: Yeah. That's why it's so difficult to find what one is looking for. | 12:07 |
| ← Helenah left | 12:08 |
|
osse
| jmd: But how often do you look for the command that uses a specific option compared to how often you look for the options for a specific command? | 12:08 |
| → Helenah joined | 12:10 |
| → courrier joined | 12:10 |
|
jmd
| I dunno, but sometimes I do that. So a more modern documentation format (such as Texinfo or similar) would make things easier. | 12:10 |
|
bremner
| kek, texinfo modern | 12:14 |
| ← sbeyer left | 12:16 |
| ← maxwilliamson left | 12:17 |
| → maxwilliamson joined | 12:19 |
| → greatgatsby joined | 12:19 |
| ← nivag left | 12:22 |
| → sim642 joined | 12:23 |
|
sim642
| Is it just me or if I revert a range and the first one has a conflict which I manually fix and stage and use --continue, then git has forgotten about all the other commits in the range that were to be reverted? | 12:23 |
|
_ikke_
| sim642: that should not be the case | 12:28 |
| wrksx_ → wrksx | 12:42 |
|
sim642
| Not sure what I could've done wrong then | 12:43 |
| → phanimahesh joined | 12:57 |
| gitinfo set mode: +v | 12:57 |
| ← gloomy left | 13:01 |
| → oatmealraisin joined | 13:02 |
| ← multiproc left | 13:12 |
| → Nozzzle joined | 13:13 |
| → multiproc joined | 13:14 |
| ← igemnace left | 13:18 |
| → SerialSmile joined | 13:19 |
| → CodeSlingerPaul joined | 13:19 |
| ← xmiah left | 13:21 |
| → jrun joined | 13:24 |
| ← courrier left | 13:27 |
|
jrun
| git stash says no local changes but git diff shows changes in .git/module what's going on? | 13:29 |
|
Nozzzle
| be, | 13:29 |
|
| sorry | 13:29 |
|
| hello, I need help with my first-ever deployment on web server. | 13:30 |
|
| I created a .git folder via cpanel | 13:30 |
| ← pastucci left | 13:30 |
|
Nozzzle
| so I suppose it is the remote repository that I need to create, right? | 13:31 |
|
grawity
| do you have SSH access to that web server? | 13:31 |
|
Nozzzle
| grawity, yes | 13:31 |
|
grawity
| then use `git` via SSH – don't create things like .git by hand | 13:31 |
|
Nozzzle
| and the tutorial i follow says that I need to have ssh-agent in order not to have to type password. | 13:31 |
|
grawity
| well, possibly, but that's a bit separate from git configuration | 13:32 |
|
Nozzzle
| currently I know nothing about git, I can say. I am following a tutorial in order to move a local folder to the web server. | 13:34 |
|
| and it says I need to have ssh agent | 13:34 |
|
| which has the keys added | 13:34 |
| → computer2000 joined | 13:36 |
| ← feriman left | 13:36 |
| ← enoq left | 13:39 |
| → g4570n joined | 13:40 |
|
Nozzzle
| ok I think I added it | 13:41 |
| → gloomy joined | 13:46 |
| ← jim left | 13:50 |
| ← SerialSmile left | 13:50 |
| → finalbeta joined | 13:50 |
| → jim joined | 13:51 |
| → SerialSmile joined | 13:51 |
| → mattmurr_ joined | 13:51 |
| ← SerialSmile left | 13:51 |
| → oxguy3 joined | 13:51 |
| ← Thorn left | 13:53 |
| ← aw1_ left | 13:53 |
| → mrcrypto08 joined | 13:53 |
| ← cdown left | 13:59 |
| ← greatgatsby left | 13:59 |
| → cdown joined | 14:00 |
| → akemhp_ joined | 14:05 |
| → lucasb joined | 14:06 |
| ← akemhp left | 14:06 |
| → akem__ joined | 14:07 |
| ← akemhp_ left | 14:10 |
| ← TomyLobo2 left | 14:16 |
| ← oxguy3 left | 14:23 |
| ← mattmurr_ left | 14:31 |
| → maestrojed joined | 14:33 |
|
ashnur
| someone told me i should rebase to keep my feature branch clean, but right now i am trying to rebase and it keeps starting over, i see the same conflicts over and over and over again in a loop | 14:37 |
| → prepend joined | 14:37 |
| → truthseeker_ joined | 14:39 |
| ← jmd left | 14:39 |
|
cdunklau
| ashnur: gimmie the deets yo | 14:42 |
|
ashnur
| ? | 14:42 |
|
cdunklau
| the details | 14:42 |
|
| first, what command did you run | 14:43 |
|
jim
| is it possible to append to the message of the latest commit? | 14:43 |
|
ashnur
| git rebase branchname | 14:43 |
|
cdunklau
| jim: you can edit it with --amend | 14:43 |
| → thevishy joined | 14:43 |
|
cdunklau
| dunno about appending though | 14:43 |
|
jim
| git commit --ament? | 14:43 |
|
| d | 14:43 |
|
ashnur
| cdunklau: so after rebase i got conflict, i changed the file, saved and then added them, then git rebase --continue | 14:44 |
|
| then sometimes git rebase --skip if it's empty | 14:44 |
|
| and continue doesn't work | 14:44 |
|
cdunklau
| jim: yes | 14:44 |
|
oxymoron93
| it will prompt the editor for you, with existing message of last commit, you just add whatever you want. About automating, I have no idea. jim | 14:44 |
|
cdunklau
| ashnur: "doesn't work"? | 14:45 |
|
jim
| no, it need not be automated | 14:46 |
|
cdunklau
| ashnur: cmon you know how IRC works :) | 14:46 |
|
ashnur
| cdunklau: i am assuming you used this before and you know when you write git rebase continue and it doesn't do shit just says to try skip, well i talk about that | 14:46 |
|
jim
| I'll give it a shot | 14:46 |
|
cdunklau
| ashnur: ...jesus chill out. you know it's impossible to help with any confidence if one party doesn't know what the other is experiencing | 14:47 |
|
| ashnur: so *show us* | 14:47 |
|
| my best guess is "you didn't fix the conflict" | 14:47 |
|
| which is also not helpful to you | 14:48 |
|
ashnur
| i did fix it | 14:48 |
|
| i tried it twice before i asked here | 14:48 |
|
cdunklau
| ashnur: what did it say, precisely, when you did --continue | 14:48 |
|
Hello71
| "it doesn't work" | 14:50 |
|
ashnur
| cdunklau: https://gist.github.com/ashnur/e11451767accea0931610623373a2c6c | 14:51 |
|
cdunklau
| ashnur: what's git status output | 14:51 |
|
ashnur
| right, that was then, i aborted long time ago | 14:52 |
|
| you never see this message? | 14:52 |
|
| every time i do rebase it's full of this | 14:52 |
|
| even years ago when i did it first time, this was part of it | 14:52 |
|
| so i don't understand what is so surprising | 14:52 |
|
| but there was no conflict, no files to change or anything | 14:54 |
|
| anyway, i will try to recreate it | 14:54 |
| ← mikami left | 14:54 |
|
cdunklau
| ashnur: no, i haven't run into this, at least i don't remember running into it. --abort, fix the conflict, run `git status`, `git rebase --continue`, and pastebin the terminal session | 14:54 |
|
ashnur
| do you do rebase often? | 14:54 |
|
cdunklau
| err, --abort, rebase again, etc of course | 14:54 |
|
ashnur
| there is no conflict cdunklau if i --abort | 14:55 |
|
| only if rebase | 14:55 |
|
| i could fast forward merge | 14:55 |
|
cdunklau
| yes, i corrected my instructions | 14:55 |
|
| --abort, rebase again, fix the conflict, run `git status`, `git rebase --continue`, and pastebin the terminal session | 14:55 |
| ← maestrojed left | 14:58 |
|
cdunklau
| ashnur: also, `git log --oneline --decorate --graph branchname..` and the same except with `..branchname` can be enlightening | 14:59 |
|
| maybe --stat instead of --oneline | 14:59 |
|
ashnur
| ? | 15:00 |
|
| can be enlightening | 15:00 |
|
oxymoron93
| jim git commit --amend -m "your message" | 15:00 |
|
| in your script you could grab message of the amended commit, and afterwards build new message by appending to it | 15:01 |
|
| use this in mentioned command... there probably are much better ways | 15:01 |
|
ashnur
| i bet there is no tool to sanitize commit messages | 15:02 |
|
| or just git output | 15:02 |
| → maestrojed joined | 15:03 |
|
ashnur
| cdunklau: https://gist.github.com/ashnur/af92c12ec8c706cc9f134aba85af90cb | 15:03 |
| → feriman joined | 15:06 |
| ← oxymoron93 left | 15:07 |
| → juhwad__ joined | 15:07 |
|
ashnur
| so i am saying git rebase --continue but it says no changes, did i forget to add? and i didn't, there were no changes, there are no files | 15:07 |
| ← gloomy left | 15:08 |
|
ashnur
| git status stays everything clean, i should --continue, but --continue says that there isn't anything to do | 15:08 |
|
| it "doesn't work" | 15:08 |
|
| but you can be an asshole about it | 15:08 |
| ← Anthaas left | 15:08 |
| → zalt_ joined | 15:08 |
|
BtbN
| That can mean that the commit was a no-op, since all of its changes were already done. So you can skip it. | 15:08 |
|
ashnur
| BtbN: that's what I was doing, but then eventually I get back here and the rebase never ends | 15:10 |
|
cdunklau
| ashnur: well, with that info someone else might be able to help. which is good, because i sure as hell don't want to even try | 15:10 |
|
| best of luck | 15:10 |
|
relipse2
| I'm on windows, how do I add another repo as a remote to this one and then cherry pick one of the commits? | 15:10 |
|
| using git bash | 15:10 |
| ← maestrojed left | 15:10 |
|
osse
| ashnur: was it git rebase --skip you tried? | 15:10 |
|
ashnur
| osse: yes, why? | 15:10 |
|
_ikke_
| relipse2: you can use git remote add <name> <url> to add a new remote | 15:10 |
|
| relipse2: then run git fetch <name> | 15:10 |
|
| after that, you can cherry-pick the commit by hash | 15:11 |
|
osse
| ashnur: I wasn't sure | 15:11 |
|
ashnur
| osse: then i can continue but as I was saying, eventually the commits repeat without the rebase ending | 15:11 |
|
osse
| you can run git rebase --skip a million times? :O That sounds like a bug in git rebase | 15:12 |
| → Anthaas joined | 15:12 |
|
ashnur
| osse: no, after skip i get the normal function of rebase, there is a conflict, i fix, i --continue | 15:13 |
|
| osse: just that, as i mentioned before, the commits repeat, the rebase never ends | 15:13 |
|
| i will get back to the beginning of the conflicts. git log will have the same commit messages repeated in order | 15:14 |
|
osse
| so after you've resolved commit 6 it tries to apply commit1 again? | 15:14 |
|
| could it be that because of pripr rebases and pushing and pulling you do actually have a bunch of seemingly identical commits in the history? | 15:15 |
|
ashnur
| pripr? | 15:15 |
|
| prior. maybe | 15:15 |
|
osse
| prior | 15:15 |
|
ashnur
| i probably have similar commits but not with the same commit message | 15:16 |
|
| since these are some test files and i was switching back and forth | 15:16 |
| → Kremator joined | 15:16 |
|
osse
| if you can, git rabase --abort and start over with the -i flag, so that you get an editor with the list of commits to rebase | 15:16 |
|
ashnur
| good idea, thanks for reminding me, i will try it out | 15:17 |
|
mobidrop
| git: 'rabase' is not a git command. See 'git --help'. | 15:17 |
|
osse
| git rhubarb | 15:18 |
| ← ed_peguillan left | 15:18 |
| ← gxt left | 15:19 |
| → ed_peguillan joined | 15:21 |
| → n2o joined | 15:21 |
| ← howdoi left | 15:23 |
| ← n2o left | 15:24 |
| ← omnireq_ left | 15:24 |
| ← oatmealraisin left | 15:26 |
|
lavalike
| is it possible to serialize git commits into files that apply to a different repo (from the same file contents, albeit possibly different git hashes because of authorship and dates) that keep their commit metadata like the commit date? i.e. replicate the history, git hashes notwithstanding, with the same commit metadata and contents, on top of a different history (different just in some metadata like | 15:27 |
|
| authorship) | 15:27 |
|
Nozzzle
| hello, I am following this guide to run a local website folder on a server; http://toroid.org/git-website-howto | 15:28 |
|
jim
| lavalike, I guess, you could commit to the usual git repo first, then get a patch from it to apply elsewhere | 15:28 |
|
Nozzzle
| I keep getting 'error: failed to push some refs to 'ssh://...' | 15:28 |
|
_ikke_
| lavalike: sounds a lot like git format-patch | 15:28 |
|
lavalike
| interesting | 15:29 |
|
Nozzzle
| the error comes when I run 'push web +master:refs/heads/master' | 15:29 |
|
jim
| so that would be man git-format-patch ? | 15:29 |
|
gitinfo
| the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html | 15:29 |
| ← Stace left | 15:30 |
| → greggerz joined | 15:35 |
| → Raging_Hog joined | 15:36 |
| → thiago joined | 15:36 |
| ← Frogging101 left | 15:37 |
| → Frogging101 joined | 15:39 |
| → boombatower joined | 15:40 |
| ← to1ne left | 15:43 |
| → xmiah joined | 15:44 |
|
Moongoodgirl
| <Nozzzle> I keep getting 'error: failed to push some refs to 'ssh://...' | 15:46 |
|
| pastebin the rest of the output? | 15:46 |
| ← sQVe left | 15:46 |
| ← dunpeal left | 15:49 |
| ← flaviodesousa left | 15:50 |
| ← zalt_ left | 15:50 |
|
ashnur
| so, i think i stop using rebase. i have no idea what is happening but it clearly conflicts with my flow many ways. i just realized that i am getting duplicated commits out of it, that's why i saw the same conflicts repeatedly | 15:54 |
|
| found the answer i think https://stackoverflow.com/questions/9264314/git-commits-are-duplicated-in-the-same-branch-after-doing-a-rebase | 15:56 |
| → sperry joined | 15:56 |
| → Thorn joined | 15:59 |
| ← floppydh left | 16:01 |
| ← mrcrypto08 left | 16:01 |
|
_ikke_
| trhlkjdkjdsdkfjsdlfk | 16:02 |
|
| k | 16:02 |
|
| ugh | 16:02 |
|
| my vpn connection died one way apparenly :( | 16:02 |
| → darkbit joined | 16:02 |
| ← darkbit left | 16:02 |
| ← thiago left | 16:04 |
| ← akem left | 16:05 |
| → akem joined | 16:05 |
| ← akem left | 16:05 |
| → omnireq joined | 16:06 |
| → cvcxc joined | 16:06 |
| → submerciful joined | 16:09 |
|
Nozzzle
| Moongoodgirl, the error is like ''error: failed to push some refs to 'ssh://mysite.com/home/mysitename/addondomainname/somefolder.git' | 16:09 |
| → mowcat joined | 16:09 |
|
Moongoodgirl
| Nozzzle: Is that /all/ the output you get? Just that one line? O.o | 16:10 |
|
Nozzzle
| Moongoodgirl, I am trying to run a locally created website on my hosted server, following this guide; http://toroid.org/git-website-howto...after typing 'git push -f origin master' I get above error. | 16:12 |
|
| Also before that I got this error, too; https://bpaste.net/show/I5KUS | 16:12 |
| ← chele left | 16:14 |
| ← Noti left | 16:16 |
| ← alexandre9099 left | 16:18 |
| ← mobidrop left | 16:20 |
| ← cvcxc left | 16:27 |
| → Lucas_Gray joined | 16:32 |
| → g00s joined | 16:32 |
| → to1ne joined | 16:34 |
|
Nozzzle
| can anyone help me get forward with this? | 16:35 |
| → alexandre9099 joined | 16:39 |
| → oatmealraisin joined | 16:43 |
| ← cdown left | 16:47 |
| → cdown joined | 16:47 |
| ← Sc0tty- left | 16:48 |
|
jim
| Nozzzle, maybe it could help the folks here understand better if you start over, and let them know what you're doing (I can't include myself in that, because I'm just using git for basic stuff, not web deployment, at least not yet | 16:50 |
|
| ) | 16:50 |
| → armin joined | 16:52 |
| → durham joined | 16:52 |
|
armin
| so my boss just linked me to this article here https://tech.churchofjesuschrist.org/wiki/Git_Credential_Caching_on_Mac_OS_X is that a running joke or something? i mean that site is, just in fact, hosted on churchofjesuschrist.org - i can't just believe that's without ulterior motive. | 16:53 |
| ← gpanders left | 16:54 |
| → usbguy1 joined | 16:55 |
| ← rardiol left | 16:55 |
|
_ikke_
| armin: how are we supposed to know? :) | 16:55 |
| ← usbguy1 left | 16:56 |
| ← saint_ left | 16:57 |
| → rardiol joined | 16:58 |
| ← rfuentess left | 16:59 |
| → mikami joined | 17:00 |
| → saint_ joined | 17:01 |
| → Giant81 joined | 17:03 |
| → thiago joined | 17:03 |
| → gpanders joined | 17:05 |
|
armin
| _ikke_: i feel a bit cursed. i think i'll ask him on the x-mas company event after a beer or so what that should mean. | 17:08 |
| → jleclanche joined | 17:09 |
| ← maxwilliamson left | 17:10 |
| ← Lucas_Gray left | 17:12 |
| → maxwilliamson joined | 17:13 |
| ← learningc left | 17:14 |
|
Nozzzle
| jim, thank you very much. I created a Nikola website locally. Nikola is a static site generator. I followed this guide to deploy it; http://toroid.org/git-website-howto, but got stuck at the last push command, getting the above error | 17:16 |
| ← bvdw left | 17:18 |
| → wildlander joined | 17:19 |
| → bvdw joined | 17:19 |
| ← thevishy left | 17:21 |
| ← figuinhas left | 17:22 |
| ← computer2000 left | 17:23 |
|
jim
| Nozzzle, the permission denied you're getting from running mkdir in /var/www is because usually only root can write there | 17:23 |
| ← wildlander left | 17:28 |
| → mat001 joined | 17:31 |
|
Nozzzle
| jim, should I run it with sudo? | 17:31 |
| → wildlander joined | 17:31 |
| ← cdown left | 17:33 |
| → cdown joined | 17:34 |
| → causasui joined | 17:35 |
| ← mikecmpbll left | 17:39 |
| → bluesoul joined | 17:44 |
| → wootehfoot joined | 17:45 |
| ← alezandro left | 17:46 |
| ← Phylock left | 17:51 |
| ← to1ne left | 17:53 |
| ← sperry left | 17:58 |
| → gareppa joined | 17:58 |
| ← maxwilliamson left | 17:58 |
| → maxwilliamson joined | 17:59 |
| → sperry joined | 17:59 |
| ← gareppa left | 17:59 |
| → to1ne joined | 18:02 |
| ← dartmouthed left | 18:04 |
| ← vicfred left | 18:06 |
| → cdown_ joined | 18:06 |
| ← cdown left | 18:09 |
| cdown_ → cdown | 18:09 |
| ← lightstalker left | 18:10 |
| → gordonfish joined | 18:11 |
| → ferdna joined | 18:12 |
| → KnoP joined | 18:12 |
| ← causasui left | 18:14 |
| → enoq joined | 18:14 |
| → learningc joined | 18:14 |
| → alezandro joined | 18:17 |
| → causasui joined | 18:17 |
| → sidetrack joined | 18:18 |
| → igemnace joined | 18:20 |
| → gareppa joined | 18:21 |
| → gloomy joined | 18:22 |
| ← sidetrack left | 18:22 |
| → oxguy3 joined | 18:22 |
| ← gloomy left | 18:25 |
| ← gareppa left | 18:26 |
|
bin_bash
| NO | 18:26 |
|
| you should setup permissions properly. | 18:26 |
| → gloomy joined | 18:26 |
| → sidetrack joined | 18:27 |
| ← multiproc left | 18:27 |
| → scurfee joined | 18:33 |
| → gareppa joined | 18:34 |
| ← rardiol left | 18:35 |
| ← mikami left | 18:36 |
| → rardiol joined | 18:37 |
| ← shored left | 18:38 |
| → oatmealr1 joined | 18:39 |
| → shored joined | 18:40 |
| ← gareppa left | 18:40 |
| ← a-l-e left | 18:41 |
| ← oatmealraisin left | 18:42 |
| → a-l-e joined | 18:43 |
| ← a-l-e left | 18:43 |
| → a-l-e joined | 18:44 |
| ← scurfee left | 18:44 |
| ← oatmealr1 left | 18:50 |
| → saul joined | 18:52 |
| → testman joined | 18:52 |
| gitinfo set mode: +v | 18:53 |
| ← KnoP left | 18:53 |
| ← dionysus69 left | 18:53 |
|
saul
| Hi, I've got a strange situation with a repo. I made some changes to some text files, and when it looks like it's being treated as a git annex item when i view the pull request in stash/bitbucket. It seems like a git annex issue, not dependent on stash/bb itself. | 18:54 |
|
| in the PR it looks like all the text is gone and replaced with a git annex SHA | 18:54 |
| ← Paradisee left | 18:57 |
|
j416
| saul: is there a question? | 18:57 |
| ← truthseeker_ left | 19:00 |
|
saul
| How can I get my file into a regular state, ignored by git annex? | 19:02 |
| ← Nozzzle left | 19:03 |
| → Parse joined | 19:04 |
| → howdoi joined | 19:05 |
|
j416
| saul: don't use git-annex? | 19:15 |
| → Sasazuka joined | 19:15 |
| ← T_UNIX left | 19:15 |
| ← xmiah left | 19:16 |
| ← Sasazuka left | 19:16 |
| → Sasazuka joined | 19:17 |
| ← sweatsuit left | 19:17 |
| ← Sasazuka left | 19:17 |
| → gxt joined | 19:18 |
| → Sasazuka joined | 19:19 |
| ← prepend left | 19:21 |
| → jamiejackson joined | 19:21 |
| ← Sasazuka left | 19:22 |
| → sweatsuit joined | 19:22 |
| → Sasazuka joined | 19:23 |
| ← sauvin left | 19:24 |
| ← testman left | 19:26 |
| ← APic left | 19:29 |
| ← Raging_Hog left | 19:32 |
| ← durham left | 19:32 |
| ← ferdna left | 19:35 |
| → ferdna joined | 19:37 |
| → APic joined | 19:38 |
|
lavalike
| U dud | 19:43 |
|
| (oops, hit the keyboard wrong there) I did git am *.patch and between two of those I have this message: https://pastebin.com/raw/tMp2aE9E | 19:43 |
|
saul
| j416: work on your material | 19:43 |
|
lavalike
| does it apply to the patch above or below it? | 19:43 |
|
j416
| saul: sorry, what does that mean? | 19:43 |
| → rindolf joined | 19:46 |
|
lavalike
| I suppose it applies to the one above, i.e. it writes Applying: <commit title> and then the warning, not the reverse | 19:46 |
|
j416
| lavalike: I was going to write that I'd assume that, but I realise it might as well be the other way round. It does seem logical that it'd be the one before it. | 19:47 |
| → prepend joined | 19:47 |
| → cd joined | 19:47 |
|
lavalike
| I'll reset and try one at a time to figure it out | 19:47 |
|
j416
| I wonder if you could enable tracing and that would help | 19:48 |
|
| GIT_TRACE=1 etch | 19:48 |
|
| etc. | 19:48 |
|
lavalike
| our intuition was confirmed correct: it's Applying: <name> and then the relative warnings | 19:49 |
| ← a-l-e left | 19:49 |
|
rindolf
| Hi all! Suppose I want to clone certain sub-repositories, but pin them at certain commits so I'll get consistent results - are submodules the way to go? | 19:49 |
| ← planetcall|work left | 19:49 |
|
j416
| lavalike: cool. thanks. | 19:49 |
|
| rindolf: what's a sub-repository? | 19:50 |
|
| rindolf: and, what is the use-case? | 19:50 |
| ← Murr left | 19:50 |
|
j416
| submodules make sense in some cases, but in my experience most of the time there's a better solution | 19:51 |
|
rindolf
| j416: i keep the sources for stories / screenplays (see https://www.shlomifish.org/humour/stories/ ) in separate github repos and clone them from within the main site's build sys | 19:54 |
|
lavalike
| _ikke_: thanks for the pointer to format-patch it worked beautifully! | 19:54 |
| ← Mattiaslndstrm left | 19:54 |
|
robertparkerx
| This means it was reverted right? https://d.pr/i/8jpHoW | 19:55 |
|
j416
| robertparkerx: so it seems. | 19:55 |
|
robertparkerx
| How do I revert it back | 19:55 |
| ← juhwad__ left | 19:55 |
|
j416
| a reversion is just a regular commit. | 19:55 |
| → mat001_ joined | 19:56 |
|
j416
| you can choose to revert the revert (git revert 3ad4d), for example. | 19:56 |
|
| why was it reverted? the commit does not say | 19:56 |
|
robertparkerx
| git revert 3ad4d66f0bef5470f0d978b853b1e6a9b1bd9f98 | 19:56 |
|
j416
| it's useful to note. | 19:56 |
|
robertparkerx
| I don't know | 19:56 |
|
j416
| robertparkerx: sure. | 19:56 |
|
robertparkerx
| I started to get emails | 19:56 |
|
j416
| robertparkerx: maybe ask Meng | 19:56 |
|
robertparkerx
| haha | 19:57 |
| ← prepend left | 19:59 |
| ← mat001 left | 19:59 |
| → oatmealr1 joined | 20:04 |
|
robertparkerx
| ty j416 | 20:04 |
|
j416
| o/ | 20:04 |
| → lightstalker joined | 20:06 |
| → DogManJr joined | 20:09 |
| ← azwieg103 left | 20:09 |
| → azwieg103 joined | 20:09 |
| ← pks left | 20:09 |
| → Narrat joined | 20:10 |
| ← mat001_ left | 20:12 |
| → mat001 joined | 20:13 |
| → akemhp_ joined | 20:18 |
| → srg joined | 20:19 |
|
srg
| Hi. I'm trying to create a commit from within a CI system. I'm using `git commit --author="Automation [email@hidden.address] -m "Sync with upstream"` but git is returning an error saying "Please tell me who you are". How can I override it? | 20:20 |
| ← jamiejackson left | 20:22 |
| ← akem__ left | 20:23 |
|
cdunklau
| srg: ...is that the entire error? | 20:24 |
|
srg
| Well, no, but I figure the people here are familiar enough with it. Want me to pastebin it? | 20:24 |
|
cdunklau
| srg: yes | 20:24 |
|
srg
| https://gist.github.com/srguglielmo/603626e04c2ab3ef2e6336d9f123ea0e | 20:25 |
| ← sperry left | 20:25 |
|
cdunklau
| huh. i thought it might be complaining about email, but you provided it | 20:26 |
|
| odd | 20:26 |
|
srg
| I mean, I could just add the `git config` commands to my CI script, but that seems unecessary with the --author option | 20:26 |
| ← oatmealr1 left | 20:26 |
| ← Codaraxis left | 20:27 |
|
cdunklau
| srg: i think that's for _overriding_ | 20:27 |
|
squirrel
| isn't author different to committer? | 20:27 |
|
cdunklau
| srg: but you can specify it via env vars. i'd probably do that | 20:28 |
|
| srg: git help config and search for user\.name | 20:28 |
| → oatmealr1 joined | 20:28 |
|
squirrel
| https://stackoverflow.com/questions/32676281/bypass-tell-me-who-you-are-error-in-git | 20:29 |
|
srg
| Ah! I didn't think of ENV vars, yeah good idea. I don't see a --committer option for `git commit` | 20:29 |
|
cdunklau
| squirrel: i thought so | 20:29 |
| ← enoq left | 20:29 |
| → dknitrox joined | 20:29 |
|
cdunklau
| but git help commit says "commit author" | 20:29 |
| ← dknitrox left | 20:29 |
|
cdunklau
| which is not all that decisive :) | 20:29 |
|
srg
| "As of git 2.12.2, this fails if the default isn't set." this is a comment on that stackoverflow question - so you're right cdunklau, it's only for _overriding_ | 20:30 |
|
| Thank you both! | 20:30 |
|
cdunklau
| \o/ | 20:30 |
|
squirrel
| woo | 20:31 |
|
j416
| and there was much rejoicing | 20:32 |
| → prepend joined | 20:32 |
| ← akemhp_ left | 20:37 |
| → elsheepo joined | 20:38 |
| → m0viefreak joined | 20:41 |
| → arcanescu joined | 20:43 |
|
arcanescu
| i have a commit which has been pushed onto my branch which is in the past, how can I modify the past commit to exclude a file which I accidently commited? | 20:44 |
| → Crell joined | 20:44 |
|
Crell
| Hi folks. I'm trying to figure out why I am getting a merge conflict. | 20:45 |
|
| My local repo is a clone of A. I then add a remote for B, which doesn't have common history. I then run git merge --allow-unrelated-histories -X theirs --squash some-tag. 99% of the time this works perfectly and does exactly what I want. But with one particular case, I am getting 3 files that don't merge cleanly due to "both added" (according to Git). | 20:46 |
|
| If both add the file... shouldn't -X theirs resolve that? And... why would they be added by both when I'm just merging ONE remote into local? | 20:46 |
| → Nozzzle joined | 20:47 |
| → sperry joined | 20:47 |
| → mat001_ joined | 20:47 |
| ← cdown left | 20:48 |
| → pks joined | 20:50 |
| ← mat001 left | 20:50 |
| ← elsheepo left | 20:54 |
| → mat001 joined | 20:56 |
| → localhorse joined | 20:56 |
| → emmanuelux joined | 20:58 |
| ← mat001_ left | 21:00 |
| ← Nozzzle left | 21:03 |
| ← gloomy left | 21:03 |
| → _homme__ joined | 21:04 |
| ← arcanescu left | 21:05 |
| ← srg left | 21:06 |
| ← emmanuelux left | 21:07 |
| ← rindolf left | 21:08 |
| → akemhp joined | 21:11 |
| → akemhp_ joined | 21:11 |
| ← akemhp left | 21:15 |
| ← DogManJr left | 21:16 |
|
cdunklau
| Crell: i think you meant -s theirs | 21:22 |
|
| hm no | 21:22 |
| ← sidetrack left | 21:22 |
| ← akemhp_ left | 21:23 |
|
cdunklau
| Crell: is it doing a recursive merge | 21:25 |
|
| if not, -X theirs won't have an effect, i suspect. if i'm reading the merge manpage right, rerursive is the only one with options | 21:26 |
|
| uh, 'recursive' of course | 21:27 |
| ← prepend left | 21:28 |
| → sidetrack joined | 21:31 |
| ← mat001 left | 21:32 |
| ← cd left | 21:33 |
| → DogManJr joined | 21:34 |
| → cd joined | 21:35 |
|
Crell
| This is part of a build script which works for 50 other repositories where I'm doing the same. It's JUST this one where it's not. | 21:36 |
| ← CalimeroTeknik left | 21:37 |
|
Crell
| According to the diff after I try the merge, the only difference is those 3 files have perms 755 now instead of 644. But... Both remotes and my local have perms 644 on those files, so I don't know why it's trying to change perms. | 21:37 |
| ← andreas303 left | 21:37 |
| → Fernando-Basso joined | 21:38 |
|
Crell
| And if I manually change them to 755 and commit first, then the merge command works. | 21:38 |
| ← giaco left | 21:43 |
| → andreas303 joined | 21:43 |
| ← Narrat left | 21:43 |
| ← howdoi left | 21:43 |
| → mat001 joined | 21:43 |
| ← relipse2 left | 21:44 |
| → dartmouthed joined | 21:50 |
|
zebrag
| Can I convert a very small project to a text file suitable for a pastebin? | 21:51 |
| → relipse2 joined | 21:51 |
|
Moongoodgirl
| Some pastebins let you do multiple files | 21:52 |
| ← to1ne left | 21:52 |
|
Moongoodgirl
| If yours doesn't, you could just concatenate the files with a marker before each one and pastebin that | 21:53 |
|
| that's fine if you just need to show the files to some people in a casual way | 21:53 |
|
zebrag
| Sure; maybe what I'm looking for is sth like "tar" | 21:53 |
|
grawity
| there's this pastebin called gist.github.com | 21:53 |
|
Moongoodgirl
| you could use MIME instead, which is more formal|proper and machine-readable | 21:54 |
|
grawity
| where you can literally `git push` a very small project into a pastebin | 21:54 |
|
Moongoodgirl
| Or you could pastebin a diff from an empty directory, which is probably easier while also being proper and machine-readable | 21:54 |
|
| And yeah, Gist is one of the ones that does multiple files | 21:54 |
|
zebrag
| yes, gist seems good | 21:55 |
|
Moongoodgirl
| GitHub Gists are actually fully-fledged git repositories, which is pretty nice | 21:55 |
| ← g00s left | 21:55 |
|
Moongoodgirl
| …I guess that's kinda implied by the ability to `git push` into them, heh | 21:57 |
| ← mat001 left | 21:58 |
| → Narrat joined | 21:58 |
| ← monr0e left | 22:00 |
| → mat001 joined | 22:00 |
| ← mat001 left | 22:00 |
| ← jlosito left | 22:02 |
| ← fphilipe left | 22:02 |
| ← Fusl left | 22:03 |
| ← swalladge left | 22:04 |
| → Fusl joined | 22:04 |
| → hqdruxn08_ joined | 22:05 |
| ← null1337 left | 22:09 |
| ← hqdruxn08__ left | 22:09 |
| → to1ne joined | 22:12 |
| → fphilipe joined | 22:13 |
| ← crose left | 22:16 |
| → Phylock joined | 22:17 |
| ← fphilipe left | 22:17 |
| ← to1ne left | 22:18 |
| ← oatmealr1 left | 22:20 |
| ← Phylock left | 22:22 |
| ← feriman left | 22:23 |
| → to1ne joined | 22:25 |
| ← to1ne left | 22:29 |
| → feriman joined | 22:33 |
| → mat001 joined | 22:33 |
| → swalladge joined | 22:40 |
| → fragamus joined | 22:41 |
| ← Sasazuka left | 22:45 |
| → Sasazuka joined | 22:47 |
| ← preisi left | 22:48 |
| ← wildlander left | 22:48 |
| → preisi joined | 22:51 |
| → to1ne joined | 22:54 |
| ← Helenah left | 22:55 |
| ← ZachGibbens left | 22:55 |
| → Helenah joined | 22:57 |
| → robinb joined | 22:58 |
| → ZachGibbens joined | 22:58 |
| ← azwieg103 left | 22:59 |
| → rsrx joined | 23:00 |
| → Mattiaslndstrm joined | 23:00 |
|
robinb
| let's say I have a branch1 which is in review but I need to use that branch commit for a new branch2 how can I do this? Also when the branch1 is merged I wanna remove that commit or update it. | 23:00 |
| ← greggerz left | 23:02 |
| ← Mattiaslndstrm left | 23:02 |
| ← anddam left | 23:04 |
| ← cliluw left | 23:06 |
| ← Sasazuka left | 23:06 |
| → Nixerus joined | 23:06 |
| ← wootehfoot left | 23:06 |
| → cliluw joined | 23:06 |
| → fstd_ joined | 23:06 |
| → reprazen_ joined | 23:07 |
| ← mowcat left | 23:07 |
| → anddam joined | 23:07 |
| → wootehfoot joined | 23:07 |
| → FernandoBasso joined | 23:07 |
| → Codaraxis joined | 23:07 |
| ← _homme__ left | 23:07 |
| ← _xor left | 23:07 |
| → Sasazuka joined | 23:07 |
| → _xor joined | 23:07 |
| ← oxguy3 left | 23:08 |
| ← Kremator left | 23:08 |
| ← Cerise left | 23:08 |
| ← fxrs left | 23:08 |
| → Xeago_ joined | 23:08 |
| ← lucasseikioshiro left | 23:08 |
| ← qguv left | 23:08 |
| ← wootehfoot left | 23:08 |
| ← misuto left | 23:08 |
| ← Xeago left | 23:09 |
| ← qgTG left | 23:09 |
| → fxrs_ joined | 23:09 |
| Xeago_ → Xeago | 23:09 |
| ← wodim left | 23:09 |
| → mowcat joined | 23:09 |
| → Kremator joined | 23:09 |
| → qgTG joined | 23:09 |
| → Milos_ joined | 23:09 |
| ← feriman left | 23:09 |
| → wodim joined | 23:09 |
| → misuto joined | 23:09 |
| → nivag joined | 23:09 |
| ← Milos left | 23:09 |
| ← Fernando-Basso left | 23:10 |
| ← reprazent left | 23:10 |
| ← ZachGibbens left | 23:10 |
| ← prg318 left | 23:10 |
| → ZachGibbens joined | 23:10 |
| ← shored left | 23:10 |
| ← kimiamania left | 23:10 |
| ← grandfso left | 23:10 |
| ← IAmNetx left | 23:10 |
| → shored joined | 23:10 |
| ← m1sdirection left | 23:10 |
| → kimiamania joined | 23:10 |
| → Cerise joined | 23:10 |
| ← anddam left | 23:11 |
| ← Mindi left | 23:11 |
| → m1sdirection joined | 23:11 |
| ← utrack left | 23:11 |
| ← hk239 left | 23:11 |
| → lucasseikioshiro joined | 23:11 |
| → oxguy3 joined | 23:11 |
| ← fstd left | 23:12 |
| fstd_ → fstd | 23:12 |
| → prg318 joined | 23:12 |
| → Improvotter joined | 23:12 |
| ← Codaraxis left | 23:12 |
| ← caskd left | 23:13 |
| → caskd joined | 23:14 |
|
robinb
| set irc.look.smart_filter on | 23:15 |
|
| yes | 23:15 |
| → akemhp joined | 23:16 |
| → Codaraxis joined | 23:18 |
| ← bvdw left | 23:18 |
| ← Codaraxis left | 23:18 |
| → bvdw joined | 23:19 |
| ← to1ne left | 23:19 |
| → buckworst joined | 23:19 |
| ← caskd left | 23:20 |
| → utrack joined | 23:20 |
| → howdoi joined | 23:20 |
| ← ed_peguillan left | 23:21 |
| → bongjovi joined | 23:21 |
| → Codaraxis joined | 23:22 |
| → im0nde_ joined | 23:22 |
| → jlosito joined | 23:24 |
| ← im0nde left | 23:24 |
| → to1ne joined | 23:25 |
| ← CodeSlingerPaul left | 23:26 |
| ← buckworst left | 23:26 |
| ← jlosito left | 23:29 |
| ← bongjovi left | 23:30 |
| → malmalmal joined | 23:30 |
| → bongjovi joined | 23:30 |
| ← submerciful left | 23:39 |
| ← to1ne left | 23:43 |
| ← fxrs_ left | 23:44 |
| ← Improvotter left | 23:44 |
| → caskd joined | 23:45 |
| ← vrih left | 23:45 |
| → alonkli joined | 23:46 |
| → alonkli12 joined | 23:46 |
| → fxrs joined | 23:46 |
| → vrih joined | 23:48 |
| → RoriconKnight joined | 23:50 |
| ← akemhp left | 23:51 |
| ← sperry left | 23:58 |