IRCloggy #git 2017-09-14

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.

2017-09-14

← himanshijain left00:00
← stutter left00:00
← menip left00:01
→ stutter joined00:02
← orbyt_ left00:02
← cagomez left00:05
→ cagomez joined00:06
← kerrick left00:06
← cbd_ left00:06
→ kerrick joined00:06
→ cbd_ joined00:06
← Cabanossi left00:09
← cagomez left00:10
→ chrisshattuck joined00:10
→ Cabanossi joined00:11
← cbd_ left00:11
← leeN left00:11
→ justanotheruser joined00:11
→ EricPoe joined00:14
→ bronson joined00:14
← lxnr left00:15
← sleepingforest left00:15
← kerrick left00:16
← xaa left00:17
← chrisshattuck left00:18
→ igemnace joined00:18
→ kerrick joined00:19
← bronson left00:20
← cdown left00:21
→ tangerinecandida joined00:24
tangerinecandida t00:24
← EvilPenguin left00:24
← m0viefreak left00:24
← vjacob left00:27
tangerinecandida I’m learning about git. The documentation is thorough & I appreciate that. I’ve a question, though, regarding best practice. If a project runs on a remote device and is being debugged remotely (Eclipse + PyDev). The source code’s copy that’s being executed therefore resides on the device, not on the computer that’s doing the editing/rewriting/etc. Would it make more sense to keep a copy of the repo on00:27
the software designer’s computer and one on the device as well, and then synchronize them both with the repo on GitHub? … Or would it make more sense to have *one* pulled copy, keep it on the device, and edit it remotely on the designer’s computer?00:27
I’m leaning towards keeping one copy on the device and then committing changes *from* the device to the GitHub repo… but I’m accustomed to committing from within the Eclipse development environment. That’s not a technical reason to keep doing it. It’s merely what I’m accustomed to doing. :)00:29
← multi_io left00:29
→ renarc joined00:31
→ manuelschneid3r joined00:32
→ vjacob joined00:33
rewt tangerinecandida, i'd look at having the repo locally, and pushing the code to the device to test/debug00:35
← justanotheruser left00:36
← adgtl left00:36
→ steeze joined00:38
→ lxnr joined00:41
→ edvb joined00:43
← durham left00:44
→ durham joined00:44
← durham left00:44
→ durham joined00:45
← durham left00:45
→ durham joined00:47
← durham left00:47
→ durham joined00:47
← ArcaTech left00:47
← durham left00:48
→ xaa joined00:49
← acidjnk left00:49
thiago tangerinecandida: first of all, I wouldn't put the source code on the device00:53
← jameser left00:53
thiago that's not efficient00:53
use a remote debugger so that the source code resides on the developer's computer00:53
but regardless, sincronising via GitHub is slow and inefficient too. Just synchronise locally.00:53
I would also skip git and synchronise with rsync00:53
← svm_invictvs left00:55
← ahr3n left00:56
bitmod join ##javascript01:01
bremner no!01:02
just kidding, I'm sure they're lovely people.01:03
← dsop left01:04
→ dsop joined01:04
→ cbd_ joined01:06
→ finalbeta joined01:06
→ mizu_no_oto joined01:07
← mikecmpbll left01:07
→ multi_io joined01:07
→ rchavik joined01:07
→ dsdeiz joined01:08
← dsdeiz left01:08
→ dsdeiz joined01:08
← Cabanossi left01:09
← d^sh left01:09
→ YuGiOhJCJ joined01:10
← cbd_ left01:11
→ Cabanossi joined01:11
→ bambs joined01:12
← dsdeiz left01:12
→ Nizumzen joined01:14
→ justanotheruser joined01:15
← leprechau left01:18
← fscala left01:20
→ cagomez joined01:21
→ leprechau joined01:21
→ EvilPenguin joined01:21
→ nd joined01:23
← kfoonamalik left01:24
← DIDAVISION left01:24
← nd- left01:25
← cagomez left01:25
→ DIDAVISION joined01:26
← Murr left01:28
→ Murr joined01:28
→ fscala joined01:29
← hash-z3r_ left01:29
→ dsdeiz joined01:29
← dsdeiz left01:29
→ dsdeiz joined01:29
→ czart__ joined01:30
← Solvaring left01:30
← sunri5e left01:31
→ Solvaring joined01:32
← CussBot left01:32
→ CussBot_ joined01:32
CussBot_ → CussBot01:32
← czart_ left01:33
← dsdeiz left01:35
← chriys left01:35
← j08nY left01:35
← blackwell left01:35
→ sunri5e joined01:36
→ cagomez joined01:36
→ blackwell joined01:36
← michelangelo left01:36
→ Elon_Satoshi joined01:37
→ cdg joined01:37
← bambs left01:38
→ chrisshattuck joined01:38
← dirtyroshi__ left01:38
← duckydan left01:39
→ chriys joined01:39
← chriys left01:39
→ chriys joined01:39
→ pharma_joe joined01:39
← chriys left01:40
→ dirtyroshi joined01:42
← cdg left01:42
→ hash-z3r0 joined01:43
→ duckydan joined01:44
← ilbot3 left01:44
← mostlybadfly left01:46
→ cqi joined01:46
→ watabou joined01:47
→ jameser joined01:48
← Sasazuka left01:48
→ fstd_ joined01:49
← watabou_ left01:50
← hdqn left01:51
→ PresidentBiscuit joined01:52
kadoban_ → kadoban01:52
← ResidentBiscuit left01:52
PresidentBiscuit → ResidentBiscuit01:53
→ holodoc joined01:53
→ ForeignBiscuit joined01:53
← fstd left01:53
fstd_ → fstd01:53
← thiago left01:53
← EvilPenguin left01:54
→ thiago joined01:54
← msonntag left01:54
← str left01:55
← tisquib left01:55
→ ilbot3 joined01:55
→ sleepingforest joined01:57
← holodoc left01:59
→ holodoc joined01:59
← pharma_joe left02:00
← chrisshattuck left02:01
← salamanderrake left02:01
← mizu_no_oto left02:04
← petersaints left02:04
→ pharma_joe joined02:05
→ msonntag joined02:06
→ cbd_ joined02:06
→ svm_invictvs joined02:07
← Cabanossi left02:08
← sleepingforest left02:09
→ dsdeiz joined02:10
→ Cabanossi joined02:10
← batrick left02:10
← cbd_ left02:11
→ menip joined02:12
→ petersaints joined02:13
← dviola left02:13
← pharma_joe left02:14
← cagedwisdom left02:15
→ bronson joined02:15
→ batrick joined02:19
← svm_invictvs left02:19
← YuGiOhJCJ left02:20
← Gustavo6046 left02:20
← Solvaring left02:20
← akushner___ left02:20
← bronson left02:20
← dsdeiz left02:20
← manuelschneid3r left02:21
← kerrick left02:21
→ justan0theruser joined02:23
← justan0theruser left02:23
→ justan0theruser joined02:23
→ Orbixx[m] joined02:24
← cagomez left02:25
← elsevero left02:25
← justanotheruser left02:26
← Gurkenglas left02:26
→ hanthings_ joined02:27
→ orbyt_ joined02:27
linuxmodder → kn4fto02:27
→ cagedwisdom joined02:28
→ tunekey joined02:28
← Mattiaslndstrm left02:30
← hanthings left02:31
→ jstimm joined02:33
→ nandi_ge___ joined02:34
← traveler left02:34
← hanthings_ left02:37
← ResidentBiscuit left02:37
→ lxnr_ joined02:38
← Cabanossi left02:38
← misosoup left02:39
← dre_ left02:39
→ cdg joined02:40
← CussBot left02:40
← Jon31 left02:40
→ Cabanossi joined02:40
→ CussBot joined02:41
← lxnr left02:41
→ lagothrix joined02:41
→ chachasmooth joined02:41
← chachasmooth_ left02:42
← a3Dman left02:42
→ Vortex35 joined02:43
← lafleurdubien left02:43
← lagothri1 left02:44
← cdg left02:44
← Vortex34 left02:47
→ d^sh joined02:47
← menip left02:47
→ a3Dman joined02:50
← CubiK left02:50
← Plouescat left02:51
→ EvilPenguin joined02:51
→ Plouescat joined02:51
→ CubiK joined02:51
← Noldorin left02:53
← raijin left02:54
→ dre_ joined02:55
← pks left03:00
→ svm_invictvs joined03:03
→ pks joined03:04
tangerinecandida thiago: Thank you.03:07
→ cbd_ joined03:07
tangerinecandida thiago: That’s good advice. I appreciate your time and your insight.03:08
← tangerinecandida left03:12
← DIDAVISION left03:13
← igemnace left03:13
→ igemnace_ joined03:13
← Plouescat left03:15
→ kfoonamalik joined03:16
← pR0Ps left03:18
→ pharma_joe joined03:19
→ diqidoq_ joined03:20
← diqidoq_ left03:20
← tinanoo left03:21
→ pR0Ps joined03:23
← diqidoq left03:23
← stutter left03:23
← EvilPenguin left03:24
→ mizu_no_oto joined03:27
← Murr left03:28
→ Murr joined03:28
← orbyt_ left03:28
→ michelangelo joined03:33
← MACscr left03:34
→ bongo joined03:35
→ Joel joined03:36
Joel somewhat unrelated to git, github, is showing two committers, both are me, I only want to show one, any ideas where it's pul;ling the second user from? https://github.com/joelcontrastthrowaway/ops-hire-project/commit/03f9e667070fa6677c0fe582745a10f8f2d9f58a03:36
← Cabanossi left03:39
→ Cabanossi joined03:39
Joel git log 03f9e667070fa6677c0fe582745a10f8f2d9f58a -n1 --dense --full-diff --format='%ae %ce' [email@hidden.address] [email@hidden.address]03:39
looks like I need to figure out how to change that03:39
← Nizumzen left03:40
igemnace_ → igemnace03:44
← CubiK left03:44
→ akushner___ joined03:45
← hash-z3r0 left03:45
← lxnr_ left03:46
→ chrisshattuck joined03:46
Joel managed to work it out03:46
← akushner___ left03:46
→ hash-z3r0 joined03:46
→ Bock joined03:47
→ mkali joined03:50
→ zumba_addict joined03:51
← hash-z3r0 left03:51
zumba_addict i'm working on an application. I have commits. I also ran `npm version patch' which created a different commit as shown by git log. Can I combine these 2 commits into 1 before I push my feature-branch?03:52
← jimmyrcom_ left03:55
Joel zumba_addict git rebase -i HEAD~<number of commits to go back>03:55
zumba_addict right now, the last commit shown was done by `npm version patch`. It just updated the version number in package.json file. My commit was the one before it03:55
Joel I ttypically do something like git rebease -i HEAD~203:55
then you have to squash them.03:55
zumba_addict ok. I haven't push this feature branch yet03:56
Joel this is a common thing. google can provide plenty of help03:56
← mizu_no_oto left03:56
zumba_addict yup, i'm reading this - https://stackoverflow.com/questions/12522565/how-can-i-combine-two-commits-into-one-commit03:56
← bitmod left03:57
← hahuang65 left03:57
→ BSaboia joined03:59
← pharma_joe left04:00
← EricPoe left04:02
→ xaxxon_ joined04:02
← xaxxon left04:02
zumba_addict it worked! Thanks :)04:04
i need to do it often so it becomes part of my memory04:05
← cagedwisdom left04:07
← netj left04:08
→ netj joined04:08
→ cagedwisdom joined04:08
← Cabanossi left04:08
→ Cabanossi joined04:09
→ pharma_joe joined04:14
← pharma_joe left04:14
← kfoonamalik left04:15
→ pharma_joe joined04:15
→ bronson joined04:17
→ kfoonamalik joined04:18
→ EvilPenguin joined04:21
← bronson left04:21
→ jkadaver joined04:21
← Elon_Satoshi left04:24
← chrisshattuck left04:25
→ bayman joined04:25
← atomi_ left04:25
→ Elon_Satoshi joined04:26
→ jimmyrcom_ joined04:26
bayman I enabled pipelines in my bitbucket repo and it added a yml file to my source. i made some changes on my local source, exec git push and it says Updates were rejected because the remote contains work that you do not have locally.04:27
what do i do?04:27
→ stutter joined04:28
igemnace just fetch the new yml file04:28
← stutter left04:28
igemnace if that was the only change from bitbucket, a git pull should handle it cleanly04:29
bayman ok just ran git fetch04:29
igemnace you did? check git log HEAD..@{u}04:29
← jkadaver left04:29
bayman Your branch and 'origin/master' have diverged,04:29
and have 1 and 1 different commits each, respectively.04:29
(use "git pull" to merge the remote branch into yours)04:29
← ForeignBiscuit left04:29
igemnace can git merge, can git rebase04:30
doesn't really matter where it goes into history, since it's just a config file for your pipelines04:30
bayman git log HEAD ... -> bitbucket-pipelines.yml edited online with Bitbucket04:30
igemnace yup04:31
run git merge to get that commit into your local master04:31
→ atomi joined04:31
bayman ok i think it's fixed04:32
thanks04:33
← matoro_ left04:35
→ matoro joined04:36
← Cabanossi left04:37
← watabou left04:39
→ Cabanossi joined04:39
bayman i have another issue04:40
← steeze left04:40
← Guma left04:41
bayman i made some source code changes on a server that and now when i git pull from repo, it says Please, commit your changes or stash them before you can merge.04:41
→ lxnr_ joined04:42
bayman i don't care about the changes i made and i want the repo source to overwrite the changes, what should i do?04:42
igemnace that message hints at the solution: either git commit or git stash04:42
ti2 A 'git reset --hard HEAD' throws away all local non-committed changes.04:43
bayman do i git stash then git reset -hard HEAD ?04:43
igemnace one of the two04:43
git stash keeps it for later, git reset --hard HEAD discards it completely04:44
→ geoid joined04:45
bayman thanks04:45
← lxnr_ left04:46
→ rkta_ joined04:46
← abithvijayan[m] left04:47
← dikiaap left04:47
← cbd_ left04:48
← rcn left04:48
← Neic0 left04:49
→ Neico joined04:49
→ Nizumzen joined04:49
← atomi left04:49
← rkta left04:49
rkta_ → rkta04:49
→ jkadaver joined04:51
→ abithvijayan[m] joined04:51
→ dikiaap joined04:51
← Nizumzen left04:52
→ Nizumzen joined04:52
→ rcn joined04:52
→ AnujSharma joined04:53
← jkadaver left04:54
← EvilPenguin left04:54
← _28_ria left04:55
→ cdg joined04:56
← rchavik left04:57
→ _28_ria joined04:57
→ atomi joined05:00
← cdg left05:00
→ _ng joined05:06
← doppo left05:06
→ cbd_ joined05:06
← xPucTu4 left05:06
← xkr47 left05:06
← boombatower left05:07
→ dec0n joined05:07
→ doppo joined05:07
→ boombatower joined05:07
→ xkr47 joined05:08
← Cabanossi left05:09
→ Cabanossi joined05:09
← cbd_ left05:11
← safe left05:11
→ atesc joined05:14
→ xPucTu4 joined05:14
→ czart_ joined05:14
← denimsoft left05:14
→ fatihgenc joined05:16
← pharma_joe left05:16
→ freimatz joined05:16
← boombatower left05:17
→ roygbiv joined05:17
← czart__ left05:18
→ imack joined05:18
→ rchavik joined05:18
→ cagomez joined05:21
→ ZyX-I joined05:21
← bayman left05:22
→ MrMojit0 joined05:23
→ boombatower joined05:23
→ thierryp joined05:24
← atesc left05:24
→ pharma_joe joined05:24
← boombatower left05:25
← cagomez left05:25
→ dreiss joined05:25
← ZyX-I left05:26
← dzho left05:26
← rkta left05:27
← armenb left05:27
← dsnow left05:27
→ armenb joined05:27
← Oatmeal left05:27
← Puffball left05:27
← shakalaka_ left05:27
← vdl left05:27
← samlisl_ left05:27
→ Puffball joined05:28
→ dzho joined05:28
→ dsnow joined05:28
→ tsunamie joined05:28
→ jkadaver joined05:28
→ shakalaka joined05:28
→ vdl joined05:29
→ durham joined05:29
← AnujSharma left05:29
→ howdoi joined05:29
← geoid left05:30
← thierryp left05:30
→ jkadaver_ joined05:31
→ ljc joined05:31
← jkadaver left05:33
→ thierryp joined05:35
← jkadaver_ left05:35
parsnip hmm, after i git submodule add mathjax --depth 1, make starts running at 99% CPU05:39
← thierryp left05:39
parsnip hmm, it's ruby fsevent_watch05:40
→ lss8_ joined05:40
parsnip oh, it's the `jekyll serve` i left running05:41
→ roelmonnens joined05:42
→ lxnr_ joined05:43
← lss8 left05:43
← madewokherd left05:44
→ zefferno joined05:45
← roelmonnens left05:47
← lxnr_ left05:47
← _28_ria left05:48
→ Raging_Hog joined05:49
← freimatz left05:49
→ freimatz joined05:49
← Kavothe left05:50
→ thierryp joined05:51
→ EvilPenguin joined05:51
→ _28_ria joined05:51
→ atesc joined05:53
← thierryp left05:55
→ dege joined05:56
→ Kavothe joined05:56
→ qwedfg joined05:58
→ JeroenT joined05:58
→ MACscr joined05:58
← _ng left05:58
→ _ng joined05:59
→ Oatmeal joined05:59
→ neil_cn joined05:59
← roygbiv left05:59
← thiago left06:01
← JeroenT left06:02
→ JeroenT joined06:02
→ thierryp joined06:03
← imack left06:04
← guardian left06:04
→ imack joined06:05
→ cdown joined06:05
→ cbd_ joined06:06
→ high_fiver joined06:07
← JeroenT left06:07
→ govg joined06:07
→ tarkus joined06:07
← pharma_joe left06:09
← thierryp left06:10
← cbd_ left06:10
→ ppang joined06:10
→ LeBlaaanc joined06:11
← bongo left06:11
← Raging_Hog left06:12
→ ronskisika joined06:12
→ JeroenT joined06:14
← ExeciN left06:14
← Bock left06:14
→ pharma_joe joined06:17
← TomyLobo left06:17
→ bronson joined06:18
← edvb left06:18
osse When I run git fsck I see a lot of "danglnig tag", but when I run cat-file -t on them a bunch of them are blobs, trees and commits. How is that possible?06:19
← ShalokShalom left06:20
← \drew left06:20
→ roelmonnens joined06:22
← bronson left06:22
← ljc left06:23
← tarkus left06:24
→ bayman joined06:24
→ horpoppy[m] joined06:24
← EvilPenguin left06:24
← ash_workz left06:26
→ thierryp joined06:27
← svm_invictvs left06:29
→ ash_workz joined06:30
parsnip because git fsck sees all objects, and those are all objects?06:31
← thierryp left06:31
parsnip "Verifies the connectivity and validity of the objects in the database."06:31
→ jknetl joined06:31
→ overlord_tm joined06:32
osse But why does it think a commit is a tag ?06:33
parsnip what are you seeing?06:34
strange, i don't think a tag is an object, so i'm wondering how to interpret the manual06:35
← MrMojit0 left06:35
parsnip i guess git fsck can additionally show tags, but i think that's a ref not an object, and not a commit.06:36
→ \drew joined06:37
← Nizumzen left06:37
← atesc left06:38
← dreiss left06:39
→ tkore joined06:39
← tkore left06:39
→ tkore joined06:39
→ abba joined06:40
→ AnujSharma joined06:40
→ Solvaring joined06:40
→ navidr joined06:43
→ lxnr_ joined06:43
→ Bock joined06:44
osse There is an object type called tag. One issue created when you do git tag -a06:44
s/issue/is/06:44
← Solvaring left06:44
← _28_ria left06:46
← bayman left06:47
← lxnr_ left06:48
→ jsears joined06:50
← cdown left06:50
← pharma_joe left06:51
← \drew left06:51
→ Commander_Cody joined06:51
parsnip ah, tags are objects06:52
→ ShalokShalom joined06:52
Commander_Cody Upon request, I'd like to create one patch file via `git format-patch` with several commits squashed, not losing their commit messages.06:52
→ cdown joined06:52
Commander_Cody How can I accomplish this without soiling my commit history by *actually* squashing all those commits? I just want a patch file that looks as though I did that.06:53
parsnip you could make a new branch ref, check that out, and squash that06:54
that will leave the old branch ref still pointing at original commit, and thus the sequence.06:54
← Ratler left06:55
← Thunderfunk left06:56
→ Ratler joined06:56
→ _28_ria joined06:56
parsnip osse: okay, but why do you say "23:33 <osse> But why does it think a commit is a tag ?", care to share?06:57
→ Thunderfunk joined06:58
← durham left06:58
← Soni left07:01
parsnip osse: this might be interesting to you at the moment http://eagain.net/articles/git-for-computer-scientists/07:01
they do say tags are a "node", i'm not sure wht07:01
*why07:01
→ TomyWork joined07:01
← foodSurprise left07:02
parsnip maybe in the sense that fsck sees them as objects?07:02
← cdown left07:02
← kfoonamalik left07:03
→ Soni joined07:03
→ cbd_ joined07:06
Commander_Cody parsnip: Your suggestion worked fine, thanks.07:06
← jimmyrcom_ left07:06
→ luc4 joined07:07
← Cabanossi left07:07
parsnip Commander_Cody: nice, i thought of it, wasn't sure if it was the right approach, but googling suggested it was the popular approach.07:07
→ wandering_vagran joined07:09
→ Cabanossi joined07:09
← cbd_ left07:10
→ juniper joined07:12
jast tags are two things, kind of. generally, a tag *name* is a ref (like a branch name). the ref can point directly to a commit (which makes it a non-annotated tag) or a tag *object* (which points to another object, usually a commit) and has some metadata. tags involving tag objects are called annotated tags.07:12
'node' is not official terminology07:12
juniper → Guest1482707:12
→ Tobbi joined07:13
← Commander_Cody left07:14
→ EvilPenguin joined07:14
parsnip it's as if he thought the hashed part of a tag was more like a commit object than a tree object is.07:14
perhaps if we assume he was narrowing his focus to commits and refs, than sure.07:15
which is not an impractical thing to do.07:15
→ Commander_Cody joined07:15
parsnip oh, can non-annotated tags and annotated tags be moved to other commits, say upon rebasing for example?07:16
→ rscata joined07:16
← Guest14827 left07:16
→ dsdeiz joined07:17
→ iambiglooser2022 joined07:17
jast tags are never changed automatically07:17
filter-branch has an option to rewrite tags... rebase doesn't07:18
← iambiglooser2022 left07:18
← qwedfg left07:18
jast osse: are there any replaced objects? that's the only potentially relevant thing I can see in the code at a glance07:18
parsnip if annotated tags are hashed, than you can't move them, perhaps that's what the author was getting at.07:18
← EvilPenguin left07:18
jast not sure what you mean by 'hashed'07:19
parsnip oh, like how commits, trees and blobs are hashed07:19
jast tag objects are content-addressed like all other objects, so if you change where a tag object points to, the tag's SHA1 changes, too07:19
→ iambiglooser2022 joined07:19
→ theoceaniscool joined07:19
→ valhalla_22 joined07:20
← valhalla_22 left07:20
→ valhalla_22 joined07:20
← dsdeiz left07:21
valhalla_22 I was updating local dev branch with respect to master but i found i cam across some glitch , which is stopping the updation of branch , I want to understand why this is happening and how can i resolve it . here is the paste07:21
https://paste.pound-python.org/show/1KtDReOUZElstPZA1tMf/07:21
→ jceb joined07:22
← Commander_Cody left07:22
parsnip valhalla_22: open those files in your text editor, they will have some funny lines indicating where the merge conflic occurred.07:25
valhalla_22 yeah07:25
← overlord_tm left07:25
valhalla_22 they had07:25
parsnip valhalla_22: do you know what happens after that?07:26
→ overlord_tm joined07:26
→ dka joined07:26
valhalla_22 not exactly but some has to be removed and some has to be left07:26
→ cagomez joined07:26
← Murr left07:28
→ Murr joined07:28
→ ExeciN joined07:29
parsnip valhalla_22: you consider the merge conflict, that is, each branch has two stories on what should be there. the merge needs a decision.07:31
← cagomez left07:31
valhalla_22 hmm i want to forgo the local one07:31
parsnip valhalla_22: once you edit those lines to indicate the new end result, you remove the special markup.07:31
valhalla_22 i just want to get updated with master one ,07:32
parsnip ah, you could probably reset.07:32
valhalla_22 how07:32
parsnip hmm07:32
um, checkout your local branch07:33
valhalla_22 ok done07:33
parsnip then `git reset origin/<branch>`07:33
valhalla_22 what will this do07:33
parsnip valhalla_22: you might be curious what reset does.07:33
:)07:33
valhalla_22 no07:33
parsnip ?07:34
valhalla_22 it reset the pointer to HEAD07:34
parsnip you're telling me? or asking me?07:34
valhalla_22 i have used this a lot git reset --hard07:34
but never used git reset origin/master07:34
parsnip valhalla_22: lets focus on `git reset --soft`, it's easier to explain this way.07:34
valhalla_22 ok07:35
parsnip the sequence is `--soft, --mixed, --hard`07:35
the default is --mixed07:35
valhalla_22 hmm so this is the philosphy07:35
ok07:35
i get it07:35
parsnip they all do what --soft does, plus a little more07:35
so the real idea is in --soft07:35
`git reset --soft` moves a branch ref.07:36
that is, it moves the branch ref that you are checked out on.07:36
so if you are checked out on local branch, it will move that ref.07:36
valhalla_22: does that make sense, then i say what --mixed and --hard do in addition?07:37
valhalla_22 hmm little bit07:37
parsnip so if you don't pass it another commit as an argument, the ref doesn't actually move.07:37
so, now on to --mixed and --hard07:38
valhalla_22 k07:38
parsnip --mixed overwrites the index with whatever is in the commit we are at now07:39
--hard additionally overwrites the working directory.07:39
valhalla_22 oops but for my perscpectve ,git reset --hard works fine , is that ok with it .07:40
parsnip valhalla_22: you could, no harm in it i think07:40
valhalla_22: you could always git stash if you're nervous07:40
→ sarri joined07:41
← sarri left07:41
→ sarri joined07:41
parsnip git stash just puts current status of working directory and index into a special kind of commit in a special "stash" storage.07:41
!lol07:41
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all07:41
valhalla_22 yeah , parsnip that sound great but how to overcome my problem07:41
parsnip valhalla_22: do you know git pull is really just git fetch and git merge?07:42
valhalla_22 yes07:42
it fectes and do the merge07:42
→ Noodlewitt joined07:42
parsnip okay, so git fetch is done, and you had problem at git merge07:42
valhalla_22 yeah07:42
parsnip i think you can undo the partial merge by doing `git reset --hard` on your local branch07:43
i think that's still not quite what you want, but it won't hurt anything07:43
valhalla_22 i did07:43
parsnip `git reset --hard origin/<branch>`, no?07:43
that will move the local ref07:44
valhalla_22 git reset --hard commithash07:44
parsnip `git reset --hard origin/commithash`, no?07:44
valhalla_22 till here i had beautiful memory07:44
after that things got messy07:44
parsnip i don't understand that.07:44
→ lxnr_ joined07:45
valhalla_22 git reset --hard 0553ac207:45
parsnip i'm lost07:45
valhalla_22 why07:46
→ ahr3n joined07:46
valhalla_22 its just additional git reset -hard with specific cmmit number07:46
parsnip: i think you told me solution but i have fear to implement it07:46
parsnip :)07:46
valhalla_22: i have an idea07:47
valhalla_22 git reset --hard origin/dev_branch what it will do07:47
← Tobbi left07:47
igemnace what was the original problem again? wasn't it just a merge conflict?07:49
← lxnr_ left07:49
parsnip valhalla_22: it will move the branch ref07:49
valhalla_22: if you replace --hard with --soft, that's _all_ it will do.07:50
valhalla_22 i wont be loosing any code07:50
na07:50
i can loose this one but not 6 mnths back07:50
one07:50
parsnip valhalla_22: here's an idea to make possible issues less difficult:07:51
valhalla_22 ok07:51
← ahr3n left07:51
parsnip valhalla_22: create a temporary branch name for where local branch ref is now.07:51
valhalla_22 ok07:51
← Thunderfunk left07:51
parsnip valhalla_22: that way, when you move your local branch ref to remote branch HEAD, you can still see full commit graph easily with `git lol`.07:52
→ Tobbi joined07:52
valhalla_22 ok07:52
← aFeijo left07:52
parsnip you can _see_ what happened, and know if you're comfortable with removing the temporary branch name.07:52
valhalla_22 tnks but i have got the idea07:53
← theoceaniscool left07:53
valhalla_22 git is all about trees and branch07:53
so i want to do this07:53
← high_fiver left07:54
→ Thunderfunk joined07:55
parsnip valhalla_22: yeah, to me, most of my thinking is based on the commit graph, and refs, and how commits aren't really deleted (at least not immediately), you can find them if you move a branch ref. if a commit isn't pointed to by ref or a descendant that has a ref, it won't appear in git log, but you can still find it other ways.07:59
← xaxxon_ left07:59
parsnip refs move around, but commits don't really.08:00
the diffs sort of do.08:00
valhalla_22 ok08:00
parsnip :)08:00
→ EvilDMP joined08:00
valhalla_22 i am newbie to git08:00
i went to tour on himalya for 3 months08:00
→ noyb joined08:00
valhalla_22 so i forgot many things :-(08:00
← Thunderfunk left08:01
→ mostlybadfly joined08:01
→ Thunderfunk joined08:02
→ pinux joined08:02
EvilDMP Is there some way to break apart a commit into two commits? I submitted a PR containing some new material and some refactoring, and I have been asked to submit this as two commits for easier reviewing.08:02
selckin rebase -i & edit, or git reset HEAD^, to remove the commit and then you can git add -p parts08:03
jast EvilDMP: so I'm guessing it's the topmost commit on that branch?08:03
EvilDMP jast: yes08:03
→ King_Hual joined08:03
EvilDMP git add -p is new to me, I will investigate08:04
jast yeah, I'd go with 'git reset HEAD^' and stage the two sets of changes separately with add -p08:04
EvilDMP Thanks jast selckin!08:04
jast add -p is one of the features I use pretty much every day :)08:04
I actually use 'git commit -p' most of the time but it amounts to the same thing08:05
← ppang left08:06
osse jast: yes, I made some replacements. that could be it08:07
manually stitching together something resembling a history from zip archives \o/08:07
→ Solvaring joined08:08
← ertes left08:08
jast the type output does honour replace, the object name being output is the original08:08
→ acidjnk joined08:10
→ CheckDavid joined08:10
← valhalla_22 left08:10
← LeBlaaanc left08:13
→ Murii joined08:13
← jameser left08:14
→ jameser_ joined08:14
← Murii left08:14
→ Murii joined08:15
→ EvilPenguin joined08:15
→ LeBlaaanc joined08:15
← fatalhalt left08:17
→ lxnr_ joined08:17
→ bronson joined08:19
← Murii left08:19
→ Nizumzen joined08:19
← lxnr_ left08:21
→ fatalhalt joined08:22
← Cabanossi left08:22
← jnewt left08:24
← bronson left08:24
→ Cabanossi joined08:25
← frsk left08:25
← Tobbi left08:26
→ schleppel joined08:27
← Noodlewitt left08:27
→ Tobbi joined08:28
→ frsk joined08:29
→ Borg- joined08:31
gitinfo set mode: +v08:31
← noyb left08:32
→ ertes-w joined08:33
← _ADN_ left08:34
← vjacob left08:37
→ dimi1947 joined08:41
← gusnan left08:41
← diogenese left08:42
→ jlebrech joined08:43
jlebrech morning all08:43
← mkali left08:43
jlebrech can I ignore my dist/ folder for every user except for the CI server?08:43
→ diogenese joined08:44
kadoban jlebrech: What would that mean?08:45
In git, ignore rules only have any effect on untracked content08:45
jlebrech https://help.github.com/articles/ignoring-files/ like the 3rd section08:45
kadoban That is a place you can put rules, in .git/info/exclude, but unless I'm misunderstanding the question, I'm having a hard time imagining how it'll be useful?08:46
jlebrech we seem to be generating slightly different compiled files, because we have windows and mac. and it should just look the same. and only want the CI server to compile the dist folder08:47
we're always getting merge conflict for nothing08:47
→ vjacob joined08:48
← EvilPenguin left08:48
→ pbandark joined08:49
→ _ADN_ joined08:49
jlebrech I want devs to have that folder ignored, but it to be generate by CI. but it don't think it's an issue actually, I could configure CI to compile and scp, so from the CI end it won't be using git08:50
→ thierryp joined08:50
← fatihgenc left08:50
← thierryp left08:51
→ thierryp_ joined08:51
igemnace jlebrech: you *will* have to do that08:51
kadoban You usually shouldn't be tracking generated files, so any way you can avoid that would be good.08:52
igemnace jsyk you can actually just git add --force anything regardless of .gitignore08:52
jlebrech oh, alright. seemed like a sound plan08:52
igemnace but once you track the thing, changes will be tracked regardless of .gitignore08:52
kadoban For pretty much the reason you're seeing, merges get weird and it'll get randomly out of sync from the codebase and etc.08:53
jlebrech so should I remove dist first?08:53
→ fatihgenc joined08:53
← iambiglooser2022 left08:54
igemnace well, yeah. much easier for everyone to just remove dist from the repo and ignore it moving forward08:54
jlebrech ah yeah08:55
← fatihgenc left08:55
igemnace have the CI server deploy dist/ not using git, because it'll ruin the idea of ignoring it08:55
← dre_ left08:55
jlebrech haha of course, I remembered at the last minute git isn't use to deploy :D08:56
→ cdg joined08:56
→ FilipNortic joined08:56
→ dre_ joined08:57
→ tvw joined08:57
→ fatihgenc joined08:57
← _ADN_ left08:59
→ qwedfg joined08:59
← Kavothe left09:00
← cdg left09:01
→ cstratak joined09:01
← venmx_ left09:02
← venmx left09:02
→ venmx joined09:02
→ venmx_ joined09:02
← dave0x6d left09:03
→ cy1 joined09:06
→ Chuguniy joined09:06
→ Kavothe joined09:06
← JeroenT left09:07
← Cabanossi left09:09
→ Cabanossi joined09:10
← venmx_ left09:10
← venmx left09:10
← AnujSharma left09:10
→ gxt joined09:11
→ chll_ joined09:11
← imack left09:11
→ achadwick joined09:12
→ _ADN_ joined09:12
cy1 I go "git log -p" and it skips showing some patches. Like when I do "git show SHA" it shows a patch (a bad merge commit of a bad merge commit), but when I do "git log -p" and go to that SHA, it says no files modified, no patch...09:13
→ venmx joined09:15
→ venmx_ joined09:15
jast cy1: as briefly mentioned in the manpage, 'git show' defaults to using --cc which affects how merge commits are displayed. by default (with -p which doesn't automatically imply -c or --cc), merges don't display a diff.09:15
cy1 Oh, I thought --cc was more terse, though?09:16
Am I getting that backwards?09:16
osse jast: goddammit09:16
git fsck | awk '$2 = "tag" {print $3}'09:17
git fsck | awk '$2 == "tag" {print $3}'09:17
(also parsnip)09:17
→ dsdeiz joined09:17
jast hah09:17
→ lxnr_ joined09:18
cy1 well, adding --cc seems to show the patches in git log. Thank you!09:18
← cagedwisdom left09:18
jast cy1: terser than -c, not terser than the default (nothing) :)09:18
→ wxg joined09:19
→ ahr3n joined09:21
← dsdeiz left09:22
→ hanthings_ joined09:22
→ JeroenT joined09:22
← dimi1947 left09:22
← lxnr_ left09:22
→ lxnr_ joined09:25
← nandi_ge___ left09:25
→ imack joined09:25
← lxnr_ left09:25
← Murr left09:28
← belmoussaoui_ left09:28
→ Murr joined09:28
→ kurkale6ka joined09:29
→ gusnan joined09:29
← gusnan left09:29
→ gusnan joined09:29
→ bergice_ joined09:30
→ belmoussaoui_ joined09:31
→ freimatz3 joined09:32
→ czart__ joined09:32
← venmx_ left09:32
→ magicturtle joined09:33
← venmx left09:33
→ mkali joined09:34
→ Floflobel joined09:35
← freimatz left09:35
← czart_ left09:36
→ cagedwisdom joined09:36
← kurkale6ka left09:39
← wxg left09:41
→ kurkale6ka joined09:41
← energizer left09:42
→ cagomez joined09:42
→ freimatz joined09:43
→ AnujSharma joined09:43
→ ArcaTech joined09:44
← freimatz3 left09:44
→ EvilPenguin joined09:45
← [worksti] left09:46
← vjacob left09:46
← cagomez left09:46
→ wxg joined09:47
← igemnace left09:47
← enkrypt_ left09:48
→ enkrypt joined09:48
→ hash-z3r0 joined09:49
← Tobbi left09:49
← wxg left09:50
← rchavik left09:51
← Oatmeal left09:52
→ freimatz3 joined09:52
← freimatz left09:54
← cstratak left09:56
→ cagomez joined09:58
← cqi left10:00
← Nizumzen left10:01
← cagomez left10:02
→ cstratak joined10:04
← JeroenT left10:04
→ bybb joined10:05
Richard_Cavell Hello all. I have a git repo. I see that I can get a commit ID from git log. I want to see all the changes made to a file between one commit and another commit. How do I do that?10:06
jast git diff commit1 commit2 -- file10:06
Richard_Cavell And in git log where it says "commit d462e84181c534d73658b367f872628f7dc3699410:07
" is that the string that I'm looking for?10:07
jast or as separate diffs for each commit in the range: git log -p commit1..commit2 -- file10:07
that's the commit ID, yes. you can often shorten it to a few characters (e.g. d462e) and get the same result10:08
depends on how big your repo is, a prefix of eight characters will work virtually all the time and 4-5 characters are typically fine for smaller repos10:08
→ rchavik joined10:08
→ manuelschneid3r joined10:12
pinux → ppang10:14
→ mentazoom joined10:15
← sarri left10:16
← EvilPenguin left10:18
→ someone235 joined10:19
→ sarri joined10:19
← sarri left10:19
→ sarri joined10:19
→ bronson joined10:20
← enkrypt left10:20
someone235 Hi, I did a "git clone [email@hidden.address] but I want to switch to branch 0.10. I did "git branch -a", but I can't see it, although it appears in the branch list here: https://github.com/bitcoin/bitcoin/10:21
someone knows what am I doing wrong?10:21
← Cabanossi left10:23
maxb Having cloned, it'll be there as "remotes/origin/0.10"10:23
← bronson left10:25
→ Cabanossi joined10:25
someone235 maxb, "git checkout remotes/origin/0.10" doesn't work10:25
← Anja left10:26
→ Nizumzen joined10:26
→ ShalokShalom_ joined10:26
maxb "doesn't work" is not very descriptive, if you give the exact error message, it would make it easier to help you10:26
→ freimatz joined10:27
← freimatz3 left10:29
← ShalokShalom left10:29
someone235 maxb, error: pathspec 'remotes/origin/0.10' did not match any file(s) known to git.10:29
← Solvaring left10:30
→ HolodocPrime joined10:31
← King_Hual left10:31
maxb I'm not sure what you're doing then, because running the exact commands you've given above in double-quotes works for me10:32
← holodoc left10:33
→ ljc joined10:33
→ venmx joined10:33
→ venmx_ joined10:34
→ enkrypt joined10:34
jast try a 'git fetch', maybe the clone was incomplete for some weird reason10:34
→ j08nY joined10:35
→ JeroenT joined10:35
← Borg- left10:35
→ Oatmeal joined10:36
← thinkpad left10:37
→ Anja_ joined10:38
→ bitmod joined10:39
← mkali left10:39
→ thinkpad joined10:39
← mostlybadfly left10:40
→ Anticom joined10:42
← venmx left10:42
osse someone235: what does 'git config remote.origin.fetch' print ?10:42
← venmx_ left10:43
someone235 osse, +refs/heads/master:refs/remotes/origin/master10:43
osse someone235: run git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"10:44
then git fetch. now you'll see it10:44
← bybb left10:46
← Elon_Satoshi left10:46
→ bybb joined10:46
← Anticom left10:47
← hash-z3r0 left10:47
→ Elon_Satoshi joined10:47
← Soni left10:48
→ rnsanchez joined10:49
→ bomb-on joined10:51
← bybb left10:51
→ Anticom joined10:51
jast the situation looks as though --single-branch was passed when cloning10:51
osse I concur with this assessment10:54
Furthermore, Carthage must burn.10:54
someone235 thx10:55
→ venmx joined10:56
→ venmx_ joined10:56
Celelibi Is there an efficient way to version large binary objects and tie them to commits?11:00
→ cagomez joined11:00
osse git-annex, git-lfs, git-slave11:00
Celelibi Thanks, I'll look at that.11:00
I tried to just commit my sqlite database, but some simple git commands take very long.11:00
jast !annex11:04
gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs11:04
← magicturtle left11:04
jast gitslave is for managing groups of repos, not related to this IMO11:04
← cagomez left11:05
→ SteffanW joined11:07
← Cabanossi left11:08
→ Cabanossi joined11:10
← ahr3n left11:11
← neil_cn left11:13
osse Ah, my bad11:14
→ EvilPenguin joined11:15
← nahtnam left11:15
← Chuguniy left11:15
← JeroenT left11:16
→ cagomez joined11:16
→ kurkale61 joined11:17
→ dsdeiz joined11:18
← thierryp_ left11:18
→ thierryp joined11:18
← raynold left11:19
← kurkale6ka left11:19
← cagomez left11:20
← Anticom left11:21
→ theoceaniscool joined11:21
← dsdeiz left11:22
→ Chuguniy joined11:23
→ arbes joined11:24
← arbes left11:25
→ adioe3 joined11:25
adioe3 hi folks11:25
somebody seems to have mucked up my repo, when i clone it i get:11:25
fatal: Invalid revision range 0000000000000000000000000000000000000000..53441323826d5d716274f6a79063e4b2081e952a11:25
any idea how to fix that or what the problem is?11:26
→ watabou joined11:26
→ clmsy joined11:26
← Murr left11:28
→ kurkale6ka joined11:28
→ Murr joined11:28
← kurkale61 left11:29
← theoceaniscool left11:29
→ Soni joined11:30
→ JeroenT joined11:31
← bitmod left11:32
← SteffanW left11:32
→ Darcidride joined11:33
→ jmccarthy joined11:33
jmccarthy If I have a list of old commits (non-contiguous) which are missing a Change-Id - what is a handy way to script running the commit hook against them to add one in ? Can this be done in some way that doesn't require a force push ?11:36
→ bybb joined11:38
grawity no, it cannot11:38
→ sekmo joined11:38
jmccarthy May with some sort of rebase magic ? no ?11:40
← jeffreylevesque left11:40
grawity no11:40
← qwedfg left11:40
grawity changing old commits requires a force push, end of story11:40
← dan2k3k4 left11:41
← ppang left11:41
→ ppang joined11:42
jmccarthy :/11:42
→ glad joined11:43
→ peff joined11:45
← Chuguniy left11:45
→ Chuguniy joined11:46
→ bayman joined11:46
jmccarthy Is filter-branch really that bad ? It says 'don't use it' - but in a test I did, I was able to doctor up the commits just fine (in my local workspace)11:46
← ArcaTech left11:47
sonOfRa You will still need to force-push11:47
← EvilPenguin left11:49
jmccarthy Ok, yep I have read that in many places - just checking :) ! Or if maybe there is a preferred way besides filter-branch ?11:49
→ dan2k3k4 joined11:50
← ShalokShalom_ left11:51
← bayman left11:51
→ ShalokShalom joined11:51
jast not for the kind of thing you're trying to do... and even if there were, it would still be impossible to do it without a force push11:52
jmccarthy Ok, I believe ye :)11:52
Thanks :) !11:54
→ dave0x6d joined11:58
← JeroenT left11:59
← jameser_ left12:00
→ synthroid joined12:02
jmccarthy Follow up question: How does this differ from 'reword', if I do interactively, I think I can add Change-Ids and push up a review ok, is that right ?12:03
jast sure... but if you pushed the original commit earlier, it requires a force push12:03
← inovas left12:04
← jceb left12:04
jast the main difference between filter-branch and rebase is that rebase works on patches, i.e. when re-creating the commit it re-applies the corresponding patch12:04
when all you're doing is changing the commit message, that difference is mostly irrelevant12:04
→ str joined12:05
→ sz0 joined12:06
← Cabanossi left12:08
← dzho left12:09
→ dzho joined12:09
→ Cabanossi joined12:10
→ JeroenT joined12:11
→ Gurkenglas joined12:13
→ Acerific joined12:13
← Acerific left12:13
→ Acerific joined12:13
← kadoban left12:15
→ epta joined12:16
→ sucode_ joined12:16
sucode_ Hi! everyone, I want to apply for co-mentor in the outreachy program.12:17
→ jceb joined12:17
epta Why do git ask for password when doing 'git clone https://github.com/a/b' even if the repo is public?12:18
tobiasvl epta: are you sure you're using the HTTPS URL for cloning?12:19
→ kurkale61 joined12:19
tobiasvl epta: if you're using an SSH URL instead (or [email@hidden.address] with no protocol in front) it probably doesn't ask for a password, but your SSH key's passphrase?12:19
dzho epta: I often encounter that error when I have a typo in my URL. It can't find the project, and so then must authenticate me to check to see if a private repo of that name exists.12:20
jast sucode_: probably a typo in the URL. on github, trying to clone a non-existing repo results in a password prompt12:20
whoops12:20
epta: probably a typo in the URL. on github, trying to clone a non-existing repo results in a password prompt12:21
tobiasvl aah, good call.12:21
→ bronson joined12:21
epta jast: whoa, it was a typo, thanks12:22
jast happens to the best of us :)12:22
← kurkale6ka left12:22
→ YuGiOhJCJ joined12:22
← epta left12:22
→ Paker joined12:24
← sucode_ left12:25
← Acerific left12:25
→ plexigras joined12:25
← bronson left12:26
→ bongo joined12:26
→ kurkale6ka joined12:26
→ noecc joined12:27
← a3Dman left12:28
← kurkale61 left12:28
plexigras how can i set the default merge message?12:29
→ jeffreylevesque joined12:30
→ jkadaver joined12:30
← Led_Zeppelin left12:31
← jknetl left12:31
← cagedwisdom left12:34
← cstratak left12:35
→ hash-z3r0 joined12:35
→ cstratak joined12:35
→ southernirc joined12:36
→ lempface joined12:36
← ShalokShalom left12:37
jast plexigras: I think the only way to override it is the '-m' command line option12:37
which I guess will skip the message editor, too...12:38
→ a3Dman joined12:38
lempface So I've had this repository for a couple years, and no issues. I created a feature branch and made one commit just fine. I've made a bunch more changes and want to start adding commits but now when I try to git add any files I get an error: "fatal: internal error: ce_mode is 0" I can't seem to find a whole lot related to this error. Any ideas? I'm a little nervous my repo is borked!12:38
← kurkale6ka left12:38
→ ShalokShalom joined12:38
← hash-z3r0 left12:40
← up_the_irons left12:40
→ kurkale6ka joined12:40
← Fissure left12:41
→ up_the_irons joined12:41
jast lempface: your index may be corrupt, try 'git reset' -- this will forget which changes you have staged12:41
→ Fissure joined12:41
lempface any risk of losing my work with that?12:41
I'll back it up first12:41
→ sucode_ joined12:42
jast it affects only git's knowledge of what is staged and what isn't. commits and your working tree are left alone if you don't add any more options12:42
but a backup never hurts :)12:42
sucode_ → Guest1634012:42
← MoaMoaK left12:42
← ShalokShalom left12:42
→ ShalokShalom joined12:43
lempface @jast - much love friend, that fixed it WHEW!12:43
jast great12:43
← mrkake left12:43
← MattMaker left12:44
→ MattMaker joined12:44
← MattMaker left12:45
→ MattMaker joined12:45
→ EvilPenguin joined12:45
← MattMaker left12:46
→ MattMaker joined12:46
← MattMaker left12:46
← dre_ left12:49
plexigras i want the default merege message of branch `hotfix/something` to be `fix: something` and of `feature/something`, `feat: something`12:50
→ mrkake joined12:50
← Guest16340 left12:51
jlebrech how do i checkout a branch of the same project into a submodule?12:51
→ diqidoq joined12:52
← mrkake left12:54
← ljc left12:54
→ rawste joined12:55
→ mkali joined12:56
→ renarcii joined12:58
→ bruce_lee joined12:58
← bruce_lee left12:58
→ bruce_lee joined12:58
→ mrkake joined12:59
← str left13:00
→ pinux joined13:01
← renarc left13:02
renarcii → renarc13:02
← ppang left13:03
lempface @jast - After I committed my changes, somehow one of my submodules was deleted. Best route to fix?13:04
← renarc left13:04
lempface should just reinit be fine?13:04
→ renarc joined13:05
jast huh. worth a try, certainly...13:06
lempface I have no idea how it became all wonky, I didn't do anything out of the ordinary and I'm the sole author on this project13:06
← Cabanossi left13:07
lempface Reinit seems to have brought it back but it is set to HEAD instead of master. Still fairly new to submodules so maybe this is expected13:08
Nevermind, that is a tag gitkraken auto created13:09
→ Cabanossi joined13:09
→ str joined13:12
→ chriys joined13:12
← YuGiOhJCJ left13:13
→ murii joined13:14
→ cdg joined13:15
← synthroid left13:15
← renarc left13:15
← AnujSharma left13:15
→ igemnace joined13:16
← EvilPenguin left13:18
→ dsdeiz joined13:18
← dsdeiz left13:18
→ dsdeiz joined13:18
← str left13:19
→ FatKiwi joined13:21
→ cdg_ joined13:21
pinux → ppang13:21
→ gugah joined13:22
← Anja_ left13:22
← dsdeiz left13:23
→ jeffreylevesque_ joined13:25
← cdg left13:25
← jeffreylevesque left13:26
← Murr left13:28
← j08nY left13:28
→ Murr joined13:28
→ Anticom joined13:29
→ Tobbi joined13:29
← govg left13:30
→ govg joined13:31
→ str joined13:31
plexigras how do i change the default merge message13:33
← Nizumzen left13:34
← ronskisika left13:34
← chll_ left13:34
→ Cavallari joined13:34
→ tinanoo joined13:35
→ Es0teric joined13:35
→ Anja_ joined13:36
← sekmo left13:36
→ mescalinum joined13:36
→ bybb_ joined13:37
← bybb left13:37
← Cabanossi left13:37
← peff left13:38
→ peacememories joined13:38
jast plexigras: I've already answered...13:38
about an hour ago13:39
→ Cabanossi joined13:39
osse prepare-commit-msg would do the trick13:40
← Tobbi left13:40
plexigras no -m changes the merege messeage i want to change the default merge message13:40
ok i will take a look at that13:40
→ Tobbi joined13:41
→ ahr3n joined13:42
→ bitonic joined13:44
jast man githooks for reference13:45
gitinfo the githooks manpage is available at https://gitirc.eu/githooks.html13:45
bitonic is it possible to check if there are any conflicts between two branches without attempting a merge?13:45
i need this to perform some sanity checks in a ci script13:45
jast bitonic: not really13:45
bitonic jast: that's a bummer13:45
jast about the best you can do is redirect the index and working tree to a temporary location to try the merge13:45
osse how about checking if merge-tree prints anythign13:46
→ nettoweb__ joined13:46
osse (haven't done this myself. it's just as much a question as an answer)13:46
jast I think merge-tree doesn't run the whole gamut of automatic merging13:47
→ MattMaker joined13:47
jast it does a trivial merge, meaning it doesn't perform automatic merging within a file13:47
→ lebwoski joined13:47
osse ah13:47
← ahr3n left13:47
← lebwoski left13:47
→ balance joined13:48
balance hi13:48
jast but doing this and then trying manual merges on individual stages in the index would remove the requirement of creating a complete temporary working tree13:48
→ lebwoski joined13:48
→ bayman joined13:49
jast so I guess you can do a decently efficient job simulating a merge but it takes a fair bit of familiarity with the concepts13:49
→ ahr3n joined13:49
balance How come that git pull origin master doesn't actually "update" a file? I cloned the repo, made a change to file X but didn't commit it and then just wanted to get to the newest state by doing pull origin master but the file keeps the same.13:49
osse balance: because if it did then it would wipe your uncommitted changes13:49
git doesn't like that13:50
jast 'git pull' is for fetching updates, it doesn't overwrite your changes because it considers them valuable13:50
if you want to get rid of uncommitted changes, check the output of 'git status' for useful hints13:50
tobiasvl balance: git should have told you this when pulling13:50
rewt it should tell you what it's doing ... yes, it's a lot of text, but it has important info13:50
jast or use 'git reset --hard' for tabula rasa13:50
balance osse so what happens in this case and why do I get "already up to date"?13:50
jast because 'git pull' didn't have any updates to give you13:51
rewt what does `git status` say?13:51
jast you're already up-to-date, you just have some uncommitted changes13:51
← justan0theruser left13:51
jast pulling never means "throw away things I did", it means "combine my things with upstream things"13:51
← MattMaker left13:51
→ robotroll joined13:52
balance jast osse tobiasvl ok thanks - gonna reread some tutorial about it. status shows the uncommited changes.13:52
→ AaronMT joined13:53
rewt pull = fetch + merge13:53
← bayman left13:53
jast yeah, and it also shows you how to get rid of your changes :)13:53
→ JeroenT_ joined13:53
balance jast yeah, solved it. thanks!13:54
← someone235 left13:55
gitinfo set mode: +v13:55
lebwoski Hi, I want to rebase a fork to the original vanilla repository, but I only have a snapshot(not git files). I tried to create a repository with git init and rebase with adding a new remote (upstream) and 'git rebase' but I get conflicts with two files 'both added' by both repositories. Is there a way around patching the files manually? Thx!13:55
→ bitmod joined13:55
→ schasi joined13:56
← dec0n left13:56
→ Guest16340 joined13:57
← JeroenT left13:57
← manuelschneid3r left13:57
→ seds joined13:57
← LeBlaaanc left13:58
← JeroenT_ left13:58
← seds left13:58
← zefferno left13:59
→ JeroenT joined13:59
← Thunderfunk left13:59
schasi Can anyone tell me why there is no "force" switch to clone into an non-empty directory?13:59
→ zefferno joined13:59
osse My guess is that no one has bothered making it14:00
← lebwoski left14:01
schasi Hm. But the bothered not allowing cloning into non-empty directories.14:01
→ seds joined14:01
osse because that's easier to implement :p14:01
git init && git remote add origin .... && git fetch origin && git checkout -b master origin/master14:02
there. dirty clone14:02
← seds left14:02
schasi Heh. Well thanks X)14:02
→ seds joined14:03
→ NeverTired joined14:04
← noecc left14:04
→ snowkidind joined14:04
← Rubin left14:05
→ manuelschneid3r joined14:06
← erhandsome left14:06
→ freimatz3 joined14:06
← nettoweb__ left14:07
→ nettoweb__ joined14:08
← dave0x6d left14:08
→ stutter joined14:08
→ phluks joined14:09
← freimatz left14:09
→ erhandsome joined14:09
← Es0teric left14:10
← JeroenT left14:10
← robotroll left14:10
← erhandsome left14:11
← howdoi left14:11
→ Es0teric joined14:11
→ guardian joined14:12
← imack left14:12
← stutter left14:13
← abba left14:13
→ Thunderfunk joined14:14
→ kpease joined14:14
← ShalokShalom left14:15
→ EvilPenguin joined14:15
← sz0 left14:16
→ erhandsome joined14:16
← erhandsome left14:17
→ MattMaker joined14:17
→ dsdeiz joined14:18
→ erhandsome joined14:18
→ cbd_ joined14:19
← _ADN_ left14:19
← erhandsome left14:19
→ synthroid joined14:20
← navidr left14:20
→ erhandsome joined14:20
→ kurkale61 joined14:21
← bladdezz left14:22
→ bronson joined14:22
← MattMaker left14:22
← dsdeiz left14:22
← Cabanossi left14:23
→ hash-z3r0 joined14:23
→ nick-mbp joined14:23
→ Gustavo6046 joined14:23
← kurkale6ka left14:24
→ Cabanossi joined14:25
→ dsdeiz joined14:25
→ FrostCandy joined14:25
→ ForeignBiscuit joined14:25
← erhandsome left14:25
→ Plouescat joined14:25
ForeignBiscuit → ResidentBiscuit14:25
→ al-damiri joined14:26
→ JanC_ joined14:26
→ erhandsome joined14:26
→ cagomez joined14:26
← bronson left14:27
← fatihgenc left14:27
← JanC left14:27
JanC_ → JanC14:27
→ LeBlaaanc joined14:27
← hash-z3r0 left14:28
← Jokler left14:28
→ knudLeopold joined14:29
→ Jokler joined14:29
← nettoweb__ left14:31
→ kurkale6ka joined14:31
← cagomez left14:31
← kurkale61 left14:34
← nick-mbp left14:34
→ Prisoner-2460_1 joined14:34
Prisoner-2460_1 how might you go about dropping multiple stashes at once?14:34
← dsdeiz left14:34
← knudLeopold left14:35
← Calinou left14:35
← seds left14:35
→ Rubin joined14:36
→ dsdeiz joined14:36
← bsanford left14:36
← jsears left14:37
→ dsdeiz_ joined14:37
← jlebrech left14:38
← ahr3n left14:38
→ cha18 joined14:38
← bomb-on left14:39
→ stutter joined14:41
← freimatz3 left14:41
→ freimatz joined14:41
← Thunderfunk left14:41
→ Thunderfunk joined14:42
← chriys left14:42
← bybb_ left14:42
← AfroThundr left14:42
→ AfroThundr joined14:43
→ chriys joined14:43
jast Prisoner-2460_1: I don't think there's a friendly way to do it, but you can manually edit .git/logs/refs/stash (newest stashes at the bottom)14:43
← peacememories left14:45
→ sz0 joined14:45
→ peacememories joined14:46
← zefferno left14:46
→ thiago joined14:47
Prisoner-2460_1 jast: lovely! also seems handy for renaming14:47
← chriys left14:47
← EvilPenguin left14:48
→ chriys joined14:49
← peacememories left14:49
→ jesst joined14:49
← overlord_tm left14:50
→ Gsham joined14:50
→ npgm joined14:52
← rchavik left14:53
→ crose joined14:55
← netj left14:56
→ netj joined14:56
← jesst left14:57
→ peacememories joined14:58
← ppang left15:01
← TomyWork left15:02
→ roelmonn_ joined15:02
→ Vortex34 joined15:02
← roelmonn_ left15:02
← rscata left15:02
← mkali left15:02
→ marinin joined15:02
← peacememories left15:02
→ roelmonn_ joined15:03
→ mkali joined15:03
→ shdw joined15:04
← Vortex35 left15:04
← Cavallari left15:04
← clmsy left15:04
← roelmonnens left15:05
← thiago left15:06
← dsdeiz_ left15:07
← roelmonn_ left15:07
→ Phylock joined15:08
→ steeze joined15:09
← jceb left15:09
← synthroid left15:10
← chriys left15:10
← Es0teric left15:10
→ jceb joined15:11
→ chriys joined15:12
→ chrisshattuck joined15:12
→ nettoweb__ joined15:15
← wandering_vagran left15:16
→ kurkale61 joined15:17
→ MattMaker joined15:18
← kurkale6ka left15:19
← Phylock left15:20
→ roelmonnens joined15:20
← sunri5e left15:22
← MattMaker left15:23
← tkore left15:24
→ freimatz3 joined15:24
← meLon left15:24
← Guest16340 left15:25
← roelmonnens left15:25
→ synthroid joined15:25
→ synthroi_ joined15:26
→ seds joined15:26
← Murr left15:27
→ imack joined15:28
← imack left15:28
← freimatz left15:29
→ inovas joined15:29
← synthroid left15:30
→ Murr joined15:30
← SerusWork left15:30
← seds left15:31
→ kerrick joined15:31
→ dviola joined15:32
→ cagomez joined15:32
→ Es0teric joined15:33
← nettoweb__ left15:33
← vush left15:33
→ meLon joined15:34
← meLon left15:34
→ meLon joined15:34
→ edvb joined15:34
← cagomez left15:34
→ seds joined15:35
→ sunri5e joined15:35
← mescalinum left15:35
→ boombatower joined15:35
→ SwiftMatt joined15:36
→ imrg90 joined15:37
← stutter left15:37
← Cabanossi left15:37
← chriys left15:38
→ kurkale6ka joined15:39
← Gurkenglas left15:39
← igemnace left15:40
→ Cabanossi joined15:40
→ igemnace joined15:40
→ dreiss joined15:41
← cstratak left15:41
← kaldoran left15:41
← sim590 left15:41
← kurkale61 left15:42
→ nettoweb__ joined15:42
← inovas left15:43
→ sim590 joined15:43
← imrg left15:43
→ kaldoran joined15:43
← imrg90 left15:43
→ chriys joined15:44
→ imrg90 joined15:44
→ vush joined15:46
→ bomb-on joined15:46
→ madewokherd joined15:47
← murii left15:47
→ SerusWork joined15:47
← Chuguniy left15:47
← Plouescat left15:48
← a3Dman left15:48
← antfoo left15:50
← nettoweb__ left15:50
← imrg90 left15:50
← idlemind left15:50
← noobineer left15:50
→ imrg90 joined15:51
→ gugah_ joined15:51
← jceb left15:52
← jstimm left15:52
→ antfoo joined15:52
← gugah left15:53
← musicmatze[m] left15:54
→ robotroll joined15:54
→ Plouescat joined15:55
→ j08nY joined15:55
→ a3Dman joined15:56
→ deepakbndeepu joined15:56
← synthroi_ left15:56
→ overlord_tm joined15:57
→ EvilPenguin joined15:57
→ qpdb joined15:57
→ Gurkenglas joined15:57
→ TomyLobo joined15:57
→ nettoweb__ joined15:58
← Gustavo6046 left15:58
← imrg90 left15:58
← CheckDavid left15:58
← deepakbndeepu left15:59
→ cstratak joined15:59
→ murii joined15:59
← cstratak left16:00
→ cstratak joined16:00
→ navidr joined16:02
← Thunderfunk left16:02
→ CheckDavid joined16:05
→ inovas joined16:07
← Cabanossi left16:08
→ Cabanossi joined16:10
← Tobbi left16:10
→ balance1 joined16:10
← Kavothe left16:11
→ hash-z3r0 joined16:11
→ Guest16340 joined16:12
← balance left16:13
→ z1haze joined16:13
→ durham joined16:13
z1haze when doing an interactive rebase.. what is the 'onto' and what is the 'from'? I have done them before from the command line (still not really knowing what im doing) but these terms confuse me. My goal is to take this branch im working on, and squash a few commits that are stupid insignificant changes. Can anyone advise?16:14
← Guest16340 left16:16
→ imack joined16:16
← hash-z3r0 left16:16
→ shdw- joined16:16
→ Kavothe joined16:16
← marinin left16:17
← shdw- left16:17
← shdw left16:19
← luc4 left16:19
→ EricPoe joined16:19
→ MattMaker joined16:19
→ aFeijo joined16:19
→ Tobbi joined16:19
→ synthroid joined16:20
← upperdeck left16:20
→ qwedfg joined16:20
← nettoweb__ left16:21
→ orbyt_ joined16:21
← SwiftMatt left16:21
← erhandsome left16:21
← wcpan_ left16:21
← Plouescat left16:22
← Anticom left16:22
→ thiago_ joined16:22
← LeBlaaanc left16:22
→ wcpan joined16:22
→ SwiftMatt joined16:23
→ erhandsome joined16:23
→ bronson joined16:23
← MattMaker left16:23
← crose left16:24
→ tarkus joined16:24
→ LeBlaaanc joined16:25
← Gsham left16:27
← bronson left16:27
→ Plouescat joined16:27
→ upperdeck joined16:28
thiago_ → thiago16:29
→ Brain joined16:30
← tunekey left16:32
→ Noldorin joined16:34
← Noldorin left16:35
→ Noldorin joined16:36
→ cdown joined16:37
← dreiss left16:38
← igemnace left16:39
← Es0teric left16:40
← SwiftMatt left16:40
← durham left16:40
→ hash-z3r0 joined16:42
→ hdqn joined16:42
hdqn how do I gitignore a whole directory except a chose few files?16:42
← kerrick left16:43
← rk left16:43
→ theoceaniscool joined16:44
← Gurkenglas left16:44
← kurkale6ka left16:44
→ kfoonamalik joined16:45
→ bayman joined16:45
→ Es0teric joined16:45
← sz0 left16:46
→ mostlybadfly joined16:46
Seveas hdqn: something like this in .gitignore:16:49
foo/16:49
!foo/bar16:49
gitinfo bar16:49
← Zoxc left16:49
parsnip !ssh16:49
gitinfo Please use SSH to talk to remote repos. http:// and git:// are completely unsecured and http:// suffers from smart webservers trying to implement policy. You can try to do "smart" https://, but it can be troublesome to configure if you do not know how (see !web_repos for simple instructions) unless your company implements a MITM attack and prevents end-to-end crypto.16:49
← bayman left16:49
→ rk joined16:50
Seveas https is just fine, gitinfo16:50
← imack left16:50
Seveas z1haze: https://git.seveas.net/rebasing-illustrated.html#rebasing-illustrated may help16:50
→ jstimm joined16:50
← gxt left16:51
← schasi left16:53
← bomb-on left16:53
← cdown left16:54
→ hahuang65 joined16:55
→ v4ult joined16:56
→ durham joined16:56
→ Gurkenglas joined16:56
← chriys left16:57
→ noecc joined16:57
→ cdown joined16:57
→ chriys joined16:58
z1haze I'm just trying to understand some terminology Seveas : normally if I rebase interactively i do 'git rebase -i master' and then i pick/squash my commits, whatever .. my question is though for terminology on my GUI thing.. it has dropdown for branches labeled 'onto' and 'from'16:58
← a3Dman left17:00
← Es0teric left17:00
← ertes-w left17:01
Seveas z1haze: 'from' is the oldest commit to be rebased, 'onto' the commit to transplant them onto17:01
z1haze so i guess in translating 'git rebase -i master' what would be onto what what would be from? Nice website btw17:02
→ dsdeiz_ joined17:03
← cdown left17:03
→ imack joined17:04
→ roelmonnens joined17:05
→ bronson joined17:05
← robotroll left17:05
→ a3Dman joined17:07
→ peacememories joined17:07
→ cdown joined17:08
← dsdeiz_ left17:08
← chriys left17:08
← Cabanossi left17:08
→ ArcaTech joined17:08
→ Cabanossi joined17:10
→ Zoxc joined17:10
← qwedfg left17:11
← balance1 left17:11
← Paker left17:12
→ iNCoNFuN joined17:13
← noecc left17:14
← Gurkenglas left17:15
← feodaron left17:15
← manuelschneid3r left17:16
→ feodaron joined17:16
← cyberz left17:17
→ ShalokShalom joined17:18
→ cyberz joined17:19
→ MattMaker joined17:20
→ kyan joined17:20
→ UrsoBranco joined17:20
← gugah_ left17:22
← Floflobel left17:23
← kyan left17:23
← a3Dman left17:23
→ high_fiver joined17:24
← cstratak left17:24
← roelmonnens left17:24
→ manuelschneid3r joined17:24
← MattMaker left17:24
→ roelmonnens joined17:26
→ Mattiaslndstrm joined17:26
Seveas onto would be master@{u}, from would be the first commit after that and to would be master17:26
← synthroid left17:27
← roelmonnens left17:27
→ aard_ joined17:27
→ Paker joined17:28
→ svm_invictvs joined17:28
→ kerrick joined17:31
→ a3Dman joined17:33
→ stutter joined17:34
parsnip on mnemonic i have is, the branch that is currently checked out, is the only ref that will move.17:34
→ fahadash joined17:34
parsnip that seems to be true for many git commands, like [commit, rebase, cherry-pick, merge, reset]17:35
← cyberz left17:35
parsnip s/^on /one /17:35
← konsolebox left17:35
← Plouescat left17:36
→ cyberz joined17:37
← FatKiwi left17:38
← a3Dman left17:38
→ hgrall joined17:39
→ a3Dman joined17:39
← a3Dman left17:39
→ a3Dman joined17:39
→ glad_ joined17:39
Seveas yup17:41
← glad left17:41
z1haze thanks Seveas17:41
Seveas I think only push and fetch update multiple refs at once17:41
← hgrall left17:42
→ konsolebox joined17:42
parsnip okay, fetch updates multiple remotely controlled branches17:42
doesn't the merge part of pull only act on currently checked out branch?17:43
s/branches/refs/17:43
← tvw left17:45
grawity it does17:45
← orbyt_ left17:45
← manuelschneid3r left17:46
← a3Dman left17:46
→ somiaj joined17:46
→ fatihgenc joined17:47
somiaj I can't seem to figure out what changed, but on repos that were working fine (and work fine from antother computer) when I try 'git pull' or 'git fetch' (which use to work) I get the following error and nto finding much info on google about it. "fatal: Malformed response in ref list: <html>"17:47
→ retropikzel joined17:47
APic Can You name the affected Repositories?17:48
OMGOMG are you by any chance on a free wifi17:48
← phluks left17:49
Seveas somiaj: that smells like http:// cloning and a bad MITM proxy. Try https:// or ssh:// cloning17:49
← seds left17:50
Seveas or a git host that's broken and serves error responses as html without giving it a non-200 return code17:50
somiaj I'm using https://, I upgraded the git server I was using, and it has caused a few other problems, maybe I should download it.17:50
Seveas yeah, broken git server. Check the logs17:50
somiaj I can't seem to clone any repos either. The machine that is having troulbe is centos6, using git 1.7, the machine that works has git 2.1.4, think I just need to downgrade the gitserver I'm using.17:51
→ a3Dman joined17:51
← nuked0ne left17:53
→ nuked0ne joined17:53
→ Gurkenglas joined17:53
→ bayman joined17:54
somiaj don't see anything unsual in the logs. Anyways, I will just have to downgrade...thanks17:55
→ orbyt_ joined17:57
← murii left17:57
← kerrick left17:58
← venmx left17:59
← bayman left17:59
← venmx_ left17:59
→ Es0teric joined18:00
→ manuelschneid3r joined18:01
→ Sasazuka joined18:02
→ kerrick joined18:02
→ venmx joined18:03
→ venmx_ joined18:03
← Cabanossi left18:08
→ chriys joined18:09
→ Cabanossi joined18:10
→ seds joined18:10
→ Argylelabcoat joined18:13
← rk left18:13
→ rk joined18:13
← chriys left18:13
← nezylop left18:14
→ dmc joined18:15
→ m0viefreak joined18:15
→ upperdeck_ joined18:16
← venmx_ left18:17
→ chriys joined18:17
← venmx left18:17
→ rkta joined18:17
← selckin left18:18
← upperdeck left18:18
→ selckin joined18:18
→ hash-z3r_ joined18:19
← hash-z3r0 left18:19
→ def_jam joined18:19
← eblip left18:20
→ MattMaker joined18:20
→ cdg joined18:23
← stutter left18:25
← MattMaker left18:25
← cdg_ left18:26
← achadwick left18:27
← upperdeck_ left18:28
→ upperdeck joined18:29
← iNCoNFuN left18:29
← netj left18:31
→ basiclaser joined18:31
→ netj joined18:31
→ dersand joined18:34
← peacememories left18:35
← Bock left18:35
← mkali left18:35
← Gurkenglas left18:35
→ grazfather joined18:36
grazfather hey guys, how can I create a branch without checking it out? I just want to make a new branch point to a certain commit, but not suffer the time it takes to change over to it18:36
grawity `git branch <name> <base>`18:37
grazfather wow18:38
ty18:38
→ peacememories joined18:38
→ cdg_ joined18:38
→ ankit01ojha joined18:38
grazfather oh you can even move the branch you're not on18:39
i assumed it was always working on your current branch18:39
← Brain left18:39
→ cdg__ joined18:40
← hash-z3r_ left18:40
← peacememories left18:40
→ phluks joined18:40
← cdg left18:41
→ Ldip joined18:41
→ peacememories joined18:41
← grazfather left18:42
→ stutter joined18:42
← cdg_ left18:42
← NeverTired left18:43
← cdg__ left18:44
→ MattMaker joined18:47
← seds left18:47
← belmoussaoui_ left18:47
→ belmoussaoui_ joined18:49
← jmccarthy left18:49
→ Murii|osx joined18:49
← peacememories left18:50
→ peacememories joined18:50
→ Gurkenglas joined18:52
→ ka joined18:55
← ka left18:55
← imack left18:56
→ bitbit joined18:56
→ mescalinum joined18:56
→ hash-z3r0 joined18:56
← jstimm left18:58
→ cagedwisdom joined18:59
← thiago left19:00
← orbyt_ left19:00
→ doener joined19:00
→ nixjdm joined19:02
→ tvw joined19:02
→ raynold joined19:02
→ olalonde joined19:03
→ synthroid joined19:03
→ mar77i_ joined19:03
← mar77i left19:05
→ Ladus joined19:05
→ marinin joined19:06
← peacememories left19:07
← southernirc left19:07
→ thiago joined19:07
← EvilPenguin left19:07
→ EvilPenguin joined19:08
← m0viefreak left19:09
→ jimsio joined19:09
→ salamanderrake joined19:10
→ peacememories joined19:10
→ jnavila joined19:11
← Gurkenglas left19:11
→ mr_sm1th joined19:11
← lempface left19:12
→ Dougie187 joined19:12
← peacememories left19:12
← pks left19:13
→ Bishop_Bautista joined19:14
→ pks joined19:16
← _Patrick_ left19:18
← z1haze left19:21
→ _Patrick_ joined19:23
→ peacememories joined19:24
← Murr left19:27
→ Murr joined19:28
skalpin When I do a merge from two branches and resolve the conflicts, it results in no new merge commit because resolving the conflicts keeps the files as is. Is there a way to resolve these conflicts permanently? I keep getting the same conflict on each merge.19:29
← peacememories left19:30
perlpilot skalpin: enable rerere ?19:31
mar77i_ → mar77i19:31
← cdown left19:33
← nixjdm left19:34
← _Patrick_ left19:35
← prg318 left19:36
→ _Patrick_ joined19:36
→ prg318 joined19:37
skalpin oh, I'm dumb. after completing the merge I needed to do a `git merge --continue` to create the merge commit.19:37
← kerrick left19:37
skalpin I just didn't think there was anything to commit because posh-git was telling me nothing had changed. But I was still in a merging state.19:38
← lkolstad left19:40
← dviola left19:41
← Ladus left19:41
→ orbyt_ joined19:42
→ seds joined19:44
→ kerrick joined19:44
← pks left19:46
→ nixjdm joined19:47
→ pks joined19:48
→ vjacob joined19:49
→ Gurkenglas joined19:50
→ cdown joined19:50
→ yqt joined19:52
→ ozcanesen joined19:53
← rnsanchez left19:54
← seds left19:56
→ kadoban joined19:56
← fatihgenc left19:56
→ bomb-on joined19:56
← Xethron left19:56
← mr_sm1th left19:56
→ nobso joined19:57
← nobso left19:57
← synthroid left19:57
← Baughn left19:58
← steeze left19:58
← beerdrop left19:59
→ Baughn joined20:00
→ seds joined20:01
← kerrick left20:02
→ steeze joined20:03
← thiago left20:04
← cdown left20:05
← Hello71 left20:06
← marinin left20:06
→ King_Hual joined20:07
→ ZyX-I joined20:07
→ marinin joined20:07
→ cdown joined20:08
→ Hello71 joined20:08
→ kerrick joined20:08
← phluks left20:08
← EvilPenguin left20:09
→ geekhands joined20:09
← rkta left20:09
→ synthroid joined20:10
← Anja_ left20:10
← glad_ left20:12
← kerrick left20:12
← jeffreylevesque_ left20:12
← Es0teric left20:14
→ rkta joined20:14
← seds left20:14
→ Es0teric joined20:15
← Darcidride left20:15
→ EvilPenguin joined20:16
→ thiago joined20:16
→ cdg joined20:18
→ seds joined20:19
→ kerrick joined20:20
← cdg left20:20
→ Anja joined20:21
← seds left20:21
→ cdg joined20:24
← dersand left20:28
← plasticle left20:29
→ relipse___ joined20:29
← rk left20:30
← kerrick left20:30
→ Guma joined20:30
→ rk joined20:30
← Gurkenglas left20:32
← vush left20:32
→ Phylock joined20:34
→ stethewwolf joined20:34
← mattcen left20:34
← nixjdm left20:34
→ beerdrop joined20:35
→ mustmodify_ joined20:36
mustmodify_ → mustmodify20:37
mustmodify This is probably crazy, but can I ask git whether the word "box-shadow" has been removed from my repo in the last ... say.... 2 months?20:37
→ mattcen joined20:37
_ikke_ mustmodify: git log --since='2 months ago' -S 'box-shadow' --all20:39
something like that20:39
mustmodify -S ...20:39
→ sbeyer joined20:39
mustmodify I'll check it out. Thanks.20:39
_ikke_ (it whould also show commit that added it, add -p to see the diff)20:39
yes20:39
-S shows you commits that either added or removed that string20:39
← rawste left20:39
→ kerrick joined20:40
mustmodify HOLY CRAP IT WORKED. That's amazing. Thank you. And I'm going to just send a thank you out to Torvalds et al.20:40
_ikke_ hehe20:40
→ kasual joined20:40
→ seds joined20:41
← freimatz3 left20:42
← Ldip left20:43
→ vush joined20:44
→ xaxxon joined20:44
← Bishop_Bautista left20:46
→ nixjdm joined20:47
← geekhands left20:48
← EvilPenguin left20:49
← steeze left20:50
← jimsio left20:50
← doener left20:51
← synthroid left20:52
← King_Hual left20:54
← fahadash left20:54
→ Gurkenglas joined20:54
← kerrick left20:55
← Oatmeal left20:56
→ kerrick joined20:58
← ankit01ojha left20:58
← mescalinum left20:58
← tijensse left20:58
→ anakinz23E joined20:58
→ tijensse joined20:59
→ torshido joined20:59
← tijensse left20:59
→ tijensse joined21:00
← TomyLobo left21:00
← anakinz23E left21:01
← stutter left21:01
← sbeyer left21:02
→ Marvel joined21:02
→ steeze joined21:03
→ King_Hual joined21:03
← King_Hual left21:03
→ King_Hual joined21:03
← Marvel left21:04
→ EvilPenguin joined21:05
← bronson left21:06
← cdown left21:06
→ mescalinum joined21:06
→ markus13 joined21:07
→ bronson joined21:07
← markus13 left21:08
← tijensse left21:08
→ tijensse joined21:09
← seds left21:09
← orbyt_ left21:10
→ Xethron joined21:11
→ Gustavo6046 joined21:11
← ash_workz left21:11
← jnavila left21:13
← Gurkenglas left21:13
→ Rc43 joined21:14
Rc43 Hi guys21:14
I am just wondering what I am doing wrong with git-subtree21:15
→ paguy61 joined21:15
→ cdown joined21:15
Rc43 Trying to merge history of other repo in to my main repo21:15
But got `git-subtree cannot be used without a working tree`, though .git is present in current folder21:15
→ preyalone joined21:16
← LeBlaaanc left21:16
→ justan0theruser joined21:18
← Es0teric left21:19
← utrack left21:19
← paguy61 left21:19
← aard_ left21:19
→ orbyt_ joined21:19
← tijensse left21:19
← Mindi left21:21
→ tijensse joined21:22
Rc43 Even on freshly cloned repo with origin21:26
← chriys left21:27
← tijensse left21:27
← Murr left21:28
→ tijensse joined21:28
→ Murr joined21:28
→ chriys joined21:29
→ mr_sm1th joined21:30
← chriys left21:30
← tijensse left21:30
→ Mindi joined21:30
→ utrack joined21:30
→ tijensse joined21:30
xaxxon Rc43 did you init your submodules?21:32
Rc43 hrmm, nm21:32
→ seds joined21:32
← Elon_Satoshi left21:32
→ Elon_Satoshi joined21:33
xaxxon Rc43 did you follow the instructions here: https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging ?21:33
← relipse___ left21:34
← nixjdm left21:34
→ phinxy joined21:34
← seds left21:35
→ relipse joined21:35
relipse I have a coworker who made some commits NOT on a branch, how do I pull those changes into a branch i have the commit hash21:35
← phinxy left21:35
← yqt left21:36
← Murii|osx left21:36
kadoban relipse: Do you just want to give them a name, like a new branch name? Then 'git branch omgimabranch whateverSHAid'21:36
Rc43 xaxxon, probably this is the key: "git checkout -b rack_branch rack_remote/master"21:36
I followed SO answer, it misses it21:37
kadoban Or you can just merge them into something also if you want, just using the sha-id.21:37
relipse yes kadoban21:37
→ dsdeiz_ joined21:37
← Anja left21:38
← marinin left21:40
→ noobineer joined21:40
← stethewwolf left21:41
→ xaxxon_ joined21:41
← dsdeiz_ left21:42
← xaxxon left21:42
← govg left21:42
Rc43 xaxxon, actually this link solves the problem without merging histories, git read-tree I mean21:43
oh he left21:43
← markzen left21:43
← ResidentBiscuit left21:45
xaxxon_ oh he's back21:45
← tijensse left21:45
→ tijensse joined21:45
→ dviola joined21:46
← Dougie187 left21:47
Rc43 xaxxon_ :) strange that I can found nothing about git-subtree21:47
← bronson left21:47
← tijensse left21:47
→ tijensse joined21:47
→ nixjdm joined21:47
→ dsdeiz_ joined21:48
→ TomyLobo joined21:48
← CheckDavid left21:48
← str left21:49
→ jeffreylevesque joined21:50
Rc43 except git --help of course21:50
← madewokherd left21:51
Rc43 this weird error message ..21:51
← Tobbi left21:51
alyptik → y-21:51
Rc43 could it be because of windows?21:51
← orbyt_ left21:52
← AfroThundr left21:52
→ seds joined21:52
← seds left21:52
← dsdeiz_ left21:53
→ orbyt_ joined21:55
y- → a21:57
a → alyptik21:57
→ Sootherer joined21:58
← mescalinum left21:58
← EricPoe left21:59
→ iamthad joined21:59
→ Gurkenglas joined21:59
→ m0viefreak joined22:00
← overlord_tm left22:01
← jeffreylevesque left22:01
← navidr left22:03
← kpease left22:05
→ jeffreylevesque joined22:06
← Prisoner-2460_1 left22:07
typikal → ^k22:08
→ bayman joined22:08
→ jeffreylevesque_ joined22:10
← cbd_ left22:10
→ energizer joined22:10
← theoceaniscool left22:10
→ jnewt joined22:11
← jeffreylevesque left22:13
← bayman left22:13
← _ng left22:14
→ AfroThundr joined22:14
← mel00010 left22:15
← jeffreylevesque_ left22:15
← edvb left22:15
→ mel00010 joined22:16
← Gurkenglas left22:18
← relipse left22:18
← ozcanesen left22:20
← nadley left22:20
→ edvb joined22:20
→ ozcanesen joined22:20
→ jeffreylevesque_ joined22:22
angular_mike___ is it possible to have a hook be called on remote side after push even if everything is up to date?22:28
← rk left22:30
→ rk joined22:31
kadoban Hm, I suspect not. I don't think the usual ones even run22:31
← Argylelabcoat left22:31
← rk left22:32
→ ertes joined22:33
← AfroThundr left22:33
angular_mike___ I'm setting up a hook to redeploy a docker service when I push to dev branch on the repo on docker host22:34
← nixjdm left22:34
angular_mike___ but being able to just restart that way as well would be convenient22:35
kadoban Ya, this is the kind of thing you run into when you try to use git as a deployment whatever, IMO. Then you have to find weird ways to signal things through git that kind of don't make sense to git, since they're not content they're just commands to the deployment system or something22:35
→ rk joined22:36
→ ovidnis joined22:36
← EvilPenguin left22:37
← Cabanossi left22:38
← Rc43 left22:38
← FrostCandy left22:38
→ Oatmeal joined22:39
→ Cabanossi joined22:40
→ oskarkv joined22:41
→ Nizumzen joined22:41
← Phylock left22:41
← bomb-on left22:42
→ jfeets joined22:43
← ozcanesen left22:43
→ ozcanesen joined22:47
→ nixjdm joined22:47
← dsdeiz left22:48
← tarkus left22:48
→ dsdeiz joined22:49
← dsdeiz left22:49
→ dsdeiz joined22:49
← qpdb left22:51
→ dave0x6d joined22:51
← courrier________ left22:53
→ courrier________ joined22:53
← ZyX-I left22:53
→ LuksLux joined22:56
← nydel07 left22:57
→ Gurkenglas joined22:58
← xaxxon_ left22:59
→ xaxxon joined23:00
← xaxxon left23:01
← ozcanesen left23:02
← nixjdm left23:02
→ ozcanesen joined23:04
← finalbeta left23:04
→ EvilPenguin joined23:05
angular_mike___ git is a filesystem23:07
which makes deployment one of its primary use cases23:08
maybe I can do an empty amend on last commit orsmth?23:08
→ blaeks joined23:08
angular_mike___ since there's no issue with doing force push and force checkout23:08
← edvb left23:08
→ feodoran_ joined23:09
kadoban Git isn't a filesystem? And if it were, I am not sure how that makes deployment something it must do. *shrug*23:09
feodoran → Guest239223:09
→ renarc joined23:09
feodoran_ → feodoran23:09
angular_mike___ it is according to its author Linux Torva23:10
preaction it started as one, sure23:10
→ roelmonnens joined23:10
preaction if you want, you could proxy the git communication (like gitolite does) to do what you need23:10
→ rameerez joined23:11
angular_mike___ I wanna avoid installing jenkins23:11
← Guest2392 left23:11
preaction was that a response to me? because i'm not sure what that was a response to23:12
matthiaskrgr effects like pain? maybe 10 minutes23:13
oops23:13
wrong channel23:13
← high_fiver left23:14
← roelmonnens left23:14
← rameerez left23:14
→ jimmyrcom_ joined23:15
← justan0theruser left23:15
angular_mike___ preaction: maybe23:16
Hello71 "Linux Torva"23:16
preaction alright, well, i can't help you until you're clear about what you're asking23:16
Hello71 I exhaled more deeply than usual.23:16
preaction so, good luck23:16
→ xaxxon joined23:17
← Gurkenglas left23:17
← schleppel left23:17
angular_mike___ preaction: execute post-receive or similar hook after I push and it is already up-to-date23:18
hmm23:18
tho maybe, I could just create a new branch and push it?23:18
preaction angular_mike___: you aren't listening to me, so i don't know why you keep pulling me into the conversation. there is no conversation if you're not listening to me.23:18
angular_mike___ cause I set up the script to check out the branch that has been pushed23:19
preaction it's just you saying things at me. that's not a conversation23:19
← dege left23:19
angular_mike___ preaction: I'm just saying what seems most important23:19
preaction i again ask: Why are you saying it TO ME?23:19
← ozcanesen left23:19
angular_mike___ preaction: idk, do you know how to use git?23:19
→ mizu_no_oto joined23:20
angular_mike___ before you complained i wasn't talking to you enough23:20
preaction yes. i, in fact, know how to solve your problem23:20
angular_mike___ girl, stop these hot n cold games23:20
← dsdeiz left23:20
← Elon_Satoshi left23:21
preaction [18:10:48] <preaction> if you want, you could proxy the git communication (like gitolite does) to do what you need23:21
→ dsdeiz joined23:21
angular_mike___ idk what that means23:21
why are you so mysterious23:21
→ ozcanesen joined23:22
preaction you didn't ask. if you want to know what something means, you need to ask23:22
look at how gitolite works, then you can see how you can intercept git communication to do what you need23:22
angular_mike___ I don't wanna install another tool23:23
my setup is already complex enough23:23
preaction which is why i said _look_, and not _install_23:24
→ AfroThundr joined23:24
← Cabanossi left23:24
→ nadley joined23:24
angular_mike___ hm, it uses 't' for test directory name23:25
→ Cabanossi joined23:25
← preyalone left23:25
angular_mike___ oh shit ,its perl23:25
preaction yes, "t" as a test directory is common for perl code23:26
→ relipse joined23:26
→ Elon_Satoshi joined23:27
← Murr left23:27
def_jam → eb0t23:28
→ relipse__ joined23:28
→ Murr joined23:28
angular_mike___ https://i.ytimg.com/vi/LR8fQiskYII/hqdefault.jpg23:28
← basiclaser left23:28
preaction yes, that's lwall, the developer of perl23:30
← mattcen left23:31
← jfeets left23:31
← relipse left23:31
← kerrick left23:31
→ kerrick joined23:33
→ mattcen joined23:34
← King_Hual left23:34
idmistir hey guys.. I could really use some help. I think I messed with the timeline ^^23:35
→ Puffball_ joined23:35
← ozcanesen left23:35
→ edvb joined23:35
idmistir I think, about a month ago, I commited to a repo while being checked out on an earlier version and effectively altering the course of history since then23:35
← mizu_no_oto left23:36
idmistir can I recover the commits on the parallel universe I cut loose?23:36
preaction git rebase is a good tool for this, yes, idmistir23:36
idmistir preaction; i can't see those commits at all.. I don't know their hashes or anything..23:37
I've been looking for them with git fsck23:37
preaction git fsck doesn't look for things though. maybe you meant git reflog?23:37
← Puffball left23:37
idmistir i did that too23:37
→ wxg joined23:37
idmistir i couldn't see anything that seemed relevant23:37
→ DIDAVISION joined23:38
idmistir preaction; Should I be able to view the commits I can't "see" in my normal history?23:38
→ plasticle joined23:39
idmistir (btw, this is all on one branch, master)23:39
preaction i mean, if you can't find them, and you don't know their commit hashes, they're likely gone23:40
if the commit isn't reachable from master, it won't show up in the log23:40
→ ozcanesen joined23:40
idmistir I think I just skipped a beat23:40
and not in a good way :/23:40
← mr_sm1th left23:40
preaction did git fsck report removing any unreachable things?23:41
how did you merge the upstream's master?23:41
→ someone235 joined23:41
idmistir I see three unreachable things, and some dangling blobs, but nothing weird. What IS weird is that I see one commit being referenced like 8 times as "amended" (I never amended that commit)23:41
which is very strange23:41
preaction how did you merge the upstream's master?23:43
idmistir preaction; I'm sorry, I don't quite understand that.23:44
not very good with git terminology23:45
preaction idmistir: how did the commits disappear? how did you learn that the upstream had moved on? if it's all the same branch, you must have done something locally (git pull perhaps) that added their commits to your branch23:45
idmistir preaction; I'm extrapolating based on what I see. There is definitely work lost, and this is the only thing that makes sense. Since the repo that is missing commits is a submodule of a main repository, the working theory is that something like "git push origin HEAD:master" happened while in a detached HEAD state23:47
which, in all honesty, I am not sure if it would cause this23:47
← EvilPenguin left23:47
preaction a push would not cause this, no23:47
idmistir what would?23:47
→ bronson joined23:47
← ozcanesen left23:48
preaction committing to a detached head and then doing git submodule update on the parent would23:48
→ brent__ joined23:48
idmistir committing without having pushed?23:48
preaction sure. you can't push if you don't have a branch23:49
and submodules only recently started tracking branches at all23:49
→ shdw joined23:49
← tvw left23:49
idmistir Fair enough.. but this doesn't make sense in the context of how we work.. consider dev machines, and a remote staging server. the staging had the changes that I am currently missing. they're not on there now either23:49
← cdg left23:49
idmistir what you're saying would make sense if we lost the changes on local only?23:49
Our remote is on bitbucket23:50
^ remote git is on bitbucket*23:51
preaction you're saying this code was committed and was in bitbucket and now it's gone?23:51
→ durham_ joined23:51
idmistir allegedly, yes.23:51
preaction what do you mean allegedly?23:51
idmistir well, I have yet to prove this. Just the only thing that makes sense so far.23:52
could I have messed with the HEAD and and then garbage collection cleaned up any references?23:52
preaction so you did some work. you committed that work. you pushed that up to bitbucket. and... then what?23:52
idmistir aight, let me take it from the top23:52
← bronson left23:52
idmistir I have a guy I work with.. let's call him "Smith". Smith did some work, committed and pushed that work, and that work was pulled on the staging server from the bitbucket repo23:53
About a month ago, I added a few things to the repo. Now, changes Smith made before I did my additions (on completely unrelated files, btw) got lost23:53
→ Gurkenglas joined23:54
idmistir Consequently, a git pull was made on the staging server23:54
← Oatmeal left23:54
idmistir The staging server, of course, is now up to date with master, which does not have said commits on log23:54
← durham left23:54
idmistir Makes sense?23:54
"Now, some changes Smith made"*23:55
some being the key word23:55
← durham_ left23:56
preaction how did you push your changes to the server?23:58
idmistir to the staging server?23:58
preaction to bitbucket, first of all23:59
idmistir just a git push from phpstorm23:59
← orbyt_ left23:59
preaction and phpstorm does not add --force?23:59
← steeze left23:59
preaction did you add --force?23:59

Logs Search ←Prev date Next date→ Channels Documentation