IRCloggy #git 2019-12-12

Logs Search ←Prev date Next date→ Channels Documentation

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

2019-12-12

thiago left00:00
CryptoDavid left00:08
CarlFK left00:13
Kremator left00:14
silverwhitefish left00:16
feriman left00:17
Phylock left00:18
IAmNetx left00:19
Copenhagen_Bram left00:19
sidetrack joined00:19
sidetrack left00:23
sidetrack joined00:23
jfariasf joined00:24
Copenhagen_Bram1 joined00:24
Copenhagen_Bram1Copenhagen_Bram00:25
fahadash left00:26
sidetrack left00:28
n3wborn left00:34
Viridian joined00:40
Viridian__ left00:41
fphilipe joined00:42
fphilipe left00:47
CipherMethod left00: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 questions00:50
mowcat left00:56
saint_ left00:57
mowcat joined00:57
saint_ joined01:00
mowcat left01:03
mowcat joined01: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 left01:11
_0x40_ (I want to delete them ONLY from .git, and not from the remote as well, just to be clear)01:11
physikoi joined01:16
omnireq joined01:16
Codaraxis left01:17
ethernether joined01:20
ChanServ set mode: +o01:21
physikoi left01:21
ethernether left01: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 happens01:22
Eugene kicked Eugene (de-op)01:22
Eugene joined01: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 fiddy01:23
ethernether joined01:23
bin_bash well you should try it01:24
ethernether left01:25
bin_bash it's not a good look to kick yourself to de-op01:25
phy1729 you should add a bot trigger to count up the nickles01:25
Copenhagen_Bram left01: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 worry01:26
Eugene I like how much time people talk about it01:26
ethernether joined01:26
bremner craves attention, that bot01: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 nothing01: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 left01:27
milkt joined01:28
ethernether joined01:29
ExeciN joined01:31
orbyt_ joined01:33
thiago joined01:39
duderonomy left01:39
duderonomy joined01:40
fphilipe joined01:42
duderonomy left01:45
fphilipe left01:48
akemhp_ joined01:49
vrih left01:50
akem__ joined01:51
akemhp left01:52
mat001 left01:52
akemhp_ left01:54
Sasazuka left01:54
zalt_ left01:56
mowcat left01:57
jaziz1 joined01:58
kerframil left02:01
jaziz left02:01
jfariasf left02:02
vrih joined02:08
Mindi left02:10
vostok4 left02:11
ethernether left02:13
ethernether joined02:13
utrack left02:13
anddam left02:16
lightstalker joined02:17
ethernether left02:18
vostok4 joined02:18
ethernether joined02:19
utrack joined02:20
maestrojed joined02:23
lucasb left02:23
Mindi joined02:24
maestrojed left02:24
plasticle left02:27
foo fffOB/w 202:28
plasticle joined02:28
anddam joined02:29
z8z joined02:31
deltab joined02:32
Copenhagen_Bram joined02: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 joined02: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 joined02:40
F0rTex left02:40
F0rTex joined02:41
dionysus69 left02:43
howdoi left02:44
thiago Copenhagen_Bram: there's no wiki feature in Git. That's a GitHub feature.02:46
Copenhagen_Bram ah02:46
phy1729 left02:47
Copenhagen_Bram I discovered you can clone a wiki from github though02:47
thiago foo: what does it say in the >>>> line?02:47
Copenhagen_Bram Although I tried and it asked me for my github username02: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 left02:51
ethernether left02:55
oatmealraisin left02:59
Sasazuka joined03:01
fstd_ joined03:05
sidetrack joined03:06
Wetmelon joined03:09
fstd left03:09
fstd_fstd03:09
Codaraxis joined03:11
sidetrack left03:11
dartmouthed left03: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-applied03:17
juhwad__ joined03:19
foo thiago: oh, but I thought it wasn't that black-and-white, I thought head was constructed from... hmm. ok03:20
jaziz1 left03:21
Cabanossi left03:28
ezzzc joined03:32
def_jam joined03:34
eb0t_ joined03:34
eb0t left03:35
Cabanossi joined03:35
eblip left03:35
fphilipe joined03:44
Viridian left03:46
physikoi left03:48
fphilipe left03:49
spacefrog joined03:51
ezzzc left03:58
sidetrack joined03:59
lagothrixGuest112003:59
Guest1120 left03:59
aw1__ joined04:00
lagothrix joined04:00
aw1_ left04:01
caskd left04:03
sidetrack left04:03
caskd joined04:04
duderonomy joined04:04
alezandro joined04:08
cbreak left04:09
cbreak joined04:10
oxguy3 left04:10
nav2002 joined04:12
Giant81 left04:13
Codaraxis left04:17
vostok4 left04:18
vostok4 joined04:18
maestrojed left04:19
sidetrack joined04:24
maestrojed joined04:28
Copenhagen_BramElon_Sat0shi04:28
fk left04:29
sidetrack left04:29
fk joined04:29
maestrojed left04:30
rafasc left04:35
oxguy3 joined04:57
Furai left04:58
Furai joined05:00
pks_ joined05:01
igemnace joined05:04
pks left05:04
pks_pks05:04
Sasazuka left05:12
jlosito left05:15
bket left05:15
jlosito joined05:16
bvdw left05:18
bket joined05:18
bvdw joined05:19
envex left05: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 like05: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 left05:32
_ikke_ dysfigured: I don't think using branches for these things is the right way tgo05: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 branches05:37
planetcall|work joined05:37
crose joined05:37
zalt_ joined05:38
dysfigured (at least in my mind anyway)05:38
sidetrack joined05:38
_ikke_ yes, but like you noticed, it's difficult to keep each branch up-to-date05:38
you need to costantly either merge or rebase05:39
for each branch05:39
dysfigured so instead of using git branches, i should continue re-doing the same work but in different repositories?05:40
Inline left05:41
crose left05:42
crose joined05:42
sidetrack left05:42
Helenah joined05:44
fphilipe joined05:45
fphilipe left05: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 joined05:50
_ikke_ try to commit early and often (which is hard)05:51
use tools that let you easily select what the commit05:51
dmc joined05:53
omnireq joined05:58
axisys left06:07
axisys joined06:08
ilmostro left06:08
ilmostro joined06:11
jcbitter left06:12
Mattiaslndstrm joined06:24
IAmNetx joined06:26
orbyt_ left06:26
zalt_ left06:30
sauvin joined06:30
Noti joined06:30
sidetrack joined06:31
Stace joined06:35
sidetrack left06:36
localhorse left06: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 it06:38
Stace isn't familiar with the ettiquette of git pull requests.06:39
Mattiaslndstrm left06:39
pandem1 depends on your team but i would not make a new commit there, but rather let the original author fix it06:39
or if they don't have time discuss about it and if you agree then fix it06:40
Mattiaslndstrm joined06: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
*ok06:49
sidetrack joined06:51
sidetrack left06: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 joined06:59
gxt left07:00
gavlee left07:05
TomekStano joined07:07
gavlee joined07:10
oxguy3 left07:10
sidetrack joined07:11
tmz left07:12
g00s joined07:13
Codaraxis joined07:14
oxguy3 joined07:14
sidetrack left07:16
omnireq_ joined07:19
omnireq left07:21
akem__ left07:25
thevishy joined07:25
thevishy left07:26
chele joined07:30
gloomy joined07:32
monr0e joined07:33
maxwilliamson left07:34
maxwilliamson joined07:35
sQVe joined07:37
fphilipe joined07:37
n3wborn joined07:42
sidetrack joined07:42
a-l-e joined07:44
thiago left07:45
rfuentess joined07: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 joined07:46
a-l-e can i do "git reset filename"?07:47
sidetrack left07: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 joined07:49
thevishy left07:49
a-l-e following the hint to use "git restore --staged" seems to have solved the issue...07:50
TomyLobo2 joined07:59
Belliash joined08:03
Jackneill joined08:04
reprazent joined08:05
gloomy left08:06
gloomy joined08:07
jayjo joined08:08
nav2002 left08:15
sidetrack joined08:16
Wetmelon left08:17
flaviodesousa joined08:18
shabius_ left08:21
sidetrack left08:21
cluelessperson_ left08:23
cluelessperson joined08:24
Fernando-Basso joined08:24
Wetmelon joined08:27
Ring0` left08:28
EdFletcherT137 joined08:33
Belliash left08:34
Belliash joined08:35
causasui left08:37
gxt joined08:38
pastucci joined08:43
macaronus left08:44
iam730 left08:45
sbeyer joined08:46
oxymoron93 joined08:46
Paradisee joined08:47
iam730 joined08:48
z8z left08:48
lacrymology joined08:48
Nozzzle joined08:48
shabius joined08:50
dionysus69 joined08:50
wagle left08:55
warthog9 left08:55
warthog19 joined08:55
raven-au_ joined08:56
raven-au left08:56
gordonfish left08:56
raven-au_raven-au08:56
warthog19warthog908:57
wagle joined08:57
juhwad__ left08:57
mobidrop joined08:59
xall joined09:01
Wetmelon left09:06
multiproc joined09:09
rajputh54 joined09:10
nivag joined09:10
SJr left09:10
rajputh54 I'm using an open source code and then changing url to private repository.09:11
Helenah left09:11
rajputh54 But later how to fetch updates from open source repo ?09:12
kanzure joined09:12
_ikke_ rajputh54: you can have more then one remote09:12
SJr joined09:13
floppydh joined09:13
rajputh54 _ikke_ Thank you ... I'll try this09:14
feriman joined09:14
Stoot left09:15
azwieg103 left09:16
T_UNIX joined09:16
azwieg103 joined09:16
Helenah joined09:16
oxguy3 left09:19
border_man joined09:19
oxguy3 joined09:21
Moongoodgirl As I understand it, the customary names are `origin` and then `upstream`.09:25
feriman left09:25
fphilipe left09:26
feriman joined09:27
babilen left09:28
babilen joined09:29
oxguy3 left09:31
Tobbi_ joined09:35
border_man left09:37
oxguy3 joined09:38
random_yanek left09:38
Fernando-Basso left09:44
g00s left09:44
random_yanek joined09:45
dartmouthed joined09:47
sbeyer left09:47
sbeyer joined09:48
akemhp joined09:48
akemhp left09:52
fphilipe joined09:54
rfuentess__ joined09:57
rfuentess left09:58
akemhp joined10:00
xall left10:12
rfuentess joined10:20
rfuentess__ left10:20
tmz joined10:20
mikecmpbll joined10:27
oxguy3 left10:28
figuinhas joined10:40
courrier joined10:53
jmd joined10:53
oxymoron93 left10:53
courrier left10:53
oxymoron93 joined10:54
sauvin left10:57
sauvin joined10:59
xall joined10:59
wrksx_ joined11:01
wrksx left11:02
enoq joined11:05
mowcat joined11:09
TomekStano left11:11
bvdw left11:18
bvdw joined11:19
rajputh54 left11:24
cdown joined11:27
Sc0tty- joined11:35
azwieg103 left11:35
Sc0tty- what does -u mean with `git push -u origin master`11:35
azwieg103 joined11:35
Sc0tty- is it --set-upstream ?11:35
_ikke_ yes11:35
Sc0tty- thank ya11:36
reprazent left11:39
howdoi joined11:42
mowcat left11:47
dionysus70 joined11:53
Phylock left11:53
dionysus69 left11:54
dionysus70dionysus6911:54
xall left11:54
xmiah joined11: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 found11:58
jmd Which git command is it that has a --ignore-dates option?11:58
osse seems like the answer is none11:59
aw1_ joined12:00
jmd perhaps it's --ignore-date (singular)12:00
reprazent joined12: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.html12:01
osse jmd: rebase and am12:02
aw1__ left12:02
jmd osse: Thanks.12:03
osse jmd: each command has its own man page btw. man git-rebase12:03
gitinfo jmd: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html12:03
multiproc left12:05
Nozzzle left12:06
multiproc joined12:06
Phylock joined12:06
lacrymology left12:07
jmd osse: Yeah. That's why it's so difficult to find what one is looking for.12:07
Helenah left12: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 joined12:10
courrier joined12: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 modern12:14
sbeyer left12:16
maxwilliamson left12:17
maxwilliamson joined12:19
greatgatsby joined12:19
nivag left12:22
sim642 joined12: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 case12:28
wrksx_wrksx12:42
sim642 Not sure what I could've done wrong then12:43
phanimahesh joined12:57
gitinfo set mode: +v12:57
gloomy left13:01
oatmealraisin joined13:02
multiproc left13:12
Nozzzle joined13:13
multiproc joined13:14
igemnace left13:18
SerialSmile joined13:19
CodeSlingerPaul joined13:19
xmiah left13:21
jrun joined13:24
courrier left13: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
sorry13:29
hello, I need help with my first-ever deployment on web server.13:30
I created a .git folder via cpanel13:30
pastucci left13: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, yes13:31
grawity then use `git` via SSH – don't create things like .git by hand13: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 configuration13: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 agent13:34
which has the keys added13:34
computer2000 joined13:36
feriman left13:36
enoq left13:39
g4570n joined13:40
Nozzzle ok I think I added it13:41
gloomy joined13:46
jim left13:50
SerialSmile left13:50
finalbeta joined13:50
jim joined13:51
SerialSmile joined13:51
mattmurr_ joined13:51
SerialSmile left13:51
oxguy3 joined13:51
Thorn left13:53
aw1_ left13:53
mrcrypto08 joined13:53
cdown left13:59
greatgatsby left13:59
cdown joined14:00
akemhp_ joined14:05
lucasb joined14:06
akemhp left14:06
akem__ joined14:07
akemhp_ left14:10
TomyLobo2 left14:16
oxguy3 left14:23
mattmurr_ left14:31
maestrojed joined14: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 loop14:37
prepend joined14:37
truthseeker_ joined14:39
jmd left14:39
cdunklau ashnur: gimmie the deets yo14:42
ashnur ?14:42
cdunklau the details14:42
first, what command did you run14:43
jim is it possible to append to the message of the latest commit?14:43
ashnur git rebase branchname14:43
cdunklau jim: you can edit it with --amend14:43
thevishy joined14:43
cdunklau dunno about appending though14:43
jim git commit --ament?14:43
d14:43
ashnur cdunklau: so after rebase i got conflict, i changed the file, saved and then added them, then git rebase --continue14:44
then sometimes git rebase --skip if it's empty14:44
and continue doesn't work14:44
cdunklau jim: yes14: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. jim14:44
cdunklau ashnur: "doesn't work"?14:45
jim no, it need not be automated14: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 that14:46
jim I'll give it a shot14: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 experiencing14: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 you14:48
ashnur i did fix it14:48
i tried it twice before i asked here14:48
cdunklau ashnur: what did it say, precisely, when you did --continue14:48
Hello71 "it doesn't work"14:50
ashnur cdunklau: https://gist.github.com/ashnur/e11451767accea0931610623373a2c6c14:51
cdunklau ashnur: what's git status output14:51
ashnur right, that was then, i aborted long time ago14:52
you never see this message?14:52
every time i do rebase it's full of this14:52
even years ago when i did it first time, this was part of it14:52
so i don't understand what is so surprising14:52
but there was no conflict, no files to change or anything14:54
anyway, i will try to recreate it14:54
mikami left14: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 session14:54
ashnur do you do rebase often?14:54
cdunklau err, --abort, rebase again, etc of course14:54
ashnur there is no conflict cdunklau if i --abort14:55
only if rebase14:55
i could fast forward merge14:55
cdunklau yes, i corrected my instructions14:55
--abort, rebase again, fix the conflict, run `git status`, `git rebase --continue`, and pastebin the terminal session14:55
maestrojed left14:58
cdunklau ashnur: also, `git log --oneline --decorate --graph branchname..` and the same except with `..branchname` can be enlightening14:59
maybe --stat instead of --oneline14:59
ashnur ?15:00
can be enlightening15: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 it15:01
use this in mentioned command... there probably are much better ways15:01
ashnur i bet there is no tool to sanitize commit messages15:02
or just git output15:02
maestrojed joined15:03
ashnur cdunklau: https://gist.github.com/ashnur/af92c12ec8c706cc9f134aba85af90cb15:03
feriman joined15:06
oxymoron93 left15:07
juhwad__ joined15: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 files15:07
gloomy left15:08
ashnur git status stays everything clean, i should --continue, but --continue says that there isn't anything to do15:08
it "doesn't work"15:08
but you can be an asshole about it15:08
Anthaas left15:08
zalt_ joined15: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 ends15: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 try15:10
best of luck15: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 bash15:10
maestrojed left15: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 remote15:10
relipse2: then run git fetch <name>15:10
after that, you can cherry-pick the commit by hash15:11
osse ashnur: I wasn't sure15:11
ashnur osse: then i can continue but as I was saying, eventually the commits repeat without the rebase ending15:11
osse you can run git rebase --skip a million times? :O That sounds like a bug in git rebase15:12
Anthaas joined15:12
ashnur osse: no, after skip i get the normal function of rebase, there is a conflict, i fix, i --continue15:13
osse: just that, as i mentioned before, the commits repeat, the rebase never ends15:13
i will get back to the beginning of the conflicts. git log will have the same commit messages repeated in order15: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. maybe15:15
osse prior15:15
ashnur i probably have similar commits but not with the same commit message15:16
since these are some test files and i was switching back and forth15:16
Kremator joined15: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 rebase15:16
ashnur good idea, thanks for reminding me, i will try it out15:17
mobidrop git: 'rabase' is not a git command. See 'git --help'.15:17
osse git rhubarb15:18
ed_peguillan left15:18
gxt left15:19
ed_peguillan joined15:21
n2o joined15:21
howdoi left15:23
n2o left15:24
omnireq_ left15:24
oatmealraisin left15: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 like15: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-howto15:28
jim lavalike, I guess, you could commit to the usual git repo first, then get a patch from it to apply elsewhere15:28
Nozzzle I keep getting 'error: failed to push some refs to 'ssh://...'15:28
_ikke_ lavalike: sounds a lot like git format-patch15:28
lavalike interesting15: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.html15:29
Stace left15:30
greggerz joined15:35
Raging_Hog joined15:36
thiago joined15:36
Frogging101 left15:37
Frogging101 joined15:39
boombatower joined15:40
to1ne left15:43
xmiah joined15: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 left15:46
dunpeal left15:49
flaviodesousa left15:50
zalt_ left15: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 repeatedly15:54
found the answer i think https://stackoverflow.com/questions/9264314/git-commits-are-duplicated-in-the-same-branch-after-doing-a-rebase15:56
sperry joined15:56
Thorn joined15:59
floppydh left16:01
mrcrypto08 left16:01
_ikke_ trhlkjdkjdsdkfjsdlfk16:02
k16:02
ugh16:02
my vpn connection died one way apparenly :(16:02
darkbit joined16:02
darkbit left16:02
thiago left16:04
akem left16:05
akem joined16:05
akem left16:05
omnireq joined16:06
cvcxc joined16:06
submerciful joined16: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 joined16:09
Moongoodgirl Nozzzle: Is that /all/ the output you get? Just that one line? O.o16: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/I5KUS16:12
chele left16:14
Noti left16:16
alexandre9099 left16:18
mobidrop left16:20
cvcxc left16:27
Lucas_Gray joined16:32
g00s joined16:32
to1ne joined16:34
Nozzzle can anyone help me get forward with this?16:35
alexandre9099 joined16:39
oatmealraisin joined16:43
cdown left16:47
cdown joined16:47
Sc0tty- left16: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 yet16:50
)16:50
armin joined16:52
durham joined16: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 left16:54
usbguy1 joined16:55
rardiol left16:55
_ikke_ armin: how are we supposed to know? :)16:55
usbguy1 left16:56
saint_ left16:57
rardiol joined16:58
rfuentess left16:59
mikami joined17:00
saint_ joined17:01
Giant81 joined17:03
thiago joined17:03
gpanders joined17: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 joined17:09
maxwilliamson left17:10
Lucas_Gray left17:12
maxwilliamson joined17:13
learningc left17: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 error17:16
bvdw left17:18
wildlander joined17:19
bvdw joined17:19
thevishy left17:21
figuinhas left17:22
computer2000 left17:23
jim Nozzzle, the permission denied you're getting from running mkdir in /var/www is because usually only root can write there17:23
wildlander left17:28
mat001 joined17:31
Nozzzle jim, should I run it with sudo?17:31
wildlander joined17:31
cdown left17:33
cdown joined17:34
causasui joined17:35
mikecmpbll left17:39
bluesoul joined17:44
wootehfoot joined17:45
alezandro left17:46
Phylock left17:51
to1ne left17:53
sperry left17:58
gareppa joined17:58
maxwilliamson left17:58
maxwilliamson joined17:59
sperry joined17:59
gareppa left17:59
to1ne joined18:02
dartmouthed left18:04
vicfred left18:06
cdown_ joined18:06
cdown left18:09
cdown_cdown18:09
lightstalker left18:10
gordonfish joined18:11
ferdna joined18:12
KnoP joined18:12
causasui left18:14
enoq joined18:14
learningc joined18:14
alezandro joined18:17
causasui joined18:17
sidetrack joined18:18
igemnace joined18:20
gareppa joined18:21
gloomy joined18:22
sidetrack left18:22
oxguy3 joined18:22
gloomy left18:25
gareppa left18:26
bin_bash NO18:26
you should setup permissions properly.18:26
gloomy joined18:26
sidetrack joined18:27
multiproc left18:27
scurfee joined18:33
gareppa joined18:34
rardiol left18:35
mikami left18:36
rardiol joined18:37
shored left18:38
oatmealr1 joined18:39
shored joined18:40
gareppa left18:40
a-l-e left18:41
oatmealraisin left18:42
a-l-e joined18:43
a-l-e left18:43
a-l-e joined18:44
scurfee left18:44
oatmealr1 left18:50
saul joined18:52
testman joined18:52
gitinfo set mode: +v18:53
KnoP left18:53
dionysus69 left18: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 SHA18:54
Paradisee left18:57
j416 saul: is there a question?18:57
truthseeker_ left19:00
saul How can I get my file into a regular state, ignored by git annex?19:02
Nozzzle left19:03
Parse joined19:04
howdoi joined19:05
j416 saul: don't use git-annex?19:15
Sasazuka joined19:15
T_UNIX left19:15
xmiah left19:16
Sasazuka left19:16
Sasazuka joined19:17
sweatsuit left19:17
Sasazuka left19:17
gxt joined19:18
Sasazuka joined19:19
prepend left19:21
jamiejackson joined19:21
Sasazuka left19:22
sweatsuit joined19:22
Sasazuka joined19:23
sauvin left19:24
testman left19:26
APic left19:29
Raging_Hog left19:32
durham left19:32
ferdna left19:35
ferdna joined19:37
APic joined19:38
lavalike U dud19: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/tMp2aE9E19:43
saul j416: work on your material19:43
lavalike does it apply to the patch above or below it?19:43
j416 saul: sorry, what does that mean?19:43
rindolf joined19:46
lavalike I suppose it applies to the one above, i.e. it writes Applying: <commit title> and then the warning, not the reverse19: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 joined19:47
cd joined19:47
lavalike I'll reset and try one at a time to figure it out19:47
j416 I wonder if you could enable tracing and that would help19:48
GIT_TRACE=1 etch19:48
etc.19:48
lavalike our intuition was confirmed correct: it's Applying: <name> and then the relative warnings19:49
a-l-e left19: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 left19: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 left19:50
j416 submodules make sense in some cases, but in my experience most of the time there's a better solution19: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 sys19:54
lavalike _ikke_: thanks for the pointer to format-patch it worked beautifully!19:54
Mattiaslndstrm left19:54
robertparkerx This means it was reverted right? https://d.pr/i/8jpHoW19:55
j416 robertparkerx: so it seems.19:55
robertparkerx How do I revert it back19:55
juhwad__ left19:55
j416 a reversion is just a regular commit.19:55
mat001_ joined19:56
j416 you can choose to revert the revert (git revert 3ad4d), for example.19:56
why was it reverted? the commit does not say19:56
robertparkerx git revert 3ad4d66f0bef5470f0d978b853b1e6a9b1bd9f9819:56
j416 it's useful to note.19:56
robertparkerx I don't know19:56
j416 robertparkerx: sure.19:56
robertparkerx I started to get emails19:56
j416 robertparkerx: maybe ask Meng19:56
robertparkerx haha19:57
prepend left19:59
mat001 left19:59
oatmealr1 joined20:04
robertparkerx ty j41620:04
j416 o/20:04
lightstalker joined20:06
DogManJr joined20:09
azwieg103 left20:09
azwieg103 joined20:09
pks left20:09
Narrat joined20:10
mat001_ left20:12
mat001 joined20:13
akemhp_ joined20:18
srg joined20: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 left20:22
akem__ left20: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: yes20:24
srg https://gist.github.com/srguglielmo/603626e04c2ab3ef2e6336d9f123ea0e20:25
sperry left20:25
cdunklau huh. i thought it might be complaining about email, but you provided it20:26
odd20:26
srg I mean, I could just add the `git config` commands to my CI script, but that seems unecessary with the --author option20:26
oatmealr1 left20:26
Codaraxis left20: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 that20:28
srg: git help config and search for user\.name20:28
oatmealr1 joined20:28
squirrel https://stackoverflow.com/questions/32676281/bypass-tell-me-who-you-are-error-in-git20: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 so20:29
enoq left20:29
dknitrox joined20:29
cdunklau but git help commit says "commit author"20:29
dknitrox left20: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 woo20:31
j416 and there was much rejoicing20:32
prepend joined20:32
akemhp_ left20:37
elsheepo joined20:38
m0viefreak joined20:41
arcanescu joined20: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 joined20: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 joined20:47
sperry joined20:47
mat001_ joined20:47
cdown left20:48
pks joined20:50
mat001 left20:50
elsheepo left20:54
mat001 joined20:56
localhorse joined20:56
emmanuelux joined20:58
mat001_ left21:00
Nozzzle left21:03
gloomy left21:03
_homme__ joined21:04
arcanescu left21:05
srg left21:06
emmanuelux left21:07
rindolf left21:08
akemhp joined21:11
akemhp_ joined21:11
akemhp left21:15
DogManJr left21:16
cdunklau Crell: i think you meant -s theirs21:22
hm no21:22
sidetrack left21:22
akemhp_ left21:23
cdunklau Crell: is it doing a recursive merge21: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 options21:26
uh, 'recursive' of course21:27
prepend left21:28
sidetrack joined21:31
mat001 left21:32
cd left21:33
DogManJr joined21:34
cd joined21: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 left21: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 left21:37
Fernando-Basso joined21:38
Crell And if I manually change them to 755 and commit first, then the merge command works.21:38
giaco left21:43
andreas303 joined21:43
Narrat left21:43
howdoi left21:43
mat001 joined21:43
relipse2 left21:44
dartmouthed joined21:50
zebrag Can I convert a very small project to a text file suitable for a pastebin?21:51
relipse2 joined21:51
Moongoodgirl Some pastebins let you do multiple files21:52
to1ne left21:52
Moongoodgirl If yours doesn't, you could just concatenate the files with a marker before each one and pastebin that21:53
that's fine if you just need to show the files to some people in a casual way21:53
zebrag Sure; maybe what I'm looking for is sth like "tar"21:53
grawity there's this pastebin called gist.github.com21:53
Moongoodgirl you could use MIME instead, which is more formal|proper and machine-readable21:54
grawity where you can literally `git push` a very small project into a pastebin21:54
Moongoodgirl Or you could pastebin a diff from an empty directory, which is probably easier while also being proper and machine-readable21:54
And yeah, Gist is one of the ones that does multiple files21:54
zebrag yes, gist seems good21:55
Moongoodgirl GitHub Gists are actually fully-fledged git repositories, which is pretty nice21:55
g00s left21:55
Moongoodgirl …I guess that's kinda implied by the ability to `git push` into them, heh21:57
mat001 left21:58
Narrat joined21:58
monr0e left22:00
mat001 joined22:00
mat001 left22:00
jlosito left22:02
fphilipe left22:02
Fusl left22:03
swalladge left22:04
Fusl joined22:04
hqdruxn08_ joined22:05
null1337 left22:09
hqdruxn08__ left22:09
to1ne joined22:12
fphilipe joined22:13
crose left22:16
Phylock joined22:17
fphilipe left22:17
to1ne left22:18
oatmealr1 left22:20
Phylock left22:22
feriman left22:23
to1ne joined22:25
to1ne left22:29
feriman joined22:33
mat001 joined22:33
swalladge joined22:40
fragamus joined22:41
Sasazuka left22:45
Sasazuka joined22:47
preisi left22:48
wildlander left22:48
preisi joined22:51
to1ne joined22:54
Helenah left22:55
ZachGibbens left22:55
Helenah joined22:57
robinb joined22:58
ZachGibbens joined22:58
azwieg103 left22:59
rsrx joined23:00
Mattiaslndstrm joined23: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 left23:02
Mattiaslndstrm left23:02
anddam left23:04
cliluw left23:06
Sasazuka left23:06
Nixerus joined23:06
wootehfoot left23:06
cliluw joined23:06
fstd_ joined23:06
reprazen_ joined23:07
mowcat left23:07
anddam joined23:07
wootehfoot joined23:07
FernandoBasso joined23:07
Codaraxis joined23:07
_homme__ left23:07
_xor left23:07
Sasazuka joined23:07
_xor joined23:07
oxguy3 left23:08
Kremator left23:08
Cerise left23:08
fxrs left23:08
Xeago_ joined23:08
lucasseikioshiro left23:08
qguv left23:08
wootehfoot left23:08
misuto left23:08
Xeago left23:09
qgTG left23:09
fxrs_ joined23:09
Xeago_Xeago23:09
wodim left23:09
mowcat joined23:09
Kremator joined23:09
qgTG joined23:09
Milos_ joined23:09
feriman left23:09
wodim joined23:09
misuto joined23:09
nivag joined23:09
Milos left23:09
Fernando-Basso left23:10
reprazent left23:10
ZachGibbens left23:10
prg318 left23:10
ZachGibbens joined23:10
shored left23:10
kimiamania left23:10
grandfso left23:10
IAmNetx left23:10
shored joined23:10
m1sdirection left23:10
kimiamania joined23:10
Cerise joined23:10
anddam left23:11
Mindi left23:11
m1sdirection joined23:11
utrack left23:11
hk239 left23:11
lucasseikioshiro joined23:11
oxguy3 joined23:11
fstd left23:12
fstd_fstd23:12
prg318 joined23:12
Improvotter joined23:12
Codaraxis left23:12
caskd left23:13
caskd joined23:14
robinb set irc.look.smart_filter on23:15
yes23:15
akemhp joined23:16
Codaraxis joined23:18
bvdw left23:18
Codaraxis left23:18
bvdw joined23:19
to1ne left23:19
buckworst joined23:19
caskd left23:20
utrack joined23:20
howdoi joined23:20
ed_peguillan left23:21
bongjovi joined23:21
Codaraxis joined23:22
im0nde_ joined23:22
jlosito joined23:24
im0nde left23:24
to1ne joined23:25
CodeSlingerPaul left23:26
buckworst left23:26
jlosito left23:29
bongjovi left23:30
malmalmal joined23:30
bongjovi joined23:30
submerciful left23:39
to1ne left23:43
fxrs_ left23:44
Improvotter left23:44
caskd joined23:45
vrih left23:45
alonkli joined23:46
alonkli12 joined23:46
fxrs joined23:46
vrih joined23:48
RoriconKnight joined23:50
akemhp left23:51
sperry left23:58

Logs Search ←Prev date Next date→ Channels Documentation