Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-13

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

All times shown according to UTC.

Time Nick Message
00:00 eletuchy joined #git
00:00 ecksit joined #git
00:03 MattMaker joined #git
00:05 f3r70rr36f joined #git
00:06 Vinnie_win_d joined #git
00:08 Wulf joined #git
00:08 doktori joined #git
00:10 bilb_ono joined #git
00:14 Noldorin joined #git
00:16 netj joined #git
00:17 khmarbaise joined #git
00:29 beingthecomedian joined #git
00:30 axiom_1 joined #git
00:35 jason237 joined #git
00:41 unbalancedparen joined #git
00:41 tristanp joined #git
00:42 corpix joined #git
00:44 rossome joined #git
00:44 deltab joined #git
00:46 armyriad joined #git
00:46 Schwarzbaer_ joined #git
00:49 dreiss joined #git
00:51 mmlb joined #git
00:52 ktosiek joined #git
00:56 GandalfTheWizard joined #git
00:57 corpix joined #git
00:59 MattMaker joined #git
01:01 Wulf4 joined #git
01:02 LeBlaaanc joined #git
01:05 corpix joined #git
01:08 corpix joined #git
01:08 tristanp joined #git
01:10 tristanp joined #git
01:11 interne7y joined #git
01:13 jaguarmagenta joined #git
01:14 fstd_ joined #git
01:15 pks joined #git
01:17 lvns joined #git
01:17 cqi joined #git
01:20 Kev- joined #git
01:24 McNozes joined #git
01:27 ekinmur joined #git
01:27 m_antis joined #git
01:28 fission6 joined #git
01:29 morenoh149 joined #git
01:32 Adrian___ joined #git
01:33 Adrian___ Hey
01:33 gitinfo Adrian___: 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.
01:33 checkItOut joined #git
01:33 Adrian___ I have an issue with trying to do a git pull while having an excluded file
01:34 catbeard try moving it or stashing it?
01:34 Adrian___ I have added a connection strings file to .git/info/exclude and it doesn't show as ready to commit from a git status
01:34 Adrian___ but when I do a git pull...
01:35 Adrian___ error: Your local changes to the following files would be overwritten by merge:         _properties/ConnectionStrings.config Please, commit your changes or stash them before you can merge.
01:35 Adrian___ so stashing says there are no local changes to stash
01:35 catbeard git diff?
01:36 mellernoia joined #git
01:37 Adrian___ never used it before but ran it against the file
01:37 Adrian___ nothing return
01:37 Adrian___ I'm also on windows, if that matters
01:38 ajf- joined #git
01:38 catbeard git diff origin/master:_properties/ConnectionStrings.config _properties/ConnectionStrings.config
01:38 rewt Adrian___, did you perhaps want .gitignore ?
01:38 catbeard replace origin with your origin name, and master with your branch name you want to compare against
01:39 SebastianFlyte joined #git
01:39 Adrian___ right
01:39 Adrian___ so that did show me the changes I expected
01:39 catbeard you just don't want to commit that to the repo?
01:39 Adrian___ yup
01:39 catbeard if so, rewt is correct, add the file to .gitignore
01:39 Adrian___ I want to keep my local changes
01:40 Adrian___ I added it to exclude
01:40 catbeard ok now run git status
01:40 Adrian___ because I don't want to commit a global ignore for this file. The rest of my team wants to keep committing it
01:41 catbeard Adrian___: your team is on crack then
01:41 rewt you don't have to commit the ignore file...
01:41 catbeard yeah you're not committing the .gitignore
01:41 Adrian___ Your branch is behind 'origin/master' by 14 commits, and can be fast-forwarded.   (use "git pull" to update your local branch) Untracked files:   (use "git add <file>..." to include in what will be committed)          FormRoot_backup.xml  nothing added to commit but untracked files present (use "git add" to track)
01:41 catbeard ok so git pull should work now
01:46 Adrian___ rror: Your local changes to the following files would be overwritten by merge:         _properties/ConnectionStrings.config
01:46 catbeard maybe move the file out of the project root
01:46 catbeard git pull
01:46 catbeard then move it back
01:46 kadoban joined #git
01:46 italoacasas joined #git
01:46 Adrian___ that worked
01:46 catbeard sweet
01:46 Adrian___ so now, I just need to understand the difference between exclude and .gitignore
01:46 Adrian___ so I can avoid this in the future
01:46 nettoweb joined #git
01:46 Adrian___ so I want to always keep the local changes to that file
01:46 catbeard https://help.github.com/articles/ignoring-files/
01:46 Adrian___ but the rest of my team gets those changes when they commit it
01:47 mischat joined #git
01:47 Adrian___ so this is the bit that is confusing me: A .gitignore file should be committed into your repository, in order to share the ignore rules with any other users that clone the repository.
01:48 Adrian___ I want this rule just for me
01:48 catbeard right but you can also do a global one
01:48 rewt should != must
01:48 catbeard that's not project specifi
01:48 Adrian___ this one is project specific
01:49 Adrian___ I also can't uncommit the .gitignore that already exists
01:49 Adrian___ and I assume any changes I make to it will go upstream
01:50 Adrian___ hence me trying to use exclude
01:51 catbeard this? http://365git.tumblr.com/post/51901​6351/three-ways-of-excluding-files
01:51 catbeard section 2
01:51 alanwill joined #git
01:51 Adrian___ yep, that's what I tried
01:52 Adrian___ this could also be a result of my misunderstanding the ignore rules
01:52 catbeard possibly
01:52 artgoeshere joined #git
01:52 catbeard maybe syntax error
01:53 Adrian___ # File patterns to ignore; see `git help ignore` for more information. # Lines that start with '#' are comments. *Logic/App.Config *Migrator/App.config *_properties/ConnectionStrings.config
01:53 snips joined #git
01:53 Adrian___ each of the ones with a * are on a new line
01:53 catbeard check https://www.kernel.org/pub/softw​are/scm/git/docs/gitignore.html
01:53 catbeard under Pattern Format
01:54 italoacasas joined #git
01:55 ceaucari joined #git
01:58 Adrian___ right, so the * is unnecessary
01:58 Adrian___ but it still doesn't seem to be working
01:58 Adrian___ because now it still wants to commit the _properties/ConnectionStrings.config file
01:59 Adrian___ I ran a git update-index --assume-unchanged _properties/ConnectionStrings.config after updating the exclude file and it stopped tracking it
02:00 Adrian___ but this is what I did last time
02:00 Adrian___ and when I tried to pull, I got that error
02:00 Adrian___ so really I still confused as hell
02:00 Wulf4 joined #git
02:01 Khisanth joined #git
02:02 diegoaguilar joined #git
02:03 arescorpio joined #git
02:04 snips joined #git
02:07 checkItOut joined #git
02:09 snips joined #git
02:10 snips joined #git
02:10 waveclaw joined #git
02:11 snips joined #git
02:13 lfmobile__ joined #git
02:16 jaguarmagenta joined #git
02:16 alanwill_ joined #git
02:17 italoacasas joined #git
02:18 snips joined #git
02:18 oliverio joined #git
02:18 oliverio joined #git
02:18 khmarbaise joined #git
02:18 snips joined #git
02:19 alanwill joined #git
02:19 UTAN_dev joined #git
02:22 mingrammer_ joined #git
02:22 ahr3n_ joined #git
02:24 anu0 joined #git
02:26 tristanp joined #git
02:27 tristanp joined #git
02:30 cqi joined #git
02:33 eletuchy joined #git
02:38 alanwill_ joined #git
02:43 mehola joined #git
02:46 lfmobile joined #git
02:47 lfmobile joined #git
02:50 alanwill joined #git
02:51 hexagoxel joined #git
02:51 harish joined #git
02:57 chachasmooth joined #git
02:59 anirudhj joined #git
03:02 aavrug joined #git
03:07 alanwill joined #git
03:09 snips joined #git
03:10 checkItOut joined #git
03:11 snips joined #git
03:11 snips joined #git
03:11 _rht joined #git
03:11 abbi joined #git
03:12 nitrix joined #git
03:12 interne7y joined #git
03:16 snips joined #git
03:19 khmarbaise joined #git
03:20 k3rn31 joined #git
03:22 torbjorn joined #git
03:23 troyt joined #git
03:24 checkItOut joined #git
03:31 eletuchy joined #git
03:32 tristanp joined #git
03:35 mischat joined #git
03:36 fracting joined #git
03:39 nitrix joined #git
03:40 eletuchy joined #git
03:41 TalkToMe joined #git
03:42 TalkToMe joined #git
03:46 TalkToMe joined #git
03:49 alanwill joined #git
03:50 jstimm joined #git
03:55 checkItOut joined #git
03:55 dreiss joined #git
03:56 ahr3n joined #git
03:56 k3rn31 joined #git
04:09 alanwill_ joined #git
04:10 alanwil__ joined #git
04:15 Cabanossi joined #git
04:15 tristanp joined #git
04:16 ome joined #git
04:18 zturner joined #git
04:19 khmarbaise joined #git
04:26 mehola joined #git
04:26 alanwill joined #git
04:34 fracting joined #git
04:37 khmarbaise joined #git
04:38 harish_ joined #git
04:39 rchavik joined #git
04:39 checkItO1t joined #git
04:43 Lorcatar joined #git
04:43 nilg joined #git
04:45 boudiccas joined #git
04:47 Mowgli joined #git
04:52 netj joined #git
04:52 shgysk8zer0 joined #git
04:53 alanwill joined #git
04:55 muthu joined #git
04:57 ewet joined #git
05:01 d4rklit3 joined #git
05:01 hahuang61 joined #git
05:02 shgysk8zer0 joined #git
05:03 shgysk8zer0 joined #git
05:03 lordjancso joined #git
05:04 tristanp joined #git
05:05 lvns joined #git
05:05 iveqy_ left #git
05:05 iveqy joined #git
05:05 iveqy I'm at a company which uses gitlab to do merge requests for changes to be approved into master. The internal rules for writing a merge message is to include a list of all files changed and for each item in the list write what has changed in that file
05:06 iveqy to me this seems wrong. Each commit should contain a description on why the changes are done to the files in that commit.
05:07 iveqy however I lack documentation to strengthen my argument. I would love to hear you oppinions about this
05:07 emPi joined #git
05:09 shgysk8zer0 joined #git
05:12 jennings What works for us is: Each commit's message should explain what that commit is doing. In theory, the commit should be able to be viewed independently and still make sense.
05:12 fracting joined #git
05:13 jennings But when merging a whole branch, there's often a larger "story". That's what we use the merge request message for. Why are me making this series of changes?
05:13 interne7y joined #git
05:13 qt-x joined #git
05:14 justanotheruser joined #git
05:14 jennings The individual commits are "refactor", "refactor", "slot in the new feature", and the merge request explains why you had to refactor, and how the branch as a whole solves what the issue tracker ticket wanted.
05:15 jennings Listing the changes to each file seems excessive, but if doing that is providing value at your company, more power to them.
05:16 mariuscc joined #git
05:17 alanwill joined #git
05:18 iveqy jennings: thanks for sharing. Your workflow seems sane to me.
05:19 iveqy jennings: the problem we've is that each commit is worthless on its own. In fact only the merge request contains something sane at all. so each commit is useless and could be squashed into a single commit before the merge (but this isn't done)
05:20 iveqy with useless commits, and commit messages, the merge request message is important. That's why we aim to write really good merge requests
05:20 jennings Yeah, I'm guilty of having commits simply titled "oops" from time to time.
05:21 MattMaker joined #git
05:21 iveqy the part that bothers me the most is that what's important is a change, not a file. A change could intersect with many files and multiple changes could span the same files as other changes
05:22 iveqy I'm trying to get us to do review commit by commit and not review a single merge request as one giant blob
05:23 iveqy I've seen that when reviewing too many changes, the quality of the review is getting worse
05:23 mischat joined #git
05:24 elastix joined #git
05:25 jennings 2000 line diff: "looks good to me". 2 line diff: "this could use some work"
05:28 mangolisk joined #git
05:31 sangy joined #git
05:31 flavius joined #git
05:31 linuxmint joined #git
05:32 djb-irc joined #git
05:35 ThomasLocke joined #git
05:35 jennings left #git
05:37 subhojit777 joined #git
05:38 Grimm_ joined #git
05:40 diogenese joined #git
05:42 alanwill joined #git
05:43 Lorry_ joined #git
05:47 infra-red joined #git
05:53 checkItOut joined #git
05:53 linuxmint joined #git
05:53 mns joined #git
05:55 Raging_Hog joined #git
05:55 eletuchy joined #git
06:00 alanwill joined #git
06:02 Stace joined #git
06:04 mehola joined #git
06:04 Stace Hello! I would like to ignore subdirectories ending in .srcs, I tried using /*.srcs/ in my gitignore but it doesn't seem to work. Here's my .gitignore: https://gist.github.com/StaceyRiec​k/99aef5d29c4ea2920e0b06a90af85030
06:08 Stace oh, figured it out. it's /**/*.srcs/
06:10 mischat joined #git
06:10 hhee joined #git
06:11 alanwill joined #git
06:13 son joined #git
06:13 zeroed joined #git
06:14 rscata joined #git
06:14 alanwill_ joined #git
06:18 vuoto joined #git
06:19 alanwill joined #git
06:20 freimatz joined #git
06:20 Stace joined #git
06:22 fracting joined #git
06:22 Stace left #git
06:24 yuhlw joined #git
06:29 harish_ joined #git
06:30 eletuchy joined #git
06:31 mischat joined #git
06:33 stonerfish joined #git
06:34 jceb joined #git
06:37 kugel_ joined #git
06:38 kugel__ joined #git
06:39 rbr joined #git
06:39 jaguarmagenta joined #git
06:43 ki0 joined #git
06:43 hahuang61 joined #git
06:46 Sceorem joined #git
06:50 DonRichie joined #git
06:51 alanwill joined #git
06:54 alanwill_ joined #git
06:54 k3rn31 joined #git
06:56 alanwil__ joined #git
06:57 cqi joined #git
06:58 nilg` joined #git
06:58 alanwill joined #git
06:59 cbreak gitignore only matches patterns without / (excluding trailing /) in the whole tree
07:00 d4rklit3 joined #git
07:00 cbreak a pattern starting with / is rooted at the root, or the directory of the .gitignore
07:00 dreiss joined #git
07:02 leeN joined #git
07:03 barteks2x joined #git
07:04 kugel joined #git
07:04 PCatinean joined #git
07:06 infra-red joined #git
07:06 son joined #git
07:06 lvns joined #git
07:06 slappymcfry joined #git
07:08 tax joined #git
07:09 theskillwithin joined #git
07:09 intellix joined #git
07:10 clemf joined #git
07:10 JeroenT joined #git
07:10 encod3 joined #git
07:11 leeN joined #git
07:12 diogenese joined #git
07:14 interne7y joined #git
07:14 astrofog joined #git
07:15 ceaucari joined #git
07:20 alanwill_ joined #git
07:23 ahmedelgabri joined #git
07:23 BSaboia joined #git
07:24 filcab joined #git
07:26 alcohol Eugene: yes?
07:26 dopesong joined #git
07:27 solars joined #git
07:30 intellix joined #git
07:33 Calrik joined #git
07:33 SimonNa joined #git
07:36 zturner joined #git
07:37 mmattice joined #git
07:39 phanimah1sh joined #git
07:40 alanwill joined #git
07:42 alanwil__ joined #git
07:42 interne7y joined #git
07:44 alanwill_ joined #git
07:45 King_Hual joined #git
07:45 King_Hual joined #git
07:45 Balliad joined #git
07:47 mischat joined #git
07:47 lb joined #git
07:49 Andrew_K joined #git
07:50 intellix joined #git
07:51 GavinMagnus joined #git
07:53 dimi1947 joined #git
07:57 grift joined #git
07:58 davisonio joined #git
07:59 ceaucari joined #git
07:59 alanwill joined #git
08:00 eijk joined #git
08:02 mehola joined #git
08:03 eijk_ joined #git
08:03 alanwill_ joined #git
08:04 mrkat joined #git
08:06 kurkale6ka joined #git
08:06 alanwil__ joined #git
08:07 jbitdrop joined #git
08:08 _pix joined #git
08:08 tristanp joined #git
08:09 courrier joined #git
08:09 fracting joined #git
08:12 ToBeCloud joined #git
08:12 clmsy joined #git
08:14 Silenced joined #git
08:14 zturner joined #git
08:15 Silenced joined #git
08:16 marcogmonteiro joined #git
08:16 marcogmonteiro joined #git
08:16 neanderslob joined #git
08:18 Darcidride joined #git
08:18 pungi-man joined #git
08:20 grift joined #git
08:22 alanwill joined #git
08:24 alanwill_ joined #git
08:26 chigang_ joined #git
08:26 ocbtec joined #git
08:29 trobotham joined #git
08:31 zamba joined #git
08:31 Schwarzbaer_ joined #git
08:33 basiclaser joined #git
08:33 ahr3n joined #git
08:36 texinwien joined #git
08:40 iLembus joined #git
08:43 algun joined #git
08:43 grift joined #git
08:43 nilg joined #git
08:44 algun how do i force origin into local’s state?
08:44 fracting joined #git
08:44 cbreak git push -f
08:44 Hounddog joined #git
08:45 algun and the branch (and only the branch) is going to be in the same state? what about the stage?
08:45 cbreak that's local state
08:45 cbreak it can not be pushed
08:45 algun thanks
08:45 cbreak you can force push tags as well
08:45 Neon joined #git
08:46 cbreak git push -f --all pushes all branches of course
08:46 cbreak and so on
08:46 cbreak careful with force :)
08:48 acetakwas joined #git
08:48 imjacobclark joined #git
08:48 lb cbreak here's your planet-blaster-laser-shot-lights​aber-BFG-katana-MG-atomic-bomb. be careful with it ^^
08:49 cbreak yeah. And don't touch the button over there.
08:49 cbreak the one with the label "free cake"
08:49 algun cbreak wat wat wat wat?
08:49 lb what button? .... oh free cake ...yummy.... *push*
08:49 algun oh, —all. alright
08:50 Neon I've just imported one git repo into another one using the steps described on http://stackoverflow.com/a/8396318/2477364. It kind of preserved the files' history of the imported repo, but with the original path. I'm using a git GUI and like to be able to just right click a file and show its history, which now doesn't work for the files from the imported repo, because their history is assigned to their old path. Any idea how
08:50 Neon I can fix this? Maybe prefix all paths for a set of revisions?
08:50 circ-user-GW4fr joined #git
08:50 jagob joined #git
08:50 ruskie joined #git
08:50 imjacobclark joined #git
08:53 alanwill joined #git
08:53 j416 Neon: use git log --follow -- path
08:54 j416 Neon: an alternative is to filter-branch the original repo to move the files before you joined it.
08:54 nidr0x joined #git
08:54 ediz_ joined #git
08:55 Neon j416: You mean, undo the joining, move the files in the old repo, then rejoin?
08:55 CrypticGator joined #git
08:55 Neon I.e. adjust the old repo's dir structure?
08:55 j416 yes
08:55 j416 yes
08:56 Neon Cool idea.
08:56 ruskie joined #git
08:57 notebox joined #git
08:57 goTAN joined #git
08:58 j416 Neon: man git-filter-branch has an example using index-filter on how it can be done. I never got that working properly (quoting hell or something), so I just use tree-filter. It is a bit slower to run but more intuitive.
08:58 gitinfo Neon: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
08:59 Hounddog joined #git
08:59 notebox joined #git
09:02 ynanm joined #git
09:03 mischat joined #git
09:03 phanimahesh joined #git
09:04 nidr0x joined #git
09:05 eijk_ joined #git
09:08 lvns joined #git
09:08 cdown joined #git
09:10 acetakwas joined #git
09:10 encod3_ joined #git
09:12 aard_ joined #git
09:13 jagob joined #git
09:14 nidr0x joined #git
09:15 tvw joined #git
09:16 fracting joined #git
09:16 Mowgli joined #git
09:17 vuoto joined #git
09:18 troulouliou_div2 joined #git
09:20 filcab joined #git
09:21 davisonio joined #git
09:24 nidr0x joined #git
09:26 bongjovi joined #git
09:26 imjacobclark joined #git
09:28 Calrik joined #git
09:28 zeroed joined #git
09:30 pol123456 joined #git
09:30 Calrik joined #git
09:31 Calrik joined #git
09:34 jknetl joined #git
09:35 TomyWork joined #git
09:37 Mowgli joined #git
09:40 PCatinean joined #git
09:44 lvns joined #git
09:49 mmlb joined #git
09:49 mdw joined #git
09:52 compeman joined #git
09:52 compeman joined #git
09:54 Dro joined #git
09:56 weckl joined #git
09:58 Firecatcher joined #git
10:00 Firecatcher hi there. What is the fastest way to make nested git root (git submodule) just as a bunch of libraries? I don't have composer on remote server and have to push project
10:00 Calrik joined #git
10:01 acetakwas joined #git
10:02 SoRoot joined #git
10:03 quetz joined #git
10:05 digidog joined #git
10:08 Neon How can I use git subtree add without prefix?
10:08 Neon I just want to kind of sort one repo into another, preserving history.
10:09 tristanp joined #git
10:09 Neon (with the same directory structure)
10:10 inflames joined #git
10:18 dsdeiz joined #git
10:18 dsdeiz joined #git
10:18 compeman_ joined #git
10:19 Mowgli joined #git
10:19 bruce_lee joined #git
10:19 bruce_lee joined #git
10:21 j416 Neon: are you looking to just merge it?
10:21 j416 Neon: what is the goal?
10:21 j416 Neon: (do you need subtree at all?)
10:23 Noldorin joined #git
10:24 Neon j416: Well, I realized your idea. I'm quite nooby concerning git, so I'm just reapplying the snippets I've learned so far rather than having understood all the concepts and backstories and being able to adapt. I have two repos A and B and want to copy all files from B to A, just root to root, preserving both histories. A should then be standalone with all files from A and B (B will be deleted).
10:24 compeman joined #git
10:24 compeman joined #git
10:25 TheVoid joined #git
10:25 j416 Neon: then plain git is enough.
10:26 Neon Add B as remote, pull, merge?
10:26 eletuchy joined #git
10:26 j416 Neon: cd A && git remote add B location/of/b && git fetch B && git merge B/master
10:26 j416 something like this
10:26 j416 Neon: pull == fetch + merge
10:27 Neon :)
10:27 Rodya_ joined #git
10:30 j416 Neon: the point of the git-subtree contrib is to make it easier to merge something into a subdir and keep updating that with changes from the remote. If you don't need that, you probably don't need git-subtree.
10:32 keltvek joined #git
10:33 davisonio joined #git
10:34 Neon j416: Yeah, the confusion came from the fact that I started with the need to merge the repo into a subdir, but then I noticed that it didn't update the paths in the changes, but I wanted it to. So I was still in the subtree-universe, when I actually reduced the whole task to basic functions.
10:34 Neon j416: Thanks for your help.
10:34 Neon Maybe it's because I'm using Tortoise GIT, because I really like the visualizations.
10:35 Neon (and I always forgot the git commands)
10:36 Neon The worst thing is that my first contact with a repository software was SVN so when I learned about git all concepts in my head got confused.
10:38 inflames joined #git
10:39 notebox joined #git
10:39 j416 Neon: don't use tortoise, it's broken
10:40 j416 Neon: tortoise works ok for svn, but the git version (last time I tried it) is not very useful
10:40 j416 Neon: learn cmdline, you won't regret it.
10:40 phanimahesh joined #git
10:41 j416 Neon: you can get visualisation with gitk, gitx (if you're on OS X), tig, etc.
10:41 j416 Neon: or just something similar to !lol
10:41 gitinfo Neon: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
10:41 unicorn914 joined #git
10:44 operanew1 joined #git
10:44 knutstrut joined #git
10:45 kedare joined #git
10:45 Neon j416: Broken? In what way? :o
10:45 j416 Neon: I don't remember. But it was unpleasant.
10:46 j416 Neon: maybe they fixed things by now, not sure. I still think it's a bad UI.
10:46 j416 Neon: git works best (imo) when you think of changes and not files.
10:47 j416 Neon: a change can be something done across many files.
10:47 lf622662 joined #git
10:47 paul424 joined #git
10:48 JeroenT joined #git
10:49 sdothum joined #git
10:49 Neon j416: That's what I call commits at the moment.
10:49 intellix joined #git
10:50 j416 Neon: yes, makes sense.
10:50 goTAN joined #git
10:51 Neon j416: I've built up the repo using Tortoise and I did the fiddling with subtrees and stuff with the console and can't notice anything broken until now. I'm using Tortoise only for display, adding, removing, committing, reverting and such simple things. Maybe these things work properly.
10:52 Neon But I might have a look at other visualizations or the console. Can you recommend me a complete guide to git, because I'd like to get into it a bit more as I will be using it more and more probably. And also I need to know how to use it properly. My commits aren't at the best times I think. :S
10:52 d0nn1e joined #git
10:53 WayToDoor joined #git
10:55 Firecatcher How to push submodule to remote server?
10:55 Firecatcher It's just ignored!
10:55 Firecatcher damn working directory clean
10:58 jaguarmagenta joined #git
11:02 nettoweb joined #git
11:03 fission6 joined #git
11:05 ferr1 joined #git
11:11 ahr3n joined #git
11:11 tvw joined #git
11:15 SoRoot joined #git
11:16 intellix joined #git
11:16 Rodya_ joined #git
11:17 interne7y joined #git
11:18 rahtgaz joined #git
11:19 mdw_ joined #git
11:20 lordjancso joined #git
11:21 mdw joined #git
11:22 Froziph joined #git
11:22 Firecatcher I've added libs from github with composer.json and command `composer update`. Next I push whole project but this libs are not pushed. How to push them?
11:25 mmlb joined #git
11:26 linuxmint joined #git
11:26 gauthier joined #git
11:27 zturner joined #git
11:30 rnsanchez joined #git
11:31 TomyWork joined #git
11:31 fission6 joined #git
11:34 tristanp joined #git
11:41 gauthier joined #git
11:41 creppe joined #git
11:42 gauthier Hi! I just added a red char to my prompt in case the previous command returned an error, and git-log started annoying me
11:43 gauthier As I understand, with `less` as my pager, `git log` does its thing and pipes to `less`.
11:44 fahadash joined #git
11:44 gauthier As soon as I kill `less` with `q`, `git log` is unhappy and exits with SIGPIPE, that is 141
11:44 intellix joined #git
11:44 gauthier it's annoying, since I don't want to get used to seeing an error when there is no actual unexpected error
11:44 gauthier -unexpected
11:45 osse gauthier: What version of git?
11:45 benycze joined #git
11:45 benycze left #git
11:45 gauthier Is there a way to exit `git log` + pager without making it so unhappy?
11:45 j416 q
11:46 gauthier osse: git version 2.5.0
11:46 j416 ah, didn't read
11:46 gauthier :)
11:46 j416 || true ? :D
11:46 osse gauthier: Git should be happy already
11:46 doritos joined #git
11:47 flaguy48 joined #git
11:47 jhass mmh, I can actually confirm that behavior on 2.8.3
11:47 osse gauthier: Have you explicitly configured git to use less, or is it default.
11:47 osse ?
11:47 gauthier default
11:47 gauthier `echo $GIT_PAGER` gives nothing
11:48 osse git config core.pager
11:49 bruce_lee joined #git
11:49 Rodya_ joined #git
11:49 osse env | grep LESS
11:50 gauthier LESSOPEN=| /usr/bin/lesspipe %s
11:50 gauthier LESSCLOSE=/usr/bin/lesspipe %s %s
11:50 gauthier
11:50 gauthier osse: no core.pager in ~/.gitconfig
11:50 gauthier osse: do you mean that you don't see the behavior?
11:50 osse What's that stuff
11:50 gauthier I have no clue
11:51 osse I don't see the same behavior. But maybe I haven't tested on a repo large enough
11:51 osse Ie. that git is done writing before I press q
11:52 gauthier osse: try with `git log -u`, and a small terminal window?
11:53 osse There we go
11:53 osse Yes, same thing
11:55 doritos joined #git
11:56 fracting joined #git
11:58 AlexRussia joined #git
11:58 osse Imho. it would make sense for git log to ignore SIGPIPE in this case.
11:58 gauthier osse: same here.
11:59 osse Well, not completely ignore, but exit successfully in the normal case
12:00 gauthier osse: and I wonder what git-log is still doing in the background.
12:00 osse it's writing to less
12:00 uhmgawa maybe 'git log' could restrict the error report to the case the exec of less failed, but not the write failure to stdout as it knows what's consuming its output.
12:00 gauthier osse: if you `cat <large file> | less`, and exit with `q`, no problem.
12:01 gauthier git log | cat | less :D
12:01 gauthier works
12:01 cqi joined #git
12:01 osse my guess is cat handles sigpipe too, then
12:03 mmlb joined #git
12:03 rom1504 what about dogs
12:03 Rodya_ joined #git
12:03 Sceorem joined #git
12:04 jhe_ joined #git
12:06 osse dogs handle pipes very well: https://s-media-cache-ak0.pinimg.com/736x/35​/32/c1/3532c188a5f3dd34b71d8aa005d517b2.jpg
12:08 osse gauthier: huh, this doesn't exit with 141:  git log -u | less +q
12:09 Darcidride_ joined #git
12:09 JustinHitla joined #git
12:09 JustinHitla what the difference between github.com and github.io ?
12:09 gauthier osse: Mhm... maybe that's why git-log needs to be alive? For coloring?
12:09 moritz JustinHitla: try asking in #github?
12:10 gauthier but... no...
12:10 linuxmint joined #git
12:10 JustinHitla moritz: asked like 10 minutes ago, no one answers
12:10 King_Hual joined #git
12:10 moritz #git -- the better #github
12:10 moritz JustinHitla: github uses github.io for user-generated sites
12:11 moritz mostly to avoid cookie leakage between those and github.com
12:11 italoacasas joined #git
12:11 Rooxo joined #git
12:12 k3rn31 joined #git
12:12 operanew1 left #git
12:12 jhass !crosspost
12:12 gitinfo Note: The above question was posted in both #git and #github
12:13 osse gauthier: the cat example is flawed because  git log -p | less   with an immediate q also exits 0
12:13 espindola joined #git
12:14 osse gitinfo: if you do the latter and echo ${PIPESTATUS[@]} you'll see git exited with 141, and less with 0. Same with cat
12:14 eletuchy joined #git
12:14 rgrinberg joined #git
12:16 rgrinberg joined #git
12:16 rom1504 osse: :D
12:16 JustinHitla left #git
12:16 blackwind_123 joined #git
12:16 shinnya joined #git
12:20 ediz__ joined #git
12:21 ash_workz joined #git
12:22 ahr3n joined #git
12:23 Cata|Work joined #git
12:23 gauthier osse: `git log` somehow hides the pipe, PIPESTATUS[@] gives only one return code
12:24 osse gauthier: that's expected
12:24 osse gauthier: there is no pipe as far as the shell is concerned. Git handles it
12:27 rwb joined #git
12:27 bouncy Hi guys! Do you have any ideas why major distros have not updated git in their repos? Ubuntu has git v1.9 and RHEL has git v1.8.
12:27 osse gauthier: in 'git log | less` then the shell runs both git and less, and sets up a pipe to connect git's stdout to less' stdin.  When you run `git log` then bash only runs git. git itself runs less and writes to it.
12:28 osse in both cases git is killed by sigpipe, as shown by the 141 exit code
12:28 osse alternatively it exits with 141 itself, imitating that it was killed
12:28 gauthier osse: ok.
12:29 Rish joined #git
12:29 gauthier osse: since being killed by sigpipe is the normal use case (right?) then git should not push it further to the shell, I suppose
12:30 osse gauthier: judging by how intricate setting up and running the pager is in Git's source code my guess is that this behaviour is intentional.
12:30 osse gauthier: yes, that's my opinion as well
12:33 fracting joined #git
12:33 SoRoot joined #git
12:33 Rish_ joined #git
12:34 cqi joined #git
12:35 subhojit777 joined #git
12:35 tristanp joined #git
12:36 diegoviola joined #git
12:38 fission6 joined #git
12:39 Firecatcher How to ignore .git folder inside /vendor/* folders?
12:40 xfbs joined #git
12:40 Firecatcher tried create .gitignore with content vendor/.git, vendor/<some_folder>/.git
12:40 Firecatcher it not works
12:41 fission6 joined #git
12:41 Neon Firecatcher: Did you try /vendor/**/.git?
12:42 Firecatcher Neon, nope, I'll try now
12:42 jeffreylevesque joined #git
12:42 jaguarmagenta joined #git
12:43 khelkun joined #git
12:44 LBV_User joined #git
12:44 davisonio joined #git
12:45 irco joined #git
12:46 imjacobclark joined #git
12:46 cbreak Firecatcher: git doesn't ever track .git dirs anyway
12:46 Firecatcher cbreak, but git doesn't push contents of folder that contains .git
12:47 cbreak Firecatcher: it doesn't track them either
12:47 Firecatcher cbreak, yeah, how to fix that?
12:47 cbreak so there's nothing to push
12:47 cbreak delete the .git dir
12:47 cbreak then add them
12:47 cbreak you cannot add directories containing a .git dir to git
12:48 Firecatcher need to clean cache first?
12:48 cbreak no
12:48 cbreak rm the .git dirs
12:48 cbreak then git add the directories
12:48 cbreak IF you have added the directories as submodules, then you have to remove those first
12:50 EvilDMP I cherry-picked using "git cherry-pick improve-apphooks-docs"; I was surprised to find that the content of the commit I was interested in bringing over is all there, but the commit message is not
12:50 Firecatcher cbreak, thx, it worked but how to force git to not watch .git folders?
12:51 EvilDMP Would it have worked differently had I referred directly to the commit when cherry-picking?
12:51 cbreak Firecatcher: it can't
12:51 cqi joined #git
12:51 Firecatcher cbreak, I feel I want to edit sorces and remove that option :)
12:51 cbreak EvilDMP: cherry-pick should also copy the message
12:51 Firecatcher sources*
12:52 cbreak did you get a conflict? If so, it will not make a commit
12:52 EvilDMP cbreak: yes, that must be why
12:52 i7c EvilDMP, that and there is no difference if you specify a hash or any other refspec.
12:52 cbreak Firecatcher: git relies on .git dirs for its internal structure
12:52 cbreak EvilDMP: it will tell you if there's a conflict
12:52 cbreak git status should also tell you
12:52 EvilDMP so unlike merge, it doesn't create a "cherry-pick conflict"
12:52 i7c There can be conflicts.
12:52 EvilDMP so unlike merge, it doesn't create a "cherry-pick commit"  I mean
12:52 raininja joined #git
12:52 EvilDMP Thanks
12:53 gauthier osse: another solution would be an option to tell git-log to run to its end, always. `git-log`, then G (go to end) then q, works.
12:53 i7c Ah, no, it creates a new commit with its own id but there are no merge commits, indeed.
12:53 jhass EvilDMP: once you resolved the conflicts a plain git commit should still have the message
12:54 italoacasas joined #git
12:55 cbreak EvilDMP: it creates a commit
12:56 cbreak but only if there's no conflict
12:56 cbreak just like merge
12:56 al-damiri joined #git
12:56 EvilDMP and once I'd finished resolving the conflicts, I had to create a brand new commit
12:56 EvilDMP thanks
12:56 ash_workz joined #git
12:57 cbreak EvilDMP: it should give you the commit message of the commit you picked
12:57 cbreak just like merging
12:58 EvilDMP cbreak: it didn't appear to, but possibly in all the excitement I missed it
12:58 EvilDMP no matter, git commit --amend has restored it for me
12:58 cbreak EvilDMP: git commit -c someothercommit
12:58 cbreak that'll let you "steal" messages from other commits
12:58 atomicb0mb joined #git
12:58 cbreak you can use that when you make series of similar commit-messaged commits to save on typing too :)
12:59 cbreak (with -c HEAD)
12:59 davisonio joined #git
12:59 Bmw-01 joined #git
12:59 Bmw-01 left #git
12:59 jimi_ joined #git
13:00 EvilDMP thanks
13:01 grift left #git
13:04 chappy joined #git
13:06 SaraDR joined #git
13:06 SaraDR If I put a gitignore file in a subfolder, will it trigger/work for that folder, or do I need to include it from anywhere else?
13:07 moritz SaraDR: it works just like that
13:07 nettoweb joined #git
13:08 fracting joined #git
13:09 SaraDR Super, thanks moritz.
13:09 eletuchy joined #git
13:10 lvns joined #git
13:17 Firecatcher Is there a way to add filed from ignored directory without editing .gitignore?
13:17 Firecatcher files*
13:17 Silenced joined #git
13:17 Silenced joined #git
13:18 jhass Firecatcher: git add -f
13:18 interne7y joined #git
13:18 grift joined #git
13:19 intellix joined #git
13:19 Firecatcher jhass, git add -f that/hidden/folder ?
13:19 rnsanchez_ joined #git
13:20 jhass try and see for yourself?
13:20 Firecatcher jhass, it can be too expensive if -f will add all ignored files
13:21 jhass man git-add then
13:21 gitinfo the git-add manpage is available at http://jk.gs/git-add.html
13:21 Firecatcher ths, u r the best :)
13:22 rbr joined #git
13:22 gws_ joined #git
13:26 Darcidride__ joined #git
13:28 ncthom91 joined #git
13:30 khelkun_ joined #git
13:35 rominronin joined #git
13:40 bollullera joined #git
13:40 bollullera left #git
13:41 NeverDie joined #git
13:43 Rish joined #git
13:43 linuxmint joined #git
13:44 bluepixel joined #git
13:45 grift left #git
13:49 cdg joined #git
13:49 encod3 joined #git
13:51 Heisenberg1276 joined #git
13:52 madewokherd joined #git
13:52 rahtgaz joined #git
13:53 axisys joined #git
13:53 jchonig joined #git
13:54 fscala joined #git
13:55 linuxmint joined #git
13:55 kaldoran joined #git
13:57 bluepixel joined #git
13:59 grift joined #git
14:00 infra-red joined #git
14:02 cyan__ joined #git
14:02 zturner joined #git
14:03 eletuchy joined #git
14:04 flavius joined #git
14:09 Bin4ry joined #git
14:10 Lunatrius` joined #git
14:12 toogley joined #git
14:14 ResidentBiscuit joined #git
14:15 ResidentBiscuit joined #git
14:15 ResidentBiscuit joined #git
14:16 JJM joined #git
14:18 ash_workz joined #git
14:20 linuxmint joined #git
14:20 robinsmidsrod joined #git
14:21 doscta joined #git
14:22 notebox joined #git
14:26 frem_ joined #git
14:27 kaldoran joined #git
14:29 fission6 joined #git
14:31 eletuchy joined #git
14:33 k3rn31 joined #git
14:33 linuxmint joined #git
14:34 sangy joined #git
14:34 Oebele joined #git
14:34 acetakwas joined #git
14:36 ncthom91 joined #git
14:37 sgen joined #git
14:37 thiago_ joined #git
14:38 WayToDoor joined #git
14:39 souther joined #git
14:39 WayToDoor joined #git
14:40 JJM_ joined #git
14:40 eletuchy joined #git
14:41 italoacasas joined #git
14:42 linuxmint joined #git
14:42 invisbl joined #git
14:43 ekinmur joined #git
14:43 pigeon joined #git
14:44 Gitzilla joined #git
14:45 bsanford joined #git
14:47 thiago_ joined #git
14:47 mostlybadfly joined #git
14:47 croberts joined #git
14:48 morenoh149 joined #git
14:55 clemf joined #git
14:56 robinsmidsrod joined #git
14:57 atomicb0mb joined #git
14:58 mekhami left #git
14:59 Spacew00t joined #git
14:59 pol123456 joined #git
15:07 bango2 joined #git
15:11 kilo_bravo joined #git
15:15 phanimahesh joined #git
15:15 ki0_ joined #git
15:16 phanimah1sh joined #git
15:17 kpease joined #git
15:18 phanimah1sh joined #git
15:19 interne7y joined #git
15:19 dmto joined #git
15:21 Rish joined #git
15:21 madewokherd joined #git
15:23 dsdeiz joined #git
15:23 dsdeiz joined #git
15:24 kpease joined #git
15:25 ahmedelgabri joined #git
15:25 eijk joined #git
15:29 morenoh149 left #git
15:29 phaleth joined #git
15:30 eijk_ joined #git
15:30 johnmilton joined #git
15:30 vuoto joined #git
15:32 ahmedelgabri joined #git
15:32 unicorn914 joined #git
15:33 elastix joined #git
15:34 italoacasas joined #git
15:34 Grimm_ joined #git
15:34 LionsMane joined #git
15:35 dmto joined #git
15:37 dimi1947 joined #git
15:39 hobodave joined #git
15:41 ericvw joined #git
15:43 diegoaguilar joined #git
15:43 LeBlaaanc joined #git
15:44 rkazak joined #git
15:44 eczu joined #git
15:45 diogenese joined #git
15:46 ki0 joined #git
15:47 ki0 joined #git
15:47 johnmilton joined #git
15:47 vuoto joined #git
15:47 Zuzo joined #git
15:52 ceaucari joined #git
15:53 xuokl joined #git
15:56 ceaucari joined #git
15:59 NimeshNeema joined #git
16:00 dreiss joined #git
16:01 dopesong joined #git
16:01 hobodave_ joined #git
16:02 tref joined #git
16:04 eletuchy joined #git
16:04 cdown_ joined #git
16:04 hobodave joined #git
16:05 jceb joined #git
16:05 bluehunter90 joined #git
16:06 phanimahesh joined #git
16:06 phanimah1sh joined #git
16:07 mkf joined #git
16:07 InfoTest joined #git
16:09 Bin4ry joined #git
16:09 danteJ joined #git
16:10 troulouliou_div2 joined #git
16:10 heroux joined #git
16:13 rominronin joined #git
16:15 kus joined #git
16:16 irco joined #git
16:17 imahchuchu joined #git
16:18 tomog999 joined #git
16:18 digidog joined #git
16:21 Waut joined #git
16:22 PCatinean joined #git
16:22 pwnz0r joined #git
16:23 subhojit777 joined #git
16:24 InfoTest joined #git
16:26 Fdc joined #git
16:31 algun joined #git
16:32 WayToDoor joined #git
16:32 ahmedelgabri joined #git
16:33 knutstrut joined #git
16:36 spriz joined #git
16:36 tmh1999 joined #git
16:37 rgrinberg joined #git
16:37 axiom_1 joined #git
16:37 davisonio joined #git
16:39 tmh1999 Hi everyone, I have a question and I hope some guru here could help me out :) I have 1 shell script here with one line as : "REPO_ADD='git://github.com/username/project.git' " . I want to change the repo address to my account address and different project name with a branch rather than master. How can I do so ? Something like REPO_ADD='git://github.com/mynam​e/myproject.git?branch=teseting' . Thanks
16:40 dimi1947 joined #git
16:41 ceaucari joined #git
16:41 elementalest joined #git
16:41 elementalest joined #git
16:44 Befd joined #git
16:44 jhass you would have to parse out the query string and pass it to git clone's -b option, git does not support it
16:44 ceaucari joined #git
16:45 tmh1999 jhass : in github, they support the url as : github.com/username/project_name/tree/testing. Can I use it ?
16:45 tmh1999 where testing is the name of the branch
16:46 tmh1999 the problem i have is that the script is too complex, i cannot trace down where the repo is actually cloned in the script in order to do the $clone -b command :(
16:46 jhass no
16:47 santa-fire joined #git
16:48 tmh1999 thanks !
16:48 ceaucari joined #git
16:49 ahmed_elgabri joined #git
16:49 austincheney joined #git
16:49 dreiss joined #git
16:49 austincheney where can I get information about the git URI scheme?
16:50 osse austincheney: man git-clone
16:50 gitinfo austincheney: the git-clone manpage is available at http://jk.gs/git-clone.html
16:50 austincheney awesome thanks
16:50 Kicer86 joined #git
16:50 robotroll joined #git
16:52 GavinMagnus left #git
16:53 austincheney from reading the man page it appears the git scheme is identical to http (insecure)
16:53 thiago joined #git
16:53 thiago joined #git
16:54 alanwill joined #git
16:54 Zcpk joined #git
16:55 jhass yes
16:56 jhass https is recommended these days for most instances
16:56 kilo_bravo joined #git
16:56 pullphinger joined #git
16:57 ahmed_elgabri joined #git
16:58 Darcidride joined #git
16:58 Rish joined #git
16:59 vuoto_ joined #git
17:00 ahmedelgabri joined #git
17:01 vuoto_ joined #git
17:01 unbalancedparen joined #git
17:02 _ikke_ or ssh
17:04 mdw joined #git
17:05 infra-red joined #git
17:07 phanimahesh joined #git
17:08 ochorocho__ joined #git
17:08 phanimahesh joined #git
17:10 rgrinberg joined #git
17:10 d4rklit3 joined #git
17:12 phanimah1sh joined #git
17:13 rgrinberg joined #git
17:14 rominronin joined #git
17:16 The_Woodsman joined #git
17:17 ahmed_elgabri joined #git
17:17 TomyLobo joined #git
17:19 Mouaad joined #git
17:22 cdown joined #git
17:22 belak joined #git
17:23 aard_ joined #git
17:23 constantinexvi joined #git
17:24 Scriptonaut joined #git
17:24 kpease joined #git
17:25 atomicb0mb joined #git
17:26 Scriptonaut hey guys, I setup a new machine to dev on. On the old machine, if I had a remote branch, like: "origin/production", then I could just do: git checkout production, and it would create a new local branch production, reset it to origin/production, and then set tracking on it. This isn't working on the new machine. How do I set this behavior up?
17:26 kpease joined #git
17:26 vuoto joined #git
17:26 diegoviola joined #git
17:26 _ikke_ Scriptonaut: This only works if you have one remote added
17:27 _ikke_ But should work by default
17:27 vuoto joined #git
17:27 Rish joined #git
17:27 fahadash joined #git
17:27 Scriptonaut _ikke_: what do you mean "one remote added"
17:28 Scriptonaut I have 4 remotes
17:28 Scriptonaut origin, acceptance, staging, and production
17:28 _ikke_ right
17:28 bluepixel joined #git
17:28 _ikke_ THen git does not know what branch to checkout
17:28 Scriptonaut oh
17:28 Scriptonaut is there a way to set it to default to origin?
17:28 _ikke_ afaik not
17:29 Scriptonaut :(
17:29 Scriptonaut There is more than one remote on the other machine and it works
17:29 LeBlaaanc joined #git
17:29 _ikke_ Do they share the same branches?
17:29 Scriptonaut yes
17:29 bluepixel joined #git
17:29 Scriptonaut oh, I guess not all of them
17:29 Scriptonaut the only ones they share are master and production
17:29 Scriptonaut ah, that's probably the issue, thank you for explaining it to me
17:29 durham joined #git
17:30 maroloccio joined #git
17:30 _ikke_ np
17:31 Sasazuka joined #git
17:32 SwiftMatt joined #git
17:33 Scriptonaut left #git
17:34 nilg joined #git
17:36 alanwill_ joined #git
17:36 eletuchy joined #git
17:36 italoacasas joined #git
17:36 d4rklit3 joined #git
17:37 belak joined #git
17:38 Juzzika joined #git
17:39 stonerfish joined #git
17:41 cdown joined #git
17:42 djb-irc joined #git
17:42 drodger joined #git
17:44 The_Woodsman I created some folders with the wrong naming scheme. I should have called them some_folder but instead I did SomeFolder. now, the remote master is showing the folders with the name SomeFolder even though on my own local files (which i have pushed) the folders are correctly named. Does anyone know how I can fix a remote master having the wrong names for folders when pushing with the correct names seems useless?
17:46 austincheney The_Woodsman, then just delete them from the remote, rename them on the local, and push them back to the remote
17:46 paul424 joined #git
17:46 _ikke_ You don't push files or directories, you push commits
17:46 austincheney true, commit the changes with the renamed directory, and push it
17:47 The_Woodsman deleting and pushing my local commit will work, i think. thanks
17:47 ceaucari joined #git
17:48 _ikke_ Just renaming + comitting + pushing is enough, or amending the commit with the wrong names (requires rewriting history)
17:49 evi joined #git
17:50 unbalancedparen joined #git
17:51 dustinm joined #git
17:51 rgrinberg joined #git
17:51 nitin joined #git
17:51 doritos joined #git
17:52 The_Woodsman _ikke_: the weird thing is, renaming + committing + pushing is apparently not enough, the "bad" names have persisted. so i think I'll have to delete it and push the local copies with the good names
17:54 SaraDR left #git
17:55 _ikke_ Doesn't look like a git problem to me
17:56 _ikke_ Pushing git does not update any files by default
17:56 _ikke_ (in the working tree)
17:56 Sound joined #git
17:56 _ikke_ by default, git denies pushing to a non-bare repository
17:56 PCatinean joined #git
17:57 ncthom91 joined #git
17:57 _ikke_ So it looks like something else updates (or fails to update) those directories.
17:59 Dyonisos joined #git
17:59 flopsec joined #git
18:00 livingstn joined #git
18:02 rgrinberg joined #git
18:02 alanwill joined #git
18:02 tristanp joined #git
18:05 ochorocho__ joined #git
18:06 k3rn31 joined #git
18:06 jophish__ left #git
18:06 jophish joined #git
18:06 jophish Hi all
18:06 khmarbaise joined #git
18:06 rgrinberg joined #git
18:07 fscala joined #git
18:07 IWishIKnew joined #git
18:07 _ikke_ ohai
18:07 italoacasas joined #git
18:08 davisonio joined #git
18:09 djb-irc joined #git
18:10 D-Boy joined #git
18:10 slayerjain joined #git
18:11 dreiss joined #git
18:12 BSaboia joined #git
18:12 tyreld joined #git
18:13 baxx joined #git
18:13 Rooxo joined #git
18:13 rominronin joined #git
18:16 ceaucari joined #git
18:16 tvw joined #git
18:18 Rish joined #git
18:18 todd_dsm_work joined #git
18:19 fees joined #git
18:19 ochorocho__ joined #git
18:20 todd_dsm_work joined #git
18:22 todd_dsm_work joined #git
18:23 cmyers left #git
18:24 mmlb joined #git
18:24 alanwill_ joined #git
18:24 phanimahesh joined #git
18:25 espindola joined #git
18:26 Rish joined #git
18:29 d5sx43 joined #git
18:30 krsr joined #git
18:31 djb-irc joined #git
18:31 Rish joined #git
18:32 tristanp joined #git
18:37 d5sx43 joined #git
18:38 yqt joined #git
18:38 drodger joined #git
18:38 yqt joined #git
18:40 cyan__ joined #git
18:40 spudowiar AHA!
18:40 spudowiar Found it!
18:40 spudowiar git add -N!
18:40 Bin4ry joined #git
18:40 mmlb joined #git
18:41 _ikke_ congratz
18:41 _ikke_ random eureka of the day
18:41 Esya_ joined #git
18:42 jj995 joined #git
18:42 multi_io joined #git
18:43 jj995 "git config user.name" shows no output and fails with exit code 1 -- any ideas why?
18:43 _ikke_ did you set a user name?
18:44 irco joined #git
18:44 jj995 _ikke_: yes, I'm on windows, and when I manually run "git config user.name" from the git bash window it successfully shows the username, but when I run from a script (Jenkins) it fails, and I'm trying to figure out what part of environment or something is missing
18:45 _ikke_ As what user does jenkins run?
18:45 jj995 _ikke_: the same user that I am manually running the command from (confirmed with whoami)
18:46 eletuchy joined #git
18:46 rgrinberg joined #git
18:49 jj995 ok, nevermind, I got it, HOMEPATH needed to be defined
18:49 eletuchy joined #git
18:52 osse why does jenkins need user.name configured?
18:52 osse if you're making jenkins create commits Imma open a can of whoopass
18:54 Balliad joined #git
18:54 Limes_ joined #git
18:55 Balliad joined #git
18:55 jj995 osse: no, Jenkins isn't committing, git config returning failure error code seemed easier to troubleshoot than git pull hanging. now both are working
18:55 osse arrrrggghhhh
18:55 osse if pull shat its pants then it tried to create a commit
18:56 * osse gets a can opener
18:56 osse tee hee
18:57 jj995 well, I guess it is creating commits, because it simulates merging a branch to master and commits on a temporary branch for that.  seems harmless though, since I'm not pushing
18:58 SJr joined #git
18:58 osse in that case carry on
18:59 jj995 osse: I'm glad to have your blessing :)
19:00 paul424 joined #git
19:00 johnny5 joined #git
19:02 diogenese joined #git
19:03 satbyy joined #git
19:03 Urbany joined #git
19:04 bluepixel joined #git
19:05 ochorocho__1 joined #git
19:06 tristanp joined #git
19:06 WizJin joined #git
19:09 Grimm_ joined #git
19:11 diegoviola joined #git
19:12 Rish_ joined #git
19:12 nilg joined #git
19:14 rominronin joined #git
19:16 nwkj86 joined #git
19:17 ochorocho__ joined #git
19:18 ceaucari joined #git
19:20 ahmedelgabri joined #git
19:21 interne7y joined #git
19:23 dsdeiz joined #git
19:23 dsdeiz joined #git
19:23 arand joined #git
19:26 chappy left #git
19:31 CJKinni joined #git
19:32 gavin joined #git
19:32 NimeshNeema joined #git
19:34 dmto joined #git
19:35 netj joined #git
19:35 cdown_ joined #git
19:35 digidog joined #git
19:36 ekinmur joined #git
19:36 vuoto joined #git
19:42 whatevsz joined #git
19:43 k3rn31 joined #git
19:45 rahtgaz joined #git
19:45 mischat joined #git
19:46 cdown_ joined #git
19:48 IWishIKnew joined #git
19:48 hecliunyx joined #git
19:48 vF3hNGxc47h8 joined #git
19:49 plasticboy joined #git
19:50 raininja joined #git
19:51 Raging_Hog joined #git
19:52 synthmeat joined #git
19:53 crayon joined #git
19:53 synthmeat joined #git
19:56 aswen joined #git
19:58 fission6 joined #git
20:03 Hogofwar joined #git
20:03 Lorcatar joined #git
20:07 LeBlaaanc joined #git
20:07 nettoweb joined #git
20:07 rkazak joined #git
20:08 d4rklit3 joined #git
20:09 drodger joined #git
20:10 Bin4ry joined #git
20:10 flupke joined #git
20:10 angelsl joined #git
20:12 XDS2010 joined #git
20:12 circ-user-NuHgv joined #git
20:14 Schwarzbaer joined #git
20:16 austincheney joined #git
20:16 siprbaum joined #git
20:16 rominronin joined #git
20:17 xao joined #git
20:17 boudicca joined #git
20:19 skinux joined #git
20:19 skinux I just tried pushing local to GitHub and it said everyting is up to date. That is impossible.
20:20 jhass it's quite possible
20:20 skinux I just pushed to a new local branch and the original branch doesn't have changes I've made.
20:20 skinux So, GitHub CANNOT be up to date
20:20 grawity ...what do you mean, "pushed to a new local branch"
20:20 skinux I mean I commited to a new local branch
20:21 DirtyCajun joined #git
20:21 grawity ok, and pushed to GitHub using what command
20:21 skinux git push then entered username and password
20:21 jhass the correct command is git push origin new_local_branch
20:21 BtbN +-u
20:23 clemf joined #git
20:23 f3r70rr35f joined #git
20:23 clemf joined #git
20:23 ahmedelgabri joined #git
20:25 ekinmur joined #git
20:27 shgysk8zer0 joined #git
20:27 skinux Thanks
20:27 skinux left #git
20:27 akushner joined #git
20:28 shgysk8zer0 joined #git
20:32 sybariten left #git
20:33 LionsMane joined #git
20:33 GavinMagnus joined #git
20:36 Vinnie_win joined #git
20:36 Chill_Surf joined #git
20:40 Rish joined #git
20:40 Rodya_ joined #git
20:40 ojdo joined #git
20:40 radsy joined #git
20:42 GavinMagnus left #git
20:42 kilo_bravo joined #git
20:44 dsdeiz joined #git
20:45 diogenese joined #git
20:47 elastix joined #git
20:50 aswen joined #git
20:51 cdown_ joined #git
20:52 romerocesar joined #git
20:52 ahmedelgabri joined #git
20:54 crose joined #git
20:57 Alit joined #git
20:58 m0viefreak joined #git
21:00 drodger joined #git
21:00 ahmed_elgabri joined #git
21:06 Guest54 joined #git
21:06 anth0ny joined #git
21:08 flavius joined #git
21:09 rnsanchez joined #git
21:11 elastix joined #git
21:15 allcentury joined #git
21:15 ajf- joined #git
21:16 Grimm_ joined #git
21:17 mangolisk joined #git
21:18 rominronin joined #git
21:18 CrazyBonz joined #git
21:20 unicorn914 joined #git
21:20 swami_ joined #git
21:21 fission6 joined #git
21:22 interne7y joined #git
21:23 romerocesar joined #git
21:25 boombatower joined #git
21:27 mellernoia joined #git
21:27 axiom_1 joined #git
21:28 Juzzika joined #git
21:28 ahr3n joined #git
21:29 dsdeiz joined #git
21:29 dsdeiz joined #git
21:30 chachasmooth joined #git
21:39 nivag https://git-scm.com is showing 2.8.4 as the latest stable version & has for some days, but the banner here is still saying 2.8.3.  However, I suspect the official stable version will soon change to 2.9.0 (as per my last git pull)
21:41 Fijit joined #git
21:44 editshare-ericf joined #git
21:44 zeroed joined #git
21:44 sdothum joined #git
21:46 joki joined #git
21:50 _ikke_ .version
21:50 Topic for #git is now Welcome to #git, the place for git help and comedy salvation | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git pull a day keeps the conflict's away
21:51 _ikke_ :-)
21:52 SwiftMatt joined #git
21:52 jhass oh, parses https://www.kernel.org/pub/software/scm/git/ I guess?
21:53 aca20031 joined #git
21:54 aca20031 hey gentlemen, I'm dealing with a big repo with lots of submodules and I'm noticing that when I submodule update --checkout, some of them checkout a particular commit (not the latest commit to the branch)
21:54 aca20031 but I cant find any place the commit is specified (.gitmodules or .git/config)
21:54 NaN joined #git
21:54 aca20031 where might it be deciding which commit to checkout?
21:54 NaN how can I retreive files from stash? I get 'Could not restore untracked files from stash' :(
21:56 AaronMT joined #git
21:56 LionsMane joined #git
21:57 raininja joined #git
21:58 nettoweb joined #git
21:58 arescorpio joined #git
21:59 sbeller_ aca20031: git submodule update --remote ?
22:00 aca20031 won't work appropriately because our master branches are named "develop" not master, and the branch isnt configured in .gitmodules
22:00 aca20031 which I know I could fix, but I dont understand how its deciding on which commit to use currently
22:01 mase-tech joined #git
22:01 sbeller_ the one recorded in the index, i.e. if you do a git submodule update --remote (assume that works), git add . && git commit && git push; then another dev would get the latest submodules
22:01 sbeller_ you can configure the branches in .git/config IIUC, too
22:02 amdi_ joined #git
22:03 Hogofwar I've got a branch of commits, how would I split each commit into it's own branch, without being based on any of the previous commits in the branch?
22:03 romerocesar joined #git
22:04 jhass Hogofwar: git checkout -b new_branch master; git log old_branch; git cherry-pick <sha_of_desired_commit>
22:04 jhass repeat for each
22:05 blackwind_123 joined #git
22:05 aca20031 doesn't quite make sense. For example if i git submodule update --checkout --force I get : Submodule path 'build/cmake': checked out '8ed3354a70974ec775eee94cdce57810deeda65f'
22:05 DirtyCajun joined #git
22:05 aca20031 but, D:\git\nano\build\cmake>git branch; * (HEAD detached at 8ed3354);  master
22:06 aca20031 it decided to checkout 8ed3354 even though master doesnt point there
22:09 OliverJAsh joined #git
22:09 pigeon joined #git
22:12 MattMaker joined #git
22:13 digitalpeer joined #git
22:14 ahmed_elgabri joined #git
22:16 AaronMT joined #git
22:18 ceaucari joined #git
22:19 rominronin joined #git
22:21 rgrinberg joined #git
22:24 italoacasas joined #git
22:29 ncthom91 joined #git
22:29 CheckDavid joined #git
22:30 cdown joined #git
22:35 empty_ joined #git
22:36 tubaman joined #git
22:37 empty_ hello
22:37 gitinfo empty_: 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.
22:37 empty_ yay i can speak :)
22:37 empty_ hey everyone
22:37 WaReZ joined #git
22:38 NaN help! I'm getting "Could not restore untracked files from stash"
22:38 artemisart joined #git
22:41 empty_ does anyone know of an irc channel where people speak?
22:41 shgysk8zer0 joined #git
22:41 empty_ about code or something
22:42 nnyk joined #git
22:44 nb_bez___ joined #git
22:44 sol56 joined #git
22:45 unbalancedparen joined #git
22:45 Gamecubic joined #git
22:47 jstimm joined #git
22:48 bremner empty_: ##programming
22:52 jamesd joined #git
22:53 ceaucari joined #git
22:55 rkazak joined #git
22:58 diogenese joined #git
23:00 eletuchy joined #git
23:02 akushner joined #git
23:04 ceaucari joined #git
23:07 akushner joined #git
23:08 NaN I tried this >> https://gist.github.com/de​magu/729c0a3605a4bd2e4c3d << but I still get the message
23:09 raininja joined #git
23:11 inflames joined #git
23:12 atomicb0mb joined #git
23:13 nitin joined #git
23:17 bobdel joined #git
23:17 garethdaine joined #git
23:20 rominronin joined #git
23:21 Impaloo joined #git
23:21 ffabi joined #git
23:22 ahmed_elgabri joined #git
23:23 interne7y joined #git
23:24 romerocesar joined #git
23:26 son_ joined #git
23:26 Impaloo joined #git
23:26 Motoko joined #git
23:30 mattfoo joined #git
23:32 bobdel joined #git
23:32 pandeiro joined #git
23:36 Impaloo joined #git
23:40 JJM joined #git
23:43 Impaloo joined #git
23:47 mablae__ joined #git
23:50 drodger joined #git
23:56 Xz joined #git
23:56 Xz hi there, I have a git SHA of a commit. How do I find out which branch it comes from?
23:59 madewokherd joined #git
23:59 ekinmur joined #git
23:59 durham_ joined #git

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