Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-22

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

All times shown according to UTC.

Time Nick Message
00:04 ahr3n joined #git
00:05 cyberz joined #git
00:07 durham_ joined #git
00:11 thedudez0r 8/join #virtualbo
00:13 eikhorst joined #git
00:17 Cabanossi joined #git
00:17 Anja joined #git
00:19 ramsub07 joined #git
00:21 bufferoverflow joined #git
00:21 enav joined #git
00:21 enav hello ... can i create a git repo with ssh only on a remote server?
00:23 peterbecich joined #git
00:23 wxg joined #git
00:24 thiago_ joined #git
00:25 enav is that even possible?
00:25 aeon joined #git
00:27 xaviergmail joined #git
00:27 elsevero joined #git
00:29 cyberz joined #git
00:29 bremner you need git on the server to do anything useful
00:31 watabou joined #git
00:31 elsevero can I clone a git repo and keep on disk only a folder from the repo ?
00:32 bremner yes. you can search for "narrow checkout" if you want to do future git operations
00:33 cagomez joined #git
00:34 fragMental joined #git
00:34 raspado_ joined #git
00:34 cyberz joined #git
00:35 raspado_ joined #git
00:36 roelmonnens joined #git
00:39 juvenal joined #git
00:40 watabou joined #git
00:40 Anja joined #git
00:46 sz0 joined #git
00:46 cyberz joined #git
00:48 steeze joined #git
00:51 seni1 joined #git
00:52 Gsham joined #git
00:52 Rotaerk joined #git
00:52 svm_invictvs joined #git
00:53 cyberz joined #git
00:56 enav joined #git
00:59 Ranhir joined #git
00:59 kbs joined #git
01:00 Anja_ joined #git
01:02 raijin joined #git
01:05 Gustavo6046 joined #git
01:06 cyberz joined #git
01:07 a_thakur joined #git
01:08 Gsham joined #git
01:10 peeps[lappy] joined #git
01:12 alexandre9099 joined #git
01:17 Cabanossi joined #git
01:17 markovh joined #git
01:19 matoro joined #git
01:21 lgff joined #git
01:22 lgff joined #git
01:25 kkimdev joined #git
01:26 kkimdev I made a Github pull request dashboard =D http://gad.m19g.com/ (just barely functional, need to clean up quite a bit)
01:27 Derperperd joined #git
01:28 Gsham joined #git
01:29 bufferoverflow joined #git
01:30 osk| joined #git
01:31 roelmonnens joined #git
01:33 cyberz joined #git
01:36 Derperperd joined #git
01:37 watabou joined #git
01:38 brent__ joined #git
01:41 kbs ah, so have all the diffs in one place across all requests? Is that the idea?
01:42 * kbs moves to #github
01:43 cyberz joined #git
01:44 rwb joined #git
01:46 StuartMI joined #git
01:47 Cabanossi joined #git
01:47 roelmonnens joined #git
01:48 kkimdev left #git
01:50 peterbecich joined #git
01:50 anuxivm left #git
01:51 duderonomy joined #git
01:53 cyberz joined #git
01:53 xissburg joined #git
01:57 skirk joined #git
01:58 cyberz joined #git
02:00 pks joined #git
02:01 buffffal00 joined #git
02:03 shgysk8zer0 joined #git
02:05 Chinggis6 joined #git
02:06 cyberz joined #git
02:06 xissburg joined #git
02:07 marianina8 joined #git
02:07 juvenal joined #git
02:09 Xarodon joined #git
02:10 jameser joined #git
02:10 StuartMI joined #git
02:12 Sample joined #git
02:12 netj joined #git
02:13 skirk joined #git
02:13 cyberz joined #git
02:13 njbair joined #git
02:13 xaviergmail joined #git
02:17 YouCallItFar joined #git
02:18 d^sh joined #git
02:19 dsdeiz joined #git
02:19 dsdeiz joined #git
02:19 YouCallItFar i have a bunch of projects as github repositories that share a common dependency thats a github repository.  when im building all thr projects i want them to share the dependency, so i create a super project that contains them all as dependency.  but then i want to do CI on individual project.  but i dont want to add common dependency as submodule to every project.  any ideas?
02:19 DarkPsydeLord joined #git
02:19 YouCallItFar contains them all as *submodule
02:21 nezZario Hey ..
02:21 nezZario What is the easiest way to break a commit up into more commits ?
02:22 nezZario admittedly, we have a really screwed up setup atm -- we don't have proper dev env.'s so the staging server and the repo are always way outta sync -- but I always go in and catch things up every week or so
02:23 nezZario One of our new developers got antsy and did ... git add .; git commit on and committed 100's of files .. a lot of which needed to go on ignore
02:24 nezZario now it has probably 15-20 commits on top of it ... it is on a feature branch ... so what would be the best course to basically .. merge in all the commits on that branch up until the commit before .. then break that commit up into several commits (and not including some changes).. and then lay the commits afterwards on top (which shouldn't be affecting any
02:24 nezZario of the files that are left out of the breaking-up process) ?
02:25 finalbeta joined #git
02:26 steeze joined #git
02:30 rewt nezZario, make a new branch at the last "good" commit, and cherry pick each commit over, editing as necessary, then delete the feature branch and re-make it at the tip of the cherry picks
02:30 dsdeiz joined #git
02:30 dsdeiz joined #git
02:30 rewt then you'll need to force push, and everyone will need to reset their local repo
02:30 rewt !history
02:30 gitinfo [!clean_history] For a pointer on how to handle history in git see this e-mail from Linus: http://thread.gmane.org/gmane.comp.video.dri.devel/34744
02:30 rewt !rewrite
02:30 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
02:32 ahrs joined #git
02:32 watabou joined #git
02:34 c137 joined #git
02:34 nezZario rewt: i shouldn't really need to force push as long as I just go from feature branch -> dev with my cherry picking ?
02:35 nezZario like if I go ... feature/messy-branch -> feature/cleaned-up-branch -> develop
02:35 Rotaerk force lightning is better
02:35 rewt you only need to force push if you intend to rewrite the feature branch on the remote;  if you're going to delete it anyways, then no force push required
02:36 Lyqyd joined #git
02:37 Goplat joined #git
02:38 livingstn joined #git
02:39 anth0ny joined #git
02:40 Sample joined #git
02:42 Ranhir joined #git
02:46 chardan joined #git
02:46 njbair joined #git
02:46 ankit01ojha joined #git
02:46 sunri5e joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.1 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 nezZario ok great .. thanks
02:51 YouCallItFar nm / answered by "mu"
02:51 YouCallItFar left #git
02:53 marianina8 joined #git
02:55 nezZario One other unrelated thing .. does something like foo/bar/*/blah not work in .gitignore's or am I doing something else wrong ?
02:57 roelmonnens joined #git
02:59 chardan joined #git
03:00 mizu_no_oto joined #git
03:02 pks joined #git
03:05 ojdo joined #git
03:15 lagothri1 joined #git
03:17 Cabanossi joined #git
03:18 chachasmooth joined #git
03:20 fahadash joined #git
03:24 anth0ny joined #git
03:25 matumbo` joined #git
03:25 livas joined #git
03:27 inflames joined #git
03:27 cyberz joined #git
03:28 cagomez joined #git
03:30 robattila256 joined #git
03:30 snowalpaca joined #git
03:31 snowalpa_ joined #git
03:34 anth0ny joined #git
03:36 livas joined #git
03:36 howdoi joined #git
03:37 TikityTik joined #git
03:37 livas wow
03:38 livas amazing site
03:38 cyberz joined #git
03:40 xissburg joined #git
03:42 SmashingX joined #git
03:42 SmashingX I would like to create a submodule, but I can’t find much information on the internet
03:42 SmashingX :/
03:43 safe joined #git
03:44 dave0x6d joined #git
03:45 venmx joined #git
03:45 madprops left #git
03:45 pur3eval joined #git
03:45 hexagoxel joined #git
03:47 xissburg joined #git
03:47 Cabanossi joined #git
03:49 mehola joined #git
03:49 svm_invictvs joined #git
03:49 OODani joined #git
03:51 OODani Is there a way to reference "the index" where you'd normally reference a revision? In particular, I want to use git-guilt (either the Node or Python versions, doesn't matter) to calculate the guilt of the staged changes and then include it in the commit message. Currently I'm just using a post-commit hook to do this, but that means every commit needs to be --amended and signed twice and I don't really like that.
03:52 seni1 joined #git
03:56 Pseudocrat joined #git
03:56 Pseudocrat joined #git
03:57 evanextreme joined #git
03:57 raijin joined #git
04:00 Noldorin joined #git
04:02 spinningarrow[m] joined #git
04:05 a_thakur joined #git
04:05 a_thakur joined #git
04:07 dsdeiz joined #git
04:09 learning joined #git
04:11 kyan joined #git
04:17 dreiss joined #git
04:17 Cabanossi joined #git
04:17 xissburg joined #git
04:18 dsdeiz joined #git
04:23 bocaneri joined #git
04:25 bocaneri joined #git
04:31 StuartMI joined #git
04:32 sbulage joined #git
04:38 Random832 OODani, don't know about git-guilt, but there's a pic out there with a guide for git diff http://images.abizern.org.s3.amazonaws.com/365git/Feb11/Git%20Diff%202.png
04:38 skirk joined #git
04:41 pks joined #git
04:45 dmc joined #git
04:46 Cabanossi joined #git
04:47 lucido-cl joined #git
04:47 SmashingX joined #git
04:47 diogenese joined #git
04:48 SwiftMatt joined #git
04:48 mrslaughter1775 joined #git
04:51 SwiftMatt joined #git
04:59 marianina8 joined #git
04:59 Muzer joined #git
05:01 thiago joined #git
05:12 graff left #git
05:14 learning joined #git
05:15 moei joined #git
05:15 a3Dman joined #git
05:18 regedit joined #git
05:19 tmg joined #git
05:19 a_thakur joined #git
05:21 a_thakur joined #git
05:21 martinhez joined #git
05:23 Vortex34 joined #git
05:24 MineCoins joined #git
05:27 matoro_ joined #git
05:30 xall joined #git
05:31 svm_invictvs joined #git
05:33 evanextreme joined #git
05:34 cagomez joined #git
05:34 imack joined #git
05:38 HoloIRCUser joined #git
05:38 durham joined #git
05:39 ayogi joined #git
05:39 durham joined #git
05:42 brent__ joined #git
05:44 Silenced joined #git
05:44 snits joined #git
05:45 Silenced joined #git
05:46 Cabanossi joined #git
05:47 _ikke_ OODani: you can also use git show :filename to get the complete file from the index
05:47 _ikke_ (the colon is significant)
05:50 rscata joined #git
05:54 a_thakur joined #git
05:55 freimatz joined #git
06:02 ckruczek joined #git
06:03 Skyfinn joined #git
06:04 cdown joined #git
06:07 dec0n joined #git
06:09 a3Dman joined #git
06:17 krabat joined #git
06:17 dan2k3k4 Anyone have any nice scripts for easily creating a branch based off another branch (e.g. "prod" instead of "master") - which just has one file and submits it as a PR to multiple repos ?
06:18 dan2k3k4 have to update some setting file in all our internal projects and wanted to create PRs so internal teams can check and merge themselves
06:19 zapb_ joined #git
06:20 * _ikke_ checks his scripts folder.. Nope
06:20 Hobbyboy joined #git
06:21 themill joined #git
06:22 imack joined #git
06:23 dan2k3k4 I remember reading about, I think it was the Google team, submitting PRs to all github repos which had some obvious flaw or they had their own password inside their repo...
06:23 dan2k3k4 but can't find the post :/
06:23 merrytimes joined #git
06:25 barteks2x joined #git
06:27 Silenced joined #git
06:35 cdown joined #git
06:36 infinite joined #git
06:37 freimatz3 joined #git
06:37 infinite joined #git
06:38 lucido-cl joined #git
06:39 infinite joined #git
06:40 freimatz joined #git
06:40 sbulage joined #git
06:41 Mo joined #git
06:42 Mo Hi, sometimes I see this error on git pull: https://bugs.gentoo.org/show_bug.cgi?id=500358#c8     error: unable to unlink old 'metadata/md5-cache/x11-themes/qtcurve-9999-r1': Permission denied
06:42 Mo Only way to fix that is  git reset --hard origin/master. Why do I need to do that?
06:43 ns5 joined #git
06:43 ns5 how can I revert a particular commit?  (not the last one)
06:43 dersand joined #git
06:43 ckruczek ns5: git revert <commit-id>
06:44 ckruczek !revert
06:44 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
06:44 ns5 ckruczek: thank you!
06:46 ns5 left #git
06:46 kexmex joined #git
06:52 adymitruk joined #git
06:52 austin987 joined #git
06:52 roelmonnens joined #git
06:54 raspado joined #git
06:54 adymitruk hello
06:54 ThomasLocke joined #git
06:54 ThomasLocke joined #git
06:54 ckruczek joined #git
06:57 Raging_Hog joined #git
06:59 PCatinean joined #git
07:01 tristanp joined #git
07:03 Silmarilion joined #git
07:06 go1111111 joined #git
07:06 freimatz joined #git
07:08 zeroed joined #git
07:08 infinite joined #git
07:11 a3Dman joined #git
07:13 sbulage joined #git
07:14 cdown joined #git
07:15 cdown_ joined #git
07:19 roelmonnens joined #git
07:20 warthog9 joined #git
07:20 star_prone joined #git
07:22 sbasso joined #git
07:24 qt-x joined #git
07:25 zeroed joined #git
07:25 zeroed joined #git
07:27 t0by joined #git
07:27 t0by joined #git
07:27 JeroenT joined #git
07:27 geoid joined #git
07:28 schleppel joined #git
07:29 Murii_ joined #git
07:30 blahdodo joined #git
07:31 Cabanossi joined #git
07:31 jnavila joined #git
07:38 ti2 joined #git
07:39 chele joined #git
07:41 overlord_tm joined #git
07:41 MineCoins joined #git
07:45 elect__ joined #git
07:48 aidalgol joined #git
07:49 Pulp joined #git
07:51 elect__ joined #git
07:52 rapidshot64 left #git
07:52 ljc joined #git
07:54 Brski joined #git
07:55 zefferno joined #git
07:59 ToxicFrog joined #git
08:00 theoceaniscool_ joined #git
08:00 JeroenT_ joined #git
08:01 Tobbi joined #git
08:01 JeroenT_ joined #git
08:02 JeroenT__ joined #git
08:03 PCatinean joined #git
08:03 govg joined #git
08:03 JeroenT_ joined #git
08:07 theoceaniscool_ joined #git
08:10 rokups joined #git
08:12 dvaske joined #git
08:13 geoid joined #git
08:13 suy joined #git
08:14 dvaske_ joined #git
08:17 kexmex joined #git
08:19 ronskisika joined #git
08:20 miczac joined #git
08:20 ronskisika joined #git
08:22 bwn joined #git
08:26 a_thakur joined #git
08:27 King_Hual joined #git
08:27 King_Hual joined #git
08:28 tvw joined #git
08:30 a_thakur joined #git
08:31 Cabanossi joined #git
08:31 fakenerd joined #git
08:32 kurkale6ka joined #git
08:33 WeiJunLi joined #git
08:34 JeroenT joined #git
08:35 JeroenT joined #git
08:36 lb1c joined #git
08:36 foul_owl joined #git
08:38 masuberu joined #git
08:38 zeroed joined #git
08:44 Balliad joined #git
08:46 Dro joined #git
08:48 Dro for the command "git push -u" , what does the -u option do?
08:48 _ikke_ It's short for --set-upstream-to
08:48 _ikke_ !remote_tracking
08:48 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
08:49 mindfart joined #git
08:51 Tantamounter joined #git
08:52 nowhereman joined #git
08:55 MineCoins joined #git
08:56 WayToDoor joined #git
08:57 sbulage joined #git
08:57 mda1 joined #git
08:58 Dro i used the command git remote add origin in a wrong folder, how can i undo this ?
09:01 algun joined #git
09:01 kadoban Did it actually do anything? Most repos will already have an origin, and any non-repo it won't do anything in anyway.
09:02 evanextreme joined #git
09:02 kadoban But 'git remote remove' exists ... I strongly suspect you usually don't need it though, in fact it'll usually be breaking something if you remove origin, for the reason above.
09:03 mikecmpbll joined #git
09:04 inflames joined #git
09:05 theoceaniscool_ joined #git
09:06 ronator joined #git
09:06 marcogmonteiro joined #git
09:09 sunri5e joined #git
09:09 _ikke_ Dro: git remote rm origin?
09:10 _ikke_ meh, late
09:10 Dro _ikke_, thx
09:10 juvenal joined #git
09:13 Derperperd joined #git
09:15 RichiH joined #git
09:15 GT4066 joined #git
09:16 xaviergmail joined #git
09:19 flatsid joined #git
09:19 RichiH joined #git
09:21 sbasso joined #git
09:21 RichiH joined #git
09:22 a3Dman joined #git
09:22 m0rdonez joined #git
09:24 Sound joined #git
09:24 Sound_ joined #git
09:27 jcalonso joined #git
09:30 JeroenT joined #git
09:31 Cabanossi joined #git
09:32 cuqfye joined #git
09:35 blahdodo joined #git
09:35 Vampire0 joined #git
09:36 seni joined #git
09:37 JeroenT joined #git
09:37 notebox joined #git
09:37 flatsid left #git
09:40 ljc joined #git
09:42 Endarked joined #git
09:42 JeroenT joined #git
09:44 juvenal joined #git
09:46 sbasso joined #git
09:46 dvaske joined #git
09:46 Raging_Hog joined #git
09:48 Sound joined #git
09:49 kent\n joined #git
09:50 marianina8 joined #git
09:51 oaao joined #git
09:53 SlashLife^m joined #git
09:53 WeiJunLi joined #git
09:54 infinite joined #git
09:54 siaw23 joined #git
09:54 JeroenT joined #git
09:55 siaw23 hi. i have made change to a repo i forked, someone else changed a file on the main repo. how do i rebase so my forked project on my local machine matches what’s on the main repo?
09:56 osse siaw23: add the original repo as a new remote. fetch from it. rebase your branch on top of what was fetched
09:56 thing_ joined #git
09:56 JeroenT joined #git
09:57 osse siaw23: !pull_upstream
09:57 gitinfo siaw23: To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
09:59 siaw23 osse: i’ve been through this already
09:59 siaw23 osse: after running git merge upstream/master
09:59 siaw23 i get
09:59 siaw23 Auto-merging .rubocop.yml
09:59 siaw23 CONFLICT (content): Merge conflict in .rubocop.yml
09:59 siaw23 Automatic merge failed; fix conflicts and then commit the result.
09:59 brent__ joined #git
10:00 osse !eek
10:00 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
10:00 SlashLife^m From the git-fetch manpage: "Fetch branches and/or tags (collectively, "refs") from one or more other repositories"; am I correct in assuming that it fetches all refs (including non-tag/branch ones), but names branches and tags specifically because those are the ones the majority of users care about?
10:01 zeroed joined #git
10:02 osse SlashLife^m: sort of. It fetches what you tell it to via the refspec. I think you're correct about why the terms "branches" and "tags" are mentioned
10:02 jast SlashLife^m: the config determines what is fetched. normally only refs/heads/* is fetched, plus some special treatment for tags
10:03 mehola joined #git
10:04 mehola joined #git
10:04 JeroenT joined #git
10:05 mehola joined #git
10:05 SlashLife^m Mhh, okay. Then I'll need to adjust this. :) Btw.: I'm open to book suggestions, if my questions about the internals get too annoying. :)
10:05 cdown joined #git
10:05 g0d355__ joined #git
10:05 mehola joined #git
10:06 mehola joined #git
10:07 mehola joined #git
10:08 mehola joined #git
10:09 mehola joined #git
10:09 osse !book
10:09 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
10:09 mehola joined #git
10:10 osse i think you're the !bottomup type
10:10 gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
10:10 infinite joined #git
10:11 mehola joined #git
10:11 SlashLife^m Do I understand this correctly, though: Everything in refs is a named alias for the hash of some value stored in the repo? And then refs/heads/* and refs/tags/* are just ordinary citizens in their like everything else - except that *by convention* the porcellain considers them special snowflakes?
10:11 finalbeta1 joined #git
10:12 SlashLife^m Oh. "Git References".
10:12 SlashLife^m I shall re-read that. Thanks. :)
10:15 flaviodesousa joined #git
10:16 sq-one joined #git
10:16 manuelschneid3r joined #git
10:16 Skyfinn joined #git
10:18 netj joined #git
10:20 kaldoran joined #git
10:20 Gloomy joined #git
10:21 sim590 joined #git
10:21 elinux joined #git
10:21 PioneerAxon joined #git
10:22 JeroenT joined #git
10:23 siaw23 osse: thanks. i feel sane now.
10:25 ij left #git
10:27 marcogmonteiro joined #git
10:29 ramsub07 joined #git
10:30 baribour joined #git
10:32 baribour left #git
10:32 bourbaki joined #git
10:32 bourbaki Hi, can anyone of you point me to a preferably oss repository browser that would allow me to list files etc via rest? We currently use GitBlit and i am not satisfied with it.
10:32 aard_ joined #git
10:33 strk joined #git
10:33 strk what's the quickest git command to check if anything was changed ?
10:34 strk it's to automatically check that a code-formatting run does not change anything
10:34 geoid joined #git
10:34 SlashLife^m strk: git status?
10:34 mage_ git status ?
10:35 strk from a script, git status doens't set return code according to that ?
10:36 canton7 strk, ang on, I've got a reference for those somewhere
10:36 canton7 strk, https://github.com/nvie/gitflow/blob/develop/gitflow-common#L90 . A return value of 1 = unstaged changes in working tree, 2 = uncommitted changes in index
10:37 strk ugly version: expr `git status --porcelain | grep '^ M' | wc -l` '>' 0
10:37 canton7 (https://github.com/nvie/gitflow/blob/develop/gitflow-common#L267)
10:37 finalbeta joined #git
10:38 SlashLife^m strk: Would you accept added files during such a run?
10:38 spm_draget left #git
10:39 JeroenT joined #git
10:39 strk SlashLife^m: good question
10:40 SlashLife^m Because if you don't, how about: [ "`git status -s`" == " ]?
10:40 SlashLife^m "" after the ==
10:40 strk yes, I think yes
10:40 kjsaihs joined #git
10:42 bariscant joined #git
10:43 lmatteis joined #git
10:44 Darcidride joined #git
10:45 rchavik joined #git
10:46 venmx joined #git
10:46 ziongate joined #git
10:47 ziongate ooo great a git channel :) hi all
10:48 sbasso joined #git
10:49 JeroenT joined #git
10:50 jast ziongate: hi! it's the one and only original official git channel!
10:52 YuGiOhJCJ joined #git
10:52 irqq joined #git
10:53 ziongate jast, many thanks for elucidating this ! :) i promise to avoid google-able quesitons :)
10:54 jast anything is google-able :) but if you don't know which keywords to use or all you find is gibberish, feel free to talk to us
10:54 jast ... or for any other reason ;)
10:57 m0rdonez joined #git
10:59 pbrewczynski joined #git
10:59 JeroenT joined #git
11:01 afuentes joined #git
11:02 ramsub07 joined #git
11:03 ferr1 joined #git
11:03 osse SlashLife^m: yes you understand correctly the refs thing
11:04 osse strk: git diff --quiet
11:05 zeroed joined #git
11:05 zeroed joined #git
11:05 tojo joined #git
11:06 ustunozgur joined #git
11:08 vuoto joined #git
11:10 muhannad joined #git
11:15 Ardethian\work joined #git
11:16 Ardethian\work joined #git
11:16 Ardethian\work joined #git
11:16 ziongate jast, thanks, very appreciated :)
11:18 geoid joined #git
11:20 a_thakur joined #git
11:20 strk thanks guys, canton7 reference helped
11:20 strk left #git
11:20 noecc joined #git
11:21 a_thakur joined #git
11:21 felixjet joined #git
11:25 unique joined #git
11:26 unique left #git
11:27 geekfarsi joined #git
11:28 vrach joined #git
11:28 geekfarsi left #git
11:32 Gloomy joined #git
11:32 eikhorst joined #git
11:33 juvenal joined #git
11:35 cagomez joined #git
11:35 sbasso joined #git
11:36 ustun joined #git
11:37 eikhorst_ joined #git
11:38 dsdeiz joined #git
11:41 n1ce joined #git
11:43 ogny joined #git
11:43 JeroenT joined #git
11:43 sbasso joined #git
11:45 kexmex joined #git
11:47 geekfarsi joined #git
11:47 Trpger joined #git
11:47 geekfarsi left #git
11:47 Furai joined #git
11:48 Trpger left #git
11:55 JanC_ joined #git
11:55 elinux joined #git
11:56 aielima joined #git
11:56 synthroid joined #git
11:59 buffal0 joined #git
12:03 finalbeta joined #git
12:03 marianina8 joined #git
12:05 sunri5e joined #git
12:05 Xatenev joined #git
12:05 Xatenev Hi
12:06 Xatenev Is there a possibility to have one file untracked forever?
12:06 Xatenev (on my machine)
12:06 Xatenev So I don't wanna add it to .gitignore - it should only be untracked on my system
12:06 Xatenev Ah I found ~/.gitignore_global => I guess I can use that?
12:07 osse Xatenev: either use a global gitingore or .git/info/exclude
12:08 Xatenev osse: thanks :)
12:08 courrier joined #git
12:08 xaviergmail joined #git
12:08 osse Xatenev: if it's untracked on your system it will be untracked on everyone else's to
12:08 osse o
12:08 fahadash joined #git
12:09 jeffreylevesque joined #git
12:09 Xatenev osse: ?
12:09 JeroenT joined #git
12:09 Xatenev osse: What?
12:09 Xatenev Ah you mean by using .git/info/exclude ?
12:10 Xatenev I don't get what you mean
12:10 sunrunner20 joined #git
12:10 osse Xatenev: if you don't understand what I meant by that it's clear I didn't understand what you meant in the first place
12:10 osse Xatenev: what do you mean by "it should only be untracked on my system"
12:10 Xatenev osse: As if I use a gitignore_global
12:10 osse Xatenev: so it's tracked for other people?
12:10 Xatenev F.e. I create a shell script that does some utility stuff for a project for me
12:11 Xatenev I put it into the project dir
12:11 Xatenev I dont wanna add it to the repo.
12:11 osse ahh, you mean "it should only be ignored on my system"
12:11 Xatenev Other people dont have the file at all
12:11 Xatenev Cause I dont wanna add it to the repo at all
12:11 osse yes, ok. a global gitignore or .git/info/exclude is fine
12:11 Xatenev Just have it in the .git directory - I think a global_gitignore works really well
12:11 Xatenev great :)
12:12 rnsanchez joined #git
12:14 peacememories joined #git
12:17 elinux joined #git
12:19 notebox joined #git
12:20 elinux_ joined #git
12:20 elinux joined #git
12:20 osse Xatenev: the problem with that is that it applies to all repos on your computer
12:20 osse .git/info/excluds only applies to this one.
12:21 osse But on the other hand you don't get it automatically if you make a new clone
12:21 Xatenev Yea thats fine for me
12:22 Xatenev :)
12:22 Xatenev I just like to make small scripts for stuff I do usually
12:22 Xatenev i.e. cache clearing or similar.
12:22 zeroed joined #git
12:22 kpease joined #git
12:23 Xatenev and my IT boss doesn't want those scripts to be anywhere inside the repo :P
12:23 osse makes sense
12:24 bremner make a different repo for your private use?
12:24 Xatenev bremner: That might be an option :)
12:24 livingstn joined #git
12:24 Xatenev bremner: I think that would be quite cool
12:25 osse is that an option? you'd want a copy of those scripts inside the other projects
12:25 bremner I was thinking add them to your path
12:25 Xatenev osse: have a repo with all those scripts inside, in seperate dirs as in /project-scripts/project1 /project-scripts/project2 and add it to the path.
12:26 osse sure, that's best
12:26 alexandre9099 joined #git
12:26 osse I jsut assumed these scritps were tailored to each repo/project
12:26 osse if they arenæ't, all the better
12:26 Xatenev osse: How do you accidently write æ ? Is that a real character on ur keyboardß :P
12:27 juvenal joined #git
12:27 tobiasvl øæå
12:27 Xatenev Seriously. I will be damn happy working with linux in two weeks again. lol
12:27 tobiasvl Xatenev: https://en.wikipedia.org/wiki/QWERTY#Norwegian
12:28 Xatenev tobiasvl: Ah hehe
12:28 osse fat-fingering '
12:28 vmiklos joined #git
12:28 djb-irc joined #git
12:30 sbasso joined #git
12:30 jameser joined #git
12:35 synthroi_ joined #git
12:37 zeroed joined #git
12:41 sunrunner20 joined #git
12:45 NimeshNeema joined #git
12:46 Cabanossi joined #git
12:47 Cavallari joined #git
12:48 Dro joined #git
12:49 cdg joined #git
12:50 enav joined #git
12:50 JeroenT_ joined #git
12:50 jameser joined #git
12:51 ionl joined #git
12:51 wrouesnel joined #git
12:52 peacememories joined #git
12:52 ionl Hi, I want to use tag for submodule. Is it possible to simply edit .gitmodules file and add tag information for that ? thank you
12:52 wrouesnel Is there some way to have git add use a diff'ing mechanism which is case insensitive for file content? or more specifically, a custom command to generate the patch?
12:53 grawity ionl: you shouldn't need anything specific
12:53 grawity ionl: since submodules are bound to a specific commit
12:53 grawity ionl: and tags aren't supposed to ever change
12:53 grawity ionl: so just check out the tag, then `git add` the submodule as always
12:54 peacememories joined #git
12:54 tcorneli joined #git
12:55 cdg joined #git
12:56 ionl gravity: oki thx. but a tag is only pointer tp specific commit ?
12:56 HardlySeen joined #git
12:57 ionl my idea is to have information about submodule version. It's more easy with tag than commit :p
12:57 diogenese joined #git
12:57 Vampire0 ionl, branches and tags are basically post-it notes that you stick to a commit and that you can peel off and stick to any other commit at any time. For tags you typically don't do this and for branches they move automatically to new commits if you have the tag checked out
12:57 juvenal joined #git
12:58 jast *the branch checked out
12:58 Vampire0 ionl, so yes, a tag is only a pointer to a commit. It can be an own object with title, body, tagger information a.s.o (annotated tag) or just a pointer (lightweight tag) but it always points to a commit
12:59 grawity ionl: live with it :p there's always `git describe` to find out if the current commit is tagged
12:59 jast Vampire0: false, tag objects can point to any kind of object :P
12:59 Vampire0 Thanks jason237 of course I meand "branch checked out"
12:59 Vampire0 jast, ok, can they?
12:59 Vampire0 s/ok/oh/
12:59 jast it's pretty much a fringe feature, but yeah
12:59 Vampire0 Didn't know that
12:59 jast I haven't tried pointing a tag object to another tag object, though
12:59 grawity I have, it works
13:00 jast fancy
13:00 Vampire0 amazing
13:00 grawity git.git has someone's PGP key blob tagged, doesn't it
13:00 Vampire0 can you tag a tree object?
13:00 grawity sure
13:00 Vampire0 fancy
13:00 grawity I think linux.git has one of that
13:00 qqx grawity: Yes git.git has the tag junio-gpg-pub
13:00 qqx For the maintainer's key.
13:01 MaximusColourum joined #git
13:01 boombatower joined #git
13:02 ionl ok thx for that. I'm trying to understand idea :D
13:02 ionl my initial idea was to specify in .gitmodules file only the annoted tag
13:02 ionl With that, we can easily see information to update it later (or not)
13:02 ionl I d'ont know if it's possible (and recommanded) to do that :)
13:03 livingstn joined #git
13:03 qqx ionl: The .gitmodules file doesn't specify which commit is used. Only where to get the submodule objects from.
13:03 Derperperd joined #git
13:04 ionl qqx : :(
13:04 qqx The information about which commit to use is stored in the tree and can differ between commits.
13:04 multi_io_ left #git
13:05 ionl it is possible to use a submodule only with a specific commit (or annoted tag) ?
13:05 cwre joined #git
13:05 rts-sander joined #git
13:06 fakenerd joined #git
13:06 rts-sander if I do git add -p and I do "n" on accident, is it easy to go back?
13:06 Gloomy joined #git
13:06 grawity the "?" help text suggests K
13:06 Xatenev1 joined #git
13:06 osse rts-sander: you can also finish the current session and run git add -p again
13:07 qqx ionl: When you use `git submodule update` it will automatically use the version specified by the link in the parent project.
13:07 rts-sander grawity, that's what I'm looking for thanks
13:07 qqx There isn't any built-in way to determine how that link is set, although you could use a hook to constrain it.
13:08 ionl qqx: oki. What is this link ? (sorry, I'm start with git)
13:08 d0nkeyBOB joined #git
13:08 qqx The link is an entry in the tree. It's managed similarly to tracked files.
13:09 ionl hum, oki
13:09 ionl it seems complex ^^
13:09 qqx Those links are automatically created and tracked with `git submodule add`.
13:09 grawity simpler than it seems
13:09 ionl \o/
13:10 grawity since in the end it's almost the same as regular files/directories/symlinks
13:10 qqx After that you can use `git add` to change newer versions of the parent project to point to a different version.
13:10 jameser joined #git
13:10 qqx Not similar to directories, since git doesn't track those.
13:11 grawity it does
13:11 grawity how is a tree object not a directory
13:11 grawity track *empty* directories is what it doesn't
13:11 osse for no reason
13:13 cdown joined #git
13:13 CEnnis91 joined #git
13:13 TomyWork joined #git
13:15 ankit01ojha joined #git
13:15 marcogmonteiro joined #git
13:18 tvw joined #git
13:19 dec0n_ joined #git
13:21 buzzLightBeer joined #git
13:22 SlashLife^m Doesn't it just *ignore* empty directories by default? I'd have to check, but I think you could explicitly unignore a directory in your .gitignore to force it to track it as an empty directory as well.
13:22 jast ignore patterns have nothing to do with this particular behaviour
13:23 iffraff joined #git
13:23 SlashLife^m Mkay; I think I've read something along those lines. May have been putting a .gitignore into the "empty" directory to make it not empty, though.
13:23 ExoUNX joined #git
13:24 jast the technical reason why Git doesn't track empty dirs is because the index can only store files
13:25 selckin its a feature /me hated empty dirs staying around in svn
13:26 sbasso joined #git
13:26 treehug88 joined #git
13:26 SlashLife^m selckin: Stop randomly creating directories all over the place then? :P
13:26 osse i mean how hard is it to add 'mkdir -p' to your deploy/build/run/whatever procedures!
13:26 osse GOSH
13:26 jast you could probably generate a tree object that references an empty tree object as a 'subdir', but you'd have to do it manually, i.e. craft contents for a tree object and write it into the database using 'git hash-object'
13:27 masuberu joined #git
13:27 jast and the Git still couldn't check that out
13:27 orbyt_ joined #git
13:27 jast *then
13:30 nettoweb joined #git
13:32 Gsham joined #git
13:33 sbasso joined #git
13:33 GodGinrai joined #git
13:35 nowhereman joined #git
13:36 geoid joined #git
13:40 * ssarah says hi
13:40 makinen_ joined #git
13:41 makinen_ left #git
13:41 makinen joined #git
13:41 makinen how can I go back a couple of commits and make a new branch of it without the two newest commits in the branch?
13:42 Xatenev makinen: git checkout -b 'myNewBranch'; git reset --hard <yourCommit>
13:42 grawity git branch <new_branch_name> <base_commit> // git checkout -b <new_branch_name> <base_commit>
13:42 Xatenev Oh I guess thats easier. :p
13:43 sarri joined #git
13:43 sarri joined #git
13:43 Gsham joined #git
13:43 jameser joined #git
13:44 vmiklos joined #git
13:44 Ryanar joined #git
13:46 benny-innofaith joined #git
13:46 regedit joined #git
13:47 makinen is this enough: git branch <new_branch_name> <base_commit> && git checkout <new_branch_name>
13:48 makinen at least log shows that the latest commit is now right
13:48 Xatenev yes
13:48 makinen ok thanks
13:48 seni joined #git
13:48 Vampire0 makinen, `git checkout -b new_branch_name base_commit` would be the same, just in one command
13:49 cdg joined #git
13:49 Vampire0 makinen, `git checkout -b new-branch @~2` actually to have it from the third-last commit of current HEAD
13:50 gitinfo makinen: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
13:50 makinen ok :D
13:50 m0rdonez joined #git
13:50 makinen thanks Xatenev grawity Vampire0
13:50 jameser joined #git
13:51 shinnya joined #git
13:51 Vampire0 yw
13:51 Xatenev .topkarma
13:51 gitinfo top karmic beings of past 30 days ('all' arg to see totals): o‍sse: 4,  _‍ikke_: 4,  v‍ampire0: 2,  j‍ast: 2,  g‍rawity: 1
13:52 Xatenev Not much in use heh
13:52 Nilesh_ joined #git
13:52 Xatenev .topkarma all
13:52 gitinfo top karmic beings of all time: o‍sse: 269,  _‍ikke_: 235,  c‍break: 144,  s‍eveas: 115,  g‍rawity: 112
13:52 Es0teric joined #git
13:55 molgrum joined #git
13:55 molgrum joined #git
13:56 scoobert1on joined #git
13:56 vmiklos joined #git
13:57 Guest16174 joined #git
13:58 alexandre9099 joined #git
13:59 aielima joined #git
14:00 arooni joined #git
14:01 Cabanossi joined #git
14:02 inflames joined #git
14:02 tmg `git reset --h` === `git reset --hard` is so dumb. is there a way to recover an index from this?
14:02 peacememories joined #git
14:04 relipse joined #git
14:04 relipse I started to do a git merge but ended up with conflicts, how do I go back before I started doing the merge?
14:04 _ikke_ git merge --abort
14:04 Zoxc joined #git
14:05 relipse thank you
14:05 canton7 joined #git
14:06 AaronMT joined #git
14:07 notebox joined #git
14:07 GodGinrai joined #git
14:09 dviola joined #git
14:09 Sound joined #git
14:10 osse 2014-03-03 18:21:03     relipse how do i abort my merge
14:10 osse 2014-03-03 18:21:17     +osse   relipse: git merge --abort
14:10 osse tee hee
14:10 osse jk, no harm, etc.
14:10 _ikke_ osse: I did not even receive your message
14:10 _ikke_ 15:04:26        relipse │ I started to do a git merge but ended up with conflicts, how do I go back before I started doing the merge?
14:10 _ikke_ 15:04:34         _ikke_ │ git merge --abort
14:10 _ikke_ 15:05:05        relipse │ thank you
14:11 _ikke_ oh
14:11 _ikke_ You answered it earlier
14:11 _ikke_ the same question
14:11 osse kinda the same
14:11 osse sameish
14:16 LeBlaaanc joined #git
14:20 jdelreal joined #git
14:21 molgrum joined #git
14:21 molgrum joined #git
14:22 jameser joined #git
14:23 JeroenT joined #git
14:24 ResidentBiscuit joined #git
14:25 jameser_ joined #git
14:26 publio joined #git
14:27 Skyfinn joined #git
14:27 eroux joined #git
14:28 g105b joined #git
14:28 jameser_ joined #git
14:30 Some_Person left #git
14:31 matsaman joined #git
14:35 a_thakur joined #git
14:37 gugah joined #git
14:37 zivester joined #git
14:38 mazert_ joined #git
14:38 Gloomy joined #git
14:39 crose joined #git
14:39 MACscr i have about 6 systems that push to a single branch. How do simply compare my local branches to the remote one? I thought git status would do that, but thats not it
14:39 e14 joined #git
14:39 keks[m] joined #git
14:40 MACscr right now i do: git fetch --all, then git pull, to update each local system
14:40 grawity git fetch; git log master..origin/master
14:40 grawity or the other..way around
14:40 grawity or with ...
14:40 cdg_ joined #git
14:41 MACscr okk so that gives me a commit log, but doesnt show me which files have changed. thats really all i need
14:41 m0rdonez joined #git
14:41 MACscr something like git status would be great
14:41 MACscr but to compare remote to local
14:42 porsche944 well you can options to git log to see the files changes
14:42 Vampire0 MACscr, git diff --name-only ...
14:42 Vampire0 MACscr, or git diff --name-status ...
14:42 dsteplight__ joined #git
14:42 Vampire0 MACscr, but you still have to fetch first
14:43 ionl1 joined #git
14:44 scorphus joined #git
14:45 bariscant joined #git
14:46 Cabanossi joined #git
14:47 shgysk8zer0 joined #git
14:47 grawity git log --stat
14:48 grawity tig is my favourite
14:48 masuberu joined #git
14:50 antoniooohhh joined #git
14:50 antoniooohhh left #git
14:50 ericho joined #git
14:53 DarkPsydeLord joined #git
14:58 sz0 joined #git
14:59 nowhere_man joined #git
15:00 clmsy joined #git
15:00 al-damiri joined #git
15:00 Ryanar joined #git
15:00 oleo joined #git
15:00 orbyt_ joined #git
15:04 snowalpaca joined #git
15:05 shgysk8zer0 joined #git
15:05 xaa joined #git
15:06 steeze joined #git
15:06 _ikke_ mine too
15:07 MACscr that seems to be a general log, which is nice, but not related to the local system
15:07 synthroid joined #git
15:07 dglambert joined #git
15:07 dglambert yuo
15:07 dglambert yo*
15:07 _ikke_ git status is only for your working tree
15:07 eh3 joined #git
15:08 fission6 joined #git
15:08 MACscr _ikke_ yes, we all know that
15:08 fission6 i wasin the wrong branch and just did a commit, how do i undo the commit and then apply it to the right branch (master)
15:10 dglambert Hey I'm looking at this git "addon"?
15:10 dglambert https://github.com/kamranahmedse/git-standup
15:10 dglambert My question is more on bash though cause I'm on windows. Specifically this command  curl -L https://raw.githubusercontent.com/kamranahmedse/git-standup/master/installer.sh | sudo sh
15:10 kexmex joined #git
15:11 TbobbyZ joined #git
15:11 dglambert | sudo sh, is this just giving me access todo this
15:12 qqx dglambert: That's giving permission to do whatever is returned from that URL. I think that is a horrible thing to advise.
15:12 orbyt_ joined #git
15:12 dglambert Well when you say it that way, I have to agree
15:12 qqx It's even possible for sites to return different content when viewed by a browser vs. when piped to sh.
15:13 LionsMane joined #git
15:13 qqx The contents of the script in that URL would be pretty simple to follow manually.
15:13 qqx Although the `make install` command would also run arbitrary code.
15:13 Learath2 joined #git
15:14 qqx But, then whatever gets installed would also do that.
15:16 dglambert Ok, so the point is, giving permission to something random on the internet
15:16 dglambert Even if I download it any of those other ways, it kind of is still promiscuous
15:17 dglambert when/how ever I decide to run it
15:20 kexmex joined #git
15:22 bitslip joined #git
15:23 fieldsy joined #git
15:24 Es0teric joined #git
15:26 Murii joined #git
15:26 nckpz joined #git
15:26 CussBot joined #git
15:29 brent__ joined #git
15:31 xaviergmail joined #git
15:32 marcogmonteiro joined #git
15:34 _Vi joined #git
15:34 Gustavo6046 joined #git
15:35 cagomez joined #git
15:38 fieldsy joined #git
15:38 hobodave joined #git
15:39 learning joined #git
15:39 guampa joined #git
15:40 Jellyg00se joined #git
15:43 styler2go joined #git
15:43 e14 joined #git
15:45 raspado joined #git
15:46 dglambert anyone else here using the git standup addon
15:46 fieldsy joined #git
15:47 jstimm joined #git
15:48 Tobbi joined #git
15:50 Vampire0 dglambert, never heard of it before
15:51 imrg joined #git
15:52 dglambert Vampire0: https://github.com/kamranahmedse/git-standup
15:52 dglambert I installed it, but seems to not find all my commits
15:52 Snugglebash joined #git
15:53 dglambert which is a bummer, cause it seems like a pretty ingenious idea
15:55 destino joined #git
15:55 nikitasius joined #git
15:56 jagob joined #git
15:56 ramsub07 joined #git
15:56 MaximusColourum joined #git
15:57 jameser joined #git
15:57 hobodave_ joined #git
15:59 geoid joined #git
15:59 tang^ joined #git
16:01 JeroenT joined #git
16:02 roelmonn_ joined #git
16:03 shinnya joined #git
16:03 Ryanar joined #git
16:03 madewokherd joined #git
16:03 finalbeta joined #git
16:03 thiago joined #git
16:04 tlaxkit joined #git
16:07 GT4066 joined #git
16:08 sespiros joined #git
16:09 snowalpaca joined #git
16:10 Gloomy joined #git
16:11 Nilesh_ joined #git
16:11 digidog joined #git
16:14 Wysi joined #git
16:14 petersaints joined #git
16:18 exarch joined #git
16:18 fieldsy left #git
16:18 thebird joined #git
16:19 raulp joined #git
16:20 PCatinean joined #git
16:20 xissburg joined #git
16:23 dsockwell joined #git
16:23 Gustavo6046_ joined #git
16:26 qqx joined #git
16:26 petersaints joined #git
16:28 eroux joined #git
16:29 geoid joined #git
16:29 Derperpe1 joined #git
16:30 jstimm joined #git
16:31 MACscr is there a way to see what changed in a local file after the merge?
16:31 s1scha joined #git
16:31 MACscr im trying to troubleshoot an issue and I did pull down the newest changes from the branch and it solved the issue, but i need to see what changed in a particular in relation to what was local and what it has now
16:32 _ikke_ MACscr: Is the merge the last thing you did?
16:32 durham joined #git
16:32 MACscr _ikke_ technically a git pull
16:32 _ikke_ right
16:33 _ikke_ git diff HEAD..HEAD^2 <file> should show you that diff then
16:33 _ikke_ sorry
16:33 _ikke_ git diff HEAD...HEAD^2 <file> should show you that diff then
16:34 lordjancso joined #git
16:34 daddio HEAD~2..HEAD
16:34 MACscr so if git pull had
16:34 MACscr Updating b501f8f..07ef688
16:34 _ikke_ daddio: No, that's not what he wants
16:34 MACscr then i should do: git diff b501f8f..07ef688 filename?
16:35 MACscr er, git diff b501f8f..07ef688v2 filename
16:35 MACscr er, thats not right iether. lol
16:35 MACscr my bad
16:35 _ikke_ No
16:35 _ikke_ git diff ...origin/<branchname> <filename> should work too
16:35 _ikke_ note the 3 dots
16:36 fission6 joined #git
16:36 Es0teric joined #git
16:36 MACscr i just did: git diff ...origin/master filename
16:36 MACscr empty
16:37 MACscr well, no response
16:38 ionl1 left #git
16:38 _ikke_ what does git rev-list HEAD...origin/master return?
16:39 e14 joined #git
16:39 svm_invictvs joined #git
16:42 MACscr _ikke_ nothing
16:42 evanextreme joined #git
16:42 _ikke_ Ok, did an actual merge happen or did it fast-forward?
16:43 toothe left #git
16:44 MACscr _ikke_ http://paste.debian.net/hidden/46a0f8ac/
16:44 MACscr foo_js.php is what im trying to investigate
16:44 _ikke_ MACscr: line 10: fast-forward
16:44 _ikke_ so no actual merge happened
16:45 _ikke_ then it's just: git diff HEAD@{1} <file>
16:45 _ikke_ (using the reflog to find the previous commit the branch was on)
16:46 Cabanossi joined #git
16:46 canton7 joined #git
16:48 canton7 joined #git
16:49 Snugglebash joined #git
16:50 dcpc007 left #git
16:51 canton7 joined #git
16:52 manuelschneid3r joined #git
16:52 nixjdm joined #git
16:53 gugah joined #git
16:53 e14 joined #git
16:55 TomyLobo2 joined #git
16:56 hashtagstrashtag joined #git
16:57 jstimm joined #git
17:00 canton7 joined #git
17:01 geoid joined #git
17:02 robattila256 joined #git
17:03 Gsham joined #git
17:04 a_thakur joined #git
17:11 ResidentBiscuit joined #git
17:13 gopar joined #git
17:14 gitgood joined #git
17:14 Xarodon joined #git
17:15 gitgood Hi - I have a question about the default credential helper that stores credentials in memory - if I set a timeout of 15 minutes is the duration reset every time I authenticate?  Or do I have to provide credentials every 15 minutes?
17:19 tyreld joined #git
17:19 LBV_User joined #git
17:25 planigan joined #git
17:26 ELFrederich joined #git
17:27 matoro joined #git
17:30 cdown joined #git
17:30 dave0x6d joined #git
17:31 jcalonso joined #git
17:33 Vadi joined #git
17:33 styks1987 joined #git
17:33 Fallen0223 joined #git
17:33 livingstn joined #git
17:34 styks1987 when it says use modified or deleted file.  If I choose modified, it is going to restore the file to the modified version and if I choose deleted, it will delete the file correct?
17:34 Vadi I thought git cherrypick is supposed to just copy a commit over to another branch, but for me it seems to be copying over way more. I'm trying to copy https://github.com/Mudlet/Mudlet/commit/07c6a3e8b4c08598e032e17052c501943590a88f to release_30 branch and it is bringing a looot of other stuff. Why?
17:35 * grawity gets the crystal ball out
17:35 re1 joined #git
17:35 grawity Vadi: !repro – demonstrate how you're copying it and what results you're seeing
17:35 gitinfo Vadi: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
17:36 Vadi hokay
17:38 e14 joined #git
17:39 Cavallari joined #git
17:39 Gustavo6046 joined #git
17:39 Vadi_ joined #git
17:40 chardan joined #git
17:40 Es0teric joined #git
17:41 algun joined #git
17:42 Arban_ joined #git
17:47 Anja_ joined #git
17:47 Darcidride joined #git
17:50 synthroid joined #git
17:51 matoro joined #git
17:54 TikityTik joined #git
17:57 gopar joined #git
17:58 luke_nukem joined #git
17:59 Fischmiep joined #git
18:00 finalbeta joined #git
18:02 juvenal joined #git
18:03 evanextreme joined #git
18:12 Sasazuka joined #git
18:12 livingstn joined #git
18:14 ozmage joined #git
18:14 jnavila joined #git
18:15 sz0 joined #git
18:15 brent__ joined #git
18:15 snowalpaca joined #git
18:16 sklv joined #git
18:16 miczac joined #git
18:17 sklv hi, i've tried to google without success - how do i pull someone's github repo and then apply one of the pull requests to it? apologies if easily found
18:17 enav left #git
18:17 grawity apply the same person's pull request, or somebody else's
18:17 grawity basically, what are you trying to achieve?
18:18 sklv i want to try this person's uart_echo https://github.com/nesl/ice40_examples/pull/2
18:18 dreiss joined #git
18:18 grawity to clarify, nesl/ice40_examples is someone else's repo, not yours?
18:19 sklv yea
18:19 grawity ok
18:19 e14 joined #git
18:20 Sasazuka_ joined #git
18:20 grawity every pull request is a branch on the submitter's own repo
18:20 grawity so if you already have cloned the main repo from nesl, you can `git pull` that pull request into it
18:21 grawity alternatively, if you don't, you can clone the submitter's repo directly instead
18:21 grawity e.g. `git clone https://github.com/smoe/ice40_examples` – then check out the branch that the PR was made from
18:21 grawity `git checkout uart_echo` in this case
18:22 sklv perfect, thanks
18:23 snowalpaca joined #git
18:23 [Brain] joined #git
18:24 marianina8 joined #git
18:24 Vadi_ I find it really strange how github doesn't make it easy to clone a PR submitters repo for testing
18:24 re1 joined #git
18:24 Vadi_ Am I missing something? I had to dig around their profile, find their work, then add that as a remote...
18:25 robotroll joined #git
18:25 jstimm joined #git
18:25 grawity Vadi_: if you have the original already cloned, it's a one-liner to fetch PRs as special branches
18:26 Vadi_ What is that?
18:26 grawity git config --add remote.origin.fetch +refs/pull/*/head:refs/remotes/pull/* && git fetch origin
18:26 grawity that's the variant I like, anyway
18:27 roentgen joined #git
18:27 grawity but besides that, yeah, it's a bit odd that I opened the above .../pull/2 and couldn't even find a clickable link to the repo
18:27 aw1 joined #git
18:27 Vadi_ I know eh. Thanks, I'll try your command.
18:28 LeBlaaanc joined #git
18:35 brent__ joined #git
18:37 mrslaughter1775 joined #git
18:38 miczac joined #git
18:40 snowalpaca joined #git
18:42 ozmage joined #git
18:43 mknod joined #git
18:44 ozmage joined #git
18:44 TbobbyZ_ joined #git
18:45 ozmage joined #git
18:46 juvenal joined #git
18:46 ozmage joined #git
18:48 ozmage joined #git
18:49 ozmage joined #git
18:51 Derperpe1 joined #git
18:51 miczac joined #git
18:52 aielima joined #git
18:52 Derperpe1 joined #git
18:53 buzzLightBeer joined #git
18:54 roentgen joined #git
18:55 flashpoint9 joined #git
18:55 flashpoint9 left #git
18:55 Derperpe1 joined #git
18:57 finalbeta joined #git
18:57 Derperpe1 joined #git
18:57 aswen joined #git
18:57 freimatz joined #git
18:58 jottr joined #git
18:58 gpiccoli joined #git
18:58 evanextreme joined #git
18:59 Vadi_ Okay. I'm going insane. Why is a cherrypick dragging across 200 commits. I'm merging, not cherrypicking. https://github.com/Mudlet/Mudlet/compare/development...vadi2:(release_30)-fix-custom-exit-lines-try-2?expand=1
18:59 manuelschneid3r joined #git
18:59 gpiccoli Hi, sorry to bother! Quick question, hopefully not too silly. Is there a way to make git send-email add a version to patchset automatically? Like a 'magic' parameter --version 4, and "PATCH v4" is added to the patches?
18:59 Vadi_ I mean.. cherrypicking, not merging.
19:00 overlord_tm joined #git
19:00 jottr joined #git
19:00 s2013 joined #git
19:02 t0by joined #git
19:03 finalbeta joined #git
19:03 qqx gpiccoli: I don't think send-email supports that, format-patch has -v a.k.a. --reroll-count
19:03 aidalgol joined #git
19:03 gpiccoli oh, perhaps -v works too in send-email, worth a try. Thanks qqx
19:04 raspado joined #git
19:04 sbasso joined #git
19:05 Ascathon joined #git
19:05 gpiccoli worked like a charm qqx =)
19:05 Derperpe1 joined #git
19:05 steeze joined #git
19:06 kasual joined #git
19:06 ozmage joined #git
19:06 jeffreylevesque joined #git
19:06 cha18 joined #git
19:07 lucido-cl joined #git
19:08 guampa joined #git
19:09 mrslaughter75 joined #git
19:09 Murii joined #git
19:10 learning joined #git
19:10 Sasazuka joined #git
19:10 Derperpe1 joined #git
19:12 Es0teric joined #git
19:14 joeco joined #git
19:16 jottr joined #git
19:17 jottr joined #git
19:26 planigan joined #git
19:26 KV joined #git
19:30 pbrewczynski joined #git
19:31 Skyfinn joined #git
19:31 rominronin joined #git
19:32 kexmex joined #git
19:33 salamanderrake joined #git
19:33 cr34ton joined #git
19:35 TbobbyZ joined #git
19:35 gopar joined #git
19:36 matoro joined #git
19:37 phtes joined #git
19:40 steeze joined #git
19:40 netj joined #git
19:40 paws_ joined #git
19:42 Sound joined #git
19:43 Snugglebash joined #git
19:45 dvaske_ joined #git
19:45 setuid joined #git
19:46 setuid If I've got a remote feature branch, and the local repo of master, how can I pull just that feature branch *alongside* the local master, so I have both copies locally?
19:46 setuid I tried -b <that feature branch>, but then that's the only branch I have
19:47 setuid git diff doesn't like local and remote copies either, if one is on a feature branch
19:47 tvw joined #git
19:49 GodGinrai joined #git
19:53 cado joined #git
19:59 Ranhir joined #git
20:02 qqx setuid: Since you mention -b are you using `git clone` for the "pull"ing.
20:02 qqx Even with that, unless you use --single-branch it will still create remote-tracking branches for all of the branches in the remote repository.
20:03 qqx Those would be accessible as origin/<that feature branch> or origin/master (assuming the default remote name of "origin").
20:04 ecuanaso joined #git
20:05 eroux joined #git
20:08 Derperpe1 joined #git
20:10 Bennux joined #git
20:11 diogenese joined #git
20:13 SuprDewd joined #git
20:16 daddio left #git
20:16 pwndave_ left #git
20:16 setuid qqx: I figured out a workaround, just checkout each branch as I need... jumping between the two and using diff against the commits, instead of the actual, local files (git diff vs. 'diff -u')
20:17 cmyers_ joined #git
20:18 pwndave_ joined #git
20:19 cmyers_ left #git
20:19 cmyers joined #git
20:19 cmyers what is the "treeish" for the index?  like if I wanted to run commit-tree directly using the tree represented by the index right now?
20:20 cmyers having a suprisingly difficult time googlign that up
20:20 Sound joined #git
20:20 _ikke_ there is no treeish for the index
20:20 _ikke_ There is a way to create a treeish from the index though
20:20 cmyers is there a plumbing command that gets...yeah, that
20:20 Puffball joined #git
20:20 _ikke_ man git write-tree
20:20 gitinfo the git-write-tree manpage is available at http://jk.gs/git-write-tree.html
20:21 cmyers ah, perfect, thanks!
20:21 pwndave joined #git
20:22 e14 joined #git
20:24 Oatmeal joined #git
20:25 sbasso joined #git
20:27 gpiccoli left #git
20:27 alexsystemf____ joined #git
20:28 doener joined #git
20:30 durham_ joined #git
20:31 Guest38290 joined #git
20:32 ramsub07 joined #git
20:35 xaa joined #git
20:35 Guest55 joined #git
20:36 dfas joined #git
20:37 evanextreme joined #git
20:37 svm_invictvs joined #git
20:38 Sasazuka joined #git
20:41 durham joined #git
20:41 andschwa_ joined #git
20:42 bariscant joined #git
20:42 Karunamon|2 joined #git
20:43 ProblemChild joined #git
20:45 MikeChernev joined #git
20:46 Jonuz joined #git
20:47 tmg joined #git
20:47 dave0x6d joined #git
20:49 Sasazuka joined #git
20:50 Mindi joined #git
20:50 evanextreme joined #git
20:51 joshszep joined #git
20:52 finalbeta joined #git
20:53 Darren_ joined #git
20:54 kfoonamalik joined #git
20:55 _Vi joined #git
20:57 nowhere_man joined #git
20:57 manuelschneid3r joined #git
20:59 ecuanaso joined #git
21:00 m0viefreak joined #git
21:01 Puffball joined #git
21:03 ziongate hi, did a small change on an include, then diff-ing i see full of ^M
21:03 ziongate seems some guy worked on windows on that file
21:03 _ikke_ line endings
21:03 _ikke_ right
21:03 brent__ joined #git
21:03 xaviergmail joined #git
21:04 Bennux joined #git
21:04 ziongate heh, if i push, changes will be mixed with line-ending changes ...
21:04 ziongate so better i do 2 commits right ?
21:05 Chinggis6 joined #git
21:06 Werring joined #git
21:07 qqx That'd be my preference.
21:07 tilpner joined #git
21:08 prions joined #git
21:08 durham joined #git
21:09 hurricanehrndz joined #git
21:10 cdown joined #git
21:10 Sasazuka joined #git
21:11 ziongate uhm
21:11 ziongate looks like is happening the opposit
21:11 ziongate that my editor is adding a dos line ending
21:11 ziongate how could it be ? i am in linux / kdevelop
21:11 min_ joined #git
21:13 ziongate and editor line ending is set to unix
21:14 jost_ joined #git
21:14 ziongate ah no sry. It's ok. It is checkpatch signalling errors on windows line ending (that are going to be removed)
21:14 ziongate all clear.
21:16 dsdeiz joined #git
21:16 dsdeiz joined #git
21:17 Cabanossi joined #git
21:18 matoro joined #git
21:22 IRCFrEAK joined #git
21:22 IRCFrEAK left #git
21:23 gugah joined #git
21:24 Tatou joined #git
21:25 ecuanaso joined #git
21:25 dvaske joined #git
21:25 gugah_ joined #git
21:29 CussBot joined #git
21:29 iron_houzi joined #git
21:29 cagomez I have a bunch of files that I'm not tracking, will changing branch cause me to lose them?
21:29 dvaske__ joined #git
21:30 sysanthrope joined #git
21:30 _ikke_ nope
21:30 pitastrudl joined #git
21:31 cagomez _ikke_: what if I do `git add` on all of them, and then stash?
21:31 Arguggi joined #git
21:31 e14 joined #git
21:31 _ikke_ then git will stash those files
21:31 Tatou Should I use git-svn bridge?
21:33 askb joined #git
21:35 Guest24 joined #git
21:35 sbasso joined #git
21:40 gopar joined #git
21:44 khfeng joined #git
21:46 scoobertron joined #git
21:48 hahuang65 joined #git
21:49 masuberu joined #git
21:49 hahuang61 joined #git
21:52 roelmonnens joined #git
22:00 utrack joined #git
22:01 rxo joined #git
22:01 peterbecich joined #git
22:02 mostlybadfly joined #git
22:04 alphor joined #git
22:05 ReenignE joined #git
22:05 ReenignE joined #git
22:07 Impaloo joined #git
22:07 mikecmpbll joined #git
22:11 styks1987 joined #git
22:13 a3Dman joined #git
22:16 anuxivm joined #git
22:18 dirtyroshi joined #git
22:20 Snugglebash joined #git
22:21 rschneberger joined #git
22:23 planigan joined #git
22:25 cdown joined #git
22:26 mda1 joined #git
22:27 planigan joined #git
22:31 gugah joined #git
22:37 peeps[lappy] joined #git
22:38 a3Dman joined #git
22:39 gopar joined #git
22:41 staafl joined #git
22:41 cdown_ joined #git
22:49 lmatteis joined #git
22:50 cmyers left #git
22:53 pandeiro joined #git
22:54 manuelschneid3r joined #git
22:56 planigan joined #git
22:58 Impaloo joined #git
22:58 xaviergmail joined #git
22:58 madewokherd joined #git
23:00 justanotheruser joined #git
23:00 Sasazuka joined #git
23:10 chrysa joined #git
23:11 dtrott joined #git
23:13 Sasazuka joined #git
23:13 dreaddymck joined #git
23:15 Derperperd joined #git
23:15 juvenal joined #git
23:15 navidr joined #git
23:16 nowhere_man joined #git
23:17 Cabanossi joined #git
23:18 t-mart joined #git
23:19 iandeb joined #git
23:21 MACscr joined #git
23:22 robattila256 joined #git
23:28 Fallen0223 joined #git
23:28 BlackMaria joined #git
23:30 venmx joined #git
23:31 Fallen0223 joined #git
23:31 robattila256 joined #git
23:32 raijin joined #git
23:32 fatalhalt joined #git
23:32 grayjoc joined #git
23:35 robattila256 joined #git
23:35 thiago joined #git
23:36 roelmonnens joined #git
23:38 matoro joined #git
23:39 todd_dsm joined #git
23:41 fatalhalt joined #git
23:41 TbobbyZ_ joined #git
23:41 ToBeCloud joined #git
23:44 todd_dsm joined #git
23:47 Tantamounter joined #git
23:50 Derperperd joined #git
23:52 fatalhalt joined #git
23:53 btree joined #git
23:54 brent__ joined #git
23:57 milki joined #git
23:57 amdi_ joined #git
23:57 btree left #git
23:59 svm_invictvs joined #git

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