Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-14

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

All times shown according to UTC.

Time Nick Message
00:00 shgysk8zer0 joined #git
00:03 energizer joined #git
00:03 energizer I have a bunch of data files in json and csv, which I'd like to version control. They're about 3 GB in total. How can I do this?
00:04 Gianormagantrous git annex
00:08 Gianormagantrous energizer, you do: git init && git annex init && git annex add .
00:08 energizer Gianormagantrous: ok reading the docs now
00:09 cagomez joined #git
00:10 Gianormagantrous It's sort of super simple + incredibly powerful… in a git way
00:13 fuchstronaut joined #git
00:16 zacts joined #git
00:21 Mission-Critical joined #git
00:27 mellernoia-work joined #git
00:28 csd_ joined #git
00:29 Electrom_ joined #git
00:30 hahuang61 joined #git
00:32 yoan joined #git
00:35 peepsalot joined #git
00:36 led_belly joined #git
00:36 MissionCritical joined #git
00:40 tgunr joined #git
00:40 JacobsLadd3r joined #git
00:41 mingrammer joined #git
00:41 JacobsLadd3r joined #git
00:45 JacobsLadd3r joined #git
00:46 JacobsLadd3r joined #git
00:47 Rodya_ joined #git
00:48 JacobsLadd3r joined #git
00:49 arescorpio joined #git
00:58 tesuji_ joined #git
01:01 l4v2 joined #git
01:02 Prisoner-2460_1_ joined #git
01:02 dhollinger joined #git
01:05 blackwell_ joined #git
01:05 constant joined #git
01:05 bobdobbs joined #git
01:06 Mannn !test
01:07 torbjorn joined #git
01:13 blackwell_ joined #git
01:15 blackwell joined #git
01:16 pks joined #git
01:17 israelzuniga joined #git
01:18 UTAN_dev joined #git
01:18 d^sh joined #git
01:19 torbjorn joined #git
01:20 energizer Gianormagantrous: i have python code that generates these big json and csv files.
01:21 energizer I'm thinking I'd have a parent folder containing folders scripts and data
01:21 energizer where scripts would have a git repo
01:21 kadoban_ energizer: Usually you wouldn't version control generated content.
01:21 energizer and data would have a git annex
01:21 cagomez joined #git
01:21 constant unless it takes some insane amount of time to generate
01:22 energizer ya they do
01:23 l4v2 joined #git
01:23 blackwell joined #git
01:23 energizer so would that be a typical structure? project_folder contains (scripts folder with git repo) and (data folder with git annex)
01:24 blackwell joined #git
01:25 energizer or at least a reasonable structure?
01:25 eka joined #git
01:26 energizer or would i have a single repo somehow tracking the source and the data
01:26 shgysk8zer0 joined #git
01:27 Dougie187 joined #git
01:28 Gianormagantrous so energizer, you can definitively mix both in the same repo
01:28 blackwell joined #git
01:28 energizer Gianormagantrous: is that what you'd recommend?
01:29 constant energizer: I would separate them out
01:29 constant but that's just personal preference
01:29 sleblanc joined #git
01:29 blackwell joined #git
01:30 energizer constant: you're saying: a regular repo for the scripts and an annex for the files, in separate directories
01:30 Gianormagantrous I too think it is a bad idea to mix generated stuff and source
01:30 constant energizer: yes
01:30 energizer ok that is what i will do then
01:31 vassagus_ joined #git
01:32 sleblanc energizer, I only have part of the story here, so bear with me: try to automatize the bridge between the two, so that your repos will be the least error-prone as possible
01:33 energizer sleblanc: sounds good, what do you have in mind
01:34 sleblanc energizer, depends on what you need. It could be as simple as a set of two commands, just keep it consistent to avoid errors
01:34 Raed|Mobile joined #git
01:35 sleblanc by automation, I don't mean an actual service or something that looks at your files and does things for you, but more as a way to simplify your workflow
01:36 mingrammer joined #git
01:36 Gianormagantrous But, sleblanc, won't he end up with lots of forever committed superfluous stuff in the annex?
01:37 Gianormagantrous The process of committing rendered data to the annex could indeed be automated but definitively manually triggered.
01:37 sleblanc yes!
01:37 blackwell joined #git
01:37 Gianormagantrous energizer, mentioned some 3G of stuff
01:38 Mission-Critical joined #git
01:39 dw joined #git
01:39 Vampire0 joined #git
01:40 dw hi. i'm trying to use git grep foo $(git rev-list --all) to sanitize a repo's history of private data. i've done a variety of rebases to purge the data, but still git grep is showing results. the revisions listed are not part of any local or remote branch or tag, and git branch --contains -a prints no output for them. any idea how they are still being referenced?
01:41 dw I tried git gc -a and suchlike but still they remain
01:41 CheckDavid joined #git
01:41 venmx joined #git
01:41 sleblanc does the new content have some relation to the previous content? If so, keeping it in a git repo (with annex) seems appropriate, to retain history and versioning. otherwise, you might be better served with an annex that simply contains tar-like archives
01:41 sleblanc ^ Gianormagantrous, energizer
01:43 energizer sleblanc: yep. the scripts go to the web, get some files, process them, save them as json and csv. there will be new versions of each file coming in from time to time
01:45 sythe joined #git
01:45 sleblanc energizer, seems like a good fit for an annex. annexes give you the ability to organize storage. So you can have your local annex that only contains the most recent data (because your dev machine does not need the history) and your backups contain the full archive, etc.
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:51 cagomez joined #git
01:57 vassagus joined #git
02:00 rossome joined #git
02:06 Blkt joined #git
02:06 codebam hey, so I'm still trying to do this. I fetched a remote branch in another repo, how can I cherry pick a commit from it in a different repo?
02:07 thiago to cherry-pick: git cherry-pick <commit-sha1-goes-here>
02:07 codebam I know that
02:07 thiago ok, so what's the issue?
02:07 codebam I don't want to fetch it again, I've already fetched it in another repo
02:08 Girafferson joined #git
02:08 thiago ok
02:08 thiago so do the cherry-pick
02:08 codebam hmm?
02:08 kadoban_ codebam: name it in the local repo, and fetch from the local repo
02:08 thiago if you've fetched, it's probably still there
02:08 thiago just cherry-pick now
02:09 codebam kadoban: how do I do name it in the local repo?
02:09 kadoban codebam: 'git branch' or 'git tag'
02:09 thiago what's the problem with running the cherry-pick? Are you getting an error?
02:10 codebam its in another git Rep th
02:10 kadoban thiago: It's in repo A on their local machine and they want to cherry-pick it in repo B
02:10 codebam repo
02:10 thiago then you need to fetch a branch that contains that commit
02:10 codebam the whole point is I don't want to fetch it again
02:10 thiago "again" implies once
02:10 thiago so why don't you cherry-pick?
02:11 codebam its in the other repo
02:11 thiago does the cherry-pick work?
02:11 codebam no
02:11 thiago ok
02:11 thiago so fetch
02:14 codebam kadoban: I don't understand how I fetch from the local repo
02:15 thiago git fetch URL branchname
02:15 codebam its local
02:15 fuchstronaut joined #git
02:15 thiago o?
02:15 thiago so
02:16 thiago use the file path or a file:// URL
02:16 codebam oh I can do that?
02:16 thiago of course :-)
02:16 codebam lol okay thanks
02:17 rewt you can add the other local repo as a remote, and fetch (which basically copies from one local repo to the other local repo)
02:18 codebam can I reference instead of fetch? I mean I'm alright with fetching, but is that possible to do?
02:18 thiago what do you mean by reference?
02:18 codebam like just use it from inside that directory without having to fetch from it
02:18 rewt the commit has to be in the repo you want to use it in
02:18 thiago ok, what do you mean by "use" now?
02:19 codebam well sort of like a symlink
02:19 thiago yes
02:19 codebam but I don't think its possible so thats alright
02:19 thiago that's called 'fetching"
02:19 codebam no fetching is copying files
02:19 thiago you can hardlink them
02:19 rewt or you could create a patch in one repo, and apply in the other
02:20 thiago hardlink the .pack and .idx files from one repository to the other
02:20 codebam rewt: I guess that's right, I probably should have done that
02:20 thiago you can set an alternates object dir, but I don't recommend it for your level of knowledge
02:20 rewt codebam, but note that that will add a "Signed-off-by" tag to the commit
02:21 thiago cherry-pick doesn't add that
02:21 thiago you have to use the -s option
02:21 codebam oh okay
02:21 codebam should I be adding the -s?
02:21 l4v2 joined #git
02:21 thiago do you want to add your own signed-off-by?
02:22 kadoban -s is pretty much specific to your workflow or project, nobody can really answer that for you.
02:22 thiago right
02:22 codebam I guess it doesn't matter, what I've been doing this far works
02:22 thiago use it if you want to
02:22 codebam is that sort of like for code review?
02:23 thiago no
02:23 thiago http://developercertificate.org/
02:23 rewt as long as you don't push to a remote repo, you can try different things, reverting to your current state between them, until you get what you're after
02:23 codebam oh I see
02:24 rewt i like gitk to visualize what happened
02:24 codebam okay rewt, thanks
02:26 jaafar joined #git
02:26 codebam I'm going to try out gitk right now, thanks for that
02:26 rewt it's not pretty, but it gets the job done
02:31 Khisanth joined #git
02:31 hahuang61 joined #git
02:31 Rodya_ joined #git
02:33 chachasmooth joined #git
02:36 rossome joined #git
02:36 codebam how do I list all the branches I fetched from a remote repo?
02:38 codebam never mind, got it
02:39 hexagoxel joined #git
02:39 lagothri1 joined #git
02:42 venmx joined #git
02:44 l4v2 joined #git
02:51 skylite joined #git
02:54 Rodya_ joined #git
02:56 le_melomane joined #git
02:56 Rodya_ joined #git
03:01 pi__ joined #git
03:08 codebam I added the APSS.FSM.3.0 branch as a remote from here because I want to add this commit https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?h=APSS.FSM.3.0&amp;id=06e51489061e5473b4e2035c79dcf7c27a6f75a6. however when I try to cherry pick it says bad object, I also can't find it in the git logs with -g --grep=
03:10 fstd_ joined #git
03:13 chandu20 joined #git
03:16 fuchstronaut joined #git
03:20 dreiss joined #git
03:23 mingrammer joined #git
03:27 boombatower joined #git
03:28 energizer Having some trouble with git annex
03:28 energizer http://stackoverflow.com/questions/38938850/git-annex-init-fails-with-no-gpg-sign-error
03:29 csd_ joined #git
03:32 Limes_ joined #git
03:35 meLon joined #git
03:37 nydel07 joined #git
03:38 ws2k3 joined #git
03:38 Dougie187 left #git
03:40 dsdeiz joined #git
03:44 venmx joined #git
03:46 realz joined #git
03:48 steven_a_s joined #git
03:50 raven-au_ joined #git
03:50 Electrometro joined #git
03:54 BenderRodriguez joined #git
03:58 israelzuniga joined #git
03:59 cqi joined #git
03:59 Mowgli joined #git
04:00 cdg joined #git
04:01 bremner energizer: just FYI, there is also #git-annex on oftc
04:02 thecomedian joined #git
04:04 csd_ joined #git
04:06 vassagus joined #git
04:14 cdg joined #git
04:15 Nex6 joined #git
04:18 mingrammer joined #git
04:20 kisonecat joined #git
04:25 Cabanossi joined #git
04:27 energizer is there a difference between creating a repo in one place, cloning it in another and doing it the other way around?
04:27 energizer in terms of the status of the repos
04:28 dreiss joined #git
04:32 hahuang61 joined #git
04:37 zacts joined #git
04:43 SwiftMatt joined #git
04:45 venmx joined #git
04:46 bq_ joined #git
04:47 languitar joined #git
04:52 evanvarvell joined #git
04:53 danimal2 joined #git
04:53 kadoban There could be in terms of what local branches exist, and what the remotes are set up as.
04:53 The_Phoenix joined #git
04:57 Jonuz joined #git
05:03 l4v2 joined #git
05:04 hyperair joined #git
05:07 csd_ joined #git
05:07 harish_ joined #git
05:13 mingrammer joined #git
05:13 energizer kadoban: how do you mean
05:14 kadoban Not really going to go into every part of that in detail, do you have a specific question?
05:16 energizer im gonna read up a bit before i ask
05:17 fuchstronaut joined #git
05:24 ColdKeyboard joined #git
05:25 ljc joined #git
05:26 hyperair joined #git
05:28 cdg joined #git
05:31 magicTurtle joined #git
05:32 bmahe joined #git
05:36 kisonecat joined #git
05:38 Derperperd joined #git
05:43 juvenal joined #git
05:44 bjd left #git
05:45 venmx joined #git
05:45 Derperperd joined #git
05:47 LucaTM joined #git
05:47 ecraven left #git
05:53 harish_ joined #git
05:58 phaleth joined #git
06:00 p4trix joined #git
06:00 pabs3 joined #git
06:01 venmx joined #git
06:01 pabs3 anyone have any thoughts on why gitk looks weird for me? https://people.debian.org/~pabs/tmp/gitk-weird.png
06:08 johnny56_ joined #git
06:10 malide joined #git
06:14 ASOLAr joined #git
06:18 fuchstronaut joined #git
06:19 ASOLAr joined #git
06:21 ASOLAr_ joined #git
06:21 harish_ joined #git
06:25 venmx joined #git
06:32 hahuang61 joined #git
06:35 ASOLAr joined #git
06:37 karstensrage joined #git
06:37 jknetl joined #git
06:40 subhojit777 joined #git
06:41 Krenair joined #git
06:44 JacobsLadd3r joined #git
06:44 paras_020 joined #git
06:46 cd-rum joined #git
06:48 paras_020 joined #git
06:48 cd-rum_ joined #git
06:53 alansaul joined #git
06:56 h4shcat joined #git
07:00 mingrammer joined #git
07:02 mrpackethead joined #git
07:05 glebihan_ joined #git
07:05 jimi_ joined #git
07:06 emPi joined #git
07:07 glebihan_ joined #git
07:08 lindenle joined #git
07:08 dminca joined #git
07:10 mehola joined #git
07:17 ryez joined #git
07:17 nilg joined #git
07:19 fuchstronaut joined #git
07:33 njr_2 joined #git
07:38 csd_ joined #git
07:41 noteness joined #git
07:41 valar joined #git
07:43 t0by joined #git
07:44 noteness joined #git
07:46 nitin joined #git
07:47 Raed|Laptop joined #git
07:50 MrMojito joined #git
07:51 r00t66 joined #git
07:52 virtum joined #git
07:52 virtum left #git
07:53 cdown joined #git
07:55 blackwind_123 joined #git
07:55 mingrammer joined #git
07:56 cdown_ joined #git
07:59 magicTurtle joined #git
08:01 blackwind_123 joined #git
08:13 tomog999_ joined #git
08:13 blackwind_123 joined #git
08:13 Jonuz joined #git
08:15 Jonuz joined #git
08:16 GT4066 joined #git
08:17 BlaXpirit if I have the same file in two completely independent branches, will it take up the space once or twice?
08:18 kadoban Once
08:18 BlaXpirit ok thanks
08:19 blackwind_123 joined #git
08:20 fuchstronaut joined #git
08:24 LiohAu joined #git
08:25 ryez is it a bug, I just found post-rewrite hook is not invoked by `git rebase -i`
08:25 ryez ?
08:26 blackwind_123 joined #git
08:28 cdown joined #git
08:33 Hink joined #git
08:33 hahuang61 joined #git
08:34 blackwind_123 joined #git
08:38 psprint_ joined #git
08:39 psprint_ Is there some obligation that for merge commits, the first parent should be current HEAD, for HEAD^1, etc. to work as expected?
08:40 kadoban psprint_: I don't think so. AFAIK it's just a convention that git uses. In particular when you do things where it matters, git makes you specify which side is which.
08:40 leeN joined #git
08:43 blackwind_123 joined #git
08:46 psprint_ kadoban: you mean what's "theirs" and "ours"? Not fully following this could you provide example? I guess that even if "ours" can be specified, it's that "ours" will be first, which is quite a convention
08:48 kadoban psprint_: I mean when you do things where it matters what parent is what, git makes you specify. Like, look at the --mainline option of man git revert
08:48 gitinfo psprint_: the git-revert manpage is available at http://jk.gs/git-revert.html
08:49 stasmakarov joined #git
08:55 iskander joined #git
08:55 SteffanW joined #git
08:56 alansaul joined #git
08:56 psprint_ Well at least libgit2 requires first parent to be tip of the branch being commited to: https://github.com/libgit2/libgit2/blob/master/include/git2/commit.h#L299-L300
08:57 blackwind_123 joined #git
08:58 noteness joined #git
08:59 iskander joined #git
08:59 DistantStar joined #git
09:02 iskander joined #git
09:03 blackwind_123 joined #git
09:04 noteness joined #git
09:05 khmarbaise joined #git
09:06 zumba_addict joined #git
09:07 garethdaine joined #git
09:07 ljc joined #git
09:08 iskander joined #git
09:09 cyan__ joined #git
09:09 heysin joined #git
09:09 wget Hello Guys. Quite a bit lost here. I downloaded a github repositotory I forked from another Github user. And I created a branch in my fork using github interface. Doing a git clone, I only have the master branch of the guy from who I forked my repo.
09:09 wget I don't see py branch locally. These are only viewable if I do a git branch -a. However a git checkout myBranch does not work, as if the content was not downloaded.
09:09 wget What am I missing here?
09:13 Freezer25 joined #git
09:17 sin3t joined #git
09:17 wget damn I needed a git fetch origin
09:17 wget git clone seems to only download the content of the default tracked branch
09:17 catsup joined #git
09:20 fuchstronaut joined #git
09:21 Darcidride joined #git
09:22 wget Still one question though. The master branch has been updated by the guy I forked from. But my master branch is not updated accordingly
09:22 wget I decided to add the remote of the guy, git fetch his remove and merge his master branch into mine
09:23 wget I did a  git merge remotes/upstream/master and it seems to be working
09:23 Mikaela joined #git
09:23 Darcidride joined #git
09:24 wget I don't know if this is the simplest process I need to follow :-/
09:25 jimi_ joined #git
09:27 Rish joined #git
09:28 Guest29537 joined #git
09:29 Raed|Laptop joined #git
09:30 choki joined #git
09:30 robotroll joined #git
09:31 Darcidride joined #git
09:33 Darcidride joined #git
09:33 alansaul joined #git
09:34 zumba_addict joined #git
09:36 linuxmint joined #git
09:37 davisonio joined #git
09:38 nwkj86 joined #git
09:39 Darcidride joined #git
09:40 csd_ joined #git
09:41 Darcidride joined #git
09:43 mingrammer joined #git
09:44 aidalgol joined #git
09:45 eivarv joined #git
09:46 slash77 joined #git
09:48 bket joined #git
09:51 br4d joined #git
09:52 br4d left #git
09:53 mohabaks joined #git
10:01 Kicer86 joined #git
10:12 alansaul joined #git
10:14 nikivi joined #git
10:16 stamina joined #git
10:16 ahmedelgabri joined #git
10:16 khmarbaise joined #git
10:16 Lea2 wget, yup fetch/merge
10:17 ams__ joined #git
10:20 Shentino joined #git
10:20 govg joined #git
10:21 fuchstronaut joined #git
10:23 bartosz_ joined #git
10:26 rgrinberg joined #git
10:30 phanimahesh joined #git
10:31 astrofog joined #git
10:34 hahuang61 joined #git
10:35 SteffanW joined #git
10:38 mingrammer joined #git
10:42 wcpan joined #git
10:42 johnny56 joined #git
10:43 alansaul joined #git
10:45 cyan__ joined #git
10:50 nitin joined #git
10:55 SirOliver joined #git
10:57 afuentes joined #git
10:57 flavius joined #git
10:59 f3r70rr35f joined #git
11:00 yoan joined #git
11:03 a3Dman joined #git
11:04 sanketdg joined #git
11:05 SirOliver joined #git
11:06 khmarbaise_ joined #git
11:06 khmarbaise_ joined #git
11:12 InfoTest joined #git
11:14 fahadash joined #git
11:16 ojdo joined #git
11:18 JrCs joined #git
11:20 beyertech joined #git
11:22 fuchstronaut joined #git
11:25 rorro joined #git
11:28 emr joined #git
11:29 emr Hello, is it valid ignore */migrations/0*.py line?
11:30 JrCs joined #git
11:35 boombatower joined #git
11:39 beyertech joined #git
11:41 sdothum joined #git
11:50 Rodya_ joined #git
11:50 madduck joined #git
11:54 madduck joined #git
11:55 Cassiopaya joined #git
11:56 sdothum joined #git
11:57 grawity joined #git
11:57 osse yes
11:57 IlNominePatre joined #git
11:58 spudowiar joined #git
12:01 beyertech joined #git
12:02 Rodya_ joined #git
12:03 beyertech joined #git
12:08 bket1 joined #git
12:13 bket joined #git
12:19 cyan__ joined #git
12:23 fuchstronaut joined #git
12:24 idmistir_ joined #git
12:25 Maple__ joined #git
12:32 jeffmjack joined #git
12:32 idmistir joined #git
12:32 idmistir joined #git
12:34 kyan joined #git
12:35 hahuang61 joined #git
12:35 CussBot joined #git
12:35 davisonio joined #git
12:37 LiohAu joined #git
12:39 Manuel15 joined #git
12:39 Manuel15 joined #git
12:40 nikivi joined #git
12:49 juliohm joined #git
12:50 joki joined #git
12:52 sagittarian joined #git
12:53 thomas joined #git
12:53 Repox joined #git
12:54 dsdeiz joined #git
12:54 dsdeiz joined #git
12:56 thomas joined #git
12:56 juliohm Hi, I have a remote repo on GitHub that is forked from another project. I cloned it to my local machine and did changes. I pushed the changes to GitHub and opened a pull request. Now, time has passed and the original project has changed. I have to rebase my changes in the pull request. I tried git fetch my_remote_repo && git checkout FETCH_HEAD && git rebase master. I solved the conflicts and completed the rebase locally. Now I want to merge the FETCH
12:56 juliohm _HEAD onto the master. I tried git checkout master && git merge FETCH_HEAD but I am getting a conflict on the same file. Can someone explain what is happening?
12:58 juliohm Apparently I am trying to merge on the original master, how can I identify the master branch of my fork?
12:59 Cata|Work joined #git
13:00 _ikke_ juliohm: my_remote_repo/master
13:01 GenZai joined #git
13:02 rbern joined #git
13:04 pabs3 left #git
13:05 juliohm _ikke_, I didn't fetch the repo with a name, I just passed the URL
13:08 _ikke_ juliohm: Easier to just add it as a remote
13:08 _ikke_ Especially when you continue to work with the remote
13:09 HappyLoa- joined #git
13:10 dreiss joined #git
13:11 juliohm _ikke_, agree, I am doing it now
13:11 l4v2 joined #git
13:16 Guest27 joined #git
13:18 zivester joined #git
13:23 juliohm _ikke_, I did git remote add myfork URL && git fetch myfork. Then I did the rebase with git co myfork/master && git rebase origin/master
13:23 fuchstronaut joined #git
13:23 Munt joined #git
13:24 juliohm _ikke_, I am on a detached HEAD now, why?
13:25 juliohm Is there anything else that I am missing? Is the rebase complete? Do I need to explicitly ask myfork/master to point to the new rebased commits?
13:26 osse juliohm: the "g co myfork/master" probably detached you
13:26 osse myfork/master sounds like a remote tracking branch
13:27 xaa joined #git
13:27 juliohm osse, what is the correct way of doing it?
13:28 osse juliohm: create a new local branch from myfork/master
13:28 osse or use master for that purpose
13:28 juliohm oh got it
13:28 mellernoia joined #git
13:28 juliohm how to use master?
13:29 osse seems you already tried that but got conflicts
13:29 osse not sure I follow
13:29 kyan joined #git
13:29 osse you git  checkout master && reset --hard myfork/master && rebase origin/master
13:30 jab416171 joined #git
13:30 juliohm osse, is the reset --hard harmful?
13:31 juliohm I never used it before, it just changes the label to another commit right?
13:31 osse yes
13:31 osse but the implication of that is that anything that is no longer labeled will be lost
13:31 osse unless it's also labeled by something else
13:32 juliohm In that way it just sets the local master to point to myfork/master instead, correct? Because the local master is already pointed by origin/master, there is nothing to loose, confirm?
13:32 osse yes
13:32 osse however I'm not sure that's what you want
13:33 juliohm osse, I want to rebase my changes and update a pull request in GitHub
13:33 juliohm just fighting with the rebase, it is not something that I do usually
13:33 osse then it sounds like it's what you want
13:33 juliohm osse, can you give an example of a situation where git reset --hard is harmful?
13:34 osse juliohm: make changes; git add them; git commit -m 'This is really important'; git reset --hard HEAD~1
13:35 juliohm got it
13:35 osse even more harmful: make changes; NOT git add; NOT git commit; git reset --hard
13:36 juliohm hahah true
13:36 juliohm I am still trying to digest the recipe for rebasing pull requests
13:36 juliohm See if you agree...
13:36 osse it's no different than rebasing anything else
13:37 osse disregard the pull request; do what needs doing; then you can push -f to the branch you submitted the PR from
13:37 juliohm ok, what is the -f?
13:37 juliohm forward is not implied?
13:38 KeelOfSteel joined #git
13:38 chachasmooth joined #git
13:39 osse force
13:40 fahadash joined #git
13:41 csd_ joined #git
13:42 blackwind_123 joined #git
13:43 juliohm Ok, I repeated the process with a local branch and everything went smooth, no message about detached head
13:43 juliohm So, now I have a local branch called feature besides the master, and the origin/master and myfork/master
13:44 juliohm I will merge this local branch by doing git co master && git merge feature
13:44 juliohm oh no
13:44 juliohm feature branch was created from myfork/master
13:45 juliohm I just need to push this branch to the remote right? git co feature && git push myfork/master?
13:46 osse what other branch a branch was created "from" rarely matters
13:46 osse the push command has a syntax error
13:47 cdg joined #git
13:48 juliohm osse, can I just push to the remote like this? Won't git complain about the conflict in the server?
13:49 osse you can't push at all because the push command is wrong
13:49 osse once you fix it yes it will likely complain
13:49 osse (hence the -f)
13:49 juliohm this is the usual way people update pull requests? Any other way to avoid this -force option?
13:50 osse depends on why they updated it in the first place.  in this case no.
13:51 juliohm I am in the standard scenario... GitHub pull request on origin/master. The project continues to receive commits regardless of my changes. I then need to update the request to rebase the changes
13:52 juliohm It is a lot of work to rebase, not trivial for me
13:52 osse then you need push force
13:52 juliohm thanks let me try
13:52 osse this has nothing to do with github or pull request, strictly speaking. you want to push an updated branch, but it's not strictly a decendant of the remote one. hence you need force
13:53 kyan joined #git
13:55 cdown joined #git
13:57 BrunoMine joined #git
13:57 cdown_ joined #git
14:02 jknetl joined #git
14:04 Gamecubic joined #git
14:10 joki joined #git
14:10 KeelOfSteel joined #git
14:12 juliohm thank you osse , problem solved
14:15 kyan joined #git
14:17 jeffreylevesque joined #git
14:19 The_Phoenix joined #git
14:20 rorro joined #git
14:24 fuchstronaut joined #git
14:25 The_Phoenix joined #git
14:26 KeelOfSteel joined #git
14:30 vassagus joined #git
14:31 reda joined #git
14:33 mikecmpbll joined #git
14:35 hahuang61 joined #git
14:39 KeelOfSteel joined #git
14:43 dlaboratory joined #git
14:44 Prisoner-2460_1 joined #git
14:45 davisonio joined #git
14:47 diogenese joined #git
14:51 Freezer25 left #git
14:53 govg joined #git
14:54 Peuc joined #git
14:55 madewokherd joined #git
14:57 cagomez joined #git
14:58 robotroll joined #git
14:58 Prisoner-2460_1_ joined #git
14:58 mingrammer joined #git
15:02 israelzuniga joined #git
15:07 despoil joined #git
15:13 jimi_ joined #git
15:16 a3Dman joined #git
15:25 tlaxkit joined #git
15:25 fuchstronaut joined #git
15:31 eivarv joined #git
15:35 alansaul joined #git
15:35 harish_ joined #git
15:36 jeffreylevesque joined #git
15:36 csd_ joined #git
15:40 kn-928 joined #git
15:42 davisonio joined #git
15:46 p4trick joined #git
15:49 fmcgeough joined #git
15:52 tlaxkit joined #git
15:53 stamina joined #git
15:54 sq-one joined #git
15:57 cagomez joined #git
15:57 cyan__ joined #git
15:59 semantipc joined #git
16:03 cdg joined #git
16:05 LiohAu joined #git
16:06 m0viefreak joined #git
16:07 cdg joined #git
16:09 vassagus_ joined #git
16:11 Darren_ joined #git
16:12 cdg joined #git
16:15 nitin joined #git
16:15 BrianJ joined #git
16:16 gitnewbie joined #git
16:19 gitnewbie left #git
16:19 iskander joined #git
16:22 beyertech joined #git
16:22 mingrammer joined #git
16:22 iskander_ joined #git
16:24 xaa joined #git
16:26 ggherdov Hello. If the remote has a branch called foo, to pull their "foo" into my "foo" should I use the command "git pull <repo-url> foo:foo" ?
16:26 ggherdov I'm getting "Couldn't find remote ref foo" for some reason.
16:28 ska left #git
16:28 beyertech joined #git
16:29 SporkWitch joined #git
16:29 _ikke_ ggherdov: git ls-remote <url> | grep foo
16:29 eivarv joined #git
16:29 ggherdov _ikke_: thanks!
16:29 zacts joined #git
16:31 SporkWitch having some trouble setting up keys.  I've tried the short (8 character), long (16 character), and full fingerprint in the user.signingkey setting, but in all attempts i get "secret key not available" (the correct key id is printed in the error message as "skipped")
16:31 _ikke_ That lists all the refs that remote has
16:31 SporkWitch the user.email and user.name also match the uid on the key
16:32 SteffanW joined #git
16:35 _ikke_ SporkWitch: Try first with gpg --local-user <key>
16:36 SporkWitch 'go ahead and type your message'
16:36 dtrott joined #git
16:36 hahuang61 joined #git
16:37 _ikke_ can you try GIT_TRACE=1 <git command>
16:38 MyDuckIsGoingMad joined #git
16:39 SporkWitch looks like it's calling gpg -bsau
16:40 dreiss joined #git
16:40 SporkWitch possible the issue is compatibility with keys generated with gpg2? is it possible to make git use gpg2 instead?
16:40 Goplat joined #git
16:41 _ikke_ gpg.program
16:41 _ikke_ config
16:41 SporkWitch yup, already googled, heh
16:41 SporkWitch and that resolved it
16:41 SporkWitch thanks for the hint with trace
16:43 _ikke_ the man for gpg.program also mentions -bsau
16:44 SporkWitch yeah, i was looking over the manpage for gpg to figure out exactly what those were doing (about all i do from the CLI with gpg normally is key management and individual files, heh)
16:44 _ikke_ hehe
16:46 srcerer joined #git
16:46 SporkWitch not my first rodeo, i actually try to do my homework first and during :)
16:47 SporkWitch was in the process of submitting my first pull request on github, and since it was for security stuff i figured it couldn't hurt to sign the changes (he may not know me, but he can at least do a cursory verification through keybase)
16:48 Faylite joined #git
16:48 _ikke_ The main security for these kinds of things is more based on good reviewing of the patches then trusting the author
16:49 SporkWitch agreed, and it's a small enough piece of work that should be trivial for him, but like i said, i figured it couldn't hurt lol
16:52 Manuel15 joined #git
16:52 Manuel15 joined #git
16:53 _ikke_ :-)
16:53 tesuji joined #git
16:54 ahmedelgabri joined #git
16:56 monoprotic joined #git
16:56 nessundorma joined #git
16:58 jost_ joined #git
17:01 nfk joined #git
17:01 Dougie187 joined #git
17:01 csd_ joined #git
17:03 thiago joined #git
17:05 meLon joined #git
17:05 davisonio joined #git
17:06 iskander joined #git
17:09 dmitrij_4459 joined #git
17:09 stasmakarov joined #git
17:11 Munt joined #git
17:12 davisonio joined #git
17:16 mariuscc joined #git
17:17 mingrammer joined #git
17:17 MyDuckIsGoingMad joined #git
17:19 paul424 joined #git
17:20 impi joined #git
17:20 impi hey guys
17:20 _ikke_ ohai
17:20 impi i got a strange one
17:20 rkazak joined #git
17:20 impi in bash this command git rev-parse --symbolic-full-name --abbrev-ref @{upstream} 2> /dev/null
17:20 impi echos my remote/branch
17:20 impi in zsh it echos @a
17:20 impi been trying to figure out why though
17:21 SporkWitch impi: academic question or trying to write a hook?
17:21 SporkWitch impi: i use zsh myself, but i write my hooks in bash
17:21 impi hey :)
17:21 impi https://github.com/arialdomartini/oh-my-git/issues/99
17:21 impi ive started using zsh, it's really rad
17:21 SporkWitch that it is :)
17:21 impi and oh-my-git in zsh and i got that bug
17:22 eivarv joined #git
17:22 impi on bash oh-my-git works sweet - no problems and the remote shows
17:22 SporkWitch huzzah for git-away prompt: ~/dev/TokenTools>-<c557c4c∙refactor/python3∙✔>
17:22 impi https://github.com/arialdomartini/oh-my-git/blob/master/base.sh#L72
17:22 impi is where the bug is
17:22 SporkWitch impi: and actually, if it's for the prompt that you're asking, you can check my configs repo on github; the prompt i modified to my taste should be on there
17:23 SporkWitch s/git-away/git-aware/
17:24 impi SporkWitch, awesome man, have you got a link
17:24 SporkWitch impi: i'd have to compare it against my own, so just compare it against mine lol
17:24 impi my prompt is the bomb though
17:24 SporkWitch sure, let me dig it up
17:24 clemf joined #git
17:24 SporkWitch i'd love a screenshot and run-down on it; always interested in improvements :)
17:25 SporkWitch https://github.com/sporkwitch/configs/blob/master/sporkprompt.zsh-theme
17:25 semantipc joined #git
17:26 rahtgaz joined #git
17:26 fuchstronaut joined #git
17:27 impi https://snag.gy/dtO87i.jpg
17:27 impi SporkWitch, my prompt is there
17:27 impi thanks for the link
17:28 SporkWitch sheesh, is there any script left on the internet that site DOESN"T need me to allow? lol
17:28 SporkWitch that's kind of neat, mine's a bit more simplistic
17:33 SporkWitch impi: http://imgur.com/aIsCMBc
17:33 impi i just used the default sorin promt, and added my own one below, because oh-my-git has this default one that i didnt like
17:34 SporkWitch icic
17:34 impi aw that is sweet you pimp
17:34 SporkWitch yeha, i need to mess with oh-my-zsh a bit, i could probably get more out of it, just never find the time to muck about with it
17:34 SporkWitch *yeah
17:34 impi i saw the prompt here https://www.youtube.com/watch?v=UBGzsb2UkeY
17:34 SporkWitch and i'm a derp, and the cursor is obscuring the red X for a dirty working dir lol
17:35 SporkWitch impi: got a timestamp? 30 minutes is a bit much lol
17:35 stuh84 joined #git
17:36 impi sure, 1 sec
17:36 InfoTest joined #git
17:36 impi 4:05
17:43 frgttnpswd joined #git
17:45 rorro joined #git
17:48 al-damiri joined #git
17:50 nnyk joined #git
17:51 eivarv joined #git
17:51 dsdeiz joined #git
17:53 gfixler joined #git
17:56 LiohAu joined #git
17:58 choki joined #git
17:59 dsantiago joined #git
18:05 arand_ joined #git
18:05 marlinc joined #git
18:06 Mannn joined #git
18:09 jussx joined #git
18:10 wget Guys. When I run git fetch <remote shortname>
18:10 wget are all remote branch pointers updated on the local side?
18:10 wget What I assume: all pointers pointing to remote repos are updated, but commits are only downloaded for the current branch only if all commits are fast foward
18:10 wget Am I right with this assumption?
18:10 spudowiar joined #git
18:11 Seveas no
18:11 Seveas it will download all commits on all branches
18:11 Seveas and then update local refs/remotes/<remote>/* refs that need updating
18:12 Seveas (unless you tweaked the fetch refspec, in which case it follows that)
18:13 BenderRodriguez joined #git
18:14 khmarbaise joined #git
18:15 thiago wget: git fetch does not (usually) update local branches
18:16 _ikke_ They should not
18:16 wget Then I don't understand. thiago you said local rbanches are not updated and Seveas said commits are downloaded.
18:16 _ikke_ Those are not mutual exlusive
18:16 wget For me, if commits are downloaded, files (and thus local branches) are updated.
18:16 Seveas nope
18:16 Seveas !soviet_git
18:16 gitinfo In Soviet Git, commits are not on branches, branches point to a commit.
18:17 Seveas commits are just objects that are transfered, like blobs and trees
18:17 _ikke_ commits live in .git
18:18 thiago wget: your local branches were not updated
18:18 thiago wget: your local copies of remote branches were
18:18 xaa joined #git
18:19 Seveas once git has all the objects to create the full history from where a remote branch points to, back to the root(s) of the commit tree, it can update the local ref that corresponds to that remote branch
18:19 wget ok so IIUC, "git fetch" downloads all commits objects, but only branch pointer objets already on the local side are updated?
18:19 Seveas branch pointers are not objects
18:19 _ikke_ refs are pointers to commits
18:19 thiago wget: there are no such obects
18:19 Seveas a branch is literally no more than saying "this label points to this object"
18:19 thiago the local copies of remote branches are updated
18:19 thiago all of them
18:19 Seveas e.g. refs/heads/master points to 2eb946ae7c35488b71879c33eec3b14b822dee14
18:20 Seveas or refs/remotes/origin/master points to dc1c9bbfe13f593bd8f4818e1255e90fa2eb24c6
18:20 thiago a branch is just a slightly easier way of dealing with commits than writing them down on post-it notes
18:22 _ikke_ there are 4 types of objects
18:22 _ikke_ blobs (files), trees, commits and tags
18:23 wget then I'm a bit confused here...
18:23 wget http://dl.wget.be/Screenshot_20160814_202138.png
18:23 wget in this use case what is updated/not updated?
18:23 dtrott joined #git
18:23 thiago wget: the local copies of the remote branches
18:23 wget the progit book also says "git fetch <remote> doesn't automatically merge it with files from working directory nor does it modify these files."
18:24 Seveas correct
18:24 _ikke_ correct
18:24 thiago "you don't have a new xxx branch - you only have an origin/xxx pointer that you can't modify"
18:24 wget thiago: and in this particular use case, are  the objects (file blob commits ) also downloaded?
18:24 Seveas wget: https://git.seveas.net/the-meaning-of-refs-and-refspecs.html#the-meaning-of-refs-and-refspecs
18:24 _ikke_ wget: yes
18:24 thiago git always downloads full history
18:24 thiago it can't work (very well) without them
18:24 SporkWitch a fetch updates info, it doesn't actually pull the data, AFAIK; is that correct, _ikke_ / Seveas ?
18:24 wget "It’s important to note that when you do a fetch that brings down new remote-tracking branches, you don’t automatically have local, editable copies of them"
18:25 SporkWitch (the data being the actual contents of those commits; the fetch grabs something akin to header info, descriptive stuff?)
18:25 _ikke_ SporkWitch: It downloads all objects, and updates remote tracking branches (refs/remotes/<remote>/*
18:25 _ikke_ SporkWitch: It downloads everything
18:25 Seveas SporkWitch: incorrect.
18:25 thiago SporkWitch: currect, fetch doesn't pull
18:25 thiago SporkWitch: but pull fetches
18:25 SporkWitch _ikke_: i see, so the only reason pull asks you to auth again is because it automatically does a fetch first?
18:25 SporkWitch yeah
18:25 _ikke_ SporkWitch: correct
18:26 _ikke_ SporkWitch: pull = fetch + merge
18:26 Seveas fetch fetches everything reachable from the refs in your fetch refspec that you don't already have locally
18:26 SporkWitch ah, gotcha
18:26 SporkWitch i seem to remember that, just don't normally think about it
18:26 inflames joined #git
18:28 wget Something is not really clear in my head here (sorry for fothering you guys ;-) )
18:28 wget If all refs/remote/<remote>/* are updated (even for new branches not available locally yet) and all commits blob objects are downloaded from these branches, why the hell could we say "the working directory is not modified" ?
18:28 zeroed joined #git
18:28 mingrammer joined #git
18:29 kadoban wget: Because it's not. All of that is just in .git/ which doesn't affect your actual content
18:29 Seveas wget: the working tree is the part of your repo that is not inside .git
18:29 Seveas and fetch changes nothing there
18:29 kadoban The working directory refers to ... your stuff, everything in the project folder except .git/
18:31 HanClinto joined #git
18:33 ixian joined #git
18:35 wget Ok. And if I'm in a branch, where I did some changes in my working directory not committed yet. If I do a git fetch to download new commits of that branch. The ref/origin/myBranch will be moved ahead and ref/local/master won't move. If I git commit, what will happen? I assume my ref/local/master won't be moved ahead to the same location as ref/origin/master.
18:36 LiohAu joined #git
18:36 rorro joined #git
18:36 _ikke_ wget: you ref/heads/master will be pointed to the new commit
18:37 _ikke_ Only when you merge origin/master into your local master, you'll get the changes
18:37 wget _ikke_: ok the source code will diverge then
18:37 _ikke_ yes
18:37 _ikke_ Untill you merge
18:37 hahuang61 joined #git
18:37 SporkWitch and then comes the fun part: interactive rebases, so you can submit a clean pull request!
18:38 * SporkWitch needs to set up a few junk repos just to practice with that, because he still seems to end up with a hideous history when he attempts that branch->master merge >_<
18:39 duderonomy joined #git
18:40 kadoban Practicing indeed helps a lot. If you're ending up with weird history you didn't intend or expect, that could just mean you're using the wrong workflow too (i.e. you're picking the wrong one of merge and rebase)
18:40 wget SporkWitch: actually git filter-branch and rebase are not that difficult when used locally :D
18:41 wget the problems arise when I need to work with several remotes
18:41 SporkWitch wget: i've only had to do it once, as i'm not a programmer primarily, heh
18:42 SporkWitch it was ugly and laborious, and i was NOT pleased with how the history ended up.  It seemed like every attempt at rebasing onto origin so i could do my pull request would just add more gunk to history, without actually keeping the correct changes lol
18:42 SporkWitch and yes, i'm aware that that is definitely 99.999999% a chair-keyboard interface problem
18:42 _ikke_ SporkWitch: odd, usually git rebase origin/branch branch should work
18:42 _ikke_ simple one command
18:43 dsantiago joined #git
18:43 Electrometro joined #git
18:44 SporkWitch yeah, i'm not sure what it was; it's likely part of it was the other guy pushing things when he shouldn't (lots of commits that should have been cleaned up first, terrible comments if any)
18:44 zeroed joined #git
18:44 zeroed joined #git
18:44 SporkWitch not to mention regressions, soooooo many regressions, because he wouldn't follow a sane branching model.
18:45 _ikke_ hehe
18:46 Electrom_ joined #git
18:47 jeffreylevesque joined #git
18:47 wget http://stackoverflow.com/a/1071300/3514658
18:47 wget "If branch you are fetching into (the right hand side of refspec <src>:<dst> does exist, Git would check if download would result in fast-forward"
18:47 wget so sometimes branches might not be updated
18:48 thiago don't do that
18:48 thiago you're not advanced enough with git
18:49 wget ok
18:49 wget :-)
18:50 zarubin joined #git
18:50 dtrott joined #git
18:53 ProbabilityMoon joined #git
18:56 ShapeShifter499 joined #git
18:57 stamina joined #git
19:00 wget thiago: http://dl.wget.be/git_cheat_sheet.pdf
19:00 wget is that correct the description I made for "git fetch" now?
19:01 chandu20 joined #git
19:01 Zoxc joined #git
19:02 joki joined #git
19:04 jaafar joined #git
19:04 jungsubk joined #git
19:05 rewt wget, refs/remotes/*, not refs/heads/*
19:05 davisonio joined #git
19:06 wget ok thanks rewt gonna change that
19:07 mingrammer joined #git
19:07 wget also when I want to see a previous revision of a binary file. The best bet is to checkout the commit sha id concerned (now in detached HEAD mode), look our file, then go back in undetached HEAD mode (git checkout branchName) ?
19:08 kadoban wget: You can use 'git show thecommit:the_path/the_file > some_file'
19:08 _ikke_ you could also do git show <commit>:file >file
19:08 belak joined #git
19:09 wget _ikke_: great :-)
19:09 davisonio joined #git
19:09 kennon joined #git
19:09 boshhead joined #git
19:10 systmkor joined #git
19:11 Vorisi joined #git
19:11 wagle joined #git
19:11 drupald joined #git
19:11 sigjuice joined #git
19:11 SporkWitch woot, he he accepted my pull request, and it works really well :)  i just generated a 4096bit RSA key in about 5 seconds lol (the project I updated was to use a crypto smartcard to generate entropy for /dev/random to use) _ikke_ :P
19:11 fullstack joined #git
19:11 _ikke_ SporkWitch: nice
19:12 SporkWitch yeah, as compared to around 5-10 minutes or more, before lol
19:12 Sigma joined #git
19:12 _ikke_ I normaly use havegd in that case
19:12 SporkWitch now (after dumping that test key) to figure out whether my particular card actually does generate legitimately random data lol
19:13 SporkWitch _ikke_: that was one of the others that was suggested, but it seemed like more work; i initially looked at CardRand but he stopped supporting that in favor of his newer, standalone TokenTools.  I just had to refactor it for python3 and to use what's now in the repos (the old version had deps that are no longer available for python2.7 in the *buntu repos).
19:14 zacts joined #git
19:14 SporkWitch (even that hasn't been touched in 2 years, but it seemed simple enough, heh)
19:14 _ikke_ SporkWitch: havegd is just a matter of installing it
19:14 SporkWitch ah, page i was looking at was misleading then, heh
19:15 SporkWitch this is basically a python script that tells the card to give me 128bits, and it just repeats that and feeds it to the kernel entropy pool
19:15 _ikke_ right
19:15 _ikke_ wondering where the card gets its entropy from
19:15 kadoban Yeah, that'd be my question
19:16 SporkWitch _ikke_: what i now have to look at, heh; i didn't actually use the key i just generated with it, i just wanted to see the result lol
19:16 SporkWitch it's a Feitian FTCOS/PK-01C; bit old, alas, but it's what i have from when i bought it around 2011 lol
19:18 nitin joined #git
19:21 govg joined #git
19:22 pikajude joined #git
19:22 pikajude joined #git
19:26 csd_ joined #git
19:27 nullp0inter joined #git
19:27 rkazak joined #git
19:28 fuchstronaut joined #git
19:33 CheckDavid joined #git
19:33 Pulp joined #git
19:33 bmahe joined #git
19:38 Krenair left #git
19:39 robotroll joined #git
19:41 mikecmpbll joined #git
19:41 LiohAu joined #git
19:43 valar joined #git
19:43 iskander joined #git
19:47 lolcat joined #git
19:47 lolcat Hello
19:47 gitinfo lolcat: 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.
19:48 lolcat Why do I have to rebase my thing?
19:48 paul424 joined #git
19:52 SporkWitch lolcat: we're gonna need a bit more detail and context on that
19:53 nchambers joined #git
19:53 lolcat SporkWitch, When do I have to rebase? What is the purpose of rebasing? What does it do?
19:54 lolcat If feature/pull-request branches have only one developer, please regularly rebase them onto master until they are merged in.
19:54 lolcat SporkWitch, why is rebasing ness when you only have one dev?
19:54 nchambers hey guys! I'm looking at a contributing guide, I saw "If feature/pull-request branches have only one developer, please regularly rebase them onto master until they are merged in.". What is a rebase, and how/why do I do one?
19:54 diegoviola joined #git
19:54 SporkWitch lolcat: so, that's mostly google questions, as to when, this is an entertaining (and informative) guide: http://justinhileman.info/article/git-pretty/git-pretty.png
19:56 SporkWitch nchambers: a VERY simplified description is that it's an attempt to catch up your local copy with the remote, and then play your changes over top of that.  This becomes necessary when the upstream diverges from the state it was in when you forked it
19:56 SporkWitch nchambers: also see the pic i linked above
19:57 nchambers oh so its like git pull, meant for after making changes?
19:58 lolcat SporkWitch, why would you fork code with only one dev?
19:58 SporkWitch lolcat: the branch only has one dev, no one said anything about the master
19:59 Finnoloid joined #git
19:59 SporkWitch nchambers: no, rebases rewrite history, pull (fetch+merge) does not
19:59 mrpackethead Lambda_Aurigae: you use pic32 without issue
19:59 mrpackethead wow.
19:59 nchambers hmmm ok
20:00 fuchstronaut joined #git
20:00 lolcat nchambers, what is your project called?
20:03 BrianBlaze420 joined #git
20:04 fmcgeough joined #git
20:05 ahmedelgabri joined #git
20:05 Vampire0_ joined #git
20:07 impi joined #git
20:08 dtrott joined #git
20:13 thiago joined #git
20:13 kn-928 joined #git
20:16 brandonw joined #git
20:16 Derperperd joined #git
20:19 aidalgol joined #git
20:20 mohabaks joined #git
20:20 star_prone joined #git
20:21 Derperperd joined #git
20:25 khmarbaise joined #git
20:26 rkazak joined #git
20:28 Shentino joined #git
20:30 kus joined #git
20:30 nwkj86 joined #git
20:33 nullp0inter i am going to host my webapp on github...i want to be able to run the most stable version on my server...and i want devs' commits to go to beta so i can display that version using a different url than the main webapp...if the status of the files in beta are good after testing, i want to check them in to the github and live web app consequently. how is that achieved?
20:33 jumpman joined #git
20:34 nullp0inter are those effectively two separate repositories?
20:36 snowkidind joined #git
20:38 hahuang61 joined #git
20:41 nnyk joined #git
20:43 mrpackethead joined #git
20:44 pasadinhas joined #git
20:46 _ikke_ nullp0inter: By a good branching workflow
20:46 fahadash joined #git
20:48 nullp0inter _ikke_, is this pretty much what im after? https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps
20:49 nullp0inter this is the first time im using a remote git setup, so i just want to be sure im on the right track
20:49 jottr joined #git
20:49 d^sh joined #git
20:54 Prisoner-2460_1_ joined #git
20:55 mingrammer joined #git
20:56 davisonio joined #git
20:57 star_prone joined #git
20:59 Shentino joined #git
20:59 nnyk joined #git
20:59 monoprotic joined #git
20:59 monoprotic joined #git
21:03 Shentino joined #git
21:04 tgunr joined #git
21:05 Rodya_ joined #git
21:07 fuchstronaut joined #git
21:09 cd-rum joined #git
21:11 GavinMagnus joined #git
21:11 Lyqyd joined #git
21:13 m0viefreak joined #git
21:16 rkazak joined #git
21:32 tgunr joined #git
21:34 spudowiar joined #git
21:38 ahmedelgabri joined #git
21:43 ehva joined #git
21:43 nwkj86 joined #git
21:45 quackgyver joined #git
21:49 mingrammer joined #git
21:52 Maple__ joined #git
21:55 rahtgaz git branch -r is showing a series of branches that have been deleted on origin. I have them also deleted on my local copy, but how can I get rid of them completely?
21:56 vassagus joined #git
21:56 ehva joined #git
21:56 jottr joined #git
21:56 rewt rahtgaz: git fetch -p
21:59 rahtgaz didn't have a chance to thank him.
22:03 Noldorin joined #git
22:05 Goplat joined #git
22:08 rewt joined #git
22:08 fuchstronaut joined #git
22:12 alansaul joined #git
22:15 Munt joined #git
22:19 nidr0x joined #git
22:22 Raed joined #git
22:25 jottr joined #git
22:25 wget Any way to force a git stah. i.e. I have no modification in my current directory, but I want to store its state as I will modify it to add a commit. (currently git rewriting my history)
22:25 wget afk
22:27 SporkWitch wget: the correct way to do that would be to create a branch and then either A) merge into the branch, B) merge into the trunk
22:30 kadoban wget: Yeah, use a branch or a tag.
22:31 arand_ joined #git
22:35 zumba_addict joined #git
22:38 thiago wget: you can't with the git stash command
22:38 hahuang61 joined #git
22:38 ahmedelgabri joined #git
22:39 thiago wget: why don't create a branch where you are?
22:40 rewt if there are no modifications, it should be identical to HEAD, so if the commit wasn't to a detached HEAD, it should already have a branch pointing to it
22:41 Rodya_ joined #git
22:43 unbalancedparen joined #git
22:44 mingrammer joined #git
22:52 ytl joined #git
22:52 jottr joined #git
22:55 MattMaker joined #git
22:57 ahmedelgabri joined #git
22:57 Tobbi joined #git
22:57 Tobbi Hey. I am bisecting, and I'm trying to set my repo to a specific revision. However, git tells me that the revision can't be found, although it's in upstream.
22:58 Tobbi And I already fetched upstream.
22:58 kadoban You're in the middle of bisecting, and you're trying to ... checkout something in particular for some reason?
22:59 Tobbi Well, I am actually trying to sync a submodule.
22:59 Tobbi But that failed, iirc.
22:59 Tobbi One moment.
22:59 Tobbi error: no such remote ref 6b4bc8d8fa618c777368fb737a0be84c938d7b81
22:59 Tobbi Yup, that
23:02 kadoban I don't understand what command(s) you're running and what state you're in.
23:02 ixian joined #git
23:03 Tobbi kadoban: I am in the middle of a bisecting. And I want to compile the recent state. Thus, I also synced the submodules and ran git submodule update --init --recursive.
23:03 Tobbi However, that gives me the error message about about no such remote ref.
23:04 kadoban Tobbi: Does the remote have that ref?
23:05 Tobbi kadoban: From what I can tell, it does.
23:09 fuchstronaut joined #git
23:15 Tobbi nvm, I reset to a different hash now which describes the same commit.
23:16 cqi joined #git
23:19 osse sounds like whatever command you ran expected and reF, not a reV
23:19 osse e.g. 'master' or whatever
23:22 arooni hey folks;  if i accidentally blew a way a text file tracked by git... but i havent committed it in some time; am i totally screwed in terms of losing all the changes from that last commit to say yesterdays version (before i blew it away)?
23:22 dsantiago joined #git
23:22 ffabi joined #git
23:23 cbreak arooni: did you git add it?
23:23 arooni cbreak: i did when i committed it initially a long time ago
23:24 israelzuniga joined #git
23:25 Raed|Laptop joined #git
23:26 Munt_ joined #git
23:27 ws2k3 joined #git
23:27 cbreak arooni: you can probably get that state back
23:27 cbreak you can not get any state back with git that you didn't tell git about
23:27 arooni yeah thats on me
23:27 arooni wont be letting that happen again
23:27 cbreak you'll have to recover from backups
23:27 cbreak time machine or what ever you have
23:28 arooni and of course this is when i am switching back up services from crashplan ==> something else; so not sure if there is a backup available
23:28 tristanp joined #git
23:28 arooni a good argument for me getting my backup story solid
23:28 ws2k3 joined #git
23:31 cbreak I use three.
23:32 dodobrain joined #git
23:37 aidalgol joined #git
23:40 a3Dman joined #git
23:41 johnny56_ joined #git
23:44 zeemz joined #git
23:45 dsantiago joined #git
23:48 Manuel15 joined #git
23:48 Manuel15 joined #git
23:48 cd-rum_ joined #git
23:58 kyan joined #git
23:58 cd-rum joined #git

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