Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-01

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

All times shown according to UTC.

Time Nick Message
00:01 rameerez joined #git
00:01 askb joined #git
00:01 cads joined #git
00:02 bitmod joined #git
00:03 d^sh joined #git
00:07 ok91 joined #git
00:09 chachasmooth joined #git
00:10 lowercas_ joined #git
00:12 shgysk8zer0 joined #git
00:13 cagomez joined #git
00:14 tsetair joined #git
00:15 exotime joined #git
00:18 mizu_no_oto joined #git
00:19 fxrs joined #git
00:23 raijin joined #git
00:26 miczac_ joined #git
00:26 Cabanossi joined #git
00:27 bilal joined #git
00:27 mrkake joined #git
00:27 jaziz joined #git
00:29 mizu_no_oto joined #git
00:29 rameerez joined #git
00:30 al-damiri joined #git
00:33 mizu_no_oto joined #git
00:34 fstd_ joined #git
00:35 m1dnight_ joined #git
00:35 Calinou joined #git
00:36 ndim joined #git
00:37 jeffreylevesque joined #git
00:37 Achylles joined #git
00:41 dmc joined #git
00:43 rameerez joined #git
00:45 Hunter1 joined #git
00:50 raijin joined #git
00:50 netj joined #git
00:51 exotime joined #git
00:55 justanotheruser joined #git
00:56 Calinou joined #git
01:00 qpdb joined #git
01:02 ojdo joined #git
01:05 madewokherd` joined #git
01:07 cagomez_ joined #git
01:10 rameerez joined #git
01:10 gableroux joined #git
01:12 finalbeta joined #git
01:13 d^sh joined #git
01:17 kbeflo joined #git
01:20 rameerez joined #git
01:21 raijin joined #git
01:22 otiose joined #git
01:23 hacman joined #git
01:25 CG_ joined #git
01:26 kbeflo_ joined #git
01:26 Cabanossi joined #git
01:26 gugah joined #git
01:27 tnecniv joined #git
01:27 kbeflo joined #git
01:28 jason237 joined #git
01:28 MattMaker joined #git
01:28 Calinou joined #git
01:29 raynold joined #git
01:32 cqi joined #git
01:33 thiago joined #git
01:36 firef1y joined #git
01:47 Anja__ joined #git
01:47 mizu_no_oto joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:54 Stumbler joined #git
01:57 matt|home hello. im a little confused about branching - if i create a new branch in git, and i have files in 'master', it won't automatically copy all those files to the new branch or anything right? it's just like a blank reference or whatever?
01:57 gablerou_ joined #git
01:57 cjohnson !list
01:57 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
01:58 ertes joined #git
02:00 dermoth joined #git
02:04 pks joined #git
02:04 Vampire0 matt|home, a branch is just a post-it note that is attached to a commit. If you create a new branch, you just peel off a new post-it note from the block, note the branch name on it and stick it to a certain commit. By default this is the commit that is currently checked out if you don't tell the command to use a different commit or use `git checkout --orphan` to create a new branch without history on next
02:04 Vampire0 commit
02:05 tubal joined #git
02:05 matt|home o.o
02:05 Vampire0 matt|home, so the answer to your question would be "no", it is not just a blank reference
02:05 brent__ joined #git
02:05 matt|home i see.. thanks vam
02:06 matt|home vampire0
02:06 tubal Hello. git newb. Trying to push to my repo on github, but it fails with Authentication failed for... I'm quite sure I'm getting the pw right. What else might I be getting wrong?
02:08 tubal cl was: config  push --set-upstream myproject master
02:09 Vampire0 You're welcome matt|home
02:09 gitinfo matt|home: 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.
02:09 matt|home o.O
02:09 Vampire0 tubal, !repro
02:09 gitinfo tubal: [!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
02:10 matt|home .karma matt|home
02:10 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
02:10 matt|home .karma vampire0
02:10 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)
02:10 matt|home cheers ;P
02:12 ShapeShifter499 joined #git
02:12 dave0x6d joined #git
02:13 chachasmooth joined #git
02:13 Vortex34 joined #git
02:15 tubal https://gist.github.com/anonymous/570c0a23bfd7dba62c1511f1b570bf05
02:16 maroloccio joined #git
02:18 mentazoom joined #git
02:18 Calinou joined #git
02:19 Vampire0 tubal, what is `config push ...`?
02:20 tubal Oh... sorry. Vampire0: config is an alias: /usr/bin/git --git-dir=$HOME/.myconfig --work-tree=$HOME
02:23 otiose joined #git
02:24 tubal .karma Vampire0
02:24 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)
02:25 Vampire0 tubal, hm, then the only explanations I have are, that either your password does not fit the username (maybe wrong keyboard layout?) or you have two-factor authorization enabled
02:26 tubal Ah! 2FA! That's probably it.   ... So, what? Disable 2FA?
02:31 Hunter1 joined #git
02:34 sturner joined #git
02:36 otiose joined #git
02:38 Vampire0 tubal, there are multiple ways. Two options are to use SSH URLs and a certifcate instead of HTTPS URLs, or to create a personal access token that you then use instead of the password on your settings page
02:39 Vampire0 tubal, disabling 2FA would of course also be an option, but it is not necessary if you pick one of the other methods
02:40 tubal Thanks, Vampire0. It did seem to defeat the  purpose of 2FA. I'll see what I can find re SSH URLs and token auth.
02:40 tubal .karma Vampire0
02:40 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)
02:40 tubal Thanks Vampire0.
02:40 tubal .karma Vampire0
02:40 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 33 (2 in past 30 days) (4 given out)
02:44 lb1c joined #git
02:46 gugah joined #git
02:46 Hunter1 joined #git
02:46 hexagoxel joined #git
02:48 Tykling joined #git
02:48 cdown joined #git
02:48 mjuszczak joined #git
02:49 howdoi joined #git
02:52 Vampire0 tubal, ten times makes on karma point ;-)
02:52 tubal Ah.
02:53 durham joined #git
02:53 tubal Vampire0 thanks.
02:53 f1nch_ joined #git
02:55 Vampire0 yw
02:56 TikityTik Lets say I want to delete a bunch of files from my last commit that I already pushed, how do I do so?
02:56 TikityTik do I have to rebase?
02:56 lagothrix joined #git
02:59 Vampire0 TikityTik, if you are aware of !rewrite, just use `--amend` option to man git commit
02:59 gitinfo TikityTik: 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:59 gitinfo TikityTik: the git-commit manpage is available at https://gitirc.eu/git-commit.html
02:59 TikityTik wtf
02:59 TikityTik those were a lot of highlights
03:00 Vampire0 all with helpful information
03:00 thiago_ joined #git
03:01 TikityTik does git usually use a lot of space?
03:01 TikityTik I notice .git/objects is 87 MiB
03:06 tubal So, https://help.github.com/articles/changing-a-remote-s-url uses the address git@github.com:USERNAME/OTHERREPOSITORY.git  What is the value of OTHERREPOSITORY supposed to be? And, I thought I wanted to change the URL for REPOSITORY?
03:07 prg3 joined #git
03:12 Grievre tubal: "origin" is the name of the remote you're changing, OTHERREPOSITORY is the repo you're changing it to point to
03:12 chipotle joined #git
03:13 tubal Ah. Right. Thanks Grievre.
03:15 thiago joined #git
03:18 Grievre tubal: if you want to actually change a repo's url on github that's more of a github question, but I think you could easily just create a new repo, pull from the old one, push to the new one and then delete the old repo
03:18 Grievre You might lose some data doing that and you might need special flags to actually pull/push everything
03:20 njbair joined #git
03:25 Doginal joined #git
03:26 Cabanossi joined #git
03:28 tubal I am really in the git weeds.
03:31 YuGiOhJCJ joined #git
03:50 fragMental joined #git
04:01 lowercaseman joined #git
04:02 altendky joined #git
04:03 lowercas_ joined #git
04:05 lowercaseman joined #git
04:08 danimal2 joined #git
04:12 moei joined #git
04:13 astrofog joined #git
04:14 fakenerd joined #git
04:15 cads joined #git
04:17 chandu20 joined #git
04:19 Bass10 joined #git
04:19 dilfridge joined #git
04:21 rwp TikityTik, git is quite space efficient. As compared with other systems I have used. But have you done a 'git gc' to garbage collect lately?
04:21 TikityTik never heard of that command
04:26 ok91 joined #git
04:26 Cabanossi joined #git
04:28 Patrick__ joined #git
04:29 kbeflo_ joined #git
04:32 Patrick__ Hello?
04:32 gitinfo Patrick__: 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.
04:36 kbeflo__ joined #git
04:36 otiose joined #git
04:38 bobofat joined #git
04:43 mizu_no_oto joined #git
04:47 kbeflo__ joined #git
04:49 kbeflo_ joined #git
04:58 freimatz joined #git
05:02 kafnjr joined #git
05:06 fakenerd joined #git
05:09 Hunter1 joined #git
05:10 fakenerd_ joined #git
05:10 MattMaker joined #git
05:10 dviola joined #git
05:11 Cabanossi joined #git
05:14 nickel_dime_look joined #git
05:14 tubal status is showing a modified path (despite my not having touched it). Nonetheless, I ran checkout -- that/weird/path   ... but it is still showing as modified. Why might that be?
05:20 indistylo joined #git
05:20 rootman123 joined #git
05:25 zefferno joined #git
05:27 Hunter1 joined #git
05:28 Garen_ joined #git
05:30 rwp tubal, Is it possible that you added it to the .gitignore file after having committed it?
05:31 kusznir joined #git
05:34 mel00010 joined #git
05:41 Cabanossi joined #git
05:48 podlech joined #git
05:49 durham_ joined #git
05:50 tubal Thanks rwp. That doesn't seem to be so.
05:52 kafnjr joined #git
05:55 di0_ joined #git
05:57 nickel_dime_look joined #git
06:00 tubal .karma rwp
06:00 gitinfo the Genuine Real Life Karma™ REST API results are back! r‍wp: 1 (0 in past 30 days) (0 given out)
06:05 rwp Sorry that wasn't what you ran into tubal. Thanks for the karma regardless.
06:05 rwp So 'git status' shows the path as changed and no other paths changed?
06:06 circ-user-dfkWJ joined #git
06:06 tubal yeah. the path is a directory.
06:06 rwp A directory?
06:06 tubal yes.
06:06 rwp That means the directory has appeared in the working copy and is not committed into the .git repository yet.
06:07 tubal but it'sa dir with a dir that was committed.
06:07 tnecniv joined #git
06:08 rwp Can you pastebin the git status output so that we could have a look at it?
06:10 tubal https://paste.ubuntu.com/24491020/
06:13 rwp And "vim-gruvbox" is a directory? (I am not a vim user so don't recognize it.)
06:13 danimal2 joined #git
06:15 aw1 joined #git
06:15 rwp That doesn't look like a directory to me.  When I try to create a test case for this I see: https://vomitb.in/AoPIMFClSq
06:16 rwp See the trialing '/' at the end?  That denotes it being a directory.  Your paste has quite different information.
06:16 rwp It doesn't say untracked files.  It says changes not staged for commit.
06:16 aw1 joined #git
06:16 rwp What does "git diff .vim/bundle/vim-gruvbox" say?
06:16 rwp Anything interesting?
06:17 rokups joined #git
06:20 rossome joined #git
06:20 rwp In any case since that is the only file listed as changed you should be able to restore to the last checked in state using !reset--hard
06:20 gitinfo You can go back to the last commit, or any other commit (effectively getting rid of commits which can cause issues, see !rewrite), using 'git reset --hard' with an optional commit/ref argument. This will irrevocably destroy all uncommitted changes, so please be careful!
06:20 tubal https://paste.ubuntu.com/24491046/
06:22 schleppel joined #git
06:22 rwp It's a subproject!  That undoubtedly explains it.  However I am probably the least knowledgable person here about submodules.
06:22 rwp https://www.git-scm.com/book/en/v2/Git-Tools-Submodules
06:25 lowercas_ joined #git
06:25 tubal I wonder how it became that. Perhaps because it's a git repo itself?
06:27 rwp I haven't any experience working with submodules. Just haven't overlapped with them. So I am lacking in experience to say.
06:27 rwp I can only point you to the documentation. Or hope that others in the channel will be able to help you with it.
06:28 lowercaseman joined #git
06:28 rwp But presumably you created a nested project there at some point.
06:29 johnflux joined #git
06:29 johnflux joined #git
06:29 rwp I would be inclinded to "history | less" to browse my history to see what I had done previously and see if there were clues there. (shrug)
06:30 roelmonnens joined #git
06:31 zeroed joined #git
06:31 tubal thanks rwp.
06:33 Kerwin_chain joined #git
06:33 lowercas_ joined #git
06:34 vrach joined #git
06:35 Hunter1 joined #git
06:35 slkth joined #git
06:37 Wulf joined #git
06:37 otiose joined #git
06:38 leeN joined #git
06:39 tubal rwp: you're right. submodule. The odd thing is, there are four other such directories, sisters of the one in question, and no complaints from git about them. Hrm.
06:39 tubal Anyway, time for the sleeps.
06:39 rwp It thinks your local version is modified. That is what makes that one different from the others.
06:40 rwp I'm not a vim user and so am twice removed from using that gruvbox theme.  But it is possible that vim modified it just as a normal course of running. (don't know)
06:40 rwp But since it is locally modified it shows up in the status.
06:41 freimatz joined #git
06:41 rwp Get some sleep. When you are awake tomorrow ask the channel again about submodules and I am sure there will be knowledgable people to help then.
06:41 Nevik joined #git
06:41 rwp I'm just not knowledgeable about them so don't know how to help further.
06:46 a_thakur joined #git
06:47 Hunter1 joined #git
06:52 soc joined #git
06:52 soc hey
06:52 soc can someone help me running some statistics on git
06:53 soc I'm trying to figure out the changes between a certain period of time grouped by authors (minus merge commits)
06:54 tocky joined #git
06:56 Cabanossi joined #git
07:00 zeroed joined #git
07:00 zeroed joined #git
07:05 soc git shortlog -s -n 123..345 gets me the number of commits, can I also get the number of lines changed?
07:07 dvaske joined #git
07:08 dvaske_ joined #git
07:10 alcohol joined #git
07:11 _ng joined #git
07:12 z8z joined #git
07:15 zulutango joined #git
07:15 rwp soc, Use 'diffstat' to report that?
07:15 soc I found git log --format='%aN' | sort -u | while read name; do echo -en "$name\t"; git log --author="$name" --pretty=tformat: --numstat 947797e..a02b913 | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }' -; which seems to be doing what I want ...
07:15 soc :-)
07:18 zefferno joined #git
07:19 Keverw joined #git
07:20 dersand joined #git
07:24 dvaske joined #git
07:25 zefferno joined #git
07:26 Aljone joined #git
07:26 kbeflo_ joined #git
07:26 Aljone hey guys i was installing new gitlab on myserver
07:27 ISmithers joined #git
07:27 King_Hual joined #git
07:27 Aljone i have an old one also and i want to clone a project completely with all its history to the new server, how do i do that?
07:28 bket joined #git
07:39 zeroed joined #git
07:42 tymczenko joined #git
07:44 j416 Aljone: rsync?
07:45 j416 Aljone: or, clone it with --bare and then push with --mirror
07:47 lowercaseman joined #git
07:51 dka joined #git
07:52 m4sk1n joined #git
07:55 bilal joined #git
07:59 mikecmpbll joined #git
07:59 zeroed joined #git
08:02 bilal joined #git
08:05 User458764 joined #git
08:05 miczac joined #git
08:07 jagob joined #git
08:09 ok91 joined #git
08:18 mda1 joined #git
08:18 roelmonnens joined #git
08:19 navidr joined #git
08:23 bilal joined #git
08:23 sea-gull joined #git
08:26 danimal2 joined #git
08:28 bilal joined #git
08:37 nowhereman joined #git
08:38 otiose joined #git
08:43 kjsaihs joined #git
08:43 z8z joined #git
08:44 bilal joined #git
08:46 clmsy joined #git
08:48 chandu20 joined #git
08:48 zefferno joined #git
08:48 Tobbi joined #git
08:49 xaa joined #git
08:49 miczac joined #git
08:49 satifant joined #git
08:53 Hunter1 joined #git
08:58 Greivre joined #git
08:59 platzhirsch joined #git
08:59 platzhirsch When do you use merge and when rebase? It feels like when a rebase involves many breaking changes/conflicts a merge seems more appropriate..?
09:02 ij You use rebase when you have commits X, Y stemming from Z and you want to change that Z to Z' and the X, Y can probably be put on Z' without much trouble.
09:02 masuberu joined #git
09:02 ij So you've been developing a branch for a while and you're ready to merge, but it's been a month and the parent is ancient, so you rebase your branch on the latest master and request merging, so the merge lines wouldn't be infinite.
09:03 miczac joined #git
09:04 ij Rebase and merge are very different.
09:05 zeroed joined #git
09:05 ij Is my answer any good?
09:09 sarri joined #git
09:09 sarri joined #git
09:09 Guest55823 joined #git
09:10 apotry joined #git
09:10 platzhirsch ij: isn't that prone to a lot of work, I usually rebase all the time so they don't diverge so much to begin with
09:11 Acerific joined #git
09:11 platzhirsch and I guess the question arises from without much trouble... if I need to force push something I would run into the possibility of creating conflicts if other people are working on this branch as well
09:11 Murii joined #git
09:11 Cabanossi joined #git
09:11 z8z joined #git
09:12 Hunter1 joined #git
09:12 atomi joined #git
09:16 bilal joined #git
09:21 platzhirsch oh right The golden rule of git rebase is to never use it on public branches.
09:22 grayjoc joined #git
09:22 mentazoom joined #git
09:22 vamiry_ joined #git
09:26 finalbeta joined #git
09:28 chipotle joined #git
09:28 indistylo joined #git
09:29 bilal joined #git
09:33 ISmithers joined #git
09:33 atomi joined #git
09:34 bilal joined #git
09:35 chandu20 joined #git
09:36 MineCoins joined #git
09:40 earnestly joined #git
09:41 finalbeta joined #git
09:42 bilal joined #git
09:44 spb joined #git
09:45 j416 platzhirsch: rebase before merge is a good idea in my book
09:45 j416 platzhirsch: as you say, rebase of branches that others are also working on is a bad idea (unless all others got the message and agree with you)
09:46 platzhirsch yeah..
09:46 j416 platzhirsch: rebasing often as opposed to seldom is good, it'll give you less headache as you say
09:47 lohfu joined #git
09:47 j416 platzhirsch: why rebase before merge? because otherwise you're more likely to end up with merge conflicts (syntactic or semantic) and solving those in the merge commit can be confusing both for the person resolving the conflict (perhaps it's not you, and then it'll be even more confusing), and for the future people who search the history for clues and find that a particular piece of code was introduced by a
09:47 j416 merge commit, which doesn't say much
09:48 j416 platzhirsch: this is my take on it; others may have different opinions, of course.
09:49 platzhirsch it's more like, I just did a merge to a feature branch instead of a rebase, what I usually do, because this branch is currently also used by someone else
09:49 j416 platzhirsch: and it's of course also about time, sometimes rebasing something complex can be more time-consuming and not worth it, in which case perhaps just merging it is ok
09:49 j416 platzhirsch: it's always a balance of what's worth it
09:49 j416 platzhirsch: right.
09:49 j416 platzhirsch: I almost never merge _to_ feature branches
09:50 j416 platzhirsch: I prefer to rebase them
09:51 j416 platzhirsch: but then I'm usually ok with helping others in the team to fix any potential screwups that happened because of my rebase
09:51 j416 platzhirsch: (hopefully it doesn't happen, because I managed to convey the action beforeand)
09:52 j416 hand*
09:52 j416 platzhirsch: but if you do rebase branches shared by others in your team, be prepared to fix their issues when they do things in odd ways -- because there will be a few screw ups every now and then
09:52 platzhirsch Agreeing with all of your points :D
09:52 j416 haha
09:54 j416 platzhirsch: in my view, the most important things are proper history and getting there without much hassle
09:54 j416 if you've a lot of ad-hoc merges here and there, history becomes harder to read
09:55 j416 structured merging according to some set rules, is good
09:58 cdown joined #git
10:00 platzhirsch that's why I started bitching around that everyone should start use rebase.. it's shocking how uncommon it still is
10:04 tocky joined #git
10:09 mkoskar joined #git
10:11 mattcen joined #git
10:24 chipotle joined #git
10:25 astrofog joined #git
10:28 mikecmpbll joined #git
10:33 fakenerd joined #git
10:34 danimal2 joined #git
10:34 Shock_ joined #git
10:38 sunri5e joined #git
10:40 otiose joined #git
10:40 crater2150 joined #git
10:41 Cabanossi joined #git
10:42 theoceaniscool joined #git
10:49 atomi joined #git
10:53 sq-one joined #git
10:54 bilal joined #git
10:56 alexandre9099 joined #git
10:56 danimal2 joined #git
10:58 m0viefreak joined #git
10:58 ZyX-I joined #git
11:01 miczac joined #git
11:04 blackwind_123 joined #git
11:04 danimal2 joined #git
11:07 borkr joined #git
11:08 miczac Hi, I'm not sure what the -cached option in git rm is doing.  When untracking a file, all changes so far still remain, so I could look them up when checking out to an earlier commit?
11:11 Cabanossi joined #git
11:11 ok91 joined #git
11:12 j416 miczac: it will record the file as deleted, in the index, but not touch the file itself
11:12 j416 miczac: the history of your files remains, yes. This is the whole point of version tracking.
11:13 miczac is there a way to have it untracked in a way as if it never was tracked?
11:15 m0viefreak miczac: not without rewriting history
11:15 miczac reason is, I started to track a data file, which wasn't a good idea. It's growing large and changes frequently and actually there's no point in trakcing it
11:15 romank joined #git
11:16 miczac and .git is large because of it
11:16 _ikke_ miczac: !bfg
11:16 gitinfo miczac: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
11:16 romank joined #git
11:17 miczac thx!
11:19 romank joined #git
11:22 netj joined #git
11:24 GT4066 joined #git
11:26 User458764 joined #git
11:27 User458764 joined #git
11:28 misosoup joined #git
11:28 askb joined #git
11:30 sturner joined #git
11:36 Hunter1 joined #git
11:36 jstein_ joined #git
11:37 nidr0x joined #git
11:38 SantaClauze joined #git
11:40 danimal2 joined #git
11:40 zeroed joined #git
11:40 zeroed joined #git
11:42 sturner_ joined #git
11:42 jagob joined #git
11:44 ixpict joined #git
11:44 caper joined #git
11:46 anuxivm joined #git
11:46 xco joined #git
11:46 romank joined #git
11:47 xco hi. when i do “git pull” and i see there’s been new changes that i successfully pulled, is there a way to something LIKE “git diff” to see the new changes pulled in?
11:47 Hello71 joined #git
11:48 jeffreylevesque joined #git
11:48 _ikke_ xco: it's easier when you fetch first
11:48 _ikke_ xco: because the pull also merged that history in
11:48 johnflux joined #git
11:48 johnflux joined #git
11:49 _ikke_ but something like git diff HEAD@{1} @{u} should work immediately after the pull
11:49 xco so then i’d need to do “git fetch” then “git diff"?
11:49 _ikke_ git fetch and then git diff @{u}
11:50 Shock_ joined #git
11:50 xco awesome, thanks :)
11:51 _ikke_ or git log -p HEAD..@{u} to see it per commit
11:52 xco sounds good i’ll try
11:56 CussBot joined #git
11:59 User458764 joined #git
11:59 romank joined #git
11:59 lukasdboer_ joined #git
12:00 circ-user-dfkWJ_ joined #git
12:01 maroloccio joined #git
12:04 gableroux joined #git
12:05 gableroux joined #git
12:05 synthroid joined #git
12:06 circ-user-dfkWJ joined #git
12:07 leeN joined #git
12:12 dvaske joined #git
12:12 HoierM joined #git
12:14 freimatz joined #git
12:14 romank joined #git
12:15 dglambert joined #git
12:18 dave0x6d joined #git
12:18 miczac Hi, lack of routine just got me confusing w/ the meaning of terms when reading man pages: "working tree" is the current files I have at hands ... so "removing from working tree" is deleting the file from disk?
12:20 dermoth joined #git
12:21 D4R5C0D3 joined #git
12:22 Gustavo6046 joined #git
12:24 maroloccio joined #git
12:26 Stumbler joined #git
12:27 caper joined #git
12:27 _ikke_ correct
12:34 gableroux joined #git
12:35 chipotle joined #git
12:37 gableroux joined #git
12:37 miczac thx!
12:38 LordRyan joined #git
12:40 otiose joined #git
12:46 jtoy joined #git
12:49 danimal2 joined #git
12:52 bailon joined #git
12:56 tocky joined #git
12:59 dvaske_ joined #git
13:00 Achylles joined #git
13:01 livingstn joined #git
13:01 Achylles joined #git
13:01 tsetair joined #git
13:02 barbos joined #git
13:02 thiago joined #git
13:03 Achylles joined #git
13:04 miczac oh wow, didn't think of that: git rm just effects the current branch? So need to be careful checking out to a different branch since the file still is there? So I'd need to do git rm  (--cached) again?
13:04 rwb joined #git
13:05 MattMaker joined #git
13:06 _ikke_ it affects only the index (and the next commit made). Previous commits and commits in other branches still have the file
13:06 cdg joined #git
13:07 miczac so in any case git checkout apparently warns me of any still exsting files being git rm-ed on the current branch. Ok, good to know, trying not to mess up now. ;)
13:11 Sound joined #git
13:11 Cabanossi joined #git
13:12 Sound_ joined #git
13:12 Gustavo6046 joined #git
13:12 Vortex35 joined #git
13:15 TheSimonator joined #git
13:17 bouncy joined #git
13:22 YuGiOhJCJ joined #git
13:23 ayogi joined #git
13:23 wcstok joined #git
13:23 davimore_ joined #git
13:24 Glooomy joined #git
13:24 mjuszczak joined #git
13:24 gugah joined #git
13:25 justin2 joined #git
13:25 snowkidind joined #git
13:25 maroloccio joined #git
13:25 grift joined #git
13:28 raijin joined #git
13:28 lamont joined #git
13:29 danimal2 joined #git
13:30 User458764 joined #git
13:32 ws2k3 im trying to clone an older release of mcrouter but this is not working: git clone -b release-35-0 --single-branch clone https://github.com/facebook/mcrouter.git what am i doing wron here?
13:32 Dougie1871 joined #git
13:32 ok91 joined #git
13:32 MineCoins joined #git
13:33 rastos2 joined #git
13:35 LeBlaaanc joined #git
13:37 njbair joined #git
13:38 zerow joined #git
13:39 tocky joined #git
13:39 NeXTSUN joined #git
13:42 thiago ws2k3: can you tell us what happens when you run that?
13:43 gableroux joined #git
13:44 rmesta joined #git
13:44 rmesta1 joined #git
13:45 sunri5e joined #git
13:45 romank joined #git
13:47 ChiLL_SurF joined #git
13:50 Es0teric joined #git
13:51 thallada joined #git
13:56 Cabanossi joined #git
13:56 laumann joined #git
13:58 qqx ws2k3: You have "clone" a second time right before the URL. Remove that and it should work.
13:59 tnecniv joined #git
13:59 ResidentBiscuit joined #git
13:59 cdg joined #git
14:01 dvaske joined #git
14:01 Archangel joined #git
14:02 Archangel left #git
14:02 dglambert yo
14:02 dglambert hmm, my voice got shut off
14:03 Cerebr0 joined #git
14:03 Cerebr0 Hey ! If i clone a project on github, where is it stored in my computer ? I'm in debian btw
14:04 ResidentBiscuit The directory you cloned in
14:05 Cerebr0 So when i don't specify any directory, it just clones in my home folder
14:05 Cerebr0 in the name of the project ?
14:06 pbrewczynski_c joined #git
14:06 kpease joined #git
14:07 circ-user-dfkWJ joined #git
14:07 ResidentBiscuit If you are in the home directory when you run it
14:07 otiose joined #git
14:10 Cerebr0 Okay ! thanks
14:11 fahadash joined #git
14:13 jagob joined #git
14:14 LeBlaaanc joined #git
14:15 miczac I'm removing a test-branch w/ git branch -d testbranch . I get the warning "error: The branch 'testbranch' is not fully merged." prompting me to use -D . "not fully merged" is meant with respect to master?
14:15 ronny joined #git
14:15 cdown_ joined #git
14:15 wandering_vagran joined #git
14:18 circ-user-dfkWJ_ joined #git
14:19 prg3 joined #git
14:20 oleo joined #git
14:21 LionsMane joined #git
14:22 overlord_tm joined #git
14:23 acetakwas joined #git
14:24 cdown_ joined #git
14:25 a3Dman joined #git
14:27 gablerou_ joined #git
14:27 snowalpaca joined #git
14:27 nickel_dime_look joined #git
14:27 Lunatrius` joined #git
14:27 snowalpa_ joined #git
14:28 cjohnson I think it's just 'not merged into any branch'
14:28 cjohnson meaning, there are some commits in that branch in which the branch is the last remaining reference to
14:28 cjohnson if you were to merge branch b into branch c then try to delete b, it wouldn't complaing since b is no longer the last remaining ref
14:28 cjohnson but then if you went to delete c as well, that's when it would complain
14:35 iota_pi joined #git
14:36 miczac ok, that's fine. testbranch is a copy of another branch to test a merge from master. So that should be fine.
14:37 romank joined #git
14:39 Es0teric joined #git
14:40 Lunatrius` joined #git
14:41 vdl joined #git
14:43 mmlb joined #git
14:44 armyriad joined #git
14:47 am55 joined #git
14:47 aruns__ joined #git
14:48 Octalot joined #git
14:48 MDA2 joined #git
14:49 raffo joined #git
14:50 Ricaz joined #git
14:50 tymczenko joined #git
14:50 NeXTSUN joined #git
14:53 theoceaniscool joined #git
14:54 prg3 joined #git
14:54 jstein_ joined #git
14:55 cqi joined #git
14:55 Sp4rKy joined #git
14:56 indistylo joined #git
14:58 TikityTik joined #git
15:01 Es0teric joined #git
15:03 al-damiri joined #git
15:04 cdown joined #git
15:04 cagomez joined #git
15:04 Burgerz joined #git
15:05 jason237 joined #git
15:05 lewix joined #git
15:06 acetakwas joined #git
15:07 MattMaker joined #git
15:08 oleo_ joined #git
15:09 raijin joined #git
15:09 oleo_ joined #git
15:11 tubal joined #git
15:11 Cabanossi joined #git
15:12 cdown_ joined #git
15:12 nickel_dime_look joined #git
15:12 wandering_vagran joined #git
15:13 Abbott joined #git
15:15 Abbott I want to delete a branch, set my branch as master, and rename the current master branch to "deprecated". Would this actually be a manner of renaming branches, or would it be more appropriate to fork a branch from current master right now called "deprecated", merge my branch into master and keep all of my changes, and then delete the third branch
15:16 cha18000000 joined #git
15:17 cha1800 joined #git
15:18 cha1800 joined #git
15:18 User458764 joined #git
15:18 lightstalker joined #git
15:18 cbreak Abbott: renaming works if you want to rewrite history\
15:19 oskarkv joined #git
15:20 jnavila joined #git
15:22 boombatower joined #git
15:24 Noldorin joined #git
15:24 Spacew00t joined #git
15:26 Abbott I guess I didn't think of that
15:26 israelpattison joined #git
15:26 zeroed joined #git
15:26 zeroed joined #git
15:29 Guest45904 left #git
15:32 gugah joined #git
15:34 blackjid joined #git
15:35 HoierM joined #git
15:35 sq-one joined #git
15:35 synthroid joined #git
15:37 cjohnson Regarding mailing list, I submitted an email about a bug/misunderstanding for git clean/git status and .gitignore
15:37 cjohnson At this point the discussion is beyond my comprehension
15:37 cjohnson Is it normal for me to just quietly watch and hope people take up the cause and figure osmething out?
15:37 cjohnson I only know how to use git I am not a C/C++ programmer
15:38 cjohnson Or is it expected that the submitter sort of sticks around to rally and project manage?
15:38 jason237 joined #git
15:38 _ikke_ thread: https://public-inbox.org/git/CAJZjrdXfcaUrJXbAoPtRtvigouZ2eNyNsZ=2WtSY20_D+Ow6qw@mail.gmail.com/T/#t
15:38 felixsanz_ joined #git
15:38 _ikke_ cjohnson: What part are you strugling with?
15:39 gableroux joined #git
15:39 ozcanesen joined #git
15:40 am55 joined #git
15:40 am55 joined #git
15:40 ertes joined #git
15:41 cjohnson oh not that I'm struggling, I just don't really have any more input to provide beyond answering questions anybody might have for me
15:41 brent__ joined #git
15:41 oleo joined #git
15:41 cjohnson I am not even remotely familiar with git's internals to be able to help guide the decision making process at this point
15:42 _ikke_ RIght, it's normal that a more technical disussion follows to see if something needs to be changed and where the problem lies
15:43 Es0teric joined #git
15:43 publio joined #git
15:43 cjohnson Oh yeah I get that for sure... I just have never used a mailing list before or contributed to a major open source project like git so I wasn't sure if it was normal for the submitter to just submit and then go silent while smarter people figure it out amongst themselves. Just making sure I'm not violating customs ha
15:44 ResidentBiscuit joined #git
15:44 cjohnson sounds like not
15:44 cjohnson thanks _ikke_ I'm just overthinking things I think. too much coffee
15:44 _ikke_ It would be unreasonable if everyone reporting bugs was expecting to fully understand the underlying mechanisms and contribute to the actual solution
15:44 _ikke_ expected*
15:44 ResidentBiscuit joined #git
15:44 madewokherd joined #git
15:44 freimatz joined #git
15:45 ResidentBiscuit joined #git
15:45 ResidentBiscuit joined #git
15:45 shinnya joined #git
15:46 ResidentBiscuit joined #git
15:46 ResidentBiscuit joined #git
15:46 Ferdroid joined #git
15:47 JanC_ joined #git
15:47 Gustavo6046 joined #git
15:48 cjohnson lol fair
15:52 gaucheph joined #git
15:53 menip joined #git
15:55 kpease joined #git
15:55 Introoter joined #git
15:56 TbobbyZ joined #git
15:56 lewix joined #git
15:57 dreiss joined #git
15:59 justin2 joined #git
16:00 ZyX-I joined #git
16:00 rkazak joined #git
16:00 am55 joined #git
16:00 am55 joined #git
16:00 ok91 joined #git
16:01 pandeiro joined #git
16:02 lindenle joined #git
16:03 raspado joined #git
16:04 mel00010 joined #git
16:07 paws_ joined #git
16:09 lipvig joined #git
16:09 eb0t joined #git
16:10 Eoxza joined #git
16:10 Ferdroid joined #git
16:11 Gloomy joined #git
16:11 lipvig left #git
16:11 circ-user-3LMm1 joined #git
16:14 awc737 joined #git
16:16 circ-user-3LMm1 How do you delete a remote branch locally?
16:16 Random832 git push remote :branchname
16:16 j416 wouldn't be remote then would it
16:16 j416 if it's local
16:16 * j416 ponders
16:16 cbreak git remote prune
16:16 j416 ah, I suppose that's what is meant
16:17 Random832 i guess the question is what exactly you mean by that
16:17 j416 circ-user-3LMm1: git fetch --prune is nice too
16:17 Random832 do you want to remove the branch *from the remote*, or remove a local branch that is tracking the remote
16:17 j416 circ-user-3LMm1: you can set fetch to prune by default with config. See man git-config search for fetch and prune
16:17 gitinfo circ-user-3LMm1: the git-config manpage is available at https://gitirc.eu/git-config.html
16:17 durham joined #git
16:18 Random832 I read 'locally' as meaning what local command can delete a branch from a remote (as opposed to ssh-ing there and running git branch -d) but i suppose you might not have meant that
16:18 boombatower joined #git
16:19 AlkindiX joined #git
16:20 madewokherd joined #git
16:21 hobodave joined #git
16:22 Es0teric joined #git
16:23 freimatz joined #git
16:24 Aeterne joined #git
16:26 Aven left #git
16:26 tymczenko joined #git
16:27 am55 joined #git
16:27 am55 joined #git
16:28 SteffanW joined #git
16:28 am55 joined #git
16:28 am55 joined #git
16:28 nitric joined #git
16:29 njbair joined #git
16:32 tristanp_ joined #git
16:32 tinanoo1 joined #git
16:33 srcerer_ joined #git
16:33 oleo_ joined #git
16:33 Tyklol joined #git
16:33 SR3ject joined #git
16:33 Shakeel__ joined #git
16:34 am55 joined #git
16:34 am55 joined #git
16:35 tijensse_ joined #git
16:35 oleo_ joined #git
16:35 rominronin joined #git
16:36 rizonz_ joined #git
16:36 wwalker_ joined #git
16:36 madewokherd joined #git
16:36 nadley_ joined #git
16:36 AustinIncognito joined #git
16:36 pigeon_ joined #git
16:37 gkatsev_ joined #git
16:37 visual_ joined #git
16:38 TheSimonator joined #git
16:39 oleo_ joined #git
16:39 DomeMasterYolo16 joined #git
16:39 _cyril__ joined #git
16:39 DomeMasterYolo16 Hi everyone
16:39 gitinfo DomeMasterYolo16: 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.
16:40 DomeMasterYolo16 I'm using git-archive and its working great
16:40 cwre_ joined #git
16:40 vamiry_ joined #git
16:40 DomeMasterYolo16 only problem is further down one of my subdirectories is another git repo
16:40 DomeMasterYolo16 archive removes the git repo for the subdirectory
16:40 dsantiag_ joined #git
16:40 DomeMasterYolo16 is there a way to stop it doing this?
16:40 bcc_ joined #git
16:40 tabakhase__ joined #git
16:41 johnnyfive joined #git
16:41 frankkahle joined #git
16:42 incredible joined #git
16:42 Gabemo joined #git
16:42 nd joined #git
16:42 blackwind_123 joined #git
16:42 madduck joined #git
16:42 Orphis joined #git
16:42 SlashLife joined #git
16:42 Neo joined #git
16:42 CustosLimen joined #git
16:42 utrack joined #git
16:42 rodarmor joined #git
16:42 mkoskar joined #git
16:42 Es0teric joined #git
16:43 spacemud joined #git
16:43 Ownix joined #git
16:43 hashpuppy joined #git
16:43 GameGamer43 joined #git
16:43 sevenever joined #git
16:43 m4sk1n joined #git
16:43 barteks2x joined #git
16:43 zifnab joined #git
16:43 ionelmc joined #git
16:43 daxroc joined #git
16:44 owlbynight joined #git
16:44 hexa- joined #git
16:44 Anthaas joined #git
16:44 Bombe joined #git
16:44 msm joined #git
16:44 anderson joined #git
16:44 kpease joined #git
16:44 kadoban Doesn't appear so to me. Which makes sense, because to git it's not part of the same repo, as far as I understand.
16:44 Hobbyboy joined #git
16:45 marlinc joined #git
16:45 svm_invictvs joined #git
16:46 tyreld joined #git
16:46 thinkpad joined #git
16:46 tabakhase__ left #git
16:46 Cork joined #git
16:46 paws_ joined #git
16:46 tabakhase joined #git
16:47 hsiktas joined #git
16:47 auv joined #git
16:47 peepsalot joined #git
16:47 satifant joined #git
16:47 satifant joined #git
16:47 maarhart joined #git
16:47 dka joined #git
16:48 ronny joined #git
16:48 Walex joined #git
16:48 tsetair joined #git
16:48 dka joined #git
16:49 cdown_ joined #git
16:49 stealthii joined #git
16:49 plasticle joined #git
16:49 LionsMane joined #git
16:50 Maxel joined #git
16:51 LeBlaaanc joined #git
16:51 Iacobus joined #git
16:52 ToeSnacks joined #git
16:53 sea-gull joined #git
16:55 cdown_ joined #git
16:55 cust joined #git
16:55 tnecniv joined #git
16:55 ojdo joined #git
16:57 TSS_ joined #git
16:57 synthroi_ joined #git
16:57 borkr joined #git
17:00 marianina8 joined #git
17:03 altendky joined #git
17:03 jason237 joined #git
17:04 Random832 joined #git
17:04 batrick joined #git
17:04 oleo__ joined #git
17:05 mikkel- joined #git
17:05 mikkel- left #git
17:07 sea-gull joined #git
17:07 Eugene DomeMasterYolo16 - nope, that's intended behaviour. submodules are not included in archive, because it is a separate repository.
17:08 MattMaker joined #git
17:08 Eugene Found with some random googling for "git archive submodule": https://github.com/Kentzo/git-archive-all
17:08 gopar joined #git
17:11 Es0teric joined #git
17:11 TheSimonator joined #git
17:12 enckse joined #git
17:12 diogenese joined #git
17:13 overlord_tm joined #git
17:13 storrgie joined #git
17:13 feodoran left #git
17:16 felixsanz_ joined #git
17:16 oleo__ joined #git
17:16 cha18 joined #git
17:17 mjuszczak joined #git
17:18 VladGh joined #git
17:18 acetakwas joined #git
17:19 synthroid joined #git
17:19 NeverDie joined #git
17:22 jtoy joined #git
17:23 gableroux joined #git
17:24 otiose joined #git
17:26 rkazak joined #git
17:27 gnixev joined #git
17:30 felixsanz joined #git
17:31 johnflux_ joined #git
17:32 Murii joined #git
17:33 Es0teric joined #git
17:34 sgen joined #git
17:34 gaucheph joined #git
17:35 Stumbler joined #git
17:36 porfiriopaiz joined #git
17:37 Es0teric joined #git
17:37 LionsMane joined #git
17:38 nickel_dime_look joined #git
17:39 Discovery joined #git
17:39 SegFaultAX joined #git
17:41 gugah joined #git
17:42 mel00010 joined #git
17:42 h8r3d joined #git
17:44 King_Hual joined #git
17:45 Es0teric joined #git
17:46 gaucheph joined #git
17:48 Es0teric joined #git
17:52 King_Hual` joined #git
17:53 User458764 joined #git
17:54 Stumbler joined #git
17:56 Cabanossi joined #git
17:57 cworth joined #git
18:00 King_Hual` joined #git
18:01 Nloox joined #git
18:02 Sasazuka joined #git
18:03 maroloccio joined #git
18:03 WayToDoor joined #git
18:03 hobodave_ joined #git
18:04 King_Hual joined #git
18:04 King_Hual joined #git
18:04 SupaHam joined #git
18:05 marianina8 joined #git
18:06 planigan joined #git
18:07 maestrojed joined #git
18:07 aielima joined #git
18:07 xaa joined #git
18:08 dviola joined #git
18:09 raynold joined #git
18:09 Yuv joined #git
18:10 h8r3d joined #git
18:11 PioneerAxon_ joined #git
18:11 acetakwas joined #git
18:11 math-alpha joined #git
18:12 am55 joined #git
18:14 oprypin joined #git
18:15 tymczenko joined #git
18:17 iskander joined #git
18:18 iskander left #git
18:18 ter0 joined #git
18:18 Maxel_ joined #git
18:20 circ-user-3LMm1 joined #git
18:21 diogenese joined #git
18:22 hobodave joined #git
18:25 kiltzman joined #git
18:27 texasmynsted I have a branch bar, that was created by branching branch foo.  The foo branch had some history re-written with a rebase and force pushed.  I have local changes that I captured in a stash
18:28 texasmynsted I changed to the foo branch and git reset —hard origin to fix it
18:28 texasmynsted But I am not sure how to fix my bar branch
18:28 texasmynsted I tried merging in foo, but of course I got conflicts...
18:28 leah2 joined #git
18:28 _ikke_ can you rebase bar?
18:29 texasmynsted Right now the only changes are changes between what foo used to look like and what it does now.  All my changes still live in a stash
18:30 _ikke_ so what's the status of branch bar then?
18:30 Arokh joined #git
18:30 texasmynsted It is in conflict with multiple files
18:30 aard joined #git
18:30 texasmynsted from the "auto-merge"
18:30 Glooomy joined #git
18:31 mvensky joined #git
18:31 texasmynsted How can I back out the merge that is still in conflict and then fix or replace bar then apply my stash?
18:31 _ikke_ git merge --abort
18:32 Es0teric joined #git
18:32 filcab joined #git
18:32 texasmynsted ok, now for the bar brach. Just git branch -D?
18:33 _ikke_ git checkout -B bar foo?
18:34 texasmynsted Not sure
18:34 kpease joined #git
18:34 texasmynsted If the commit that the stash was created from no longer exists, what happens?
18:35 texasmynsted ok I renamed the bar branch to bar-old
18:36 DomeMasterYolo16 Thanks Eugene
18:36 madewokherd if the stash exists, it should keep its parent commits alive, even if the original branch does not
18:37 texasmynsted ok
18:37 texasmynsted seems ok
18:37 texasmynsted created new bar branch and popped the changes off the stash stack
18:38 borkr joined #git
18:38 _ikke_ a stash lives on its own
18:38 njbair joined #git
18:39 _ikke_ It does not hold a reference to a commit considered by gc
18:39 _ikke_ a weak ref if you will
18:44 [cust] joined #git
18:44 kpease joined #git
18:47 texasmynsted joined #git
18:47 romank joined #git
18:49 rkazak joined #git
18:50 texasmynsted thank you
18:51 d10n-work joined #git
18:51 qqx _ikke_: Are you sure about that? I haven't tested it, but I'd expect stash references to be considered by gc.
18:52 qqx Although since at least the non-latest ones are reflogs they would eventually expire.
18:52 qqx But until the expiration it should guarantee that objects don't go away.
18:53 nixjdm joined #git
18:54 _ikke_ you are right
18:54 Hunter1 joined #git
18:54 marianina8 joined #git
18:59 User458764 joined #git
19:02 dvaske joined #git
19:02 marianina8 joined #git
19:06 finalbeta joined #git
19:08 MattMaker joined #git
19:10 Hunter1 joined #git
19:12 felGru joined #git
19:12 romank joined #git
19:13 mjuszczak joined #git
19:16 b1tchcakes joined #git
19:17 indistylo joined #git
19:17 TheSimonator joined #git
19:18 tubal joined #git
19:20 yqt joined #git
19:22 b1tchcakes hi.  i was wondering if someone could help me on a git/testing question. I might be overthinking this.  i have a project in /project  and as i am building that project I am trying to also create a /project/library which I will eventually push to github so that it can be maintained separately. but i'm trying not to switch back and forth between the app and library right now so i was wanting to see how I could accomplish this.  in
19:22 b1tchcakes other words, the /project would have a git repo but then the /project/library would have a separate one inside of that, and commiting the /project would ignore the /project/library. hope that makes sense.
19:23 kadoban You can nest repos like that if you want. That's what happens by default if you just create a repo inside of another one.
19:24 kadoban I have a feeling I'm missing some part of your question though.
19:24 kadoban By the way, that name really sucks.
19:25 b1tchcakes i am using pho storm, so if i want to create a separate library I have to leave one project and move to another, edit the code, and then switch back to the main project.  so in a way, i am just trying to keep all the files on the screen open at once, and then when the library is more refined I can just pull it out and move it to an independent location and pull it in via composer.
19:26 Cabanossi joined #git
19:26 robotroll joined #git
19:27 kadoban Hmm, not really sure the answer to that. It sounds a bit like git subtree (a contrib command), but I'm not sure.
19:27 woodi_ joined #git
19:28 gaucheph joined #git
19:30 woodi_ hello everybody, I have a question about git hook, can anyone help?
19:31 FuzzyWuz_ joined #git
19:32 woodi_ Ding...
19:32 bremner woodi_: !ask
19:32 gitinfo woodi_: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
19:33 peepsalot joined #git
19:34 NeXTSUN joined #git
19:34 woodi_ I ran a git server, and want to do somethin in post receive hooks to show the client wat was updated or which part was updated....
19:35 tnecniv joined #git
19:35 rkazak joined #git
19:35 woodi_ examined "oldrev newrev ref" but not worked
19:39 woodi_ I ran a git server, and want to do somethin in post receive hooks to show the client wat was updated or which part was updated,examined "oldrev newrev ref" but not worked
19:40 tnecniv joined #git
19:41 raspado joined #git
19:42 bremner Can you be more specific about what didn't work?
19:43 woodi_ I wanted to manipulated updated files and what was added or limited, I examined " git log " too but wanted to know is any better solution
19:44 gopar joined #git
19:45 madewokherd git diff --name-only ?
19:45 jnewt joined #git
19:47 LeBlaaanc joined #git
19:49 woodi_ I used "git diff --name-only ?" and got this error => remote: error: cannot run hooks/post-receive: No such file or directory
19:51 darkfrog joined #git
19:53 darkfrog I can't search Google for this without getting information about LFS. I'm writing a CMS for managing files (mostly media like videos and images so very large). Apart from creating a Git repo per file stored and committing my changes after each change of the file is there a better way to manage file versioning?
19:53 darkfrog ...and is Git going to be okay at versioning very large binary files?
19:54 darkfrog or am I overthinking this and should just stop worrying about diffing and focus on just creating copies?
19:54 livingstn joined #git
19:55 woodi_ @darkfrog I thought you are answering me ;^)
19:56 darkfrog woodi_: I just joined so I don't even know what you wrote.
19:56 bremner woodi_: it sounds like your hook is not found by git.
19:56 bremner check the name
19:57 jast also the #! line
19:57 woodi_ when I change the command to something simpler like "echo", It works
19:57 woodi_ I can not handle hook inputs
19:57 jast side note, I'm pretty sure the '?' was not meant literally, just to indicate a "maybe you want to use this command?"
19:58 woodi_ if it has any!
19:59 jast darkfrog: for things like video, you could just keep a copy of each version as a separate file (or use something like git-lfs). there's not much of an advantage of putting it in a repository, and there are some disadvantages for larger files
19:59 woodi_ what should I put into my script, u know it made me crazy
20:00 m4sk1n joined #git
20:00 bremner woodi_: have you read man githooks?
20:00 gitinfo woodi_: the githooks manpage is available at https://gitirc.eu/githooks.html
20:00 ahrs joined #git
20:00 m0viefreak joined #git
20:01 bremner it tells you how the arguments are passed to each hook
20:01 darkfrog jast: thanks...that's what I was starting to think, I just wanted someone else to say it. ;)
20:01 jast generic hook advice: !hook_pitfalls
20:01 gitinfo Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).
20:03 jast darkfrog: you can quote me on it if you like, please provide attribution as follows: "random person on IRC" ;)
20:04 darkfrog jast: I'll add it to the end of the book I'm writing about random people I talk to on the internet. :-p
20:05 anuxivm joined #git
20:06 jast splendid
20:06 woodi_ bremner_ @gitinfo_ : thankQ so much
20:10 shgysk8zer0 joined #git
20:11 alexandre9099 joined #git
20:11 cdg joined #git
20:11 Cabanossi joined #git
20:12 tormachris joined #git
20:14 marianina8 joined #git
20:21 Khisanth joined #git
20:21 jtoy joined #git
20:21 IndigoTiger joined #git
20:23 cagomez joined #git
20:25 tnecniv joined #git
20:25 tnecniv joined #git
20:27 peepsalot joined #git
20:27 rkazak joined #git
20:28 kegster joined #git
20:28 causasui joined #git
20:28 causasui joined #git
20:29 Eugene jast - I see your domain is back, congratulations
20:29 King_Hual joined #git
20:29 King_Hual joined #git
20:29 jeffreylevesque joined #git
20:30 tnecniv joined #git
20:30 daynaskully joined #git
20:31 Es0teric joined #git
20:33 duderonomy joined #git
20:34 marianina8 joined #git
20:35 lmat joined #git
20:38 aidalgol joined #git
20:39 Atm0spher1c joined #git
20:40 tnecniv joined #git
20:41 lewix joined #git
20:41 lyxus joined #git
20:42 Es0teric_ joined #git
20:42 hust921 joined #git
20:46 fakenerd joined #git
20:48 jimmyrcom joined #git
20:49 jast Eugene: yeah, wasn't cheap but I guess that makes it even more of a learning experience
20:49 Eugene Missed/forgot the renewal?
20:50 jast yep
20:50 Eugene br0tip: create a systems@ inbox somewhere. Have all your crap like that sent there. I abuse gmail filters to sort it a bit, then scan once a month for important-looking things
20:51 jast I did actually see the first reminder, 90 days in advance
20:51 jast the rest got caught in my spam filter's "unsure" category
20:51 Eugene Brutal
20:51 jast and I was kind of busy with my leg refusing to do what it's supposed to do. (excuses, excuses)
20:52 Eugene !logs
20:52 gitinfo [!irclog] Public logs of #git are kept at: https://itvends.com/irc/git/ or see stats for the last 30 days: http://itvends.com/irc/git.html or all logs: http://itvends.com/irc/git-all.html
20:52 Eugene I don't know if the old logs are coming back, but I did that ^
20:52 thiago my registrar reminded me every day for the last 7 days before a domain expired
20:52 thiago 90 days, 60 days, 30, 15, 7, 6, 5, ...
20:52 jast yeah, I got a boatload of reminders, too
20:52 Otkd joined #git
20:52 Eugene All the emails in the world don't matter if google thinks its spam
20:53 jast on the up side, I found another registrar that does automatic renewals using direct debit
20:53 jast plus the domain is cheaper there
20:53 Eugene My last "trouble" with registrars was one not existing anymore 10 years later when i went back to renew
20:54 jast that's one nice thing about .de domains, there's a system in place for that kind of scenario
20:54 manuelschneid3r joined #git
20:54 Eugene Since then I renew everything yearly
20:54 Eugene There is for .org too, just a PITA
20:54 jaziz joined #git
20:54 jast basically you pay any registrar a fee and then the admin-c gets a special auth code via snail mail
20:55 Eugene I had to find a FedEx store to send a fax
20:55 cagomez joined #git
20:55 jast urg
20:55 jast anyway, problem solved, reminder for domain transfer set up for next year
20:56 Eugene I like the new bot domain anyway. Nicer separation
20:56 jast yeah, I thought this was a good opportunity to clean up a little
20:57 rkazak joined #git
20:57 jast and .eu is a nice compromise between not too country-specific and affordable :)
20:57 tnecniv joined #git
20:57 ok91 joined #git
20:59 ertesx joined #git
20:59 ftzdomino joined #git
21:00 durham_ joined #git
21:01 BSaboia joined #git
21:01 ftzdomino i checked out a repo with git svn and it failed a bunch of times for various reasons.  I've now got a ton of files in the .git dir prefixed with Git_svn_delta, Git_svn_hash, and Git_git_blob.  it looks like these were all created repository->temp_acquire().  can i safely delete them?
21:04 gablerou_ joined #git
21:04 fatalhalt joined #git
21:04 rmesta joined #git
21:06 brent__ joined #git
21:07 Vasya666 joined #git
21:09 misosoup joined #git
21:09 MattMaker joined #git
21:10 durham joined #git
21:10 Ryanar joined #git
21:14 Sadeukko joined #git
21:15 Maxels joined #git
21:16 romank joined #git
21:17 sentriz joined #git
21:17 gableroux joined #git
21:18 sea-gull joined #git
21:20 nicolai86 joined #git
21:20 jccn joined #git
21:23 rwb joined #git
21:26 Cabanossi joined #git
21:27 mattcen joined #git
21:27 askb joined #git
21:29 nicolai86 joined #git
21:30 LionsMane joined #git
21:32 tnecniv joined #git
21:33 fatalhalt joined #git
21:35 gnixev joined #git
21:35 Achylles joined #git
21:41 Maxel_ joined #git
21:41 durham joined #git
21:43 TheSimonator joined #git
21:44 mjuszczak joined #git
21:47 Stumbler joined #git
21:47 al-damiri joined #git
21:51 rkazak joined #git
21:51 Hunter1 joined #git
21:54 cust joined #git
21:58 caper joined #git
21:59 ResidentBiscuit joined #git
22:00 jtoy joined #git
22:00 bilal joined #git
22:04 MattMaker joined #git
22:05 blackwind_123 joined #git
22:05 Dougie1871 left #git
22:07 DomeMasterYolo17 joined #git
22:09 _builtin joined #git
22:10 dreiss joined #git
22:10 bilal joined #git
22:10 TheSimonator joined #git
22:15 bilal joined #git
22:21 shgysk8zer0_ joined #git
22:22 cagomez joined #git
22:22 jakesyl_mobile joined #git
22:22 lowercaseman joined #git
22:23 mel00010 joined #git
22:24 kent\n joined #git
22:24 mattcen joined #git
22:24 cagomez joined #git
22:26 madewokherd joined #git
22:26 Cabanossi joined #git
22:27 lyxus joined #git
22:30 felixsanz joined #git
22:31 Celeron_ joined #git
22:32 robattila256 joined #git
22:34 Stumbler joined #git
22:34 bannakaffalatta joined #git
22:35 mellernoia joined #git
22:35 dreiss joined #git
22:35 venmx joined #git
22:36 felixsanz_ joined #git
22:38 ISmithers joined #git
22:42 tocky joined #git
22:43 caper left #git
22:45 Vitriox joined #git
22:48 sz0 joined #git
22:49 masuberu joined #git
22:49 Arquino joined #git
22:49 LBV_User joined #git
22:50 Muzer joined #git
22:52 Arquino joined #git
22:52 raijin joined #git
22:54 Sasazuka joined #git
22:54 nd_ joined #git
22:54 Stumbler joined #git
22:55 Arquino joined #git
22:56 Cabanossi joined #git
22:57 dirtyroshi joined #git
22:59 Altiare joined #git
23:01 Altiare joined #git
23:01 jtoy joined #git
23:02 gableroux joined #git
23:03 oleo_ joined #git
23:05 gableroux joined #git
23:06 jstein_ joined #git
23:07 salamanderrake joined #git
23:09 Altiare joined #git
23:11 safe joined #git
23:12 gopar joined #git
23:13 livingstn joined #git
23:13 masuberu joined #git
23:16 gopar joined #git
23:17 ISmithers joined #git
23:20 akkad_ left #git
23:22 Hunter1 joined #git
23:26 prg3 joined #git
23:29 dilijev joined #git
23:32 tocky joined #git
23:32 dsdeiz joined #git
23:32 dsdeiz joined #git
23:33 firef1y joined #git
23:34 eb0t joined #git
23:38 firef1y joined #git
23:39 marianina8 joined #git
23:41 raijin joined #git
23:43 Noodlewitt joined #git
23:48 oleo joined #git
23:50 johnflux_ joined #git
23:51 mel00010 joined #git
23:51 tubal joined #git
23:56 Cabanossi joined #git
23:57 firef1y joined #git
23:58 kutenai I have a diff tool that will give me a nice comparison of two folders, allowing me to drill down to any of the changed files.
23:59 kutenai How can I "checkout" all files from HEAD into a reference directory that I can compare against my current working files?
23:59 raijin joined #git
23:59 kutenai I don't need a bare repo or anything, just a 'snapshot' of HEAD to a different dir, or a local ignored directory.
23:59 kutenai I hope that is clear
23:59 Vampire0 kutenai, you could e. g. use man git worktree
23:59 gitinfo kutenai: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html

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