IRCloggy #git 2019-09-23

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-09-23

→ wreed joined00:02
← wgrant left00:04
← wreed left00:04
→ wreed joined00:06
← AugustusCaesar24 left00:06
← Lucas_Gray left00:11
← dartmouthed left00:13
← wreed left00:18
→ yash1th joined00:18
← p0a left00:19
→ wreed joined00:19
← wreed left00:22
howaboutsynergy ok I guess it makes sense if those commits are not part of master00:25
← JanC left00:26
→ JanC joined00:26
← m0viefreak left00:27
← darkbit left00:28
→ wreed joined00:29
← wreed left00:36
← libertyprime left00:39
→ wgrant joined00:39
← nic-hartley left00:40
→ wreed joined00:41
← CryptoDavid left00:42
← batrick left00:43
→ learningc joined00:45
→ batrick joined00:46
← yash1th left00:47
→ bambanx joined00:51
← xcm left00:53
→ xcm joined00:53
← howaboutsynergy left00:54
→ gschanuel5 joined00:56
← gschanuel left00:57
→ cdown joined00:59
→ gschanuel59 joined01:00
← gschanuel5 left01:01
← wreed left01:01
← Blukunfando left01:03
← kamog left01:04
← gschanuel59 left01:04
→ gschanuel59 joined01:05
← boombatower left01:07
← learningc left01:07
← bambanx left01:09
→ nabil__ joined01:11
← nabil_ left01:14
→ learningc joined01:21
← null1337 left01:22
← learningc left01:27
→ learningc joined01:28
← lucasb left01:34
← apetresc left01:42
→ apetresc joined01:44
← F0rTex left01:47
→ F0rTex joined01:48
← protektwar left01:52
→ protektwar joined01:54
← usbguy1 left02:01
→ usbguy1 joined02:02
← Envil left02:03
→ Wetmelon joined02:04
→ fenugrec joined02:07
→ Envil joined02:08
← xcm left02:09
→ flmbray joined02:10
← Cabanossi left02:10
→ xcm joined02:10
fenugrec Hi, I've just wasted the last 2h trying to cherry-pick a seemingly simple commit from one branch to another; the source branch having diverged a "long time ago". I also tried all the rebase tricks I know. Even tried different --strategy options but with no success. Now I pretty much gave up on cherry / rebase; before I do the damn thing manually, any ideas to generate a patch (git show -p ?), and apply with fuzz ?02:11
← ferdna left02:12
→ Cabanossi joined02:12
← Wetmelon left02:14
→ nabil_ joined02:15
lagothrix → Guest6233702:16
← Guest62337 left02:16
→ lagothrix joined02:16
→ Wetmelon joined02:17
← nabil__ left02:17
→ kotisky joined02:20
← amcclure left02:21
← doug16k left02:22
→ doug16k joined02:23
→ amcclure joined02:24
→ pengpengxp joined02:24
→ vdamewood joined02:26
→ db joined02:30
← pengpengxp left02:30
gitinfo set mode: +v02:30
→ pengpengxp joined02:31
→ null1337 joined02:31
fenugrec And *every* time I go through a cycle of manual merge conflict resolution, I somehow fail to select the proper hunks and end up with a polluted commit that reverts all kinds of lines02:38
→ visago joined02:38
← db left02:38
← pengpengxp left02:38
usbguy1 Oof, I wish I could be more help, but without seeing the hierarchy I don't think I could give any good advice lol02:39
fenugrec usbguy1, it's nothing secret, but it's obviously not online because it's an unholy mess02:40
well part of it is online. let's see02:40
(I'd even settle for at least a *partial* success, but this is just insane. It takes me 15 min to do the freaking merge every time, and there's always, always something wrong with it02:42
← visago left02:42
usbguy1 Is it on Github or anything?02:42
fenugrec so, it's this one lousy commit , https://github.com/fenugrec/NissanDefs/commit/d1ceb3f8682d4626357a60af6d5f2aac40cc6dd2 , "dc1eb" for short02:43
usbguy1 And where are you trying to cherrypick it to?02:44
fenugrec to another branch that I have locally and is just a fetch'd copy of another dude's fork, https://github.com/a33b/NissanDefs02:44
the goal is to make a clean PR, because if I submit it as-is, it's guaranteed to go through as the worst, ugliest merge commit conceivable02:45
usbguy1 So you just wanna take that commit and move it to a new branch?02:45
entirely?02:45
fenugrec move/cherry-pick / rebase, anything02:46
the complexity of course is due to the fact that our fork's common ancestor is about a dozen commits earlier, and stuff diverged a lot02:46
usbguy1 Why don't you checkout that commit and then branch off from that one?02:47
Or are you trying to remove all previous commits?02:47
fenugrec can you elaborate ? I think I might have tried already02:47
usbguy1 like 'git checkout dc1eb' and 'git branch new-branch'02:48
fenugrec how would that help ?02:48
← MrC left02:49
usbguy1 Are you trying to discard all the previous commits?02:49
fenugrec sorry, I probably wasn't clear - I want that commit merged in the other guy's repo via a github PR, and I only want the changes from that commit, not the whole diverged-history02:50
usbguy1 AH, mb, that makes much more sense, I see now...02:50
fenugrec so, one thing I did manage to do (not easily) was make a temp branch with just that commit, and rebase it up to the common ancestor02:50
(its' called test5 at this point). But rebase'ing it onto a33b's HEAD is a resounding failure, every time I try02:51
here let me push that test502:51
https://github.com/fenugrec/NissanDefs/tree/test5 Actually I lied, I had started rebasing test5 incrementally towards a33b HEAD. Painful every step02:55
usbguy1 Okay, so just to be 100% clear, that commit and ONLY that commit should be on the new branch?03:00
No others03:00
because I have a solution for you that I just tested03:00
→ ferdna joined03:00
← waveclaw left03:03
→ waveclaw joined03:04
usbguy1 If that's the case fenugrec, I believe your issue to be that git maintains parent commits via the reflog03:04
→ a0s510 joined03:04
fenugrec usbguy1, yep I'm interested in what you managed to do ?03:05
usbguy1 This causes a chain of commits like you see in the log, to correct this and remove the dependency on previous commits you need to orphan a commit03:05
Sweet03:05
fenugrec hmmm03:05
usbguy1 To do this run "git checkout --orphan d1ceb3f8682d4626357a60af6d5f2aac40cc6dd2"03:05
Once you completed this03:06
You will be in a detached state03:06
fenugrec (heh, that line confused gitk, which I keep running all the time)03:06
yep03:06
usbguy1 lol03:06
go ahead and make a new commit and name it whatever03:06
fenugrec done03:07
usbguy1 once this is completed, you may now type "git branch nameofnewbranch" and that will create a branch containing only that one singular commit with no parents03:07
checkout your new branch and push to origin03:07
→ clime joined03:07
fenugrec arg, I took a shortcut with the --orphan line and gave it a short hash. It messes up the next steps, let me redo that03:08
usbguy1 lol for sure!03:08
→ MrC joined03:08
fenugrec " warning: refname 'd1ceb3f8682d4626357a60af6d5f2aac40cc6dd2' is ambiguous " ?03:09
← kerframil left03:09
usbguy1 just a warning03:09
fenugrec okok03:10
usbguy1 Letting you know that git is uncomfortable with this lol03:10
fenugrec hahaha gitk is going ape03:10
usbguy1 It's gonna go ham for a minute lol03:10
fenugrec hmm I must've done something wrong, there's way too much change https://github.com/a33b/NissanDefs/compare/master...fenugrec:test7?expand=103:13
usbguy1 hmmm03:16
You know what you can do03:16
← shicks2525 left03:16
usbguy1 You can go back to the orphaned state03:16
fenugrec rm -Rf ?03:16
usbguy1 LOL03:16
always03:16
fenugrec hehe03:16
usbguy1 and pick only the files you want included in the commit03:16
You feel me?03:17
fenugrec yea03:17
→ shicks2525 joined03:18
fenugrec at that point I think I'll just edit the damn files by hand, it would've been finished about 3h ago. But I really wanted to find a way to just reuse the chunks, but I never seem to be able to get show/format-patch/apply to work properly, ever03:18
usbguy1, thanks a lot for giving it a try though, much appreciated03:19
usbguy1 Absolutely! Sorry a good solution really couldn't be found03:19
it was only 11 files right?03:19
fenugrec yeah thereabouts03:19
usbguy1 Yeah, when you git checkout --orphan is automatically stages every file for commit...good luck my dude03:21
fenugrec it was a bold idea, I had never done that03:22
← yokisuci left03:22
usbguy1 Same I had to look through the git docs to find that little gem, definitely putting that in my toolbox lol03:23
← thiago left03:23
→ thiago joined03:27
← thiago left03:28
← crose left03:34
→ agohoth joined03:35
agohoth where do I learn to do branch ing and merging properly?03:35
someone at work posted some link to 'a successful git merg strategy' but its bloggy and I like to read the actual free software projects docs on howto use it right03:35
can someone point me in the right direct?03:36
peez?03:36
→ thiago joined03:37
→ Freshnuts joined03:42
← Orbitrix left03:42
← thiago left03:43
→ Orbitrix joined03:43
→ shicks_ joined03:45
← ferdna left03:48
← shicks2525 left03:49
fenugrec agohoth, you'll need multiple sources03:50
→ wreed joined03:50
fenugrec man pages to refer to, and https://git-scm.com/doc for a friendlier coverage03:51
and google for the weird problems, and here for the really tough ones03:51
→ stitched_unicorn joined03:52
→ rople joined03:52
→ yokisuci joined03:54
→ assemblyman joined03:54
← usbguy1 left03:57
→ thiago joined03:57
→ usbguy1 joined03:57
nezZario Oof, hey guys03:58
Isn't there a configuration option that will automatically set the upstream to the branch of the same name on the remote 'origin'?03:59
← thiago left04:01
← agohoth left04:05
→ mrCyborg joined04:07
← donofrio left04:07
→ thiago joined04:07
← wreed left04:10
→ ferdna joined04:12
← sunri5e left04:21
→ sunri5e joined04:21
← assemblyman left04:22
← kotisky left04:28
→ kotisky joined04:28
→ nerosnm joined04:29
→ fattredd joined04:30
← zub1n left04:30
← nerosnm left04:34
→ dartmouthed joined04:34
← Wetmelon left04:39
→ g00s joined04:40
← stitched_unicorn left04:50
← Inline left04:58
← bket left05:00
→ pks_ joined05:01
← pks left05:03
pks_ → pks05:03
→ mszyszko joined05:03
→ bket joined05:03
→ bitwinery joined05:07
→ fphilipe joined05:11
→ dijitol joined05:14
← thiago left05:14
← toothe left05:15
→ iam730 joined05:16
→ toothe joined05:19
← a0s510 left05:21
→ jottr_ joined05:21
← mszyszko left05:22
→ Wetmelon joined05:24
→ fphilipe_ joined05:24
← jottr_ left05:26
← fphilipe left05:27
← fenugrec left05:28
← dijitol left05:29
← hojang left05:30
→ jottr_ joined05:30
→ tufteddeer joined05:44
← ferdna left05:48
← jottr_ left05:48
← Wetmelon left05:51
→ nerosnm joined05:54
← xcm left05:56
→ xcm joined05:57
← wgrant left05:58
← rafalcpp_ left05:58
→ rafalcpp_ joined05:59
→ wgrant joined06:01
→ Phylock joined06:02
← nerosnm left06:02
→ Wetmelon joined06:03
← g00s left06:05
→ TomTom joined06:09
← Wetmelon left06:09
← wgrant left06:10
→ wgrant joined06:12
→ gloomy joined06:14
← Orbitrix left06:15
→ jottr_ joined06:15
j416 nezZario: that'll happen by default on checkout.06:15
→ Orbitrix joined06:15
→ g00s joined06:17
→ n3wborn joined06:20
→ Mattiaslndstrm joined06:23
→ Noti joined06:25
← chachasmooth left06:26
→ chachasmooth joined06:28
← jottr_ left06:29
← cd left06:31
← [Tux] left06:32
← Joel left06:32
← clime left06:33
→ gxt joined06:34
→ oxymoron93 joined06:34
→ rafalcpp joined06:35
← rafalcpp_ left06:35
← MrC left06:36
← j416 left06:36
→ j416 joined06:40
→ arunkumar413 joined06:42
→ rfuentess joined06:45
← Freshnuts left06:50
→ thefatma joined06:50
← j416 left06:53
→ feriman joined06:55
← fphilipe_ left06:55
→ Joel joined06:57
→ chele joined06:57
← usbguy1 left06:58
→ MrC joined06:59
← publio left07:00
→ stitched_unicorn joined07:01
← roadie left07:02
← Ragnor left07:03
→ sz0 joined07:06
← Cabanossi left07:08
← Heirlung left07:10
← justanotheruser left07:12
→ c0c0 joined07:13
→ Heirlung joined07:13
→ fphilipe_ joined07:15
← Darcidride left07:15
← lankanmon left07:16
← yokisuci left07:18
→ roadie joined07:19
→ mobidrop joined07:19
← nowhere_man left07:20
← mobidrop left07:20
→ Cabanossi joined07:20
→ glosoli joined07:22
← kotisky left07:24
← vdamewood left07:25
→ mobidrop joined07:26
← craftyguy left07:30
→ j416 joined07:30
← n3wborn left07:32
← j416 left07:38
← stitched_unicorn left07:41
→ craftyguy joined07:41
→ j416 joined07:43
← g00s left07:44
→ MACscr joined07:44
→ floppydh joined07:45
← gxt left07:46
→ jguddas-tr2 joined07:48
→ gxt joined07:52
Shentino_ → Shentino07:54
← royal_screwup21 left07:54
← Noti left07:55
→ nabil__ joined07:56
→ Noti joined07:57
← nabil_ left07:58
→ dre_ joined08:01
→ TomyWork joined08:04
→ veegee joined08:05
→ rendar joined08:06
rendar this simple function https://bpaste.net/show/SyeT -- makes git to upload files correctly, then to freeze. I have to use ctrl+c to return back to the bash console. How is that? Maybe a git major bug?08:07
→ SteffanW joined08:08
← Noti left08:08
→ libertyprime joined08:12
← oxymoron93 left08:14
← wonko7 left08:14
→ Fischmiep joined08:15
→ figuinhas joined08:19
← thomasross left08:20
→ thomasross joined08:20
← Fischmiep left08:21
→ lankanmon joined08:21
→ pie__ joined08:22
← pie_ left08:25
← fphilipe_ left08:25
→ fphilipe_ joined08:26
→ sQVe joined08:28
→ cfoch joined08:29
← Goplat left08:30
← veegee left08:31
Habbie rendar, in general, it's way more likely for your script to have a bug than for git to have a bug08:32
rendar, and there is nothing in that snippet that looks like it would hang, so it's quite likely a problem in your script but outside of this function08:33
rendar Habbie: i know, but my script just calls git!08:33
Habbie: man, i call ONLY that script08:33
→ enoq joined08:33
Habbie rendar, please don't "man" me08:33
rendar ?08:33
Habbie rendar, and if you want help, please show the whole script08:33
rendar ok...08:33
that is the whole script!08:33
i call just that function with an alias08:34
Habbie oh, from a shell prompt?08:34
rendar $ alias gu08:34
alias gu='git_push_branches_and_tags'08:34
Habbie: yes08:34
Habbie try 'set -x'08:34
to see where it is hanging08:34
rendar ok, let's see08:34
it's hanging on git call08:35
← Rhonda left08:35
rendar https://bpaste.net/show/67RJ08:35
← bitwinery left08:36
Habbie ah08:37
you said it uploaded correctly08:37
did you check that?08:37
rendar well, i'm doing that now08:37
it seems it didn't08:37
Habbie ah08:37
→ veegee joined08:37
rendar hmm08:39
it seems it's a problem of the server, it has readonly filesystem08:39
Habbie ah08:39
weird that it would hang then08:39
instead of give you an error08:39
rendar indeed!08:39
← enoq left08:40
→ Rhonda joined08:40
→ Noti joined08:40
← SteffanW left08:40
→ p0a joined08:46
p0a Hello I've been trying to learn git. It seems to me my github.com account has duplication? That is, how many repos/forks would be there normally?08:46
Say if we have A/A.git and B/A and B/A:fork and then local/A and local/A:fork ? I don't get it08:47
→ SteffanW joined08:47
← gloomy left08:47
← Noti left08:47
→ fstd_ joined08:52
→ jottr_ joined08:53
→ david2 joined08:53
_ikke_ p0a: Sorry, your question is not really clear to me08:53
→ ASDX joined08:53
david2 hi to everybody just a simple question im trying to create a release on my github repo i need to inject the name of the stream in the .tar.gz but i have no idea how right now its always 1.0.tar.gz for the link thanks a lot for your help08:54
Habbie david2, that's a github feature, you'd have to ask them..08:55
← fstd left08:56
fstd_ → fstd08:56
p0a _ikke_: Suppose we have github.com/A/A.git. I want to join development and submit some commits to the project. Why can't I just work from my comamnd line? What utility does github.com have and do I have to use the github.com web UI?08:56
← david2 left08:57
Habbie p0a, github is not necessary; but if that is where a project decides to get hosted, and you want to submit code, you will also have to use github08:57
jast you don't *need* to fork if you get push access to the original repo08:57
← feriman left08:57
→ Makaveli7 joined08:57
p0a honestly I hate the github.com layer. Most tutorials do not mention it08:58
jast if you have push access, you can pretty much ignore it08:58
p0a I don't have :(08:58
I'm just trying to submit some commits to an opensource project08:58
→ fzr joined08:58
jast then you can either ask the project owner, or you'll have to make do in some other way08:58
p0a it's ok I just wanted to make sure I wasn't missing something but now I realize that github.com is a separate thing08:59
← altendky left08:59
jast most projects won't feel like giving random people permission to mess with their repository - so the fork/pull request workflow is the next best thing08:59
p0a I just wish it hadn't to do with a website that's all08:59
cdunklau p0a: if it's just a question of not being familiar with github, the git !book has a chapter on it08:59
gitinfo p0a: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable08:59
p0a gosh it's ridiculous the amount of reading that needs to be done09:00
for something simple lol09:00
cdunklau p0a: but it really depends on the project. some projects are cool with old-school email-a-patch, but a lot prefer one single workflow09:00
best to consult the project's contributor guide to see what's possible09:01
p0a right I am trying to do it the right way but it frustrates me to have to deal with something non-programming related09:01
yeah I think they prefer github.com like you said09:01
cdunklau well, then, get comfy with it if you want to help the project09:01
p0a it's more like a barrier to me09:01
my brain feels so anti-elastic on new information right now lol09:02
cdunklau p0a: you deal with non-programming stuff for any kind of OSS contribution though09:02
p0a cdunklau: yes -- I've never had one before so i'm trying to get into it09:02
cdunklau i understand that different workflows can be frusterating, but well, that's life :)09:02
→ pi- joined09:02
← Stoot left09:03
p0a It just saddens me that there's not a list of commands I can just run and get it going09:03
cdunklau p0a: i mean, you might be able to find some command-line github UI09:03
p0a I'm pretty sure I actually don't need to understand git for the most part but there's an obsession online with `defining upstream' and `forking' -- it's like, I don't even want to know the terminology, give me a break09:03
it's made up words jeez09:03
cdunklau p0a: to be clear, "git" and "github" are two different things.09:04
p0a Yeah that much is clear, but it's not clear what the differences are to me.09:04
For example, I don't understand why the project has emacs config files (for C style). Their instructions say I should copy them somewhere in the repo09:05
cdunklau p0a: git is a VCS software suite. github is a service that hosts git repositories and provides associated project management features09:05
p0a Does that mean git knows to setup a programming environment for me? I dn't understand that09:05
← dre_ left09:05
cdunklau p0a: if you're new to _git_, well, i'd suggest starting with chapter 1 of the book https://git-scm.com/book/en/v209:06
p0a yeah I don't want to read a book on using git I will forget everything tomorrow09:06
and it will be painful to read about sth like that gosh im so frustrated09:06
steven- → steven09:07
cdunklau p0a: maybe you need some tree time09:07
p0a yeah definitely09:07
cdunklau p0a: are you a software developer?09:07
p0a I made my first commit from my :master and they gave me instructions to fork it and commit again and force a pull or whatever09:07
cdunklau: hobbyist for over 10 years, alone09:08
→ Fischmiep joined09:08
pi- I am maintaining a code component (multi platform C++ library). Currently we are using githubflow. For each task/feature the assigned developer creates a local branch, and when the branch is working and tested, creates a PR. Component lead squash merges it into master. Every few weeks we publish a new version (minor/point). Publishing is done via artifactory, and master is tagged at point.09:08
We are running into some workflow difficulty when we discover a bug in a published release.09:08
cdunklau p0a: i mean, git is a _very_ widespread VCS. if you're considering getting a dev job, the overwhelming likelyhood is that you'll be using git, so it's definitely worth learning09:09
p0a cdunklau: but I am not! lol09:09
pi- Our devops lead is pushing strongly for a workflow revision whereby EVERY commit to master represents a published version (and associated tag).09:09
cdunklau p0a: what do you use for VCS on your hobby projects?09:09
pi- Does this sound healthy?09:09
p0a cdunklau: I typically have a few copies of the file laying around, version 1, version 2. Honestly it never reaches that point most of the time09:10
cdunklau: as whatever it is I'm doing is done within a week or two09:10
cdunklau p0a: okay, well, even then VCS is a great tool09:10
p0a cdunklau: so is gdb but I never used it :P09:10
cdunklau ¯\_(ツ)_/¯09:10
pi- p0a: this should be your first challenge, get a simple project up on GitHub, and use it to teach yourself the basics of git.09:11
p0a pi-: problem is, I can't "teach" myself because I will forget everything09:11
my memory is just not there for this kind of stuff09:11
pi- Luckily you are entering the arena after the battle of the VCS has been fought and won (by git).09:11
p0a: your words could be my own -- this is also my experience has my memory is terrible. I don't have the autism streak for memorising commands. I spider-learn. So getting comfortable with git has been a real challenge for me this last year.09:12
p0a or patience. I mean, there has to be a total of 6 commands I have to learn for this. Something like `setup the origin/upstream thingie locally (and github.com account?) ; pull code ; hack ; submit'09:12
rendar if i do a git push --all when there are unstaged files or modified files, what happens?09:13
p0a pi-: thanks, there's some comfort in knowing that I am not alone09:13
pi- I think the first thing to accept is that it's not a simple thing you're going to learn over a weekend. I still get flummoxed as soon as we get nontrivial situations.09:13
← Fischmiep left09:13
pi- I had a similar experience with Python. In the beginning it was so easy, I lulled myself into a full sense of security. Because it is so powerful, enormous complexity is possible. there's a reasonable parallel with git here.09:14
p0a I will in fact try your advice and get a bit comfy with the account09:14
→ Fischmiep joined09:15
pi- I will quote/paraphrase from my DSP guru (aimed at understanding Digital filters but it applies): "You're not going to master this by running at it. Discipline is required. You have to train. You have to write things down. You have to experiment methodically. You have to do exercises."09:16
p0a quoting my guru: "You bang the coconut and it cracks open."09:18
← jottr_ left09:18
p0a :P09:18
pi- How's that working out for you? :p09:18
rendar: Do `git log`. Notice all of the local commits AFTER remote-head. When you do `git push`, it is these that are pushed.09:19
i.e. only commits09:19
→ howdoi joined09:20
pi- staged/unstaged -- it makes no difference. Both are ignored.09:20
rendar ok thanks09:20
pi- `git add` to stage a bunch of files.09:20
`git commit` to bag them into a commit09:20
← Fischmiep left09:21
pi- `git push` to push all unpushed commits upstream.09:21
"You bang the coconut and it cracks open." <-- this depends upon which is harder: the coconut or your head. Maybe it is your head which cracks first. In this case you need to harden your head ;)09:23
→ jottr_ joined09:29
← figuinhas left09:30
→ Lucas_Gray joined09:30
→ figuinhas joined09:31
← lupine left09:35
→ lupine joined09:36
→ T_UNIX joined09:39
→ royal_screwup21 joined09:42
→ Fischmiep joined09:42
← fphilipe_ left09:45
→ fphilipe_ joined09:45
← Lucas_Gray left09:46
← Fischmiep left09:47
→ Lucas_Gray joined09:48
← rafalcpp left09:50
→ rafalcpp_ joined09:50
→ moldy joined09:51
moldy hi09:51
if ``git blame --ignore-rev $rev`` still shows me $rev, what's the cause of this?09:52
→ gloomy joined09:53
← zamba left09:55
→ mimajof joined09:56
← catsup left09:58
→ catsup joined09:59
← nuala2 left09:59
← jguddas-tr2 left10:00
→ jguddas-tr2 joined10:01
→ zamba joined10:03
← zamba left10:11
→ oxymoron93 joined10:11
→ zamba joined10:14
→ Fischmiep joined10:14
← jguddas-tr2 left10:15
← sz0 left10:15
→ kes joined10:16
kes Hi. May someone help me with this question?10:17
https://stackoverflow.com/q/58060172/463201910:17
← Fischmiep left10:19
→ jottr joined10:19
→ vdamewood joined10:19
← jottr_ left10:22
oxymoron93 kes you need to !rewrite history10:23
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/waqum10:23
kes oxymoron93: thank for the link10:25
← fphilipe_ left10:26
← vdamewood left10:27
→ jackkall joined10:30
→ jottr_ joined10:30
← jottr left10:33
→ jottr joined10:35
← jottr_ left10:38
→ jottr_ joined10:40
← learningc left10:42
← jottr left10:43
vals_ → tango_10:43
← oatmealraisin left10:45
← gloomy left10:45
→ bs joined10:46
← Lucas_Gray left10:46
→ gloomy joined10:47
← pi- left10:47
→ Lucas_Gray joined10:48
→ feriman joined10:50
→ JanC_ joined10:51
← JanC left10:51
← bs left10:51
JanC_ → JanC10:52
→ jguddas-tr2 joined10:54
← gloomy left10:56
← p0a left10:58
→ gloomy joined10:59
← gloomy left10:59
← cdown left11:02
← jackkall left11:03
→ e^1 joined11:05
→ bs joined11:07
← rafalcpp_ left11:08
e^1 is it possible to check what files have changed between master and the branch that i created ?11:08
→ hojang joined11:08
→ rafalcpp_ joined11:08
→ emsjessec joined11:09
Habbie e^1, 'git diff master...' (or two dots? i always forget)11:10
e^1 Habbie: just need your 2 cents, is it good to start with a git GUI to understand things more better or cli will suffice ?11:11
Habbie e^1, i did it without a gui, but don't take that as advice11:12
e^1 Habbie: okay :)11:12
← Kingsy left11:14
→ altendky joined11:15
→ agg joined11:16
→ nerosnm joined11:18
e^1 Habbie: Also when i am pushing my changes both the branches are getting updated, master as well as the branch i created11:18
← tango_ left11:18
→ tango_ joined11:19
Habbie e^1, that sounds weird11:19
e^1 Habbie: wait, my bad..11:19
← Spr0cket left11:19
e^1 i messing up things11:19
← |Tux| left11:20
← Karyon left11:20
← bs left11:20
→ Spr0cket joined11:20
→ Karyon joined11:22
→ reallymemorable joined11:22
reallymemorable im sure im doing something really stupid: why when i `git push` a repo is it saying everything is up to date, but when I go into the corresponding github repo, the timestamp is not updated and teh code is not updated?11:24
I even do this: `git remote set-url origin [email@hidden.address]11:24
did*11:24
← glosoli left11:24
→ learningc joined11:25
← e^1 left11:26
→ Fischmiep joined11:28
→ igemnace joined11:29
mSSM Does someone know if I can push directly to a PR on my github repo? The PR was created by another user.11:30
← reallymemorable left11:30
mSSM What git allows me to do is a) add the other user's repo as a new remote, b) fetch the branch the PR was made from, and c) push directly to that remote branch.11:31
→ fphilipe_ joined11:32
← Fischmiep left11:32
mSSM I wonder if I can circumvent the dance that is steps a) and b), similar to how I can “git fetch pull/4/head:LOCALBRANCH”11:32
→ e^1 joined11:33
→ bs joined11:33
← rafalcpp_ left11:35
→ rafalcpp_ joined11:36
← bs left11:36
→ clime joined11:36
← nerosnm left11:37
← hojang left11:38
→ oatmealraisin joined11:38
→ acebrianjuan joined11:39
acebrianjuan Hi all11:39
This question may be a little bit off-topic but one user that made a pull-request to my repo is not appearing in the GitHub contributors list11:40
and I would like to make sure that he is credited there11:41
He authored a few commits which are part of the master branch11:41
but for some reason GitHub is not reporting him as a contributor11:42
this is my repo: https://github.com/acebrianjuan/gnss-sdr-monitor11:42
and this is the merged pull-request: https://github.com/acebrianjuan/gnss-sdr-monitor/pull/111:43
Luyin !github11:43
gitinfo GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features11:43
→ glosoli joined11:43
acebrianjuan Luyin: indeed11:44
← rafalcpp_ left11:44
→ bs joined11:44
e^1 if i have dotfiles that need to be version, what's the good idea to have master ( which will be used for desktop ) and laptop branch seperate ?11:46
← bs left11:47
Luyin I think the good idea would it not to be branches but two repos, because they'll not be merged, will they?11:47
e^1 Luyin: I might keep them seperate i guess, simply clone laptop branch for laptop and master branch for desktop ?11:48
cdunklau acebrianjuan: the email they used in the commit isn't registered to their github account11:48
e^1 Luyin: what you are saying is a good idea as well, less complications11:48
cdunklau e^1: i wouldn't use branches for this11:48
i'd just use separate directories for the different things11:48
persumably you'll have a lot of commonality between them, yes?11:49
e^1 cdunklau: yes correct11:49
only few things here and there changes...11:49
→ Stummi joined11:49
cdunklau e^1: right, so those aren't two different paths of development11:50
they're two closely-related implementations of the same thing11:50
so i'd suggest using the same repo, same branch, and just organize the differences however you need11:51
e^1 cdunklau: taking an example, polybar, I have 2 different configs for laptop and desktop, I am using stow to manage them, If i keep in same directory i can't keep both the configs at once11:51
cdunklau e^1: sure you can11:51
acebrianjuan cdunklau: can I do something about it?11:51
→ crose joined11:51
→ bs joined11:51
cdunklau well, i don't know what stow is, but you just need to figure out how to e.g. load a different config based on where you are11:51
e^1 cdunklau: making 2 distinct dir would be good, polybar_desktop and polybar_laptop11:52
acebrianjuan cdunklau: like can I somehow tell git to map it to his registered email address?11:52
cdunklau e^1: say, you have a "dotfiles config" thing that declares which "role", or even just hardcodes the name of the appropriate config11:52
acebrianjuan: that's a github thing, not git. the contributor needs to change it in their account11:53
e^1 cdunklau: let me merge my laptop branch with desktop and create distinct dir11:53
← bs left11:54
cdunklau acebrianjuan: if you look at the commit with git log, you can see what email they put11:54
acebrianjuan: but they can tell github about their email address, it will accept multiple ones11:54
like, i have my github set up to know about my personal and work email address11:54
← rople left11:55
→ zou8944_ joined11:55
acebrianjuan cdunklau: ok, so there's nothing I cand do from my side I believe11:55
e^1 cdunklau: on github pull request is what's needed to done to merge a branch to master ?11:56
→ gloomy joined11:56
Luyin hi, I'm getting this output when I try running "git stash": https://paste.xinu.at/iBJDq/11:57
I have no idea why it's doing that11:57
cdunklau acebrianjuan: nope. the github api lets you see it too https://api.github.com/repos/acebrianjuan/gnss-sdr-monitor/commits/ddc11bc53129678e34ff6d38f6249757cd155b3911:57
Luyin (git st == alias for git status)11:57
cdunklau acebrianjuan: so i bet that's his work email, but he only has github set up to know about his personal11:57
probably just send him a message and let him know that you'd like to make sure he gets credit11:58
→ bs joined11:58
→ YuGiOhJCJ joined11:59
→ pi- joined11:59
→ escherial joined12:00
acebrianjuan cdunklau: thank you very much :)12:00
← jguddas-tr2 left12:02
cdunklau acebrianjuan: ah, there it is https://help.github.com/en/articles/adding-an-email-address-to-your-github-account12:02
← bs left12:03
← xcm left12:03
→ xcm joined12:03
→ dodobrain__ joined12:04
← feriman left12:05
← dodobrain_ left12:06
→ abraxxas joined12:07
→ bs joined12:09
← bs left12:11
e^1 cdunklau: what should i enter, git status states -> git branch --set-upstream-to=origin/<branch> laptop12:12
here origin is the url to the repo ?12:12
cdunklau e^1: it appears i've set a bad precedent :)12:13
wrt github support12:14
e^1 okay sorry, but i guess it's nothing github specific i have asked12:15
→ bs joined12:16
→ deathwishdave joined12:16
e^1 let me talk in terms of git12:18
← bs left12:18
e^1 When i am executing git pull, it complains about 'there is no tracking information for this branch' how can i can't pull but push to that specific branch ?12:19
← acebrianjuan left12:21
→ bs joined12:22
← bs left12:22
cdunklau e^1: can you pastebin your terminal session?12:23
→ howaboutsynergy joined12:27
howaboutsynergy Hi all. Suppose I have staged and unstaged modified files and I want to restore the workdir / lose all changes, to HEAD. Should I use `git restore --staged --worktree` ?12:28
or rather `git restore --staged --worktree .` assuming I'm in root dir of the repo12:28
_ikke_ " Specifying both restores both"12:29
→ jguddas-tr2 joined12:29
howaboutsynergy may I also get rid of the untracked files?12:29
should 'git clean' be used for that?12:30
_ikke_ yes12:30
howaboutsynergy sweet, thanks!12:30
← fphilipe_ left12:31
→ Kaivo joined12:32
← zou8944_ left12:32
→ fphilipe_ joined12:32
← crose left12:34
← gloomy left12:35
← fzr left12:36
→ justanotheruser joined12:38
→ donofrio joined12:39
→ tmager joined12:41
→ feriman joined12:43
← magic_ninja_work left12:43
→ Noti joined12:45
← SteffanW left12:46
← tufteddeer left12:47
← royal_screwup21 left12:48
→ CodeSlingerPaul joined12:50
← Cabanossi left12:53
→ lucasb joined12:58
← jguddas-tr2 left12:58
→ Stoot joined12:59
→ royal_screwup21 joined13:00
← Phylock left13:03
← oxymoron93 left13:06
← jottr_ left13:06
← plasticle left13:07
e^1 cdunklau: i solved that issue, thanks :)13:07
→ plasticle joined13:09
→ macaronus joined13:10
← yonder left13:11
→ is_null joined13:13
→ yonder joined13:14
→ Phylock joined13:16
← howaboutsynergy left13:16
→ jguddas-tr2 joined13:20
← abraxxas left13:20
→ jottr_ joined13:21
→ malina joined13:25
← bigfondue left13:28
→ Fischmiep joined13:28
→ gloomy joined13:30
← zulutango left13:31
← Xeyame left13:32
→ zulutango joined13:33
← Fischmiep left13:33
← fphilipe_ left13:41
→ hojang joined13:42
← glosoli left13:43
→ czart joined13:45
← Makaveli7 left13:46
→ Inline joined13:48
→ bigfondue joined13:49
→ Dougie187 joined13:50
← Dougie187 left13:53
← c0c0 left13:53
→ Dougie187 joined13:54
← Kaivo left13:54
→ c0c0 joined13:55
→ kotisky joined13:57
← floppydh left13:58
→ fphilipe_ joined14:03
→ ed_peguillan joined14:07
← Dougie187 left14:08
→ Dougie187 joined14:09
→ catbusters joined14:12
→ fahadash joined14:14
→ ericfreese joined14:15
← Dougie187 left14:15
→ Dougie187 joined14:16
← _xor left14:16
→ ExeciN joined14:21
← omnireq left14:24
← quackgyver left14:26
→ SkarmoutsosV joined14:28
→ turbofoxen joined14:28
← im0nde1 left14:29
→ im0nde_ joined14:29
→ stitched_unicorn joined14:30
← mobidrop left14:33
← macaronus left14:39
← malina left14:40
→ Fischmiep joined14:40
→ nika joined14:41
← SkarmoutsosV left14:44
← Fischmiep left14:44
← gloomy left14:45
→ malina joined14:46
→ yokisuci joined14:49
→ greggerz joined14:49
← greggerz left14:51
→ boombatower joined14:54
← clime left14:56
← sQVe left14:58
→ omnireq joined14:59
→ gloomy joined14:59
← chele left15:00
→ Cabanossi joined15:00
→ teward joined15:01
← Noti left15:01
← mojisun_ left15:01
← royal_screwup21 left15:05
→ blackmesa joined15:05
← malina left15:12
→ mojisun_ joined15:13
→ royal_screwup21 joined15:13
im0nde_ → im0nde115:15
→ flow2019 joined15:18
← thefatma left15:23
→ greggerz joined15:25
→ AtumT joined15:28
← howdoi left15:32
← flow2019 left15:33
← fphilipe_ left15:36
→ nabil_ joined15:36
← yokisuci left15:38
← nabil__ left15:40
→ SkarmoutsosV joined15:43
← shored1 left15:44
cjohnson_ → cjohnson15:44
→ shored joined15:44
→ dijitol joined15:45
← blackmesa left15:45
→ bs joined15:47
→ fphilipe_ joined15:48
← hojang left15:48
← gloomy left15:48
← bs left15:50
← AtumT left15:50
→ glosoli joined15:52
→ bs joined15:53
→ yokisuci joined15:55
→ crose joined15:56
← bs left15:57
← rfuentess left15:58
← deathwishdave left15:58
→ usbguy1 joined16:00
→ deathwishdave joined16:00
→ magic_ninja_work joined16:00
← arunkumar413 left16:01
← glosoli left16:01
← jguddas-tr2 left16:02
← mimajof left16:02
→ glosoli joined16:03
← royal_screwup21 left16:04
← Lucas_Gray left16:04
← learningc left16:04
→ learningc joined16:05
→ Lucas_Gray joined16:06
← Phylock left16:08
→ flow2019 joined16:12
← glosoli left16:13
← xcm left16:17
← hussam left16:17
→ xcm joined16:17
→ thiago joined16:20
→ Phylock joined16:22
← Lucas_Gray left16:25
→ Lucas_Gray joined16:29
→ mjacob joined16:30
→ mszyszko joined16:31
← stitched_unicorn left16:31
mjacob is there a way to show how many objects of which type there are?16:31
→ nabil__ joined16:31
mjacob `git count-objects -v` shows the number, but not grouped for type16:32
← flow2019 left16:33
← TomyWork left16:34
← nabil_ left16:34
→ philipoakley joined16:36
← nabil__ left16:37
→ glosoli joined16:37
→ malina joined16:37
→ nabil__ joined16:37
← glosoli left16:39
→ enoq joined16:39
← yonder left16:39
→ flow2019 joined16:39
→ rsrx joined16:39
→ anddam joined16:39
→ nateriver joined16:40
→ tchan joined16:41
nateriver i tried to create a bitbucket16:42
← deathwishdave left16:42
← enoq left16:42
nateriver but then when i clone the bitbucket to my project it says "Unauthorized16:42
fatal: Could not read from remote repository."16:42
→ localhorse joined16:43
nateriver i wish stuff had instructions16:43
instead of assuming we know everything16:44
← justanotheruser left16:44
← tchan left16:45
nateriver like "oh there's .00001% chance you get some attack, lets make everyone do crazy ssh stuff just to upload"16:45
and then not explain how to do it16:45
bremner don't hold back, tell us what you really think :P16:46
← fructose left16:46
bremner nateriver: what url did you pass to clone?16:46
→ fructose joined16:46
anddam hello, is there a dry-run option for rebase, to see what would happen with a non-interactive rebase?16:47
← dijitol left16:47
anddam ah jeez, https://stackoverflow.com/questions/29517440/is-there-some-kind-of-git-rebase-dry-run-which-would-notify-me-of-conflicts16:47
→ royal_screwup21 joined16:48
← ExeciN left16:48
← xcm left16:48
→ xcm joined16:49
anddam btw fiddling with a test repo for trying out https://www.atlassian.com/git/tutorials/merging-vs-rebasing I _just_ figure git log will only print out history of current branch, unless --all is used16:50
this was a big "woa!" moment16:50
← Phylock left16:50
← magic_ninja_work left16:50
← flow2019 left16:53
→ oxymoron93 joined16:56
anddam ohh now I see why I was creating all those duplicated commit when pulling other people changes, I was rebasing wrong16:57
now I know what I want from git and have a semi-idea of how to get it16:57
→ justanotheruser joined16:58
← catbusters left17:01
→ gloomy joined17:01
← Stoot left17:02
→ alonkli joined17:02
→ Phylock joined17:03
→ tsaka__ joined17:05
→ glosoli joined17:07
tsaka__ I created a new local branch. Git status shows modified, uncommitted files. How can I get a clean working tree, while not discarding unstaged changes in the master branch (which I branched from)?17:07
_ikke_ commit them in the master branch17:08
← Cabanossi left17:08
tsaka__ so the working tree is not specific to the branch?17:09
← figuinhas left17:09
tsaka__ if I discard the changes in this branch, they will be discarded in the other?17:09
← geek1011 left17:09
_ikke_ tsaka__: correct, the working tree does not belong to any branch17:10
→ geek1011 joined17:10
→ Stoot joined17:15
→ Cabanossi joined17:16
← royal_screwup21 left17:17
→ clime joined17:17
→ nabil_ joined17:17
← philipoakley left17:19
← nabil__ left17:19
→ cdown joined17:22
← gloomy left17:22
← midnightmagic left17:26
→ hussam joined17:29
→ gareppa joined17:30
→ Ragnor joined17:31
→ Raging_Hog joined17:31
→ philipoakley joined17:32
→ czart_ joined17:33
← gareppa left17:33
→ gareppa joined17:33
← comptroller left17:34
← czart left17:36
astronavt during an octopus merge, if i know which version of a file i need, can i just 'checkout' that version from the right branch17:38
→ midnightmagic joined17:39
→ cd joined17:40
astronavt yep, that worked17:40
→ dijitol joined17:40
← gareppa left17:44
→ mowcat joined17:44
← nateriver left17:44
← xcm left17:45
→ xcm joined17:46
← TomTom left17:46
→ comptroller joined17:46
→ nerosnm joined17:46
→ Blukunfando joined17:48
mns How do I find out what are the files that were deleted between the last tag and the current HEAD ?17:48
→ dboso joined17:48
← learningc left17:49
← nika left17:53
oxymoron93 mns check `--diff-filter` option to git log17:53
← tribly left17:56
→ tribly joined17:57
→ clime1 joined17:58
← clime1 left17:58
← YuGiOhJCJ left17:59
→ magic_ninja_work joined18:00
← Orbitrix left18:01
← fphilipe_ left18:02
← czart_ left18:03
→ gloomy joined18:04
→ Orbitrix joined18:06
← oatmealraisin left18:08
← kotisky left18:08
→ yonder joined18:08
← cfoch left18:09
← usbguy1 left18:09
→ Sasazuka joined18:11
← Stoot left18:13
← Lucas_Gray left18:16
← T_UNIX left18:21
→ jackkall joined18:21
→ troulouliou_dev joined18:25
← rendar left18:25
← troulouliou_dev left18:31
← glosoli left18:33
← Raging_Hog left18:33
← is_null left18:33
→ royal_screwup21 joined18:35
← nerosnm left18:36
→ fphilipe_ joined18:38
← jackkall left18:38
← gloomy left18:40
← xcm left18:41
→ xcm joined18:41
← fphilipe_ left18:44
→ gareppa joined18:45
← dboso left18:46
→ nerosnm joined18:48
← oxymoron93 left18:48
← khisanth_ left18:48
→ Stoot joined18:48
→ steven__ joined18:50
← nerosnm left18:52
← gareppa left18:52
→ gareppa joined18:53
← gxt left18:53
← shicks_ left18:54
→ beastd joined18:59
→ is_null joined18:59
→ khisanth_ joined19:02
→ blackmesa joined19:07
→ CtrlC joined19:07
CtrlC I19:08
I've made a commit that is lost now. :D I don't know which branch it was on.19:08
And I don't seem to pushed the branch.19:08
Is there any way to find it?19:08
bin_bash rip19:09
CtrlC :(19:09
_ikke_ CtrlC: git reflog19:09
CtrlC oh cool/19:10
thank you!19:10
well grep can't seem to find it!19:11
maybe I've deleted it?:/19:11
nope found it. thank you!19:12
← realies left19:13
→ nabil__ joined19:14
← malina left19:14
← Mattiaslndstrm left19:17
← nabil_ left19:17
→ nabil_ joined19:18
← jrnieder left19:19
← nabil__ left19:21
→ enoq joined19:21
→ jrnieder joined19:21
→ hojang joined19:27
← nuc left19:30
→ nuc joined19:31
← emsjessec left19:31
→ realies joined19:35
→ g00s joined19:38
→ bitwinery joined19:40
← bitwinery left19:41
→ bitwinery joined19:42
← rsrx left19:42
mns so I'm using this: git log --name-status --diff-filter=D tag1..HEAD19:42
to get a list of files that were deleted between tag1 to HEAD.19:43
but I don't want the commit hash or commit summary in the output, just the file list is all I'm looking for.19:43
← cbreak left19:43
mns how would I do tha t?19:43
_ikke_ add -s19:44
git log -s --name-only --diff-filter=D tag1..HEAD19:44
← clime left19:45
→ cbreak joined19:45
→ nerosnm joined19:46
osse mns: how about git diff ... tag1 HEAD ?19:47
mns osse: that works. thanks19:48
_ikke_: -s and --name-only are mutually exclusive19:49
← gareppa left19:49
← bitwinery left19:49
_ikke_ then use --format=""19:50
but git diff like osse said is better19:50
git log in that way could return duplicate names19:50
mns _ikke_: ahhh ok I was just about to ask why I get twice the files with git log vs git diff19:51
_ikke_ because git log will list the changed files for each commit19:52
so if two commits both change the same file, the file would be listed for both commits19:52
mns well seeing that I'm dealing with 'deletes' I would think that you wont have two commits that delete the same file, but yeah git-diff seems cleaner19:54
_ikke_ yes, git diff is definitely what you should use19:54
← kes left19:55
→ macaronus joined19:55
← e^1 left19:58
← fling left20:00
→ SmashingX joined20:02
SmashingX how can I see what has changed in my repo?20:03
← shabius left20:03
← shored left20:03
→ shored joined20:04
← dmc left20:04
← philipoakley left20:05
bin_bash git status20:05
_ikke_ git log20:05
SmashingX nope20:05
it doesn't show the changes20:06
and git log only shows past commits20:06
bin_bash what changes?20:06
SmashingX I haven't commited the changes yert20:06
bin_bash then they'd be shown in git status20:06
SmashingX the changes I did in this tracking file20:06
→ shabius joined20:10
← is_null left20:12
→ is_null joined20:13
← jottr_ left20:14
→ dmc joined20:18
→ dege joined20:19
→ clime joined20:20
SmashingX when I execute "git status" I get the files that have been modified, how can I see the exact modifications20:23
_ikke_ git diff20:23
SmashingX and also how can I see how many lines have been added/deleted20:23
_ikke_ git diff --stat20:23
SmashingX _ikke_: thank you20:24
← is_null left20:25
→ nowhere_man joined20:28
→ Lucas_Gray joined20:31
→ is_null joined20:31
← nerosnm left20:34
→ jguddas-tr2 joined20:40
← xcm left20:40
→ xcm joined20:41
← jguddas-tr2 left20:44
→ n3wborn joined20:48
← hojang left20:48
← xcm left20:51
→ xcm joined20:51
← misuto left20:52
→ greatgatsby joined20:52
→ |aaron joined20:55
|aaron Hi all. What LFS server implementations are people using these days? I just need a standalone LFS backend that supports local disk storage.20:56
← greatgatsby left20:57
→ misuto joined20:57
← SkarmoutsosV left20:58
→ m0viefreak joined21:08
→ Heirlung- joined21:09
← Phylock left21:09
← is_null left21:09
← Heirlung left21:10
← feriman left21:17
→ tgunr joined21:20
← tmager left21:22
→ jottr_ joined21:24
→ chris11 joined21:25
→ Wryhder joined21:27
← Lucas_Gray left21:27
Wryhder → Lucas_Gray21:28
→ leeN joined21:30
← jottr_ left21:30
← thiago left21:31
chris11 I'm looking at using git as part of the backend of the feature flag system. I'm wanting easily done reverts and logs. I'm thinking of git, because I think the view that includes the entire workspace, with changes saved by diffs is what I want. I want the view of the feature flag system to be whole, and changes just be diffs.21:41
My problem is that I'm having trouble automatically reverting commits when I test it out. I want to do this: https://paste.ofcode.org/xvePAzkMcx9aUGzats3RvJ21:41
→ jottr_ joined21:41
chris11 But it seems like if devA and then devB make a change on the same flag, then reverting devA's work will cause a conflict on the shared flag.21:42
→ greatgatsby joined21:43
chris11 Is there anyway to automatically resolve conflicts during reverts?21:43
← Xiti` left21:46
← jottr_ left21:46
oprypin_ → oprypin21:47
← g00s left21:48
← grumble left21:48
→ grumble joined21:50
→ g00s joined21:50
foo Is there a way to merge a specific commit from a specific branch into my staging branch?21:52
oh, it might be as simple as git merge other-branch [commit-id]21:52
→ Xiti joined21:53
← dijitol left21:55
→ fphilipe_ joined21:59
foo actually, it doesn't look to be that simple... unless I'm mis-reading these results22:00
foo investigates22:00
→ Mattiaslndstrm joined22:00
foo ah, looks like I want git cherry-pick22:01
← ed_peguillan left22:02
← Mattiaslndstrm left22:03
← fphilipe_ left22:04
← c0c0 left22:04
→ Fernando-Basso joined22:07
→ FernandoBasso joined22:09
← steven left22:10
← Ragnor left22:11
→ steven joined22:13
← leeN left22:14
→ Ragnor joined22:18
→ jottr_ joined22:18
→ thiago joined22:19
← greggerz left22:22
← Rhonda left22:24
→ ed_peguillan joined22:29
→ nic-hartley joined22:32
← cdown left22:33
← enoq left22:34
← CodeSlingerPaul left22:34
→ enoq joined22:35
← jottr_ left22:36
← fahadash left22:36
← yokisuci left22:39
→ Rhonda joined22:40
← royal_screwup21 left22:45
← g00s left22:45
← alexandre9099 left22:47
→ alexandre9099 joined22:49
→ royal_screwup21 joined22:51
← Fernando-Basso left22:51
← Revan- left22:52
→ nerosnm joined22:54
→ bambanx joined22:57
← magic_ninja_work left22:58
← nerosnm left22:59
← CtrlC left23:00
← surfist left23:00
→ surfist joined23:00
→ g00s joined23:00
→ nerosnm joined23:01
← macaronus left23:01
← omnireq left23:03
← ericfreese left23:04
← beastd left23:04
← nerosnm left23:06
→ publio joined23:06
→ jottr_ joined23:07
→ nerosnm joined23:09
← greatgatsby left23:09
← royal_screwup21 left23:14
← nerosnm left23:14
← g00s left23:14
→ AtumT joined23:14
← jottr_ left23:16
→ perrier-jouet joined23:16
→ bitwinery joined23:18
← enoq left23:24
→ xall joined23:24
← Lucas_Gray left23:26
→ veremitz joined23:27
← chris11 left23:29
← Giant81 left23:29
← clime left23:30
→ xall_ joined23:31
→ ferdna joined23:32
← xall left23:34
← n3wborn left23:34
← AtumT left23:36
→ budonyc joined23:36
← dege left23:38
← agg left23:42
→ Wetmelon joined23:44
← Dougie187 left23:45
← mowcat left23:45
← cbreak left23:45
→ nuala joined23:46
→ cbreak joined23:47
→ is_null joined23:51
← Murr left23:53

Logs Search ←Prev date Next date→ Channels Documentation