IRCloggy #git 2019-05-27

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-05-27

diogenese left00:01
tgunr left00:01
tgunr joined00:02
wald0 joined00:03
wald0 what is the correct procedure for get updated commits from an upstream project and rebase my changes (on my own branch) from it to update my code?00:04
im always confused with this00:04
bremner git fetch origin && git rebase -i origin/foo00:04
wald0 this from my master branch? and to apply the updated commits to my dev branch later how it is?00:06
or maybe i should just "git pull -r origin" from my master branch? mmh00:06
bremner probably not.00:06
git fetch origin && git checkout dev && git rebase -i origin/master00:07
xlued left00:07
xlued joined00:09
Lordveda left00:11
fphilipe_ joined00:12
tgunr left00:16
tgunr joined00:18
rustyshackleford left00:20
freeman42x left00:20
lungfisk joined00:26
lungfisk left00:27
tgunr left00:31
tgunr joined00:31
freeman42x joined00:33
milkt joined00:42
kryptonunited left00:44
tgunr left00:46
ferdna joined00:46
tgunr joined00:46
fphilipe_ left00:46
ferdna left00:53
bambanx joined00:55
nabil_ left00:57
dpl left00:57
orbyt_ left00:57
nabil joined00:58
igemnace joined00:59
orbyt_ joined01:01
Newami left01:03
diogenese joined01:04
m0viefreak left01:08
Fusl left01:09
mven joined01:10
mven left01:10
yyy left01:10
Fusl joined01:10
tgunr left01:16
tgunr joined01:17
azwieg103 joined01:22
azwieg103 left01:22
xcm left01:23
moldybits joined01:23
xcm joined01:23
azwieg103 joined01:24
tgunr left01:31
hofmann3900 joined01:31
tgunr joined01:32
nowhereman joined01:33
nowhere_man left01:34
azwieg103 left01:38
F0rTex left01:39
nabil left01:39
nabil joined01:40
lungfisk joined01:40
F0rTex joined01:40
tgunr left01:46
welovfree joined01:47
lungfisk left01:59
orbyt_ left01:59
linux_dr left02:00
tgunr joined02:01
libertyprime left02:09
freeman42x left02:13
im0nde_ joined02:15
fstd_ joined02:15
tgunr left02:16
im0nde left02:18
cdown joined02:19
fstd left02:20
fstd_fstd02:20
cdown left02:22
cdown_ joined02:22
cdown_cdown02:22
Copenhagen_Bram left02:25
ave_milia joined02:33
cdown left02:35
welovfree left02:39
Copenhagen_Bram joined02:41
fphilipe_ joined02:43
libertyprime joined02:50
tgunr joined02:50
lagothrixGuest1177002:58
Guest11770 left02:58
lagothrix joined02:58
ferdna joined02:59
nowhere_man joined03:03
nowhereman left03:07
snappy joined03:12
Sam47 left03:13
snappy is there a way to clone the linux git repo with only 512M of ram (no swap), where only 100M is used? i always get fatal out of memory errors with calloc() during the index-pack phase of the clone03:13
nowhere_man left03:15
fphilipe_ left03:17
SkarmoutsosV joined03:21
tgunr left03:31
tgunr joined03:32
relipse left03:34
Mighty_Mel joined03:35
oatmealraisin joined03:37
oni-on-ion snappy, try --depth 1 ?03:37
ave_milia left03:38
rustyshackleford joined03:41
bambanx left03:44
snappy thanks will give it a shot03:48
awesome that worked03:49
veegee joined03:51
snappy is there a way to get all the commits between the latest and kernel 5.1.3 (i suppose this is a tag)03:52
netj left04:06
netj joined04:06
tgunr left04:16
nabil left04:24
nabil joined04:24
milkt left04:28
milkt joined04:28
xlued left04:32
tgunr joined04:32
fphilipe_ joined04:33
xlued joined04:34
OtakuSenpai joined04:36
tgunr left04:46
tgunr joined04:47
Newami joined04:48
oatmealraisin left04:59
stemid_stemid05:00
tgunr left05:01
gde33 left05:01
altendky left05:02
gde33 joined05:03
Inline left05:07
shicks_ left05:07
omnireq left05:07
shicks2525 joined05:08
Raimondii joined05:15
Raimondi left05:16
RaimondiiRaimondi05:16
podlech joined05:18
andrzejv left05:18
g00s joined05:21
libertyprime left05:26
milkt left05:29
milkt_ joined05:29
milkt_ left05:29
shinzo joined05:31
shinzo Hi, how do I undo a 'git read-tree --empty' ?05:31
regedit left05:31
tgunr joined05:32
osse shinzo: git reset05:35
mjt joined05:41
mjt Hi! Is there an "easy" way to apply a patch to a file which has been renamed?05:41
_xor left05:41
_xor joined05:42
mjt I can see it's possible to rename the old file, cherry-pick the new commit, rename it back, and next to combine the 3 commits into one05:42
brezanac left05:44
dartmouthed joined05:45
brezanac joined05:45
tgunr left05:46
tgunr joined05:47
Newami_ joined05:47
Newami left05:48
OtakuSenpai left05:51
omnireq joined05:53
scientes left05:53
milkt joined05:54
kapilp left05:56
fphilipe_ left05:58
tgunr left06:01
tgunr joined06:01
podlech left06:01
fphilipe_ joined06:02
fphilipe_ left06:06
thiago left06:12
tgunr left06:16
leb left06:18
linux_dr joined06:18
cd left06:22
andrzejv joined06:22
staafl_ left06:29
sauvin left06:30
staafl_ joined06:30
PaddyF left06:30
kapilp joined06:31
sauvin joined06:31
sQVe joined06:31
cvz left06:34
m1dnight_ left06:35
n3wborn joined06:38
sQVe left06:40
sQVe joined06:40
fmgt left06:41
j416 mjt: that'd be one way. Did you try to apply it without the rename first?06:42
sometimes it'll work.06:42
m1dnight_ joined06:43
netj left06:44
netj joined06:45
esrse joined06:48
staafl_ left06:48
ferdna left06:48
OtakuSenpai joined06:48
wateriswet joined06:48
staafl_ joined06:48
averell left06:50
mjt j416: nope, it fails to find the file06:52
sQVe left06:52
sQVe joined06:53
j416 you could try changing the rename detection percentage (not sure if possible here, but maybe)06:53
if that doesn't work, I'd probably go with what you suggest above06:53
you could perhaps rename the file in the patch, though.06:54
fphilipe_ joined06:54
mjt well, cherry-pick doesn't support intermediate patch editing :) Actually I meant cherry-pick a change, not "just" apply a patch06:55
svm_invictvsbugenhagen06:55
mjt anyway, the rename-apply-rename-combine trick worked fine06:55
thank you!06:55
bugenhagensvm_invictvs06:56
Cork joined06:56
Foxboron left07:05
wateriswet left07:06
staafl_ left07:07
j416 o/07:07
TomyWork joined07:07
staafl_ joined07:07
Fusl left07:09
Sam47 joined07:11
sozuba joined07:12
interrobangd_ joined07:12
Foxboron joined07:12
Fusl joined07:14
tgunr joined07:16
Sam47 left07:17
fphilipe_ left07:20
oxymoron93 joined07:20
fphilipe_ joined07:22
staafl_ left07:27
chele joined07:28
staafl_ joined07:28
banisterfiend left07:30
mat001 left07:30
tgunr left07:31
OtakuSenpai left07:35
dpl joined07:36
pd09041999 joined07:39
czart joined07:40
Lucas_Gray joined07:41
fphilipe_ left07:43
sinhue joined07:44
sinhue left07:45
sinhue joined07:45
OtakuSenpai joined07:47
stemid left07:54
sQVe left07:56
jguddas-tr joined07:56
enoq joined07:57
Luyin there is no short form for "git diff --cached", is there?07:57
oxymoron93 nope, there is synonym `--staged` , after all, you can create alias if you need it Luyin07:59
Luyin yeah I'll do that then. sometimes I just wonder why there are no short forms for some commands07:59
diff --cached I use pretty often07:59
oxymoron93 sure then, that is the reason for creating an alias :)08:00
Luyin aliased it now :)08:00
yeah,cheers mate08:00
oxymoron93 if you think about some dash-char synonym, I guess there are many already occupied08:01
sQVe joined08:02
oojacoboo joined08:04
Newami_ left08:06
Goplat left08:06
rohit[m] joined08:07
rohit[m] left08:07
rohit[m] joined08:08
sQVe left08:08
Luyin well, -c doesn't exist for git diff08:09
but I can't be arsed to write a patch right now :D08:09
prodevcy joined08:11
joe4 joined08:13
prodevcy hello! I've got a very weird issue on windows - when using git from normal command prompt it just hangs indefinitely https://i.imgur.com/3VKYH7F.png08:15
when using from "git bash" everything is normal08:15
my googling turned up a few similar reports but most of them say that this issue was already fixed (i'm on 2.21)08:16
I've tried both x32 and x64 versions08:16
same issue08:17
if anyone can give any directions, I would very grateful08:17
Fusl left08:19
sozuba left08:19
sQVe joined08:19
Fusl joined08:20
sozuba joined08:21
floppydh joined08:21
YuGiOhJCJ joined08:22
milkt left08:30
tgunr joined08:31
milkt joined08:35
yyy- joined08:35
ferdna joined08:38
czart left08:39
planetcall|work joined08:43
tgunr left08:46
atrigent left08:47
tgunr joined08:47
yonder left08:53
atrigent joined08:57
g00s left09:02
atrigent left09:03
sozuba left09:05
sbeyer joined09:07
sozuba joined09:07
n3wborn left09:09
prodevcy left09:09
Newami joined09:10
gloomy joined09:12
oni-on-ion left09:15
Lordveda joined09:15
tgunr left09:16
tgunr joined09:16
figuinhas joined09:17
snyp joined09:21
snyp I accidentally --amend committed. Origin still has the previous commit. Any way to get it back and do a new commit in a simple way?09:21
T_UNIX joined09:21
snyp Haven't pushed to origin.09:22
catsup left09:22
catsup joined09:22
Marmotte git rebase @{u}09:22
then commit --ament to rewrite the commit message, if needed09:22
snyp What's @{u}?09:23
catsup left09:23
Lordveda left09:23
Marmotte shortcut to @{upstream}09:23
catsup joined09:23
snyp hm. ok09:23
Marmotte this is the remote-tracking branch linked to your local branch09:23
snyp let's see..09:23
catsup left09:23
catsup joined09:24
Marmotte you can list links between local and remote branches using : git remote show remotename09:24
thijso joined09:27
snyp Marmotte: works. thanks a lot.09:30
tgunr left09:31
Benjx joined09:32
tgunr joined09:32
piton joined09:33
Lordveda joined09:36
banisterfiend joined09:36
milkt left09:38
milkt joined09:38
thms_ joined09:38
linux_dr left09:38
GyrosGeier snyp, "git reset origin"09:38
polman joined09:39
GyrosGeier that takes the index back to the previous state without touching your work tree09:39
lacrymology joined09:41
thms_ How can I add empty folders to my git repo ?09:42
OtakuSenpai left09:43
Lordveda git rm??09:44
oxymoron93 !empty09:44
gitinfo [!directory] Git does not track directories, only files in directories. Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook09:44
Lordveda is there a mkdir within git commands?09:46
zamba left09:46
tgunr left09:46
Lordveda git help -a would reveal all commands right?09:46
thms_ oxymoron93, thanks09:47
oxymoron93 Lordveda yes `-a` will give all available commands09:47
tgunr joined09:47
pd09041999 left09:48
snyp GyrosGeier: the previous method works.. but does yours lose the changes I made? Or are they kept in staging or something?09:48
zamba joined09:49
PaddyF joined09:55
Lucas_Gray left09:56
GyrosGeier the work tree remains, but you need to re-add files to the index09:56
i.e. you get back to before "git add"/"git rm"09:57
"git reset" will only change the tree when you use the "--hard" argument09:57
tgunr left10:01
pks left10:01
nabil left10:01
nabil joined10:02
tgunr joined10:03
berndj left10:04
ferdna left10:04
lankanmon left10:05
pks joined10:06
Tobbi_ left10:11
Tobbi_ joined10:11
seebyr joined10:12
jguddas-tr left10:12
TomyWork left10:12
TomyWork joined10:15
tgunr left10:16
sbeyer left10:16
tgunr joined10:17
TomyWork left10:21
TomyWork joined10:21
rsrx joined10:23
BrianBlaze left10:28
Lucas_Gray joined10:28
BrianBlaze joined10:31
dsag joined10:34
dsag what do these lines mean in git10:36
https://dpaste.de/f8AL10:36
dslegends joined10:36
PaddyF left10:37
SilentGhost dsag: these are lines in bash mostly, is your question what does git symbolic-ref do?10:37
Phylock joined10:37
rocketmagnet joined10:38
rocketmagnet hi everyone, i've made changes that i've not yet commited and want them to be undone and the repo should be like the HEAD branch, how can i achieve that with git ?10:38
dsag SilentGhost: yes10:38
_ikke_ rocketmagnet: git reset --hard #Cannot be undone10:38
SilentGhost dsag: git help symbolic-ref10:39
rocketmagnet how to restoroe to a certain hash ?10:39
_ikke_ rocketmagnet: git reset --hard <commit>10:40
dsag SilentGhost: can you explain me in simple terms. I am new to git10:40
kerframil joined10:41
SilentGhost dsag: it's a way of getting the branch name10:41
dsag how different it is from git branch command10:42
_ikke_ HEAD is something special in git (a symbolic ref, similar to a symlink)10:42
jguddas-tr joined10:43
TomyWork left10:45
pigsalsa_ left10:45
TomyWork joined10:45
pigsalsa joined10:45
savolla joined10:46
totte left10:47
OtakuSenpai joined10:47
zamba left10:47
xelxebar_ joined10:47
alip left10:47
dostoyevsky left10:47
osse left10:47
shored left10:47
jguddas-tr left10:48
bachler left10:48
raatiniemi left10:48
Phylock left10:48
gloomy left10:48
xelxebar left10:48
dostoyevsky joined10:48
totte joined10:49
gloomy joined10:49
shored joined10:49
bachler joined10:49
osse joined10:49
Phylock joined10:49
zamba joined10:51
gloomy left10:52
fphilipe_ joined10:58
ghoti_ left10:59
rohit[m] left10:59
igemnace left10:59
rohit[m] joined11:00
igemnace joined11:00
gloomy joined11:05
no_maam left11:07
jguddas-tr joined11:09
rocketmagnet left11:10
kjartan left11:10
kjartan joined11:13
lankanmon joined11:14
dsag left11:15
jguddas-tr left11:20
no_maam joined11:20
fphilipe_ left11:21
immae left11:27
immae joined11:28
jguddas-tr joined11:31
milkt left11:32
milkt joined11:33
powerbit left11:37
tgunr left11:47
banisterfiend left11:50
Lordveda left11:50
OtakuSenpai left12:01
SkarmoutsosV left12:08
Lordveda joined12:09
snyp left12:10
petsc joined12:13
Newami left12:14
banisterfiend joined12:15
banisterfiend left12:20
berndj joined12:20
aesi joined12:21
fphilipe_ joined12:21
snyp joined12:24
rohit[m] left12:25
victorqueiroz joined12:26
rohit[m] joined12:26
Noti joined12:29
tgunr joined12:31
irrgit left12:32
milkt_ joined12:32
milkt_ left12:33
milkt left12:33
milkt joined12:34
czart joined12:34
milkt left12:35
Repox joined12:35
milkt joined12:36
esrse left12:39
tgunr left12:46
tgunr joined12:46
joe1 joined12:47
joe4 left12:49
wald0 left12:55
savolla left13:00
tgunr left13:01
oojacoboo left13:02
jynn left13:06
opticia joined13:07
scientes joined13:08
florekm joined13:08
Shentino left13:09
opticia left13:10
kp__ joined13:11
sinhue left13:11
Shentino joined13:12
hoshinmk112 joined13:13
gloomy left13:15
hoshinmk112 Hi. I have a submodule in my project repository. I resetted to some previous commit using "git reset hard <commit>" command. Normally, the HEAD in the submodule should also reset to the related commit, but it did not. Is there a command to update the HEAD of the submodule ?13:15
_ikke_ git submodule update13:16
bashfulshell joined13:16
tgunr joined13:16
milkt left13:16
hoshinmk112 _kke_, cool ! Thanks !13:17
BenderRodriguez left13:20
dostoyevsky left13:22
Shentino left13:28
mat001 joined13:29
ghoti joined13:29
gloomy joined13:32
jcbitter left13:34
jcbitter joined13:34
lankanmon left13:36
lankanmon joined13:38
opticia joined13:39
opticia left13:43
laice joined13:43
sinhue joined13:44
Copenhagen_Bram left13:46
wildermind joined13:46
laice left13:46
Lucas_Gray left13:47
Wryhder joined13:47
laice joined13:47
florekm left13:47
WryhderLucas_Gray13:48
laice left13:48
Luyin remember that some months ago I was maintaining/administrating a git repository/server infrastructure for a whole team? I'm at a new job and I'm doing it aaaall again :D13:48
gareppa joined13:49
gareppa left13:49
Shentino joined13:51
Habbie Luyin, at least this time you know what you are doing!13:52
Inline joined13:52
Repox left13:53
Copenhagen_Bram joined13:53
OtakuSenpai joined13:53
Luyin oi!13:58
:D13:58
Fischmiep left13:58
oatmealraisin joined13:59
khisanth_ left13:59
tgunr left14:00
tgunr joined14:01
learning joined14:03
ndimitrij left14:05
Copenhagen_Bram left14:09
petsc left14:09
Shentino left14:10
GyrosGeier hm14:10
milkt joined14:10
GyrosGeier any idea why "git subtree split" is so slow?14:10
it seems to be linear with the number of commits in the repo14:10
Shentino joined14:11
GyrosGeier but "git log -- some/sub/dir" is blazingly fast and also identifies the commits that need to be taken over14:11
agowa338 joined14:11
Copenhagen_Bram joined14:11
khisanth_ joined14:12
paulmcquad joined14:12
Marmotte git log reads commits information, git subtree split creates new tree and commit objects14:12
ndim joined14:12
Marmotte hm... maybe not new tree objects14:12
but at least commits14:12
tgunr left14:15
tgunr joined14:16
kapilp left14:16
selckin joined14:19
sQVe left14:20
kerframil left14:22
Lucas_Gray left14:25
learning left14:27
Shentino left14:28
Sam47 joined14:30
Strogg joined14:31
howell joined14:31
Strogg 'lo 'lo!14:31
shicks2525 left14:31
andrzejv left14:31
Celmor[m] joined14:32
Strogg Is there a way to make git-tag to create annotated tags by default? I looked in git-config but I didn't see anything there.14:32
or maybe I can setup a commit hook to reject tags that aren't annotated. hrmm14:33
supernovah left14:38
rafasc joined14:42
lng joined14:43
paulmcquad left14:43
lng Hi! How to merge commit from detached head? So far, I've run `git checkout master; git merge HEAD{1}` and got "merge: HEAD{1} - not something we can merge"14:44
rafasc lng: merge what?14:45
tgunr left14:45
oxymoron93 HEAD@{1} is what you probably meant, but elaborate more14:45
Celmor[m] I've gotten into a weird state of my git repository trying to apply my changes to origin/master: https://paste.linux.community/view/raw/4826108514:46
lng a commit which was done in detached head14:46
selckin probably want to cherry-pick, but not making much sense14:47
tgunr joined14:47
YuGiOhJCJ left14:47
lng the situation is like this one: https://stackoverflow.com/questions/4845505/gitx-how-do-i-get-my-detached-head-commits-back-into-master14:47
Shentino joined14:47
lng haha14:48
'@' was missing14:48
solved14:48
bluezone joined14:49
lng should be HEAD@{1}14:49
rafasc not necessarily. Only if you checkout the master branch, coming from the detached head state.14:49
kapilp joined14:49
selckin just use the left colum commit id14:50
rafasc git show, take note of the sha, checkout master; git merge <sha>.14:51
snyp left14:51
lng .зфке14:51
lng left14:51
rafasc Celmor[m]: git am --abort?14:52
TomyWork left14:53
selckin i've deleted the rebase files in .git when i got in trouble in the past14:54
Celmor[m] that worked, why does it say "You are currently rebasing" then?14:54
well, it made trouble because it couldn't find rebase files14:54
is there no "catch-all" command to get back to a origin/master state? preferrably without it touching the working tree14:55
I did try reset...14:55
enoq left14:55
rafasc Celmor[m]: git reset --soft origin/master;14:56
AWindowsKrill left14:56
Celmor[m] > I did try reset14:56
rafasc just reset will also work, it does --mixed by default which leaves your files untouched, but resets the staging area.14:56
shicks2525 joined14:58
rafasc if you're talking about exit the conflict state caused by merge/rebase/am/revert/cherry-pick, there isn't.14:59
Celmor[m] anyway, thanks14:59
rafasc you need to use --abort from the command that got you into that state.14:59
tgunr left15:00
Fusl left15:02
tgunr joined15:02
altendky joined15:03
rsrx left15:04
karoshii joined15:05
rsrx joined15:05
staafl__ left15:06
staafl__ joined15:06
Celmor[m] but what if I don't know which command got me into that state, since it mentioned "rebase" in the error and I tried aborting the rebase I couldn't easily abort it15:09
gloomy left15:10
Celmor[m] do I either have to try each of these commands with the --abort flag or with the only alternative being to delete .git and clone again or is there anything else?15:10
milkt left15:14
rafasc Celmor[m]: I am not sure what happened to you, but in latest git, git status will say You are in the middle of an am session.15:15
tgunr left15:15
rafasc that's usually enough to know what caused it.15:15
Fusl joined15:16
tgunr joined15:16
Celmor[m] rafasc: I pulled, said that there were conflicts, then I tried creating a patch and using it in git am but seems it doesn't work proeprly in powershell15:17
rafasc I think the directory rebase-apply/ is to be read as "rebase or apply".15:18
chele left15:18
selckin you can just delete the .git/rebase* files etc, keep the rest of the local data/state15:18
karoshii left15:19
karoshii joined15:19
rafasc Celmor[m]: That's problematic, you're in a conflict state and running a command that can cause conflict states.15:19
on last resort, do that selckin said, plus reset your branches if they moved. (in the rebase case)15:20
basteh joined15:20
agowa338 left15:20
kjartan left15:21
MACscr joined15:22
linux_dr joined15:23
kjartan joined15:26
Shentino left15:29
gloomy joined15:29
tgunr left15:30
hoshinmk112 left15:31
tgunr joined15:31
oxymoron93 left15:38
Silenced joined15:40
ferdna joined15:40
Benjx left15:41
diogenese left15:44
interrobangd_ left15:47
tang^ joined15:47
diogenese joined15:50
Sam47 left15:54
iam730 joined15:57
sentriz joined16:01
agowa338 joined16:06
bloops joined16:07
akushner left16:09
akushner joined16:09
lungfisk joined16:11
Sam47 joined16:11
howell left16:13
_noblegas joined16:14
yyy-yyy16:14
bloops left16:15
tgunr left16:15
tgunr joined16:16
blooops joined16:16
banisterfiend joined16:17
oatmealraisin left16:19
BeerLover joined16:22
bluesmonk joined16:22
lungfisk left16:30
Sam47 left16:30
tgunr left16:30
Sam47 joined16:31
tgunr joined16:31
banisterfiend left16:33
Sam47 left16:33
Sam47 joined16:34
Goplat joined16:34
banisterfiend joined16:36
lungfisk joined16:36
joe1 left16:38
sam_vagabond joined16:38
sam_vagabond left16:38
azwieg103 joined16:40
PaddyF joined16:41
Sam47 left16:42
blooops left16:44
jguddas-tr left16:44
tgunr left16:45
iam730 left16:48
OtakuSenpai left16:51
floppydh left16:51
tgunr joined16:52
bloops joined16:54
regedit joined16:54
azwieg103 left16:55
iNs left16:55
iNs joined16:55
[twisti] left16:58
SkarmoutsosV joined17:02
Sam47 joined17:04
gde33 left17:04
gde33 joined17:06
sz0 joined17:07
Xeyame left17:07
Olipro joined17:09
Sam47 left17:12
planetcall|work left17:13
AtumT joined17:13
Sam47 joined17:15
fphilipe_ left17:16
kerframil joined17:18
figuinhas left17:19
vavkamil joined17:22
dslegends left17:23
Newami joined17:25
wildermind left17:26
deepy left17:27
cbreak left17:29
cbreak joined17:30
tgunr left17:30
crtcji joined17:30
bloops left17:31
crtcji left17:31
tgunr joined17:32
Bobdude joined17:33
Sam47 left17:38
cbreak left17:38
freeman42x joined17:40
Shentino joined17:46
bluesmonk left17:49
neunon left17:57
neunon joined17:59
agowa338 left17:59
tgunr left18:00
bluesmonk joined18:01
tgunr joined18:01
cbreak joined18:02
jayjo I am trying to get forward ssh git users to a gitlab server, is it possible to keep regular access to ssh port 22 open while allowing git to push repos as well?18:03
selckin different ip18:04
cd joined18:05
agowa338 joined18:08
linux_dr left18:12
ghoti left18:13
JerVoo joined18:13
orbyt_ joined18:14
oni-on-ion joined18:14
Trieste left18:16
rafasc jayjo: doesn't gitlab use a 'git' user?18:19
it shouldn't affect other logins.18:20
Trieste joined18:21
ghostbuster how does merge --squash accomplish its goal? presumably it leaves the incoming branch unsquashed, right? wondering if there is a way to do the same from rebase todo18:23
selckin rebase -i; s/p/f/18:24
cdown joined18:25
rafasc ghostbuster: you just do: git merge --squash X; git commit;18:26
ghostbuster rafasc: does the --squash option exist inside the rebase-todo syntax?18:27
azwieg103 joined18:27
rafasc yes, 'squash' or 'fixup', depending if you want to keep the commit message or not.18:28
but both merge and rebase only modify the branch you have checked out. Most commands work like that.18:29
there's a caveat for rebase, because you can ask it to checkout a branch before starting the rebase, by passing an extra argument.18:29
ghostbuster can i rewrite history in such a way that the feature branch remains as-is, including when master was merged into the feature, but then when the feature comes into master, it all gets squashed?18:32
Habbie ghostbuster, autosquash might be of interest, with the fixup and squash options for git commit18:32
AfroThundr|main left18:33
AfroThundr|main joined18:33
rafasc ghostbuster: you can. Just don't rewrite the history of feature, and use $git checkout master; git merge --squash feature; git commit;18:35
oni-on-ion left18:35
yonder joined18:36
rafasc ghostbuster: the main issue with that, is that you'll lose the information the work happened on a feature branch.18:39
gloomy left18:39
ghostbuster i don't actually need the feature branch to stick around, i just want the history to be consistent in terms of one feature = one commit in master18:39
T_UNIX left18:39
rafasc then just $merge --squash feature; git commit;18:40
def_jam joined18:40
ghostbuster yeah the issue is that this happened a few commits back in master, and i forgot to use --squash18:40
eb0t left18:40
eblip left18:41
rafasc and you want to rewrite master?18:41
!rewrite18:41
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum18:41
eblip_ joined18:42
eblip_eb0t18:43
def_jameblip18:43
gloomy joined18:44
tgunr left18:45
mven joined18:46
oatmealraisin joined18:46
tgunr joined18:46
JanC left18:47
ghostbuster yeah i will get permission before doing it18:47
JanC joined18:48
ghostbuster i accidentally pushed to master without squashing, about 30 commits total from 4 different feature branches, including commits merging master->feature18:48
Shentino_ joined18:52
Shentino left18:54
ghostbuster when i try to turn merge commits into fixup commits in rebase-todo, i get an error18:58
error: commit <sha> is a merge but no -m option was given18:59
tgunr left19:00
jstimm left19:01
tgunr joined19:01
puff joined19:02
mud joined19:02
rsrx left19:04
rafasc ghostbuster: what are you doing? rebase flattens the history, how are you using 'fixup' on merge commits?19:06
yyy left19:07
leeN joined19:11
tchan left19:12
nabil_ joined19:12
ghostbuster rebase -i --rebase-merges19:12
jhill left19:14
huhlig_ left19:14
Lewix left19:14
hussam left19:14
lolmac left19:14
JJonah left19:15
Wizek left19:15
klow left19:15
kwmiebach left19:15
nabil left19:15
janx left19:16
rafasc ghostbuster: why --rebase-merges? Aren't you trying to get rid of merges by squashing?19:16
shicks_ joined19:16
sebhoss left19:16
ec left19:16
mrbkap left19:16
porton joined19:16
graingert left19:16
lineos left19:16
oh4 left19:17
bbhoss left19:17
dch left19:17
pizzaops left19:17
porton https://ibin.co/4iZEUKgxDIVm.png - why different-token-kinds and origin/different-token-kinds differ? I never pulled, so it should be the same commit in my understanding19:17
ghostbuster i'm trying to get rid of the merges where master was merged into a feature branch, but (at least originally) my goal was to preserve some merges where other branches were merged into master19:17
Strogg left19:19
ghostbuster when i run rebase -i without --rebase-merges, the commits of several of my feature branches (that mistakenly got merged into develop without squashing) are commingled, so it wasn't clear to me how to reorder and squash them in a way that creates the history i want19:20
shicks2525 left19:20
rafasc probably the best way is to do it incrementally with multiple rebases.19:21
mrbkap joined19:22
rafasc can you post your !situation?19:22
gitinfo Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)19:22
ghostbuster rafasc: i don't think i can, sorry. would it help if i create a test repo and recreate something that approximates the situation?19:23
nezZario left19:23
BeerLover left19:24
janx joined19:24
gloomy left19:24
cdown left19:26
mrbkap left19:27
fatalhalt left19:28
kwmiebach joined19:28
janx left19:28
Shentino_Shentino19:30
kwmiebach left19:31
rkta left19:31
rkta joined19:31
ferdna left19:32
dch joined19:32
mven_ joined19:32
nezZario joined19:33
__rohit joined19:34
mven left19:35
azwieg103 left19:35
porton left19:36
dch left19:38
nezZario left19:39
JJonah joined19:40
bbhoss joined19:40
pizzaops joined19:40
lungfisk left19:40
graingert joined19:40
mrbkap joined19:40
dch joined19:40
nezZario joined19:40
ec joined19:41
janx joined19:41
fphilipe_ joined19:42
lineos joined19:42
huhlig_ joined19:42
sebhoss joined19:43
Wizek joined19:43
banisterfiend left19:43
BeerLover joined19:43
kwmiebach joined19:43
hussam joined19:44
Lewix joined19:44
jhill joined19:44
oh4 joined19:45
tgunr left19:45
klow joined19:45
lolmac joined19:46
tgunr joined19:46
BeerLover left19:48
ozcanesen joined19:59
bashfulshell left19:59
mven_ left19:59
mven joined19:59
mven left20:01
mven joined20:01
n3wborn joined20:02
regedit left20:04
orbyt_ left20:04
deemel joined20:05
deemel left20:05
kapilp left20:06
rafasc you could try using $git log --graph --oneline --pretty=%x20; and annotate the relevant commits.20:07
but it will make things harder to understand.20:07
selckin left20:07
tdn joined20:10
rafasc or something like git log --graph --oneline --pretty='%<(6,trunc)%h';20:11
tdn Are there a module for serving git through apache like there is a DAV SVN module for serving Subversion repos through http/s?20:11
rafasc tdn: man git http-backend20:11
gitinfo tdn: the git-http-backend manpage is available at https://gitirc.eu/git-http-backend.html20:11
tdn rafasc, cool. Thanks.20:13
I assume that is production ready?20:14
rafasc Should be :)20:14
note that isn't an web interface.20:15
man gitweb20:15
gitinfo the gitweb manpage is available at https://gitirc.eu/gitweb.html20:15
tgunr left20:15
hofmann3900 left20:16
tgunr joined20:16
orbyt_ joined20:19
mattcen left20:20
mattcen joined20:22
polman left20:26
tgunr left20:30
tgunr joined20:31
bttf_bttf20:32
m0viefreak joined20:33
jayjo re: getting ssh to work with gitlab - looks like some modifications to the host machine are needed. Is this just if using docker (which I am) - https://github.com/sameersbn/docker-gitlab/blob/master/contrib/expose-gitlab-ssh-port.sh20:36
R2robot left20:37
bluesmonk left20:38
duderonomy left20:40
rafasc left20:44
tgunr left20:45
tgunr joined20:46
czart left20:48
orbyt_ left20:51
xp0inter joined20:53
nowhere_man joined20:55
atrigent joined21:01
azwieg103 joined21:02
lungfisk joined21:04
bashfulshell joined21:09
R2robot joined21:10
greatgatsby joined21:13
mattcen left21:15
SkarmoutsosV left21:15
tgunr left21:15
tgunr joined21:16
courrier joined21:18
__rohit left21:18
F0rTex left21:19
F0rTex joined21:20
fphilipe_ left21:22
mattcen joined21:28
agowa338 left21:30
wildermind joined21:30
tgunr left21:30
oni-on-ion joined21:32
_noblegas left21:33
tgunr joined21:36
_subopt_in_repossubopt21:37
oni-on-ion left21:37
yyy joined21:43
tgunr left21:45
Sazhen86 left21:46
tgunr joined21:46
Silenced left21:48
gadget joined21:51
lungfisk left21:57
sbeyer joined22:00
tgunr left22:00
tgunr joined22:01
oni-on-ion joined22:03
seebyr left22:04
Crocodillian left22:07
tgunr left22:15
tgunr joined22:16
mattcen left22:17
Crocodillian joined22:17
m0viefreak left22:21
m0viefreak joined22:21
mven left22:22
leeN left22:22
deepy joined22:24
xcm left22:26
subopt left22:27
xcm joined22:28
sozuba left22:30
tgunr left22:30
tgunr joined22:31
orbyt_ joined22:31
omnireq left22:35
gadget left22:36
mattcen joined22:36
freeman42x left22:36
freeman42x joined22:40
Muzer left22:40
freeman42x left22:45
Sam47 joined22:49
basteh left22:50
altendky left22:53
courrier left22:53
Muzer joined22:54
dartmouthed left22:55
tgunr left23:00
_leb joined23:00
tgunr joined23:02
acercle joined23:03
Phylock left23:04
yyy left23:06
bambanx joined23:06
_leb left23:08
sbeyer left23:12
tgunr left23:15
Lordveda hello guys23:19
m0viefreak left23:19
Lordveda I have a local repo into which I didn't sign any of my commits, what should I do to sign all those previous commits with my gnupg key??23:21
tgunr joined23:21
Mighty_Mel left23:23
orbyt_ left23:24
moldybits` joined23:27
libertyprime joined23:28
moldybits left23:29
Lordveda left23:30
tgunr left23:30
omnireq joined23:31
tgunr joined23:33
n3wborn left23:33
moldybits` left23:38
ozcanesen left23:41
tgunr left23:45
moldybits joined23:47
tgunr joined23:48
tang^ left23:48
P0rkD_ joined23:50
_leb joined23:50
yuljk left23:59
yuljk joined23:59

Logs Search ←Prev date Next date→ Channels Documentation