Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-17

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:02 mischat joined #git
00:03 cjsarette joined #git
00:04 evanwang joined #git
00:05 safe joined #git
00:06 mrpackethead joined #git
00:12 Dohplay joined #git
00:12 shakalaka joined #git
00:15 zarubin joined #git
00:18 whomp joined #git
00:19 shock- joined #git
00:19 whomp why, when i do a git blame for a specific line range, does it still have to figure out the blame for all lines of the file? -L31025,+10 is taking a while
00:19 context line numbers change ?
00:20 context and i really hope thats not 31K lines of code in a single file... thats just really scary..
00:20 whomp hmm it seems to have figured itself out
00:21 whomp yep, .pbxproj files, notoriously difficult to work with and prone to merge conflicts
00:22 xameada joined #git
00:22 Dohplay joined #git
00:23 SpeakerToMeat joined #git
00:24 arescorpio joined #git
00:25 context gotcha
00:31 fmcgeough joined #git
00:33 anuxivm left #git
00:39 SpeakerToMeat joined #git
00:39 TacticalJoke joined #git
00:39 shaggycat joined #git
00:40 TacticalJoke left #git
00:44 ekinmur joined #git
00:46 qpdb joined #git
00:48 Dohplay joined #git
00:53 diogenese joined #git
00:55 bulletmark joined #git
00:55 danemacmillan joined #git
00:56 averagedan joined #git
00:56 Dohplay joined #git
00:58 ResidentBiscuit joined #git
00:59 Guest27141 joined #git
00:59 Dohplay joined #git
01:01 jimi_ joined #git
01:03 mischat joined #git
01:04 fstd_ joined #git
01:05 malcon joined #git
01:08 Karunamon joined #git
01:09 sunri5e joined #git
01:09 pks joined #git
01:09 svm_invictvs joined #git
01:15 d^sh joined #git
01:15 sonvh joined #git
01:16 malcon joined #git
01:17 KeelOfSteel joined #git
01:18 JackFruh joined #git
01:19 anonymuse joined #git
01:23 blackwind_123 joined #git
01:25 shakalaka joined #git
01:27 rgrinberg joined #git
01:29 relgar joined #git
01:30 dan2k3k4 joined #git
01:31 finalbeta joined #git
01:33 SwiftMatt joined #git
01:35 dingo-z joined #git
01:36 littleforest joined #git
01:39 blackwind_123 joined #git
01:41 scorphus joined #git
01:46 fedepad joined #git
01:46 shafun joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:50 shyam2347 joined #git
01:51 Vampire0 joined #git
01:55 CussBot joined #git
01:56 jaguarmagenta joined #git
01:58 harish joined #git
02:04 mischat joined #git
02:06 mizu_no_oto joined #git
02:14 t0n1c joined #git
02:14 xameada joined #git
02:15 malcon joined #git
02:17 e14 joined #git
02:17 jab416171 joined #git
02:18 dviola joined #git
02:21 dviola joined #git
02:23 e14 joined #git
02:30 hexagoxel joined #git
02:30 liuzhen joined #git
02:39 chachasmooth joined #git
02:40 ahr3n joined #git
02:43 dviola joined #git
02:44 dviola joined #git
02:46 xameada joined #git
02:50 eizua joined #git
02:53 mizu_no_oto joined #git
02:54 sangy joined #git
02:57 cdg joined #git
02:58 Jameser joined #git
02:59 shakalaka joined #git
02:59 inbinder joined #git
03:00 cdg joined #git
03:00 e14 joined #git
03:01 aavrug joined #git
03:01 inbinder left #git
03:02 aavrug joined #git
03:04 mischat joined #git
03:05 howdoi joined #git
03:06 Jameser joined #git
03:07 akanksha__ joined #git
03:15 Vortex34 joined #git
03:16 govg joined #git
03:16 zarubin joined #git
03:18 JackFruh joined #git
03:19 dodobrain joined #git
03:21 shakalaka joined #git
03:21 dodobrain joined #git
03:23 MrWoohoo joined #git
03:24 Andrew_K joined #git
03:24 raspado joined #git
03:27 rkazak joined #git
03:32 Lyqyd joined #git
03:33 e14 joined #git
03:33 PioneerAxon joined #git
03:34 LandonJH joined #git
03:37 jbbiomed joined #git
03:37 DarkFox__ joined #git
03:40 whomp joined #git
03:40 SwiftMatt joined #git
03:41 jfran joined #git
03:43 robotroll joined #git
03:43 dsteplight__ joined #git
03:44 sarbs joined #git
03:45 SwiftMatt joined #git
03:45 jazz_vibes joined #git
03:45 sarbs joined #git
03:46 jazz_vibes joined #git
03:47 daynaskully joined #git
03:51 usm4n joined #git
03:51 Derperperd joined #git
03:54 shock_ joined #git
03:54 dreiss joined #git
03:56 e14 joined #git
03:59 wloncom joined #git
04:00 Deamon joined #git
04:05 mischat joined #git
04:06 whomp joined #git
04:06 phanimahesh joined #git
04:09 xall joined #git
04:15 PioneerAxon joined #git
04:18 zarubin joined #git
04:21 rchavik joined #git
04:24 dodobrain umm.. i just tried to rebase my local branch onto another localbranch and is uptodate with its upstream. git says: error: could not apply 67841d2...
04:24 dodobrain is this a rebase conflict? if yes, it is not telling me where the conflicts are so i can go and fix those up
04:29 Anja joined #git
04:30 deltab does it say anything other than "error: could not apply"?
04:30 dsdeiz joined #git
04:31 jfran joined #git
04:31 Anja_ joined #git
04:31 DopeMeston joined #git
04:32 dodobrain deltab, just says after that: When you have resolved this problem, run "git rebase --continue". if you prefer to skip ... "git rebase --skip" instead. To check out the original ... "git rebase --abort"
04:32 overlord_tm joined #git
04:32 dodobrain wait, is this like a merge conflict where the files are partially patched?
04:32 dodobrain lemme check
04:33 deltab git status  might tell you more
04:33 dodobrain it is!
04:33 dodobrain yeah, i was hoping it would tell me which files were conflicting when the patch couldn't be applied
04:33 dodobrain thanks.
04:35 bket joined #git
04:39 Motoko joined #git
04:40 poz3idon joined #git
04:40 Limes_ joined #git
04:41 Cabanossi joined #git
04:43 raspado joined #git
04:44 Ojoesinco joined #git
04:47 ayogi joined #git
04:47 subhojit777 joined #git
04:48 govg joined #git
04:48 daey_ joined #git
04:53 barteks2x joined #git
04:56 xameada joined #git
04:57 grawity joined #git
05:00 dermoth joined #git
05:01 nevodka joined #git
05:01 deltab dodobrain: yes, that would be useful; maybe open an issue about it
05:04 sriram joined #git
05:04 freimatz joined #git
05:04 chachasmooth joined #git
05:04 Endarked joined #git
05:06 mischat joined #git
05:07 gtristan joined #git
05:13 mehola joined #git
05:18 jaguarmagenta joined #git
05:18 zarubin joined #git
05:19 Jameser joined #git
05:19 grawity joined #git
05:22 lordjancso joined #git
05:25 linoespinoza joined #git
05:26 linoespinoza left #git
05:27 Jameser joined #git
05:28 lucas_ai joined #git
05:28 lucas_ai How can I apply a hotfix if I only have the link to its commit? https://github.com/tflearn/tflearn/commit/9a02203fccb25639ac94eda4fe3b672c4dc97de6
05:29 RouxTheDay_ joined #git
05:29 preaction add .patch to the end of the url to get a patch file
05:34 overlord_tm joined #git
05:35 Raging_Hog joined #git
05:35 LucaTM joined #git
05:36 brillenfux joined #git
05:36 lindenle joined #git
05:40 ColdKeyboard joined #git
05:41 Jameser joined #git
05:42 ThomasLocke joined #git
05:42 moop joined #git
05:44 liuzhen joined #git
05:45 satya4ever joined #git
05:46 Wayne_Shephard joined #git
05:47 RouxTheDay_ left #git
05:51 djb-irc joined #git
05:54 Jellyg00se joined #git
06:00 lb1c joined #git
06:01 Haliucinas joined #git
06:01 zero85 joined #git
06:02 SwiftMatt joined #git
06:02 kenden joined #git
06:02 mischat joined #git
06:02 zarubin joined #git
06:03 Repox joined #git
06:04 zulutango joined #git
06:04 rscata joined #git
06:09 zeroed joined #git
06:09 zeroed joined #git
06:10 ap0c joined #git
06:11 ShekharReddy joined #git
06:14 iugin joined #git
06:14 iugin Hi guys!
06:14 gitinfo iugin: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
06:14 chele joined #git
06:14 Bengi joined #git
06:14 iugin I made by mistake a git checkout -- foobar of a file in my stage
06:15 iugin can I undo this action?
06:18 Iugin joined #git
06:21 adgtl joined #git
06:21 xall joined #git
06:22 nd_ joined #git
06:23 nilg joined #git
06:26 corsibu joined #git
06:27 freimatz joined #git
06:28 adgtl joined #git
06:30 Jameser joined #git
06:30 rendar joined #git
06:30 Anja joined #git
06:31 JeroenT joined #git
06:32 lb1c iugin checkout doesn't affect staged files
06:32 qt-x joined #git
06:34 star_prone joined #git
06:35 cyan__ joined #git
06:35 corsibu joined #git
06:37 gtristan quick question: When gitlab or gerrit or such performs a merge, an extra superficial commit is added to the merge, even if the branch is rebased on the target and can essentially be a fastforward
06:37 lb1c gtristan: i dont see a question there?
06:37 gtristan So, my question is; after that merge commit, does the merge commit sha point to the same tree sha as the merged branch tip ?
06:37 lb1c ahh :D
06:38 gtristan sorry came in two lines :)
06:38 txdv probably not
06:38 gtristan I think the answer is no
06:38 lb1c i think so too
06:38 txdv the sha counts the commit in too
06:39 ferr joined #git
06:39 lb1c gtristan: if you are talking about the FF merge as "that merge commit" then the answer is yes. FF doesn't create new commits but simply moves the branch in the graph
06:40 txdv even if you change just the date in a commit, the sha changes
06:40 lb1c or i misread the question Oo
06:41 JeroenT joined #git
06:41 gtristan lb1c, right, so when those tools perform a merge with an extra message (i.e. with a comment pointing to a gerrit tracking ID or gitlab merge request), it's possible the commit sha directly *before* that auto-message is the same tree
06:42 gtristan lb1c, but the added merge message changes the tree correct ? even though the commit does not effect sources itself
06:42 gtristan I know it's a weird question
06:42 JeroenT joined #git
06:44 JeroenT joined #git
06:46 lb1c gtristan: yes changed infos about the commit (infos tied to that commit) are changing the commit sha. so your cannot commit something, and then add more infos to it without effectivly creating another commit
06:46 lb1c s/your/you/
06:48 gtristan lb1c, sure... thanks, it changes the tree; so two branches which share a portion of history can have commits pointing to the same tree, only where the commit objects themselves are identical
06:48 gtristan No separation of whether it modifies sources or not, I would have expected that answer but just wanted to be sure :)
06:49 lb1c gtristan: i hope i got your question correctly, but your explanation sounds right :)
06:49 JeroenT joined #git
06:50 gtristan For context; I am working with this build tooling which says that: "A build output may differ if the sum of it's dependency cache keys differ or if it's source input and build instructions differ", we decide whether to build, or reuse previous output, depending on if any of the inputs changed
06:50 gtristan Currently, the git tree sha is used for the input source, I'm building a case against this, to use the commit sha instead
06:51 gtristan even though I realize the former is "more correct", the gain is negligible compared to the cost
06:53 kenden joined #git
06:56 fedepad joined #git
06:57 Balliad joined #git
06:59 fedepad joined #git
07:00 rominronin joined #git
07:01 fees joined #git
07:01 Sceorem joined #git
07:02 Jameser joined #git
07:02 Wind0r joined #git
07:03 jnavila joined #git
07:04 fedepad joined #git
07:04 elect joined #git
07:05 dsdeiz_ joined #git
07:05 Darcidride joined #git
07:07 perohig joined #git
07:09 eshlox joined #git
07:10 mycelium joined #git
07:12 diget joined #git
07:14 nilg` joined #git
07:14 Alienpruts joined #git
07:16 ertes joined #git
07:17 ertes hi…  magit question:  can i do a reset --soft (or --mixed) or something equivalent from the UI?  'b x' does --hard
07:20 SuperSeriousCat joined #git
07:21 xall joined #git
07:22 SuperSeriousCat joined #git
07:24 SuperSeriousCat joined #git
07:24 encod3 joined #git
07:24 ertes figured it out myself (magit-reset), but it doesn't seem to be bound by default from the UI
07:24 ertes thanks anyway!
07:24 ertes left #git
07:28 zarubin joined #git
07:30 eduardas_m joined #git
07:30 maret joined #git
07:30 PCatinean joined #git
07:31 durham joined #git
07:31 Eryn_1983_FL joined #git
07:32 durham joined #git
07:35 Milos joined #git
07:35 Haliucinas joined #git
07:36 GavinMagnus joined #git
07:36 elect joined #git
07:36 ahmedelgabri joined #git
07:39 lindenle joined #git
07:39 King_Hual joined #git
07:44 ffffffff11111111 joined #git
07:44 suigeneris left #git
07:45 ffffffff11111111 left #git
07:49 brett_ joined #git
07:50 BadSnappa joined #git
07:51 corsibu joined #git
07:51 d1b joined #git
07:52 govg joined #git
07:54 corsibu joined #git
07:54 SuperSeriousCat joined #git
07:56 SporkWitch joined #git
07:57 dsdeiz joined #git
08:00 mikecmpbll joined #git
08:01 corsibu joined #git
08:02 jknetl joined #git
08:03 bjoernh joined #git
08:04 troulouliou_div2 joined #git
08:04 Anthaas joined #git
08:05 mischat_ joined #git
08:06 ferr joined #git
08:07 Wulf joined #git
08:07 Wulf Hello.
08:08 tvw joined #git
08:08 dsdeiz joined #git
08:08 perohig left #git
08:08 kenden joined #git
08:08 Wulf git branch --contains <commit> shows me branches with a commit. Now I cherry-picked into another branch and the commit hash changed, so this branch is missing from the branch list. Can git somehow find those branches too?
08:08 ocbtec joined #git
08:09 WayToDoor joined #git
08:10 flaviodesousa joined #git
08:10 User458764 joined #git
08:11 Asenar joined #git
08:11 User458764 joined #git
08:12 TheOrangeOne joined #git
08:14 GT4066 joined #git
08:14 TomyWork joined #git
08:14 djb-irc joined #git
08:15 thekrynn joined #git
08:18 Gonzo89 joined #git
08:24 chll_ joined #git
08:27 corsibu joined #git
08:28 CIAguy joined #git
08:29 kurkale6ka joined #git
08:31 Serpent7776 joined #git
08:31 Endarked joined #git
08:31 halbomin joined #git
08:32 ams__ joined #git
08:32 Neon joined #git
08:33 b100s joined #git
08:34 Neon I want to checkout another branch, but git tells me there would be untracked files overwritten. Can I diff and merge them to the branch I want to checkout? (Only local repo, no remotes)
08:34 djb-irc joined #git
08:35 Neon Because most of them should be similar to the ones on the branch, but one or two may have changed and I don't want to check it all manually.
08:35 tobiasvl Neon: there is nothing to "merge" yet, since the changes are untracked
08:35 tobiasvl Neon: you can stash the changes, checkout, then stash pop and manually apply the changes
08:35 bremner stash the untracked files?
08:36 Neon Maybe the easiest way would be checkout, but preserve files that would be overwritten.
08:36 maret joined #git
08:36 Neon Then git would show me the ones that differ from the cache.
08:36 Joost that requires an --include-untracked though
08:37 danslo joined #git
08:37 Joost Neon: that will be the situation after you pop your stash
08:38 Neon Joost: True. I will try that now.
08:38 Neon I wonder why there's no flag to checkout for that though. Would be easiser.
08:38 CIAguy joined #git
08:39 Joost Neon: sure, but then you could make flags for every common combination of commands
08:39 Joost (and sometimes that makes sense)
08:40 Jo__ joined #git
08:40 Neon Yeah, statistics on how many people need that feature actually would be needed.
08:40 dsdeiz joined #git
08:41 Jo__ test
08:41 Jo__ Hello all git experts ! :)
08:41 Seveas Yo!
08:41 Neon Now it just tells me it couldn't restore untracked files from stash. It didn't check them out, because they exist.
08:41 Jo__ I am new with git, and I have a small question for you
08:42 Neon -f comes to my mind, but I'm full of fear.
08:42 Neon -f stands for fear the result.
08:42 Seveas --frightening
08:42 bjornar_ joined #git
08:43 Jo__ I would like to install git on my raspberry to avoir making a repository on my local drive. But it seems to be impossible with git to have a distant repo without local one. Is it right ? Or can I have a ssh distant repo without local ?
08:43 Seveas Neon: try this: git diff foo.txt branchname:foo.txt
08:43 Neon Oh, there is no -f to stash at all. So I need to checkout the files from stash@{0} manually?
08:43 Seveas Jo__: why do you need to avoid having a local repository?
08:43 shaggycat joined #git
08:44 Doginal joined #git
08:45 jmleo joined #git
08:46 fuchstronaut joined #git
08:46 Jo__ I want to save space on my local drive. And I would like to have less operations to do to save it on a distant drive (if my computer crashes) than commiting on my local drive and then commiting on the distant drive...
08:46 jmleo Hi there !
08:47 \du joined #git
08:47 \du joined #git
08:47 jmleo I have a commit with several files modified. I would like to apply only some of those file changes, and not all the patch. Is there another way than dry-run and git add -i ?
08:48 govg joined #git
08:48 netwoodle joined #git
08:49 osse jmleo: git diff commit~ commit -- only_that_file
08:50 osse | git apply
08:50 jmleo osse, nice :)
08:54 Murii joined #git
08:55 Neon Say I've applied a stash successfully and now my working directory differs from HEAD. git diff stash@{0} will compare HEAD to the first stash entry, won't it? Can I compare my working directory to the stash somehow? It should show no differences then, should it?
08:56 lindenle joined #git
08:56 howdoi Can 'git push -f origin head' be reduced to something more smaller?
08:57 lmatteis joined #git
08:57 selckin git push -f
08:57 _ikke_ that relies on tracking information and push.default
08:57 _ikke_ I would refrain from using it
08:58 _ikke_ Before you know it, you force push a critical branch
08:59 gitperson joined #git
09:00 Jo__ Seveas : is there any solution do to this ?
09:00 howdoi yes 'push.default' is important
09:00 howdoi _ikke_: my history is so clean, thanks to -f :D
09:00 howdoi selckin: ^
09:01 * howdoi what do you feel about http://git.io/git-tips ?
09:02 JeroenT_ joined #git
09:03 jozwior joined #git
09:04 kenden joined #git
09:05 Wulf howdoi: nothing
09:06 alkino joined #git
09:06 alkino the survey is long
09:07 PHPanos joined #git
09:08 timewalker joined #git
09:08 systemovich joined #git
09:09 daynaskully joined #git
09:10 dsantiago joined #git
09:11 howdoi Wulf: feeling/thinking of 'nothing' is so very tough.
09:11 howdoi alkino: :D
09:11 howdoi !log
09:11 gitinfo [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html
09:11 howdoi since Jan 1, 2012, wow!
09:12 mischat joined #git
09:15 Jo__ Someone know if it is possible to have only a distant repo without a local one ? I want to save space on my local drive and I would like to have less operations to do to save it on a distant drive (if my computer crashes) than commiting on my local drive and then commiting on the distant drive...
09:15 avar who maintains those logs? I have logs since 2009 if they were interested in merging them..
09:16 osse avar: Eugene
09:16 avar hrm, actually since feb 2010
09:16 avar Eugene: ^poke
09:16 acetakwas joined #git
09:16 nettoweb joined #git
09:17 acetakwas joined #git
09:18 eka joined #git
09:18 cdown joined #git
09:20 systemovich joined #git
09:23 avar actually those logs go to like 2005, so nevermind..
09:23 gitbeg joined #git
09:24 gitbeg is there a git visualization too that's better than git log --all --full-history --graph --pretty etc?
09:24 gitbeg tool*
09:24 alkino gitk ?
09:24 _ikke_ tig
09:25 PHPanos joined #git
09:26 gitbeg شكراً
09:26 osse Idea for IRC client plugin: If you have received a notifiction/highlight and the same person writes "nevermind" or "wrong person" or similar statements within a certain time then null the notification \o/
09:26 _ikke_ gitbeg: you're welcome
09:26 rominronin joined #git
09:26 _ikke_ osse: hehe
09:27 _ikke_ (gitbegs last msg translate to thank you)
09:27 fuchstronaut joined #git
09:27 fuchstronaut joined #git
09:29 cdown_ joined #git
09:29 achadwick joined #git
09:32 systemovich joined #git
09:33 corsibu joined #git
09:34 Wind0r joined #git
09:37 tvw joined #git
09:37 lagothrix joined #git
09:43 absence when rebasing interactively, is it possible to select which chunks in a diff to include?
09:44 canton7 absence, you can 'edit' a commit, then selectively apply hunks and commit, then continue the rebase
09:45 mindriot101 joined #git
09:46 Snugglebash joined #git
09:48 absence canton7: right, what's the command to selectively apply the hunks?
09:48 canton7 add -i, add -p, and friends
09:54 jimi_ joined #git
09:55 govg joined #git
09:55 sonvh joined #git
09:57 mrpackethead joined #git
10:00 dsdeiz_ joined #git
10:03 raspado joined #git
10:07 sonvh joined #git
10:09 elect joined #git
10:11 brokensyntax joined #git
10:12 lb1c canton7: my special little friend names add-u -p :)
10:12 lb1c + ' '
10:13 lb1c osse: great idea, for which client to you implement this nvm highlight nullifier?
10:14 lb1c ;D
10:14 lb1c nvm offtopic :D
10:14 Seveas lb1c: for his brain :)
10:14 ShekharReddy joined #git
10:15 lb1c damn, i hoped it would be portable
10:15 lb1c maybe his brain has a libc somewhere so we could build a lib out of it :P
10:16 Jameser joined #git
10:16 Seveas his brain only has fortran 77 bindings
10:16 absence canton7: -p as in --preserve-merges?
10:16 lb1c absence: -p as in --patch
10:16 Seveas absence: -p as in --patch
10:18 corsibu joined #git
10:20 absence ah, for git commit, not git rebase
10:20 absence thanks
10:21 rnsanchez joined #git
10:21 jozwior joined #git
10:23 rafalcpp joined #git
10:25 amanuel2 joined #git
10:26 b100s joined #git
10:28 drmt joined #git
10:29 Raffael joined #git
10:31 jozwior joined #git
10:31 sonvh joined #git
10:32 Raffael Hello need some urgent help with git. My Hosting provider updated to a 64b OS and now git exits checkout with remote: fatal: Out of memory, realloc failed remote: fatal: recursion detected in die handler
10:32 notebox joined #git
10:34 Wulf Raffael: install 64 bit OS?
10:34 Wulf Raffael: or.. wait. Why does the hosting provider install the OS?
10:37 govg joined #git
10:37 Impaloo joined #git
10:38 osse Raffael: your hosting provider is in deep shit
10:38 Raffael Wulf: Do not know - maybe some standard upgrade policy
10:39 osse Raffael: lines with "remote:" in front are messages from the other end
10:39 danslo joined #git
10:39 Raffael osse: I do know … tried it on the target machine same failure
10:41 Raffael The interesting thing is: if I delete the remote repository and do an initial push, all woring fine
10:42 Raffael but - of course - this is not the idea :(
10:42 Orphis joined #git
10:44 Raffael I already tried variotions of different memory limiting configurations: no change
10:46 johnmilton joined #git
10:46 Impaloo joined #git
10:46 barteks2x joined #git
10:47 camo joined #git
10:47 harish_ joined #git
10:49 camo hi all, I was wondering if git-lfs storage was also encrypted or at least secured. it seems to me that given the oid and the size I could just query the API on git-lfs.gitgub.com and get a return if the file exists or not...
10:49 camo I have a few very sensitive data files that I'd like to add to a repository (private bitbucket repo)
10:51 jozwior joined #git
10:51 JeroenT joined #git
10:55 Raffael osse: unfortunately this guy's do not really care - the only one in deep shit now it's me
10:56 iomari joined #git
11:00 liuzhen joined #git
11:00 danslo joined #git
11:01 Lann joined #git
11:02 Lann I have a weird git question. If i add a file, tag it, push the tag, then git rm the file, will the file still be in the tag?
11:02 osse yes
11:03 Lann ok cool, didnt know where to put this db dump...seemed like something to do
11:03 Lann in the event of total machine loss
11:03 osse Lann: do you mean tagging a commit with the file in it, or the file itself?
11:05 Lann git add mydb.tar.gz; git commit "wtf"; git push origin master; git tag release-candidate-20161017-with-db; git push origin --tags
11:05 Lann not sure if all those stesps were necessary
11:05 Lann then i git rm the file from master and pushed the rm to master
11:05 aswen joined #git
11:06 whytaunt joined #git
11:09 Olipro joined #git
11:09 nilsi joined #git
11:10 rominronin joined #git
11:11 iomari left #git
11:11 corsibu joined #git
11:12 serycjon joined #git
11:13 jeffreylevesque_ joined #git
11:14 JeroenT joined #git
11:15 mizu_no_oto joined #git
11:19 jaguarmagenta joined #git
11:20 b100s joined #git
11:21 ki0 joined #git
11:23 Cavallari joined #git
11:23 ki0 joined #git
11:25 rominronin joined #git
11:27 athaller joined #git
11:30 ojdo joined #git
11:33 zarubin joined #git
11:33 absence when i do git commit --amend --patch (e.g. while editing a commit during interactive rebase), i only get asked about staging uncommitted changes. how do i get it to ask about the already committed changes?
11:35 bremner one way is to use git reset --patch HEAD^
11:35 nuck joined #git
11:36 ash_workz joined #git
11:36 absence bremner: will that uncommit hunks i say yes to?
11:36 bremner well, it will stage them for uncommitting, more or less.
11:40 ahmed_elgabri joined #git
11:40 absence bremner: nice, thanks
11:41 absence is it possible to edit commits like this before they are applied during an interactive rebase?
11:42 bremner yes. there is "e" for edit in the rebase TODO list
11:42 absence but "e" applies the commit first, and then lets you edit it using amend
11:43 alex1a joined #git
11:43 absence i'd like to edit the commit in --patch style before it is applied, to prevent merge conflicts
11:44 dsdeiz joined #git
11:45 govg joined #git
11:47 absence bremner: say i have commits A, B, C, and D. in the rebase todo list, i flag A and C for editing. both A and C edits the same line of the same file (in addition to other changes), and i want to the changes to that line in both commits. if reset --patch the A commit, there will be a merge conflict when C is applied
11:48 absence "and i want to remove the changes" i mean
11:49 fuchstronaut joined #git
11:53 Sceorem joined #git
11:56 JeroenT joined #git
12:00 Serpent7776 joined #git
12:00 Cavallari1 joined #git
12:01 alex1a joined #git
12:05 maret joined #git
12:07 _ADN_ joined #git
12:09 Raffael joined #git
12:11 Raffael Anyone with an idea to my 64b memory problem?
12:11 stuivi joined #git
12:14 Darcidride_ joined #git
12:16 whytaunt joined #git
12:16 synthroid joined #git
12:16 LBV_User joined #git
12:17 jknetl joined #git
12:18 tlaxkit joined #git
12:19 rgrinberg joined #git
12:19 Prisoner-2460_1 joined #git
12:26 corsibu joined #git
12:27 govg joined #git
12:27 fscala joined #git
12:28 fahadash joined #git
12:28 white_gecko joined #git
12:30 ahmedelgabri joined #git
12:30 white_gecko Hello, I want to do some interaction with a git repo in python, what is the difference between http://www.pygit2.org/ and http://gitpython.readthedocs.org/ ?
12:30 hariel joined #git
12:33 cyan__ joined #git
12:39 mischat joined #git
12:40 ieee joined #git
12:41 white_gecko I think, this tells me the difference some how: https://stackoverflow.com/questions/4034962/which-language-has-the-best-git-api-bindings/4036822#4036822
12:42 white_gecko but what does "re-entrant linkable library" in case of libgit2 mean?
12:44 corsibu joined #git
12:44 zivester joined #git
12:44 jeffreylevesque joined #git
12:45 johnmilton joined #git
12:46 rominronin joined #git
12:47 e14 joined #git
12:47 m0ltar joined #git
12:48 Seveas that it's a reimplementation of git's core that's actually usable as a library in your project.
12:49 jozwior joined #git
12:49 fuchstronaut joined #git
12:51 liuzhen joined #git
12:51 buffal0 joined #git
12:51 anonymuse joined #git
12:52 elect joined #git
12:53 MindSpark joined #git
12:54 Dohplay joined #git
12:54 MindSpark hey everyone. I had an old branch that I wanted to rebase on the master branch. I forgot I had a commit I hadn't pushed though. So I switched to old, ran rebase master and got some conflicts. So I did a reset --hard origin. Did I now completely loose the commit I had?
12:55 perlpilot If the changes were in a commit, then no.
12:55 tobiasvl MindSpark: no. do you have the commit hash? if so you can access it easily. or you can find it in !reflog
12:55 gitinfo MindSpark: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
12:56 MindSpark ok, so now I have the hash... what now?
12:56 MindSpark cherry pick it?
12:56 tobiasvl MindSpark: do what you want with it. cherry-pick it if that's what you want, yes
12:56 cyan__ joined #git
12:57 jaguarmagenta joined #git
12:57 MindSpark ok, cherry picked it, but it's in a commit. How do I see the diff with master?
12:58 MindSpark `git diff -- master` is not showing anything
12:58 concerti joined #git
12:58 tobiasvl what branch are you on?
12:58 zeroed joined #git
12:58 zeroed joined #git
12:58 osse MindSpark: the -- is misplaced
12:58 osse MindSpark: you're now asking git to filter the diff on files named master
12:59 MindSpark ah, ok, works without the --
12:59 lindenle joined #git
12:59 MindSpark perfect, thanks osse tobiasvl perlpilot !
13:00 ekinmur joined #git
13:00 context any particular reason why system config overrides global (home) ?
13:00 zeroed joined #git
13:01 tobiasvl context: so you can have local config that's more specific to a certain repo
13:01 tobiasvl how would it make sense to have global override local? then you couldn't have local config
13:01 context i said system
13:01 context not local
13:01 tobiasvl oh sorry
13:02 tobiasvl well, it's still a hierarchy of configs
13:02 context /etc/gitconfig credential.helper overrides my $HOME/.gitconfig
13:02 context which makes no sense...
13:02 white_gecko Seveas: thank you, so this is nearly like beeing git it self :-D
13:02 tobiasvl what I said still applies: so you can have user config that's more specific to a certain user
13:02 context no. /etc is SYSTEM. users cant change it.
13:02 context thats SYSTEM overriding user specific
13:03 context what is happening is the OPPOSITE of what you said
13:03 tobiasvl oh hmmm
13:03 tobiasvl well then I don't know the rationale
13:04 white_gecko left #git
13:04 grawity it doesn't override the setting
13:05 Seveas context: I just tested, $HOME overrides /etc
13:05 grawity because credential.helper is a multi-value setting
13:05 grawity so you get *multiple* helpers
13:05 Seveas !(129,SIGHUP) pp101puppet-01:/etc/puppet/environments/dkaarsemaker/puppet (master *>)$ git config --show-origin --get-all credential.helper
13:05 Seveas file:/etc/gitconfigfoo
13:05 Seveas file:/home/dkaarsemaker/.gitconfigbar
13:06 context yeah. and when etc is set auth fails.
13:06 context so i cant pull.push
13:06 context so... i cant do anything.
13:06 context multiple helpers doesnt work when the first tried is system and it fails and you cant do crap
13:06 Seveas context: git config --global credential.helper ""
13:07 context but i have a helper.
13:07 context its just NOT the same as system
13:07 Seveas as grawity said, credential.helper is special, "" overrides it. YOu can then add your own
13:07 context k
13:07 context ill try
13:07 context so... helper = ""; helper = mine ?
13:07 sdothum joined #git
13:07 Seveas so git config --global credential.helper "" ; git config --add credential.helper yours
13:07 ExoUNX joined #git
13:08 notebox joined #git
13:08 Seveas --global --add
13:11 JamesBaxter joined #git
13:12 mischat joined #git
13:12 context k, that worked
13:15 fmcgeough joined #git
13:16 umbSublime_ joined #git
13:17 qpdb joined #git
13:17 cdg joined #git
13:18 cdg joined #git
13:20 dimi1947 joined #git
13:20 nilez joined #git
13:20 CEnnis91 joined #git
13:20 tinanoo joined #git
13:24 nettoweb1 joined #git
13:24 boombatower joined #git
13:25 Seveas should be documented better. I knew this only 'cause it flew by on the mailinglist the other day
13:29 KeelOfSteel joined #git
13:31 DrizzleX joined #git
13:32 DrizzleX left #git
13:32 DrizzleX joined #git
13:32 wrouesnel joined #git
13:32 jorj joined #git
13:33 patarr joined #git
13:34 context seveas: thank you :)
13:34 context yeah, funny how there is always exceptions to the rule
13:34 Cavallari joined #git
13:34 * HedgeWork facepalms.
13:35 HedgeWork Is there a canonical document I can give people for "things to do when your merge fails BEFORE calling HedgeWork to fix it for you" ?
13:35 * Seveas high-fives HedgeWork / HedgeMage
13:35 * HedgeWork highfives Seveas
13:35 Seveas !eek
13:35 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
13:35 HedgeWork Thanks, Seveas
13:35 DeltaHeavy joined #git
13:35 todd_dsm joined #git
13:36 * HedgeWork has one or two developers who think it's the security specialist's job to fix scary merge conflicts. :(
13:37 Seveas It is.
13:37 HedgeWork No, it really isn't. :P
13:37 Seveas They're feeling insecure, obviosuly the only person who can fix that is a security specialst...
13:37 leehambley joined #git
13:37 kjsage[m] joined #git
13:37 * HedgeWork falls down laughing.
13:37 kikijiki[m] joined #git
13:37 HedgeWork Seveas: I'm using that in the future!
13:38 Seveas that'll be $7,99 :P
13:38 JeroenT joined #git
13:38 HedgeWork Worth every penny!
13:38 * HedgeWork sends Seveas Monopoly money.
13:38 malcon joined #git
13:38 Zoxc joined #git
13:39 brokensyntax joined #git
13:39 mischat joined #git
13:39 Seveas I'd prefer a get out of jail free card
13:39 mischat joined #git
13:39 Seveas Need to kill some bugs.
13:40 HedgeWork hehe
13:42 johnkevinmbasco joined #git
13:42 DeltaHeavy joined #git
13:42 phanimahesh If you are short on monopoly money, I offer a one-way bitcoin exchange at a very fair price. 1 Monopoly $ per BTC.
13:42 Okx joined #git
13:44 danemacmillan joined #git
13:47 saml joined #git
13:47 encod3 joined #git
13:47 JeroenT joined #git
13:49 griffindy joined #git
13:49 rnsanchez_ joined #git
13:49 EricPoe joined #git
13:51 fuchstronaut joined #git
13:51 e14 joined #git
13:55 tfrangio joined #git
13:55 plos joined #git
13:56 rorro joined #git
13:59 baako joined #git
13:59 baako joined #git
14:00 JeroenT joined #git
14:00 JeroenT joined #git
14:01 jimi_ joined #git
14:06 al-damiri joined #git
14:07 danimal2 joined #git
14:08 plos joined #git
14:09 plos joined #git
14:10 Derperperd joined #git
14:11 supsup joined #git
14:11 ShekharReddy joined #git
14:11 supsup hey
14:11 sangy joined #git
14:12 supsup is there a way to make an upstream on your own local machine?
14:12 supsup like say I want to keep master checked out on one folder and  branch  x on the same machine
14:13 supsup then I watch to set the master as a fetch on the stage
14:13 supsup so i don't have to checkout between the two
14:13 supsup because people have diverged them so much it takes forever to switch between them
14:13 supsup so folder master and folder branch x.  I want to make master an upstream to branch x
14:13 plos joined #git
14:16 fuzzmz supsup, sure
14:16 alhariel joined #git
14:17 IrishPrime joined #git
14:17 supsup fuzzmz how do you do it?
14:17 fuzzmz well, I'd clone it twice, once for the master and one for the branch x
14:17 supsup like i want to do fetch localmachine
14:17 supsup then merge
14:18 fuzzmz then for branch x I'd add a git remote add /path/to/master/clone
14:18 supsup well crap can i fetch a branch while in master/
14:18 fuzzmz for branch x = in the branchx folder clone
14:18 AaronMT joined #git
14:19 maret joined #git
14:19 fuzzmz yes, you can fetch a branch at any time
14:19 supsup while im in the master clone, how do I fetch the X branch from the localpath?
14:20 fuzzmz add that as a remote
14:20 fuzzmz git remote add local /path/to/local/clone
14:20 fuzzmz and then git fetch local branchname
14:20 Oaqh joined #git
14:21 govg joined #git
14:21 supsup ahh cool thanks
14:21 corsibu joined #git
14:21 supsup i thought remote had to be git address
14:22 supsup ssh/http
14:22 phaleth joined #git
14:22 sunri5e joined #git
14:22 fuzzmz it also works on local paths
14:24 Darcidride__ joined #git
14:26 gnoirzox hi
14:27 gitinfo gnoirzox: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
14:27 supsup how do i fetch the remote (local) and then merge it into the branch of maser?
14:27 supsup master
14:27 supsup nm
14:27 gnoirzox !backup
14:27 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
14:29 ResidentBiscuit joined #git
14:29 supsup can i just do git fetch localremote && git merge localremote/branch
14:29 supsup while staying in master
14:30 fuzzmz ayup
14:30 supsup cool
14:30 supsup i'll try it
14:30 jbeeze joined #git
14:30 supsup this prob sounds really dumb heh not sure what to do tho since switching between the branches takes 5 minutes
14:31 phanimahesh wut? why?
14:31 phanimahesh super slow networked storage?
14:31 supsup no locally
14:31 supsup ssd
14:31 phanimahesh or bad repo with lots of big blobs?
14:31 supsup they diverge that much
14:31 sunri5e joined #git
14:32 supsup there are lots of big blobs too
14:32 fusionx86 joined #git
14:32 phanimahesh big blobs and git don't play well together.
14:32 phanimahesh even if they diverge much, shouldn't be much of an issue.
14:33 rominronin joined #git
14:35 nedbat supsup: what huge blobs are you storing? Maybe they shouldn't be in git in the first place
14:35 supsup tons of images and a few movies
14:35 bremner !media
14:35 gitinfo [!annex] 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-lfs
14:36 fuzzmz yeah, those definately shouldn't be in git directly
14:37 eivarv joined #git
14:38 averagedan joined #git
14:40 kajnc joined #git
14:41 phanimahesh movies in git? 0.o
14:43 sunri5e joined #git
14:44 bongjovi joined #git
14:45 mischat_ joined #git
14:45 spykins joined #git
14:46 sonvh joined #git
14:47 crose joined #git
14:48 lykinsbd joined #git
14:49 fusionx86 joined #git
14:49 spykins Hello everyone, I am trying to checkout to a branch fetched from origin. When I check into it, I get switched to the branch but the commit log is not updated. When i type git branch branchName, it displays all the branches but no indication that I am checked into the branch. When I do git checkout branchName, it tells me that I am already on the branch. I have faced this issue several times, the way I solved it is to checkout to another branch, git brandh -D
14:49 spykins branchName, try to checkout to that branch again.. When I do that multiple times, I find myself in the branch , wit git branch alighting that I am on the branchName. Can anyone help me, what am I doing wrong?
14:51 fuchstronaut joined #git
14:52 zivester joined #git
14:53 harish_ joined #git
14:53 jottr joined #git
14:53 dviola joined #git
14:54 IndigoTiger joined #git
14:54 camo joined #git
14:55 mrwat joined #git
14:56 nettoweb joined #git
14:59 fuzzmz what does git status return when the branch isn't highlighted?
14:59 BSaboia joined #git
15:00 mischat joined #git
15:00 IndigoTiger joined #git
15:00 mikel joined #git
15:02 WayToDoor joined #git
15:02 crayon joined #git
15:02 ploop joined #git
15:03 mischat joined #git
15:03 m0ltar joined #git
15:06 davimore joined #git
15:08 davimore joined #git
15:10 jason237 joined #git
15:11 phaleth joined #git
15:12 lykinsbd joined #git
15:13 subhojit777 joined #git
15:17 foist joined #git
15:19 anth0ny joined #git
15:20 buffal0 joined #git
15:20 mruf joined #git
15:22 buffffal00 joined #git
15:23 tHEMtZ- joined #git
15:25 Tsutsukakushi joined #git
15:26 gtristan joined #git
15:27 jnavila joined #git
15:27 svm_invictvs joined #git
15:27 Raging_Hog joined #git
15:28 gajus joined #git
15:28 gajus joined #git
15:29 shinnya joined #git
15:29 robotroll joined #git
15:30 mischat_ joined #git
15:31 Learath2 joined #git
15:31 mischat_ joined #git
15:31 ochorocho__ joined #git
15:32 nilg joined #git
15:32 MeltedLux joined #git
15:33 rominronin joined #git
15:36 zarubin joined #git
15:40 ahmed_elgabri joined #git
15:41 hashpuppy joined #git
15:41 averagedan left #git
15:42 fmcgeough joined #git
15:43 _geoff joined #git
15:45 grift joined #git
15:46 thiago joined #git
15:47 qpdb joined #git
15:47 tyreld joined #git
15:48 xaa joined #git
15:48 lindenle joined #git
15:48 prg3_ joined #git
15:49 danslo joined #git
15:52 demize Also, git branch -a
15:53 e14 joined #git
15:55 buffal0 joined #git
15:55 LionsMane joined #git
15:56 umair joined #git
15:57 umair left #git
15:57 acetakwas joined #git
15:57 umair joined #git
15:57 Endarked joined #git
15:58 oskarkv joined #git
15:58 Electrometro joined #git
15:58 rorro joined #git
16:00 eycsigfy joined #git
16:02 Electrometro joined #git
16:02 DieguezZ joined #git
16:03 converge joined #git
16:04 mischat joined #git
16:08 kpease_ joined #git
16:13 Eugene avar - the stats go back to 2012; I have older logs(and so does the archive), but it's not worth the trouble to me to convert them to the same format
16:14 _cyril_ joined #git
16:15 bjornar_ joined #git
16:17 kurkale6ka joined #git
16:19 subhojit_ joined #git
16:19 zacts joined #git
16:21 overlord_tm joined #git
16:21 jfran joined #git
16:22 johanskizo joined #git
16:22 ShekharReddy joined #git
16:22 lykinsbd joined #git
16:24 ochorocho__ joined #git
16:24 ayogi joined #git
16:27 le_melomane joined #git
16:34 Dougie187 joined #git
16:34 fuchstronaut joined #git
16:34 johanskizo left #git
16:35 rominronin joined #git
16:35 boombatower joined #git
16:35 stuivi joined #git
16:36 malcon joined #git
16:36 avar Eugene: *nod*
16:36 nidr0x joined #git
16:36 gho5t joined #git
16:37 zarubin joined #git
16:37 serycjon joined #git
16:39 t0n1c joined #git
16:39 Macaveli joined #git
16:39 aax joined #git
16:40 concerti joined #git
16:43 lusrt1 joined #git
16:43 ayjay_t joined #git
16:43 madewokherd joined #git
16:45 le_melomane joined #git
16:46 retroj joined #git
16:46 DeltaHeavy joined #git
16:48 retroj i'm in a project with a submodule, and i have changed to a different branch.  what do i do to put the submodule in the correct state after switching branches in the main project?  i tried 'git submodule update --remote' and that did some stuff, but git status still shows the submodule as having changes
16:50 nitric joined #git
16:50 Spec-Chum joined #git
16:50 MildlySeriousCat joined #git
16:51 eshlox joined #git
16:51 durham joined #git
16:51 SteffanW2 joined #git
16:52 piling joined #git
16:53 osse retroj: 'git submodule update' by itself should do the trick
16:53 MildlySeriousCat left #git
16:53 retroj osse: thanks!
16:56 zarubin joined #git
16:57 e14 joined #git
16:58 spykins_ joined #git
16:59 xaa joined #git
17:00 cdg joined #git
17:01 hahuang65 joined #git
17:04 mikecmpbll joined #git
17:06 EvilPeng1 joined #git
17:07 freimatz joined #git
17:08 dimi1947 joined #git
17:10 vuoto joined #git
17:10 ansimation joined #git
17:11 webstrand joined #git
17:11 buffal0 joined #git
17:13 hahuang65 joined #git
17:13 raijin joined #git
17:14 webstrand I've been using git subtrees to manage a project's dependencies, because I sometimes apply custom patches to them. But rebasing isn't really possible with subtrees without losing all of my patches. What should I be doing instead?
17:14 webstrand I just had to rebase nearly the entire history to remove sensitive information, and had to remove all of the subtrees as a result.
17:14 shaggycat joined #git
17:14 overlord_tm joined #git
17:15 SporkWitch webstrand: the preferred method for handling dependencies in this manner is to use submodules
17:16 SporkWitch webstrand: this will also peg them at the version specified, so upstream patches won't break things in your project
17:16 _ikke_ *nod*
17:17 webstrand I originally considered submodules, but couldn't find any way to make local commits to the submodules that tracked with the containing repository. Did I miss something?
17:17 webstrand I can't push the patches to upstream
17:18 dsteplight__ joined #git
17:18 emg webstrand: you can pull from the subtree's repo, so you're merging instead of rebasing, and you can squash the log to a single entry for that. any reason you'd need to rebase instead?
17:18 _ikke_ webstrand: maintain a for of the upstream repo
17:19 svm_invictvs joined #git
17:19 webstrand emg: I had to remove sensitive information from files not within the subtrees. When I did git rebase --interactive, all of the subtrees lost their prefix.
17:20 xall joined #git
17:21 webstrand _ikke_, Is it possible to do submodules of the same git repository? Then I can clone the remote repository as a seperate branch, and keep track of my patches without needing to manage multiple git repositories
17:21 SporkWitch while it won't fix things retroactively (and i lack the git prowess to know for sure, short of nuking ./.git, that all the plaintext is eliminated) you might look into git-crypt for any sensitive information you need in the repo)
17:22 steveoh joined #git
17:22 SporkWitch it uses pgp to encrypt files before commit, so you can leave keys and such in your git repo, without worrying that anyone with the repo would have access
17:23 webstrand SportWitch: That's nifty. Unfortunately, I wanted the file to be cleartext, just without specific configurations. I've written my own clean/smudge filter to achieve this
17:23 acetakwas joined #git
17:24 camo joined #git
17:24 steveoh hi, i'm looking into inverting my gitignore list. git status from the terminal doesn't show folders but the github app does it properly. I'm on git 2.10. Why would the terminal show differently? gitignore: https://gist.github.com/steveoh/8e11138a7d011e842797efe0d01a7206
17:25 converge joined #git
17:26 SporkWitch webstrand: they would be cleartext to those with the keys you encrypt it to; handles it transparently, so the encryption happens on encrypt, but your working copy is plaintext after issuing the "unlock" command and until issuing the "lock" command
17:27 webstrand Actually, I don't even need submodules if I'm rolling all of the repositories into seperate branches. I can just use git worktrees
17:28 SporkWitch steveoh: you shouldn't be negating those folders.  The correct behaviour is that anything matching the pattern in .gitignore will be ignored.  That is, if you have !filename then everything EXCEPT filename will be ignored.
17:29 steveoh ?
17:30 steveoh SporkWitch: i ignore everything, then include the things i want
17:30 InfoTest joined #git
17:30 SporkWitch ...
17:30 SporkWitch i'm trying to think of a sane reason to do that, and i'm coming up empty
17:31 steveoh because it works better for me this way and the gitignore is shorter
17:31 steveoh if i add a dependency to the project i have to ignore it
17:31 steveoh every time
17:32 SporkWitch the question then become why you have so much garbage in the worktree
17:32 steveoh i don't like your tone SporkWitch
17:32 SwiftMatt joined #git
17:32 steveoh you don't have to call me insane and the stuff in my project garbage to help answer a question
17:32 SporkWitch it's text, it doesn't have tone, and i don't care whether you like it.  If you have to ignore more than you include, that means there's garbage in your worktree.  Since you said it's a dependency issue, you've proven me correct: you're not handling dependencies correctly.
17:33 SporkWitch look up how to use submodules, as they're pretty much purpose-built for including dependencies in a project without cluttering the worktree
17:33 steveoh ok bro
17:33 SporkWitch i'm not your bro, and i didn't call you insane
17:33 steveoh submodules suck and come with a lot of issues
17:33 rominronin joined #git
17:33 EvilPenguin joined #git
17:34 context left #git
17:34 SporkWitch not really, but ok; have fun fitting that square peg in the round hole.  I suggest some basic lessons on terminology as well, for example "sanity check" in the context of computing.
17:34 steveoh i'm using a package manager and for front end deps, they are siblings of my app
17:35 SporkWitch gotcha, https://xkcd.com/763/
17:35 Derperperd joined #git
17:35 WayToDoor joined #git
17:37 EvilPeng1 joined #git
17:39 patarr joined #git
17:43 robotroll joined #git
17:44 aeae64ff8df64d2a joined #git
17:45 dsantiago joined #git
17:46 kajnc joined #git
17:46 Haliucinas joined #git
17:46 dsantiag_ joined #git
17:47 ghostlight joined #git
17:47 gho5t I'm trying to change the color of my text when I echo an error message when running a git hook
17:47 gho5t REDTEXT='\033[0;31m'
17:47 gho5t echo '${REDTEXT}Error: ' $FILE ' contains a debugger line!'
17:47 Orion3k joined #git
17:47 gho5t is this incorrect?
17:48 converge joined #git
17:48 converge joined #git
17:48 steveoh left #git
17:49 qws-user-1228 joined #git
17:49 alex1a joined #git
17:50 eivarv joined #git
17:51 Sasazuka joined #git
17:52 schallusion joined #git
17:52 schallusion hi
17:53 davimore_ joined #git
17:53 emg gho5t: 1) inside single quotes you don't get expansions, so use double quotes, e.g.:  echo "${red}Error: $file contains a debugger line!"
17:53 emg gho5t: 2) don't hard code color escape sequences, use tput http://mywiki.wooledge.org/BashFAQ/037
17:54 emg gho5t: 3) I highly recommend using shellcheck.net to check your scripts
17:54 gho5t thanks man
17:54 emg gho5t: and I'll stop there, come by #bash if you want more bash/sh help
17:54 emg you're welcome, and good luck!
17:56 unclechu joined #git
17:56 schallusion i have a situation where is can need some help: somone did a fauly commit (lets call it [abcdef]) in a master branch, so i reverted it. After this the other person branched from [abcdef] to continue the work (wrong decision). Now i want to merge the master to the feature branch, but it gives me several conflict because the "revert" is also merged. The right thing would have been to merge from the revert commit and revert the revert in the feature
17:56 schallusion branch, but how can i do this now after several commits stacking up in both branches?
17:57 nwkj86 joined #git
17:57 gho5t emg: the only issue now is that my prompt's text stays red throughout after running this
17:57 gho5t although that may be a powershell issue
17:57 schallusion s/merge from the revert commit/branch from the revert commit/
17:58 kajnc joined #git
17:58 gho5t you should have him reset mixed back to where the common ancestor is
17:58 emg gho5t: tput sgr0 is reset, so    red=$(tput setaf 1) reset=$(tput sgr0); echo "${red}important stuff${reset}"
17:58 gho5t and then recommit
17:58 gho5t but I'm new here so I'll shutup
17:58 anonymus_ joined #git
17:58 kulelu88 joined #git
17:59 gho5t thanks!
18:00 alkino left #git
18:00 acetakwas joined #git
18:00 timvishe` joined #git
18:01 timvishe` left #git
18:01 hallogallo[m] joined #git
18:01 kikijiki[m] joined #git
18:01 saintaquinas[m] joined #git
18:01 Remramm joined #git
18:01 Ineentho[m] joined #git
18:01 M-meznak joined #git
18:01 M-mistake joined #git
18:01 M-shine joined #git
18:01 aviraldg joined #git
18:01 kjsage[m] joined #git
18:02 timvisher joined #git
18:02 mindriot101 joined #git
18:02 timvisher is it possible to set a git branch to push to a differently named branch by default?
18:02 whomp joined #git
18:02 gho5t joined #git
18:02 Rodya_ joined #git
18:03 nettoweb joined #git
18:04 mindriot101 joined #git
18:04 lykinsbd joined #git
18:05 mycelium joined #git
18:06 ayjay_t joined #git
18:07 nettoweb1 joined #git
18:08 emg timvisher: https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches   section "Tracking Branches"
18:08 patarr joined #git
18:08 timvisher emg: thanks
18:09 thiago joined #git
18:09 afuentes joined #git
18:11 ayjay_t joined #git
18:12 dreiss joined #git
18:13 drmt joined #git
18:15 converge joined #git
18:15 converge joined #git
18:16 concerti__ joined #git
18:21 Sam_ joined #git
18:21 maret joined #git
18:21 kajnc joined #git
18:21 Sam_ Guys, I need some help...
18:21 _ikke_ !just_ask
18:21 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
18:21 Sam_ Ok
18:22 ahmed_elgabri joined #git
18:23 stuivi joined #git
18:23 Lipp joined #git
18:26 Sam_ I want to clone off of https://github.com/kriasoft/react-starter-kit as my starting codebase for my project.  I then want to develop on top of this framework and create my own projects repository.  Can I do so while still being able to merge in community updates and changes from the original framework?
18:27 Sam_ I just don't quite understand what I need to do.  Until now, my experiences with git have been just limited to one repository (my own ones from scratch usually).
18:27 _ikke_ I would separate your project from the frameworks repository
18:27 _ikke_ They're two separate projects
18:27 _ikke_ The framework is just a dependency of your project
18:27 SporkWitch Sam_: fork it, clone the fork, do pull requests to ask them to merge your changes upstream
18:28 amanuel2 joined #git
18:28 SporkWitch Sam_: to update your copy, pull from upstream, commit to your fork
18:28 ^7heo Sam_: you can just use branches
18:28 ^7heo use master as upstream (add remote)
18:28 ^7heo and rebase your work on top of it
18:28 _ikke_ Nice, confusing answers :-/
18:29 Sam_ Hmmm, let me decrypt both of your responses for a sec.  Sorry noobie here
18:29 SporkWitch ^7heo: that seems like an easy way to make things confusing, unless you still intend to fork, and just keep master sync'd to upstream
18:29 ^7heo _ikke_: well, we all have different workflows
18:29 _Patrick_ joined #git
18:29 ^7heo SporkWitch: it's actually less confusing
18:29 _ikke_ There is no need to combine two separate projects in one repository
18:29 SporkWitch ^
18:29 Sam_ I just want to be sure that as the community betters the RSK codebase, I am not left behind.  That's essentially all I want.
18:29 ^7heo SporkWitch: since there is no merge involved
18:30 ^7heo _ikke_: yeah, one can also use submodules
18:30 Lewoco joined #git
18:30 _ikke_ Right, that's one way to do it
18:30 SporkWitch ^7heo: instead you have a single repository that is, in practical terms, two separate ones.  You're effectively using branches as separate repositories at that point...
18:30 ^7heo _ikke_: but I dunno, it's not *that* simple I'm told
18:31 _ikke_ ^7heo: It's not that complicated
18:31 Lewoco Does `git pull` merge upstream changes on all branches or just the current branch?
18:31 LionsMane joined #git
18:31 canton7 Lewoco, just the current branch
18:31 _ikke_ Lewoco: just current branch
18:31 SporkWitch Sam_: do you have a project that depends on RSK, or are you making your own modifications TO RSK?
18:31 SporkWitch Sam_: if the former, use a submodule, if the latter, fork
18:31 ^7heo _ikke_: users have issues getting submodules in my experience
18:31 Sam_ SporkWitch: I am NOT making mods to the RSK.
18:31 Sam_ My project just depends on RSK
18:31 ^7heo _ikke_: but whatever works honestly
18:31 SporkWitch Sam_: a submodule is the correct solution, then
18:32 ^7heo submodules are a way
18:32 ^7heo at this point
18:32 Sam_ Ok, I will look into the submodule route and learn a bit more.
18:32 nydel07 joined #git
18:32 bmahe joined #git
18:32 Sam_ Thank you for the direction guys.  I really appreciate it.
18:32 ^7heo any vendroing solution will work
18:32 SporkWitch Sam_: it will even peg it to the specified version, so you don't need to worry about upstream changes breaking your product, and can safely test before updating the submodule to specify the new version
18:32 _ikke_ Sam_: Depending on your language, there also might be language tools that help you with this
18:32 ^7heo so it's best to use what is popular/good for a given lang
18:32 Sam_ Oh how great!  Reading up on submodules now...
18:33 _ikke_ php has composer, ruby has gems, python has pip, node has npm (yarn)
18:33 bmahe joined #git
18:33 _ikke_ c# has nuget
18:33 ^7heo go has a hundred tools
18:33 Sam_ Right, understood.
18:33 ^7heo all different and mutually exclusive
18:33 converge joined #git
18:34 Cabanossi joined #git
18:34 mrwat joined #git
18:35 Raging_Hog joined #git
18:35 Sam_ Thanks again guys.
18:38 govg joined #git
18:38 eivarv joined #git
18:40 mindriot101 joined #git
18:41 b100s joined #git
18:41 rorro joined #git
18:46 CrazyBonz joined #git
18:47 WayToDoor joined #git
18:48 serycjon joined #git
18:49 Emperor_Earth joined #git
18:51 isysd joined #git
18:51 lykinsbd joined #git
18:52 Derperperd joined #git
18:53 Cavallari joined #git
18:54 Doginal joined #git
18:55 robotroll joined #git
18:56 barteks2x joined #git
18:56 biertie joined #git
18:57 patarr joined #git
18:59 a3Dman joined #git
18:59 altendky joined #git
19:00 bpna joined #git
19:01 cagedwisdom joined #git
19:01 buffal0 joined #git
19:01 Raging_Hog joined #git
19:02 ronskisika joined #git
19:03 antarrah joined #git
19:05 peterR`` joined #git
19:07 mrwat joined #git
19:07 cdg joined #git
19:08 e14 joined #git
19:09 mischat joined #git
19:10 mindriot101 joined #git
19:11 robotroll joined #git
19:11 durham joined #git
19:12 hahuang65 joined #git
19:13 Guest18215 joined #git
19:13 bpna joined #git
19:15 nickthetait joined #git
19:19 aard_ joined #git
19:20 cyan__ joined #git
19:21 yqt joined #git
19:24 lungaro are there best practices for avoiding nil dereferences? =P
19:25 lungaro woops. wrong chan
19:25 e14 joined #git
19:29 lykinsbd joined #git
19:29 nilez joined #git
19:30 aard_ joined #git
19:31 moritz lungaro: but let us know when you have some answers :-)
19:31 lungaro haha
19:32 therealtbe joined #git
19:33 _ikke_ lungaro: Never return nil :P
19:33 MeltedLux joined #git
19:33 therealtbe in the git log, sometimes I see "Merge branch issueXX... into develop"   and sometimes I do not see this, can someone tell me why?    I am running the same exact sequence of commands.
19:34 kajnc joined #git
19:34 _ikke_ therealtbe: fast-forward merges
19:34 _ikke_ !ff
19:34 gitinfo A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf
19:37 WhiskerBiscuit joined #git
19:40 osse joined #git
19:42 finalbeta joined #git
19:42 _ADN_ joined #git
19:42 EvilPeng1 joined #git
19:44 patarr joined #git
19:44 Juri_Agarin joined #git
19:44 m0viefreak joined #git
19:44 reim joined #git
19:45 aard_ joined #git
19:48 gentoo_ joined #git
19:49 ayogi joined #git
19:49 rgrinberg joined #git
19:49 oncall-pokemon joined #git
19:52 BSaboia joined #git
19:52 fmcgeough joined #git
19:53 msonntag joined #git
19:54 MeltedLux joined #git
19:54 mrwat joined #git
19:55 Emperor_Earth joined #git
19:55 skunkz joined #git
19:57 Macaveli joined #git
19:59 kajnc joined #git
20:00 nitesh joined #git
20:00 EvilPenguin joined #git
20:01 _cyril_ joined #git
20:02 e14 joined #git
20:04 Lor_ joined #git
20:09 mindriot101 joined #git
20:10 nilg joined #git
20:11 holgersson joined #git
20:13 DieguezZ joined #git
20:14 thiago joined #git
20:14 fedepad joined #git
20:15 fuchstronaut joined #git
20:17 magellanicloud joined #git
20:18 magellanicloud joined #git
20:18 magellanicloud joined #git
20:18 GavinMagnus left #git
20:20 mindriot101 joined #git
20:21 lykinsbd joined #git
20:23 anuxivm joined #git
20:25 modlin joined #git
20:25 TomyLobo joined #git
20:27 xall joined #git
20:29 HoierM joined #git
20:31 dodobrain joined #git
20:33 King_Hual joined #git
20:34 thiago joined #git
20:37 drmt joined #git
20:38 DieguezZ joined #git
20:39 modlin joined #git
20:40 ploop joined #git
20:40 BSAlb joined #git
20:42 BSab joined #git
20:42 tchan joined #git
20:42 SwiftMatt joined #git
20:44 aswen joined #git
20:45 lb1a joined #git
20:45 lb1a joined #git
20:46 rominron_ joined #git
20:46 ahr3n joined #git
20:46 gfixler joined #git
20:47 IndigoTiger joined #git
20:48 IndigoTiger joined #git
20:48 macefr joined #git
20:51 sl4v3 joined #git
20:51 modlin joined #git
20:51 sl4v3 i have a process issue i'm not sure how to resolve.
20:51 sl4v3 1) we require an upstream library on github
20:52 sl4v3 2) we need to make changes to source in the upstream library files
20:52 sl4v3 3) those changes should never need to go back to upstream
20:52 sl4v3 4) we will need to pull changes from the upstream library, but those will nuke our local changes
20:52 sl4v3 thoughts?
20:54 osse sl4v3: Do you think you have to make changes regularly or is it a specific set of patches for the time being?
20:54 aidalgol joined #git
20:54 BSAlb joined #git
20:54 sl4v3 osse: really, there's probably only about 8 files that need to be modified and persisted.
20:54 sl4v3 osse: changes will be infrequent.
20:55 sl4v3 osse: specifically, i am forking the SimpleSAMLphp library, but you need to configure the library to function properly, and i've also added a theme for the login page.
20:55 sl4v3 osse: but if and when there are updates to simplesamlphp, i'd like to easily pull the latest changes in.
20:56 holgersson joined #git
20:56 grawity um, where did you get 4) from?
20:56 sl4v3 osse: i think i just answered my own question, as the authors were probably aware of this issue. both the 'config' and 'metadata' folders are empty, and that's where my changes go, as well as in the modules folder, but that won't get clobbered by their changes.
20:56 EvilPenguin joined #git
20:57 sl4v3 grawity: that was just my assumption.
20:57 leehambley joined #git
20:57 Emperor_Earth joined #git
20:58 davidosomething joined #git
21:00 ki0 joined #git
21:01 denimsoft joined #git
21:03 buffal0 joined #git
21:04 theskillwithin joined #git
21:08 kadoban joined #git
21:10 grumble joined #git
21:11 reim joined #git
21:11 rgrinberg joined #git
21:12 kyan joined #git
21:13 buffal0 joined #git
21:13 modlin joined #git
21:13 rorro joined #git
21:15 shaggycat joined #git
21:16 malcon joined #git
21:23 whitby joined #git
21:26 jimi_ joined #git
21:26 dviola joined #git
21:27 anonymuse joined #git
21:29 reim joined #git
21:32 DarkFox_ joined #git
21:37 xall joined #git
21:37 diogenese joined #git
21:40 nettoweb joined #git
21:42 prg3_ left #git
21:42 kajnc joined #git
21:42 prg3 joined #git
21:43 patarr joined #git
21:49 gfixler joined #git
21:49 zulutango joined #git
21:54 davimore_ joined #git
21:54 qguv joined #git
21:54 solrize joined #git
21:55 Salander27 joined #git
21:55 solrize does anyone here use cgit?  i'm thinking of installing it on a vps and putting some of my repos in it.  gitlab seems way too hard to run, and dunno what's been happening with gogs
21:55 solrize advice/opinions are welcome
21:56 demize It really depends on your needs.
21:56 danslo joined #git
21:56 demize But yeah, if you're not using the GitLab appliance thingies it's nigh impossible to set up correctly, or at least was a few months ago.
21:58 solrize what about gitweb?  i just remembered it
21:59 solrize i guess cgit looks ok.  i like that it's a cgi, so i can chuck it on a web host instead of running my own server
21:59 demize Well, as long as you have the git repos on said server...
21:59 raijin joined #git
22:00 demize Anyway, gitweb works mostly similarly
22:00 demize Except eg. no caching, and written in Perl.
22:00 boombatower joined #git
22:00 sangy joined #git
22:01 solrize hmm ok
22:01 solrize thanks i'll check it.  gitweb may be easier
22:01 demize Easier? Not really..
22:02 demize Well, I guess easier in that if you have git installed you also have gitweb, but meh.
22:02 solrize can gitweb/cgit serve git over http?  like "git clone http://..."
22:02 przemoc joined #git
22:02 solrize oh hmm i didn't realize that
22:03 solrize i have a web host account that can serve cgi but doesn't have a c compiler, so i'd have to compile cgit on another machine and i was in the middle of figuring out how to do that
22:03 demize cgit can at least.
22:03 SourTrout joined #git
22:03 solrize but a perl cgi could be easier to run there.
22:03 demize Though you might want git-daemon instead of a dumb HTTP thing.
22:04 solrize that's git://.... ?
22:04 solrize i'd actually want to use https on general principles
22:04 learath2 joined #git
22:04 treehug88 joined #git
22:04 malcon joined #git
22:05 demize git-daemon is the git protocol yes, for smart http, use git-http-backend.
22:05 solrize oh cool, i didn't know about that
22:06 solrize well this should keep me busy for a while... i don't think i can run a daemon on the hosted web site but i can run one on my own server.  it becomes one more thing to look after but i can deal with it i guess
22:06 solrize thanks
22:06 demize git-http-backend is also a CGI binary.
22:10 Sasazuka joined #git
22:12 ISmithers joined #git
22:12 solrize cool!
22:13 solrize thanks
22:13 mischat joined #git
22:14 alex1a_ joined #git
22:14 buffal0 joined #git
22:15 foist joined #git
22:15 moop joined #git
22:16 littleforest joined #git
22:16 Lor_ joined #git
22:16 ismaris joined #git
22:22 malcon joined #git
22:22 dendazen joined #git
22:22 disi joined #git
22:22 brokensyntax joined #git
22:23 jeffreylevesque joined #git
22:24 f3r70rr35f joined #git
22:24 gentoo_ joined #git
22:24 gentoo_ joined #git
22:25 gentoo_ joined #git
22:25 gentoo_ joined #git
22:26 gentoo_ joined #git
22:28 Derperperd joined #git
22:29 sl4v3_ joined #git
22:29 Sasazuka joined #git
22:30 ISmithers joined #git
22:30 e14 joined #git
22:32 tvw joined #git
22:35 morenoh149 joined #git
22:36 morenoh149 github seems to allow you to revert a PR entirely. After I merge that (undoing some changes) how can I check it out or add more changes in a feature branch?
22:39 ochorocho__ joined #git
22:40 davimore__ joined #git
22:40 reim joined #git
22:40 mizu_no_oto joined #git
22:46 retroj left #git
22:48 publio joined #git
22:49 justanotheruser joined #git
22:49 Darren_ joined #git
22:51 mizu_no_oto joined #git
22:51 DeltaHeavy joined #git
22:56 jimi_ joined #git
22:56 shaggycat joined #git
22:56 brokensyntax joined #git
22:57 NeverDie joined #git
22:58 nettoweb joined #git
23:03 rkazak_ joined #git
23:04 Darren_ joined #git
23:05 Juri_Agarin joined #git
23:05 ejnahc joined #git
23:06 NeverDie_ joined #git
23:06 Sasazuka joined #git
23:08 KnownSyntax joined #git
23:08 KnownSyntax joined #git
23:12 nettoweb joined #git
23:12 tubaman joined #git
23:12 sssilver joined #git
23:13 Rodya_ joined #git
23:13 davimore joined #git
23:15 nettoweb1 joined #git
23:16 mischat joined #git
23:17 DarkFox_ joined #git
23:19 xall joined #git
23:27 menip joined #git
23:29 nettoweb joined #git
23:30 EvilPenguin joined #git
23:30 cdown_ joined #git
23:31 SwiftMatt joined #git
23:32 anuxivm left #git
23:32 brokensyntax joined #git
23:33 peterR`` joined #git
23:34 rorro joined #git
23:37 whitby morenoh149: (assuming you merged everything into master) you should be able to branch off master again (e.g. a feature branch) and make changes and whatnot
23:37 f3r70rr35f joined #git
23:37 fatalhalt joined #git
23:38 dsdeiz joined #git
23:38 dsdeiz joined #git
23:40 Cork joined #git
23:41 ochorocho__ joined #git
23:43 danemacmillan joined #git
23:43 SwiftMatt joined #git
23:43 fshp joined #git
23:44 zulutango joined #git
23:45 kajnc joined #git
23:47 safe joined #git
23:47 EvilPenguin joined #git
23:47 cdown_ joined #git
23:49 fshp Hi. I have branches - master and `foo`. Master was merged into `foo`. In merge commit i add file. After in `foo` was created other commits. Now i want rebase `foo` on master. But file from merge commit is lost. Is there a way to save the changes of merge commits?
23:51 arescorpio joined #git
23:51 whitby What do you mean by "In merge commit i add file."
23:51 mablae_ joined #git
23:51 whitby The merge commit should be automatically generate
23:51 whitby generated*
23:53 mizu_no_oto joined #git
23:55 jottr joined #git
23:56 pouet joined #git
23:58 f3r70rr35f joined #git
23:58 dsantiago joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary