Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-30

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

All times shown according to UTC.

Time Nick Message
00:01 ljharb joined #git
00:02 ljharb i've created an annotated tag with `git tag -a`, but when i try to `git push --tags` i get "fatal: remote part of refspec is not a valid name in tags/v0.31.4^0" - it works when i do `git push origin v0.31.4:refs/tags/v0.31.4` but i can't figure out why that'd be necessary. any ideas?
00:05 Noldorin joined #git
00:05 Tad3j joined #git
00:07 LeBlaaanc joined #git
00:08 burtons joined #git
00:10 stoopkid joined #git
00:11 shgysk8zer0_ joined #git
00:14 LeBlaaanc joined #git
00:14 sagerdearia joined #git
00:14 PabloR What’s the use of git revert instead of reseting or amending a commit? For history purposes?
00:14 tesuji joined #git
00:15 bremner PabloR: !rewrite
00:15 gitinfo PabloR: 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
00:15 neeca joined #git
00:15 interne7y joined #git
00:16 rbern joined #git
00:16 PabloR bremner. Thanks for the comment. What if it was a local repo?
00:17 shgysk8zer0 joined #git
00:18 crayon joined #git
00:18 crayon joined #git
00:18 ljharb PabloR: every local repo is also a potential remote repo, so if you didn't want to rewrite public history, you'd make your local change log match your preferred convention.
00:18 EvilPenguin joined #git
00:19 bremner PabloR: the main question is whether you've shared the history. If not, rewrite away
00:20 lucas_ai__ joined #git
00:20 ljharb bremner: any idea about my null char annotated tag issue? :-)
00:21 Darren__ joined #git
00:21 st0opkid joined #git
00:21 LeBlaaanc joined #git
00:22 PabloR Ok. I'm learning basic git. So revert use would be to undo commits but still keep them in the history then?
00:22 ljharb PabloR: yes, with revert, you get the original commit + a revert commit. with rebase, you get to pretend the mistake never happened
00:22 PabloR Great, thanks
00:23 jimi_ joined #git
00:24 bibble ah, sitaram , for a normal user to do "ssh git@host create user/repo" does 'wild repos' need to be allowed ?
00:25 bibble ...just I'm not keen on being able to create just by cloning or pushing.
00:28 watabou joined #git
00:30 LeBlaaanc joined #git
00:33 Tad3j hey. I've made a lot of commits to DEV branch and had to work directly on MASTER after that. Now I would like to apply all changes from MASTER to DEV. What would be the best way to achieve that?
00:33 Hello71 alright, one, don't capitalize random WORDS
00:33 Hello71 if you want to emphasize on IRC use asterisks
00:34 Hello71 two, git checkout dev; git merge master
00:34 Hello71 !rebase if you want
00:34 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
00:34 Tad3j sorry, my bad. thanks for heads up
00:34 Hello71 lots of Unix things are case-sensitive and capitalizing stuff makes it more confusing
00:35 durham_ joined #git
00:35 thiago joined #git
00:36 Tad3j @Hello71, wouldn't that result in a lot of conflicts?
00:36 NeXTSUN joined #git
00:36 Hello71 huh?
00:36 Hello71 and this isn't twitter
00:36 Hello71 Tad3j: hilight people by putting their nick then a colon
00:36 Hello71 then a space
00:37 byteflame joined #git
00:37 Tad3j Hello71: thanks for IRC 101 :) no one reminded me yet till today. Appreciate it
00:39 LeBlaaanc joined #git
00:40 reim joined #git
00:44 stoopkid joined #git
00:45 PabloR bremner ljharb Assuming I do want to rewrite history in my local repo, would 'reset' + 'commit'  get similar results than 'amend'
00:47 ljharb PabloR: no, reset just changes your local history
00:47 ljharb PabloR: reset + commit is similar to revert.
00:48 LeBlaaanc joined #git
00:50 interne7y joined #git
00:51 PabloR ljharb. I'm a bit confused. I thought that revert, amend and reset+commit all 3 get to the same final result but the difference what that revert leaves the changes in history while amend and reset+commit hides the history?
00:52 ljharb PabloR: amend edits the previous commit. "reset + commit" and "revert" create new commits.
00:52 mingrammer joined #git
00:54 PabloR ljharb Ah, ok. I thought reset --hard went back in time and hid the commits from the point forward. Need to read/reread the difference between the reset, reset --hard and reset --soft
00:55 LeBlaaanc joined #git
00:56 Hello71 reset sets the position of the branch
00:56 ljharb PabloR: reset only affects the working directory.
00:56 Hello71 er, assuming we're talking about reset <commit>
00:56 Hello71 not reset <paths>...
00:56 ljharb oh, maybe it moves the branch pointer, i'm blanking on it
00:57 cyphase joined #git
00:57 PabloR So far I'm still working on a local repo with no branch other than the master
00:58 ljharb master is just a branch like any other.
00:58 ajf- joined #git
00:58 PabloR ok. I meant with only 1 branch
01:00 vassagus joined #git
01:02 LeBlaaanc joined #git
01:03 rbern joined #git
01:03 rubie_ joined #git
01:04 st0opkid joined #git
01:05 anu0 joined #git
01:06 crayon joined #git
01:06 sitaram bibble: I just woke up; is the problem solved?  From the conf file, it would seem that anyone should be able to create repos under a directory of their own name
01:07 st0opkid joined #git
01:07 shgysk8zer0 joined #git
01:08 bibble Yep, thanks sitaram . Been awhile since last setup, so I was being newb. "keydir/user/pc.pub", instead of "keydir/pc/user.pub".
01:08 Hello71 #gitolite is over there ---->
01:09 bibble Hello71: :)
01:10 st0opkid joined #git
01:11 leeN joined #git
01:11 HedgeMage hey, sitaram... LTNS
01:12 ljharb i've created an annotated tag with `git tag -a`, but when i try to `git push --tags` i get "fatal: remote part of refspec is not a valid name in tags/v0.31.4^0" - it works when i do `git push origin v0.31.4:refs/tags/v0.31.4` but i can't figure out why that'd be necessary. any ideas?
01:13 st0opkid joined #git
01:13 f3r70rr35f joined #git
01:13 sagerdearia joined #git
01:14 LeBlaaanc joined #git
01:15 nnyk joined #git
01:15 ajf- joined #git
01:15 st0opkid joined #git
01:16 str joined #git
01:18 st0opkid joined #git
01:19 lindenle joined #git
01:20 wrouesnel1 joined #git
01:21 Lyqyd joined #git
01:23 NeXTSUN joined #git
01:25 adino joined #git
01:30 sangy joined #git
01:32 byteflame joined #git
01:32 Rodya_ joined #git
01:34 danslo_ joined #git
01:38 sitaram HedgeMage: hey there!
01:40 rubie joined #git
01:46 fuchstronaut joined #git
01:47 pks joined #git
01:47 tristanp joined #git
01:50 Phrohdoh joined #git
01:50 shaggycat_ joined #git
01:51 Sucks joined #git
01:51 Phrohdoh So, I just spent ~15 minutes trying to come up with a script to create patches for the last 10 commits and just decided to throw caution to the wind and try `git format-patch -10 HEAD` and it did exactly what I was after.
02:00 d^sh joined #git
02:03 hahuang61 joined #git
02:03 Goplat joined #git
02:04 ajf- joined #git
02:04 Phrohdoh Alright so now I'm in need of help. I am trying to apply https://gist.github.com/Phrohdoh/​99046973699a463425b21a9b4c26ad2e to master of https://github.com/phrohdoh/d2 but I am getting: error: ingame-infostats.yaml: No such file or directory, which is correct. The file is in chrome/ and the patch says that, so what am I doing wrong?
02:04 Phrohdoh I ran: git apply 0001-copy-changes-in-chrome-from-d2k.patch
02:05 vassagus joined #git
02:10 Phrohdoh Could it be the index hashes?
02:10 BenderRodriguez joined #git
02:11 xall joined #git
02:14 astrofog joined #git
02:15 Phrohdoh ah I know the issue
02:17 lindenle joined #git
02:18 Phrohdoh Yep, so I was missing the a/ and b/ prefixes (bad substitution on my part).
02:19 Phrohdoh left #git
02:22 ajf- joined #git
02:24 cyphase joined #git
02:26 nettoweb joined #git
02:26 ajf- joined #git
02:26 _sjs joined #git
02:28 xall joined #git
02:29 ajf- joined #git
02:35 Jon28 joined #git
02:35 jimi_ joined #git
02:38 notadrop joined #git
02:38 nnyk joined #git
02:40 mingrammer joined #git
02:41 notadrop Hi, I'm new to git. I just want to make sure I'm getting this right. To get a specific commit from a repository, I first clone the repo, then "cd" into the repo's directory, and then run "git fetch origin d4f967a1a5aecf96518e32987a2a3e9ae3795ded"? Is that correct?
02:41 ojacobson You cannot fetch specific commits
02:41 ojacobson Full stop.
02:42 notadrop oh, okay.
02:42 ojacobson _If_ the commit is in the history of a branch or tag, then you can `git checkout <the hash>` after cloning
02:42 LeBlaaanc joined #git
02:42 ojacobson otherwise, you more or less can't have it
02:42 notadrop Oh, okay.
02:43 liuzhen joined #git
02:44 notadrop um. what's the opposite of "git init"? or can I just initialize a new repository?
02:44 notadrop I'm guessing there is only one active local repo at any one time...?
02:44 ojacobson `rm -rf .git` will un-bless a work tree (and obliterate all the data stored in the repo)
02:44 notadrop also, instead of me sitting here asking newbie questions all day, I could use a nice comprehensive guide. these "quick, no BS" ones leave out a lot
02:45 notadrop links are welcomed
02:45 ojacobson !book
02:45 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
02:45 ojacobson !gcs
02:45 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
02:45 notadrop thanks :-)
02:45 ojacobson hth :)
02:45 ojacobson the bot triggers in <book> are helpful, too
02:46 notadrop ooh, there's even an eBook. nice!
02:46 notadrop I have an ebook reader and I don't get to use it nearly as often as I'd like
02:47 wrouesnel1 joined #git
02:48 ajf- joined #git
02:49 notadrop ojacobson, is /home/notadrop/.git the best place for my repo?
02:49 notadrop or is there a more "standard" place?
02:50 ajf- joined #git
02:54 kyan joined #git
02:54 bluezone joined #git
02:54 chachasmooth joined #git
02:56 LeBlaaanc joined #git
02:57 lagothrix joined #git
02:57 shgysk8zer0 joined #git
02:58 LeBlaaanc joined #git
02:59 ojacobson what do you mean "my repo"
02:59 ojacobson generally the repository for a project goes in .git in the root of the project's files
02:59 ojacobson (that's where git init puts it, too)
02:59 rubie joined #git
02:59 jaguarmagenta joined #git
02:59 ojacobson (and git clone)
03:00 ajf- joined #git
03:00 hexagoxel joined #git
03:01 LeBlaaanc joined #git
03:01 cyphase joined #git
03:02 rbern joined #git
03:02 SwiftMatt joined #git
03:06 sondr3_ joined #git
03:07 notadrop ojacobson, I meant, where should I store all my cloned repos and things git-related in my local filesystem?
03:07 notadrop where do you store yours?
03:07 notadrop eg. ~/git/ ?
03:07 jpX joined #git
03:08 ojacobson ~/Development/<domain>/<project>/ generally, though golang stuff is in ~/Development/go/src/ and non-code repos are elsewhere (~/Documents/ or whatever)
03:08 ojacobson whatever directory ontology works for you, though
03:08 notadrop hm, ok
03:08 ojacobson git is subordinate to the project, not superordinate to it
03:08 notadrop I see
03:08 ojacobson I do not keep a "here are all my git repos" directory - the _canonical_ repos are generally on github or some other host anyways
03:09 ojacobson (canonical in the sense of being the source of truth for new contributions and for releases)
03:10 notadrop Okay. I'm going with ~/Development/gnu/libreboot/.git
03:11 notadrop Works for me.
03:11 LeBlaaanc joined #git
03:11 vassagus joined #git
03:13 LeBlaaanc joined #git
03:15 anu0 joined #git
03:15 fahadash joined #git
03:18 ninjaaron joined #git
03:18 xameada joined #git
03:18 ninjaaron What's that command to revert all files back to the state they were in at the last commit?
03:19 ninjaaron I forgot it, so I just deleted the repo and cloned from origin master again.
03:19 ninjaaron but I know there is a non-stupid way to do this.
03:20 Rodya_ joined #git
03:20 k3rn31 joined #git
03:20 LeBlaaanc joined #git
03:20 harish_ joined #git
03:22 LeBlaaanc joined #git
03:24 bibble ninjaaron: it's like "git reset --head"
03:24 red_ joined #git
03:24 ninjaaron ha, bibble, I tried `git reset HEAD` like twice.
03:24 ninjaaron "something like that"
03:25 ninjaaron thanks
03:25 pwnz0r joined #git
03:26 bibble ninjaaron: :)
03:28 A5101_ joined #git
03:29 meloc joined #git
03:29 meloc joined #git
03:29 meloc test
03:30 meloc Why is git telling me my working dir is clean
03:30 meloc whenever I clearly have directories that are not part of hte index?
03:30 meloc I can neither `git add` or `git rm` them.
03:30 ojacobson directories are not tracked at all
03:30 ojacobson they're implied by the existence of files.
03:30 arescorpio joined #git
03:30 meloc I thought these were non-empty dirs but you're right
03:30 bibble notadrop: can have ~/bin, ~/src (git clone), ~/git (init --bare)
03:30 meloc wow, I'm an idiot. thanks ojacobson
03:31 ojacobson o/ any time
03:31 meloc left #git
03:31 dikiaap joined #git
03:32 mehola joined #git
03:33 SwiftMatt joined #git
03:33 mehola joined #git
03:35 mingrammer joined #git
03:35 danslo joined #git
03:39 Lyqyd_ joined #git
03:40 fstd_ joined #git
03:41 nettoweb joined #git
03:44 rbern joined #git
03:47 fuchstronaut joined #git
03:56 rubie joined #git
03:56 david007 joined #git
03:59 shgysk8zer0 joined #git
04:03 jaguarmagenta joined #git
04:03 hahuang61 joined #git
04:04 Derperperd joined #git
04:05 rbern joined #git
04:10 mingrammer joined #git
04:14 RustyShackleford I messed up and created one commit on master (local)
04:14 RustyShackleford I want to move it to otherbranch
04:15 The_Phoenix joined #git
04:15 thiago check out that branch, cherry-pick the commit, then go back to master and reset --hard to the commit you want to be in
04:15 thiago RustyShackleford: mind you, resetting is a history !rewrite, so you want to be sure other people haven't yet downloaded it
04:15 gitinfo RustyShackleford: 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
04:15 vassagus joined #git
04:16 RustyShackleford gitinfo, local master, not origin/master. All changes are local still
04:16 thiago gitinfo is a bot
04:16 RustyShackleford rofl okay
04:16 RustyShackleford went write over my head
04:17 phanimahesh joined #git
04:17 RustyShackleford i've never used git cherry-pick
04:17 thiago anyway, I had to tell you, in case you had already pushed it
04:18 lindenle joined #git
04:19 RustyShackleford understandable
04:20 RustyShackleford why/when do you use git cherry-pick as opposed to like, git merge?
04:21 thiago when I want only one commit, not all of them from the branch point up to that change
04:21 RustyShackleford when I googled this, the suggestion seems to be to merge and then hard reset
04:22 thiago that depends on how much master and otherbranch have diverged
04:22 thiago if the only difference is this one commit, merge works
04:22 rossome joined #git
04:22 RustyShackleford yeah I'm new to using git in a team. Its amazing how much git can do
04:22 Rodya_ joined #git
04:22 RustyShackleford I just need to learn all that stuff
04:23 RustyShackleford beats the hell out of ClearCase haha
04:23 thiago if master is: A-B-C-D-E-F
04:23 thiago and if otherbranch is: A-B-C-X
04:23 thiago if you go to otherbranch and do git cherry-pick F, you'll have A-B-C-X-F' (F' because it's the same change, but not the same commit)
04:24 RustyShackleford master: A B C, otherbranch: A B
04:24 thiago if you had done a merge, you'd bring in D, E too
04:24 thiago merge works in your case
04:24 rbern joined #git
04:24 RustyShackleford and then git reset --hard HEAD~1
04:25 thiago right
04:25 RustyShackleford how do you learn about git? Docs are more helpful when you're already familiar with a feature
04:26 thiago playing with it
04:26 RustyShackleford why would you do a soft reset?
04:27 thiago when I needed the things that it kept
04:27 thiago soft: move only the HEAD pointer
04:27 thiago mixed: move HEAD and load it into index
04:27 mohabaks joined #git
04:27 thiago hard: move HEAD, load it into the index, then check it out
04:27 RustyShackleford the --hard flag severs the link to the following commits
04:27 RustyShackleford yeah?
04:28 thiago git reset can move HEAD to any commit you want. Forwards, backwards, sideways, anyway.
04:28 thiago all of the modes do it. The difference is what happens to the staging area and the working tree.
04:33 ojacobson --soft, --mixed, and --hard control how the reset affects the staging area and the work tree when moving the branch
04:35 jetpack_joe joined #git
04:36 danslo joined #git
04:39 mostlybadfly joined #git
04:41 Sucks joined #git
04:44 Cabanossi joined #git
04:55 Sonderblade joined #git
04:56 snsapiens joined #git
05:03 phaleth joined #git
05:04 hahuang61 joined #git
05:06 inflames joined #git
05:06 orbitphreak joined #git
05:09 MrWoohoo joined #git
05:12 Derperperd joined #git
05:20 vassagus joined #git
05:20 nnyk joined #git
05:22 rbern joined #git
05:24 orbitphreak joined #git
05:28 freimatz joined #git
05:32 Limes_ joined #git
05:35 titanium17 joined #git
05:36 mohabaks joined #git
05:37 OKpuppet joined #git
05:40 narendraj9 joined #git
05:42 narendraj9 joined #git
05:43 Isla_de_Muerte joined #git
05:44 mar77i_ joined #git
05:45 lb joined #git
05:46 Tentacled joined #git
05:46 fk joined #git
05:47 meloc joined #git
05:47 fuchstronaut joined #git
05:51 VA3VNA joined #git
05:58 dopesong joined #git
05:59 RedShift joined #git
05:59 Puppet joined #git
06:05 hahuang61 joined #git
06:07 Darren_ joined #git
06:07 cyphase joined #git
06:09 SwiftMatt joined #git
06:11 orbitphreak joined #git
06:13 lucas_ai joined #git
06:14 MattMaker joined #git
06:16 nilg joined #git
06:17 dopesong joined #git
06:17 lindenle joined #git
06:18 sctskw joined #git
06:21 byteflame joined #git
06:24 dsdeiz joined #git
06:24 dsdeiz joined #git
06:24 subhojit777 joined #git
06:26 vassagus joined #git
06:26 lucas_ai joined #git
06:34 phanimahesh joined #git
06:35 zincrokx joined #git
06:36 zincrokx joined #git
06:37 danslo joined #git
06:37 zincrokx joined #git
06:37 circ-user-1aOox joined #git
06:38 zincrokx joined #git
06:39 zincrokx joined #git
06:40 zincrokx joined #git
06:40 dreiss joined #git
06:40 acetakwas joined #git
06:40 zincrokx joined #git
06:43 wxg joined #git
06:49 Mixologi- joined #git
06:49 jaguarmagenta joined #git
06:51 mohabaks joined #git
06:51 sleepee joined #git
06:52 wxg joined #git
06:52 emPi joined #git
06:59 sanketdg joined #git
07:01 mohabaks joined #git
07:03 shinnya joined #git
07:05 hahuang61 joined #git
07:08 b_rare joined #git
07:10 phanimahesh joined #git
07:16 neeca joined #git
07:18 wxg joined #git
07:20 xaa joined #git
07:29 _sjs joined #git
07:30 vassagus joined #git
07:31 sondr3 joined #git
07:34 wxg joined #git
07:37 {AS} joined #git
07:44 phanimahesh joined #git
07:48 mohabaks joined #git
07:48 fuchstronaut joined #git
07:49 Sazhen86 joined #git
07:49 phanimahesh joined #git
07:51 hyperair joined #git
07:59 msonntag joined #git
07:59 kurkale6ka joined #git
08:02 wxg joined #git
08:03 maroloccio joined #git
08:06 hahuang61 joined #git
08:10 stuh84 joined #git
08:11 SwiftMatt joined #git
08:13 tomog999 joined #git
08:16 texinwien_ joined #git
08:19 lindenle joined #git
08:21 star_prone joined #git
08:30 jetpack_joe joined #git
08:31 acetakwas joined #git
08:35 vassagus joined #git
08:35 eivarv joined #git
08:36 izabera left #git
08:37 maxorator joined #git
08:37 danslo joined #git
08:39 wxg joined #git
08:39 mkoskar joined #git
08:40 SwiftMatt joined #git
08:41 phanimahesh joined #git
08:43 maroloccio joined #git
08:51 leeN joined #git
08:51 jaguarmagenta joined #git
08:51 BSaboia joined #git
08:52 garethdaine joined #git
08:55 Sazhen86 joined #git
08:57 PCatinean joined #git
08:57 mingrammer joined #git
08:57 abhinav joined #git
08:57 abhinav hi
08:58 abhinav i accidentally did git merge origin otherbranch instead of git merge origin/otherbranch
08:58 abhinav hom to undo this safely?
08:58 grawity git reset --hard HEAD^
09:00 abhinav grawity: thanks.
09:01 netj joined #git
09:03 WizJin Hi, i have a repo which i have forked from upstream
09:03 WizJin now i want a particular branch of that fork to be exact replica of a particular Upstream branch
09:04 grawity git fetch upstream && git push myfork upstream/foobar:foobar
09:04 WizJin I have committed some garbage by mistake to my fork's that branch.. i want to reset it to be exact replica of upstream's that branch.. but i have important code in other branch which i don't want to lose
09:05 grawity git fetch upstream && git push --force myfork upstream/foobar:foobar
09:05 grawity or, well
09:05 grawity depends on which repo you mean by 'fork'
09:05 grawity for a *local* repo, it might be `git checkout foobar && git reset --hard upstream/foobar`
09:05 cdown joined #git
09:06 WizJin ok, i want to try that
09:06 WizJin but for safety i want to backup my forked repo so in case i don't lose those changes
09:06 WizJin what should i do ?
09:07 grawity zip it/tarball it/7zip it/winrar it
09:07 hahuang61 joined #git
09:07 grawity not that it's needed
09:07 grawity git doesn't default to destroying everything, you know
09:07 grawity though backups are wise
09:12 JanC_ joined #git
09:12 robotroll joined #git
09:13 WizJin Thanks
09:13 wxg joined #git
09:17 khmarbaise joined #git
09:30 dlaboratory joined #git
09:31 neeca joined #git
09:33 dhollinger joined #git
09:35 howdoi joined #git
09:41 vassagus joined #git
09:41 _sjs joined #git
09:43 ahmedelgabri joined #git
09:44 ahmedelgabri joined #git
09:47 wxg4irc joined #git
09:49 fuchstronaut joined #git
09:51 circ-user-DTuVT joined #git
09:55 Limes__ joined #git
09:56 Tachyon_ joined #git
10:04 t0by joined #git
10:06 Darcidride joined #git
10:06 phanimahesh joined #git
10:08 smakarov__ joined #git
10:08 rahtgaz joined #git
10:08 hahuang61 joined #git
10:08 SteffanW joined #git
10:15 mischat joined #git
10:16 Error404NotFound joined #git
10:16 Error404NotFound joined #git
10:16 ahmedelgabri joined #git
10:20 millerti joined #git
10:20 jost joined #git
10:22 star_pro_ joined #git
10:24 needs joined #git
10:26 mohabaks joined #git
10:29 Darcidride joined #git
10:30 bioz joined #git
10:34 needs Hi, I have a project with multiple releases, each in its own branch (v1, v2...).  With each release a static library is built (libproject1.a, libproject2.a, ...).  One release of the project needs the static library of the previous version in order to make an upgrade program.
10:34 needs To built libproject1.a I somehow need to "checkout" the project in the latest commit in the v1 branch, build the static library and then use it for the upgrade program.
10:35 needs p, li { white-space: pre-wrap; }  The issue is: I've yet to found a way to checkout a whole project in a subdirectory, I've read interresting things about git read-tree but I don't know if it is really what I want.
10:35 needs Sorry, the copy-pasting went wrong
10:37 needs The original message: Hi, I have a project with multiple releases, each in its own branch (v1, v2...).  With each release a static library is built (libproject1.a, libproject2.a, ...).  One release of the project needs the static library of the previous version in order to make an upgrade program.  So for instance the version 2 of my project needs libproject1.a.  To built libproject1.a I somehow need to "checkout" the project in the lates
10:37 moritz needs: you can use git archive v1 | tar x subdir/ or something like that
10:37 moritz or git archive --prefix=subdir v1|tar x
10:38 needs moritz: That's clever, I'm going to try that
10:38 moritz needs: the other option is to simply checkout v1, do the build, store the generated files somewhere, and then checkout v2, and do the second build
10:38 needs moritz: Things is, I don't want to loose the ongoing work in the working directory
10:39 needs By doing git checkout it will overwrite changed files, right?
10:39 moritz needs: ah, ok. I didn't think of uncommitted changes
10:39 moritz needs: git checkout has two forms, one with a branch, one with a directories (or files)
10:39 moritz needs: the form with the branch will try to carry over the changes to the new branch, and abort if it can't
10:40 moritz needs: the form with a directory/path/file overrides changes
10:41 moritz btw another way to achieve a full checkout in a subdirectory would be something like git --work-tree=subdir checkout v1 . # make a backup before you try this :-)
10:41 needs moritz: I see, maybe I could also use git stash before doing git chekout?
10:41 moritz needs: yes, but that's getting complicated. The version with 'git archive' really is the easiest
10:41 needs moritz: Indeed
10:42 WaReZ joined #git
10:44 needs "git --work-tree=subdir checkout v1" is a nice trick but it seems to also change HEAD, which I want to avoid.  On the other hand "git archive --prefix=subdir v1|tar x" works exactly as I wanted :)
10:44 needs Thanks!
10:45 rolha joined #git
10:45 vassagus joined #git
10:46 Jackneill_ joined #git
10:47 nettoweb joined #git
10:48 needs The exact command that works is: "git archive v1 | tar x -C subdir"
10:51 astrofog joined #git
10:51 irco joined #git
10:52 jaguarmagenta joined #git
10:52 cyan__ joined #git
10:54 eivarv joined #git
10:56 GavinMagnus joined #git
10:58 ahmedelgabri joined #git
10:58 cdown joined #git
11:06 needs moritz: Hummm, is it way too hacky to have something like: "libproject1.a: .git/refs/heads/v1" in the makefile to avoid extracting v1 branch at each invocation of "make"?
11:08 plasticle joined #git
11:08 hahuang61 joined #git
11:10 AstralFX joined #git
11:11 jeffreylevesque joined #git
11:11 AstralFX Hey. How can I delete a commit I pushed in my fork, just want some confirmation from you guys apart from trying stuff on Google.
11:12 tomreyn left #git
11:13 neonKow joined #git
11:13 _ikke_ AstralFX: last commit?
11:14 GavinMagnus left #git
11:14 AstralFX 2 commits ago. Latest commit has the fix.
11:15 phanimahesh joined #git
11:16 sdothum joined #git
11:17 _ikke_ git rebase -i HEAD~2, remote the line with the commit you want to get rid of
11:17 _ikke_ git push --force-with-lease <remote> <branch>
11:18 Cork joined #git
11:19 Stummi AstralFX, delete or revert the commit?
11:20 AstralFX Delete, but what do I remove in that rebase. There is only 1 line at the top, and it's the latest commit?
11:21 star_prone joined #git
11:22 osse AstralFX: delete the line
11:22 osse corresponding to the commit you want gone
11:22 osse there's only one that sound strange
11:22 _ikke_ yeah
11:22 _ikke_ HEAD~2 should return 2 commits
11:24 jesk joined #git
11:24 jesk hiho
11:24 jesk got a nub question
11:24 _ikke_ !just_ask
11:24 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
11:25 kbs joined #git
11:26 jesk when creating a local branch and I want the remote-repo to get updates for that as well, do I need to specify that all the time? I guess no, I could just use "git push -all origin".."
11:27 jesk but what's the best way to make the local repo and the remote aware of that branch
11:27 rom1504 use magic
11:27 _ikke_ jesk: it really depends on your push.default setting
11:27 jesk so I dont need to care about it anymore (I guess thats the way it should be use, right?)
11:27 jesk _ikke_: whats your workflow of doing this?
11:28 _ikke_ I just push specific branches when I need to
11:28 jesk so you make changes and you always remember which branch you where and explicitely named them for the push?
11:29 _ikke_ Depending on your push.default setting, you can just do git push
11:29 davisonio joined #git
11:29 jesk push.defaults are defsault
11:29 _ikke_ And do you have an up-to-date git version? (>2.0)
11:30 jesk why not?
11:30 _ikke_ why not what?
11:30 jesk so what you mean is I dont need to care about any created branches they get pushed by default?
11:30 jesk I created a remote once for the master branch
11:31 jesk then I created the new branch
11:31 jesk creating a new remote in config for every branch seems awkward
11:32 _ikke_ git push -u <remote> <branch> will set that config up
11:32 _ikke_ jesk: but like I said, it really depends on your push.default setting (and the default changes after 2.0)
11:32 jesk but isnt that pretty beginner situation
11:32 jesk why is there no simple answer
11:33 jesk want branch, want to push to remote, always of course, best workflow?
11:33 osse best workflow is what _ikke_ said
11:34 osse do that longer commend *once* and then you can do just 'git push' forever after
11:34 _ikke_ Well, that even depends on push.default
11:34 _ikke_ if it's simple, it will just push the current branch
11:34 osse since he hasn
11:34 jesk no wonder so many hate git :D
11:34 _ikke_ jesk: git is made for many workflows, not just one
11:34 osse since he hasn't said anything I just assume a default recent git
11:35 osse jesk: another tip: there is no point in creating the remote branch immediately anyway. just do it the first time you have a reason to push
11:35 jesk what have I forgotten to mention?
11:36 osse it would help if you said whether you have configured push.default yourself, and what version git is
11:36 _ikke_ given that you have a recent git version, *by default* if you have pushed a branch once fully (git push origin foo), then whenever you do git push, it will push that branch
11:36 _ikke_ that's as simple as it gets
11:36 jesk I have source code, want to modify it now, previously i checked the source into master, pushed to remote, then created branch to do customizations
11:37 osse sounds fine
11:37 jesk checked the branch out of course
11:37 jesk now I need to explicitely add it to the remote, right?
11:38 jesk and for the future a simple push is enough
11:38 osse you said you already pushed it
11:38 jesk only the master
11:38 osse ok
11:38 osse no, you don't need to push the new branch to the remote *now*. you can do it at any point in the future
11:39 jesk its about adding branched, checking it out, working in it, pushing to remote
11:39 jesk s,branched,branches,
11:39 jesk I have to push it now, because others want to see my modifications
11:39 _ikke_ right
11:40 _ikke_ git push will then push the currently checked out branch
11:40 _ikke_ just "git push"
11:40 Codfection joined #git
11:40 _ikke_ but you can always do git push <remote> <branch>
11:40 osse then push it now, with the command _ikke_ suggested
11:41 fuchstronaut joined #git
11:41 rubie joined #git
11:41 jesk so its always about making .git/config aware of a new branch and its remote equivalent, and therefor I need to execute "git push origin newbranch" at least once explicitely?
11:41 osse with -u
11:41 _ikke_ jesk: No, that's not necessary
11:42 _ikke_ jesk: especially because you haven't changed push.default
11:42 cdown joined #git
11:42 _ikke_ jesk: The only thing that does it to make you aware how much a branch is ahead of behind the remote
11:42 _ikke_ (for git status and the like)
11:42 AstralFX @osse I did that, but on GItHub nothing has changed and still shows the commit, but now my SmartGit is saying <rebasing> and conflicted?
11:43 jesk _ikke_: can't follow
11:43 osse AstralFX: what does git status say?
11:43 jesk I thought I understand it and then its again completely wrong
11:44 AstralFX rebase in progress; onto f50c3a6
11:44 AstralFX . You are currently rebasing branch 'dev' on 'f50c3a6'.
11:44 AstralFX (fix conflicts and then run "gt rebase --continue")
11:44 AstralFX (use "git rebase --skip" to skip this patch)
11:44 AstralFX (use "git rebase --abort" to check out the original branch)
11:44 _ikke_ jesk: one thing, you never should have to manually edit .git/config
11:44 jesk ok good to know
11:44 osse jesk: what you said you need to do is actually needed if you have multiple remotes or if the remote branch name is different from the local one or more complicated stuff like that. If not then recent Gits usually manage to figure it out
11:45 osse AstralFX: there you go then. you deleted a commit, and now the following commits don't apply directly.
11:45 osse you gotta fix it
11:45 jesk no, I didnt say anything like that
11:45 jesk never talked about multiple remote or different names
11:45 _ikke_ jesk: 2nd, once git knows the remote has a certain branch, by default git push will just push that branch
11:45 osse jesk: I mean when you said "and therefore I need to execute...?". Yes you need that in complicated cases, but not in yours.
11:48 AstralFX @osse Okay now do I have to commit it?
11:48 jesk ok so git push will push all branches, but only to those remotes who have the branch as well, that is git needs to know which remote has the branch, that in turn is in .git/config the branch must have the remote explicitely listed. This configuration needs to be done somehow with git remote for every branch I need to push to some remote.
11:48 AstralFX commit and push*
11:49 davisonio joined #git
11:49 osse AstralFX: have you fixed the conflicts?
11:49 AstralFX Locally yeah, but on GitHub the 2 commits are still there
11:49 osse have you run rebase --continue?
11:49 Cassiopaya joined #git
11:50 vassagus joined #git
11:50 AstralFX @osse It says "No rebase in progress?"
11:50 osse AstralFX: i think that means you already ran it
11:50 osse but you should be able to remember that :p
11:50 osse assuming the rebase is complete there is no need to commit, but you do need to push
11:51 ahmedelgabri joined #git
11:52 IlNominePatre joined #git
11:52 AstralFX @osse So just a `git push` should be enough now?
11:52 osse jesk: whether ''git push'' alone tries to push all matching branches or just the current one depends on a config setting. assuming it's configured like that the rest of your description is correct
11:52 jesk _ikke_: when creating new local repo, initializing it, adding code, commiting, adding remote for default branch master, git push, then my .git/config says "branch master has remote origin, with merge refs/heads/master", thats status quo.
11:53 osse AstralFX: probably push --force, but yes
11:54 fractalized joined #git
11:54 AstralFX @osse Yeah ty, it's gone down to 1 push on remote repo
11:54 jesk osse: http://paste.ubuntu.com/21509387/
11:55 osse jesk: *sniff* it's... beautiful :´)
11:56 lindenle joined #git
11:56 jesk tiny but finy :)
11:57 jesk and now I just created a local branch out of the master and checked it out
11:57 jesk I guess thats pretty normal workflow?
11:57 osse it is indeed
11:58 jesk whats the best way or most common way to add the branch to the config and then to the remote
11:58 osse jesk: using -u when you push it for the first time
11:58 _ikke_ git push -u <remote> <branch>
11:59 jesk thx guys :D
11:59 ahmedelgabri joined #git
12:00 osse jesk: if i remember correctly you have to push it before you are allowed to use "branch --set-upstream-to" or something like that
12:00 jesk btw do you know that manual: https://git-man-page-generator.lokaltog.net/
12:00 osse so -u is definitely the smoothest, or least bumpy
12:01 _ikke_ jesk: no, never heard of it ;-)
12:01 jesk a look worth, I guess it explains everything
12:01 _ikke_ I know it
12:02 quackgyver joined #git
12:03 codebam joined #git
12:04 osse it am teh funnie
12:05 osse that said, man gitglossary actually exists and is very useful
12:05 gitinfo the gitglossary manpage is available at http://jk.gs/gitglossary.html
12:05 jesk one last question, can it make sense, or is it even possible to work locally in refs/remotes/origin/something ?
12:06 osse jesk: no and yes :p
12:06 jesk ok, so you could but it shouldnt?
12:06 jesk hmm
12:06 jesk how would that even work?
12:06 osse jesk: in some super-weird scenarios you might want to undo that you did 'git fetch' in which case you would have to reset the refs/remotes/* stuff yourself
12:07 osse that's the only situation i can think of
12:07 jesk hmmm ok
12:07 _ikke_ the remote tracking branches are meant purely to track what the remote has sent to you
12:07 osse you can use git update-ref to update any ref you like to any value
12:08 satifant joined #git
12:08 osse !remote_tr
12:08 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
12:09 hahuang61 joined #git
12:12 nick88899966 joined #git
12:14 GavinMagnus joined #git
12:18 djb-irc joined #git
12:18 phanimahesh joined #git
12:19 nitin_ joined #git
12:20 star_prone joined #git
12:21 mingrammer joined #git
12:23 harish_ joined #git
12:26 st0opkid joined #git
12:30 star_prone joined #git
12:36 anuxivm joined #git
12:39 mingrammer joined #git
12:40 p4trix joined #git
12:41 star_prone joined #git
12:41 m0viefreak joined #git
12:41 fuchstronaut joined #git
12:45 Cork joined #git
12:49 phanimahesh joined #git
12:53 jaguarmagenta joined #git
12:54 anuxivm left #git
12:55 dsdeiz joined #git
12:56 netj joined #git
12:56 vassagus joined #git
13:00 anuxivm joined #git
13:02 spriz joined #git
13:05 netcarver joined #git
13:10 hahuang61 joined #git
13:10 nilg joined #git
13:12 spriz joined #git
13:14 rgrinberg joined #git
13:24 mohabaks joined #git
13:26 GT4066 joined #git
13:28 elux joined #git
13:29 liuzhen joined #git
13:30 anuxivm left #git
13:32 fahadash joined #git
13:32 dan2k3k4 joined #git
13:36 xenaxon joined #git
13:36 kurkale6ka joined #git
13:36 xenaxon hi
13:36 gitinfo xenaxon: 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.
13:36 harish_ joined #git
13:37 xenaxon hi. I created a branch, but it doesn't appear on the github respository page > branches page
13:38 xenaxon I'm new to github, seems confusing to me
13:38 _ikke_ How did you create the branch?
13:41 The_Phoenix joined #git
13:42 moritz xenaxon: creating the branch is not enough, you also have to push it to github
13:44 blackwind_123 joined #git
13:45 cyan__ joined #git
13:54 leeN joined #git
13:54 shaggycat_ joined #git
14:00 vassagus joined #git
14:00 shinnya joined #git
14:02 cagmz joined #git
14:04 Darren_ joined #git
14:05 _sjs joined #git
14:07 johnmilton joined #git
14:08 fractalized joined #git
14:10 sagerdearia joined #git
14:10 shaggycat__ joined #git
14:11 hahuang61 joined #git
14:12 Anthaas joined #git
14:13 sagerdearia joined #git
14:15 shaggycat_ joined #git
14:21 ffs joined #git
14:21 xenaxon +moritz: thanks I got more info in the mean time
14:21 xenaxon +moritz: about local git, and so on
14:21 xenaxon +moritz: I will have to read a book on this. seems fairly complex
14:23 _ikke_ !book
14:23 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
14:23 johnmilton joined #git
14:27 l4v2 joined #git
14:28 edaught joined #git
14:31 CheckDavid joined #git
14:31 segment-fault joined #git
14:31 fuchstronaut joined #git
14:31 segment-fault left #git
14:33 garethdaine joined #git
14:37 GavinMagnus left #git
14:40 danslo_ joined #git
14:40 tvw joined #git
14:41 dopesong joined #git
14:41 Mannn joined #git
14:41 Rodya_ joined #git
14:42 alexruf_ joined #git
14:44 f3r70rr35f joined #git
14:45 fuchstronaut joined #git
14:46 timmu joined #git
14:46 piling joined #git
14:47 Dro joined #git
14:48 phanimahesh joined #git
14:50 madewokherd joined #git
14:53 catag87 joined #git
14:54 jaguarmagenta joined #git
14:54 spudowiar joined #git
14:56 Codfection joined #git
14:56 mariuscc joined #git
14:57 snowkidind joined #git
15:00 nitesh joined #git
15:01 timmu joined #git
15:05 ahmedelgabri joined #git
15:05 jesk the Oreilly book is not bad, but lacks examples
15:05 jesk its more about the theory
15:06 GenZai joined #git
15:07 mohabaks joined #git
15:07 liuzhen joined #git
15:08 _ikke_ Which is a good basis to start with
15:08 sr105 left #git
15:10 eijk joined #git
15:10 jesk true
15:11 hahuang61 joined #git
15:12 _ikke_ Examples are much easer to follow if you understand what each command does
15:15 rubie joined #git
15:17 eivarv joined #git
15:19 liuzhen_ joined #git
15:21 rubie joined #git
15:23 Goplat joined #git
15:26 Shentino joined #git
15:32 lindenle joined #git
15:32 ShekharReddy joined #git
15:33 circ-user-DTuVT joined #git
15:35 kbs joined #git
15:38 diegoviola joined #git
15:40 danslo_ joined #git
15:41 sleepee joined #git
15:43 shaggycat_ joined #git
15:45 ljharb i've created an annotated tag with `git tag -a`, but when i try to `git push --tags` i get "fatal: remote part of refspec is not a valid name in tags/v0.31.4^0" - it works when i do `git push origin v0.31.4:refs/tags/v0.31.4` but i can't figure out why that'd be necessary. any ideas?
15:46 reactormonk left #git
15:46 fuchstronaut joined #git
15:48 mohabaks joined #git
15:49 _ikke_ How did you call your tag?
15:49 _ikke_ just v0.31.4 ?
15:50 freimatz joined #git
15:51 eivarv joined #git
15:52 nettoweb joined #git
15:53 rubie joined #git
15:53 enleeten joined #git
15:54 rubie joined #git
15:56 jimi_ joined #git
15:56 rubie_ joined #git
16:03 star_prone joined #git
16:08 ljharb _ikke_: yes
16:08 ljharb _ikke_: `git tag -a v0.31.4` and then in the resulting EDITOR prompt i added my annotation text
16:08 ljharb the first line of which matched the tag name
16:08 nettoweb joined #git
16:08 _ikke_ Any weird refspec?
16:09 _ikke_ git config --get-regex remote.origin
16:10 ljharb i mean, i have `remote.origin.fetch +refs/pull/*/head:refs/remotes/origin/pr/*` set up globally
16:10 ljharb and `remote.origin.fetch +refs/notes/*:refs/notes/*`
16:10 ljharb but that's never caused an issue before
16:10 ljharb i'll try commenting those out
16:10 _ikke_ Should not matter
16:10 gtristan joined #git
16:10 ljharb nope, didn't.
16:12 _ikke_ does it happen every time?
16:12 Dyonisos joined #git
16:12 hahuang61 joined #git
16:14 anu1 joined #git
16:16 fmcgeough joined #git
16:17 ljharb _ikke_: yes
16:17 osse ljharb: what does ''type git'' say?
16:18 dreiss joined #git
16:18 ljharb `git is hashed (/usr/local/bin/git)`
16:18 ljharb v2.9.1 fwiw
16:18 osse ljharb: and that is just git itself, not some wrapper script etc ?
16:18 rgrinberg joined #git
16:19 osse does 'git push --tags origin' work? regardless, what does 'GIT_TRACE=1 git push --tags' show ?
16:20 ljharb yes, it's just git itself. no, any git push with `--tags` included fails.
16:20 ljharb oh wait crap
16:20 ljharb `git push --tags` did work
16:20 _ikke_ but what doesn't?
16:20 ljharb i'd been using an alias, let me unwind it
16:20 osse ljharb: maybe it works now because you already ran a different push that worked
16:21 osse to test it properly you need to delete the tags from the remote each time
16:21 ljharb ok
16:21 ljharb ok i figured it out
16:21 ljharb `git name-rev --name-only HEAD` was printing out `tags/v0.31.4^0`
16:22 ljharb and that was included in my alias via a "current branch" alias
16:22 ljharb is that a bug with name-rev?
16:22 safe joined #git
16:22 _ikke_ No, it isn't
16:25 rubie joined #git
16:26 osse ljharb: if you've done 'git checkout v0.31.4' or something like that then you're !detached
16:26 gitinfo ljharb: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
16:26 ljharb osse: i'm not detached, i'm on master, but the tag is also on master.
16:26 ljharb _ikke_: why would it be intentional behavior to include "^0"?
16:27 osse ljharb: is the tag the current commit also?
16:27 ljharb yes
16:28 osse strange
16:28 _ikke_ same as git ls-remote
16:28 osse i just created a tag and did that command, and it just prints "master" instead of the tag i created (or any variation thereof)
16:30 Spec-Chum joined #git
16:31 nikitasius joined #git
16:32 ljharb i guess the real question is, what's the best way to show the current thing i'm checked out at, and if it's detached, whatever is the latest tag pointing to it?
16:32 orbitphreak joined #git
16:32 ljharb `git rev-parse --abbrev-ref HEAD` and `git name-rev --name-only HEAD` both seem like not quite what i want
16:32 _ikke_ git describe ?
16:32 osse ljharb: try git symbolic-ref HEAD
16:32 _ikke_ That returns a hash
16:33 _ikke_ or not
16:33 ljharb _ikke_: `git describe` when i'm on master + tagged commit gives me the tag
16:33 ljharb osse: that includes "refs/heads/", and then when i'm on a tag directly, gives `fatal: ref HEAD is not a symbolic re`
16:33 ljharb *ref
16:34 osse --short to the rescue
16:34 adino joined #git
16:34 ljharb that works great when on a branch :-)
16:34 _ikke_ but doesn't work with a detached HEAD
16:34 osse yes, it's only job is to show what HEAD points to. if HEAD is not a symref then you're detached
16:34 ljharb right, when detached, i want the latest tag that it points to
16:34 osse so maybe  git symbolic-ref HEAD || git describe  or osmething like thatr
16:35 ljharb hm, `git symbolic-ref HEAD --short 2>/dev/null || git describe` might do it
16:35 ljharb altho when on a random commit, `git describe` prints out `v0.31.3-17-ga32b914` eg
16:35 ljharb so, close :-)
16:36 osse what you want in that case then?
16:36 ljharb ideally an error, but "HEAD" would be ok
16:37 osse git symbolic-ref HEAD --short 2>/dev/null || git describe --exact-match 2>/dev/null || echo HEAD
16:37 _ikke_ Then you have to build in some smarts in your alias
16:37 osse let's use the transitive property!
16:37 osse { git symbolic-ref HEAD --short || git describe --exact-match || echo HEAD; } 2>/dev/null
16:38 ljharb that might work well
16:39 ljharb i can remove "|| echo HEAD" to get the error
16:39 osse sure
16:39 osse i think I'd use --always instead of --exact-match
16:39 osse then it prints the sha1 instead of "HEAD"
16:39 osse but imo. printing HEAD is kinda useless, since you're always at HEAD by definition
16:40 ljharb ah, that is a valid sha
16:40 ljharb so yeah actually that's better
16:41 osse now I just wonder how often you're actually gonna use this... :p
16:41 ljharb all the time, i'll be aliasing this to `git current` which tons of my aliases reference
16:41 ljharb thanks osse + _ikke_, this is perfect :-)
16:42 _ikke_ I think this is implemented in lots of git prompt scripts
16:42 _ikke_ something similar
16:42 ljharb in the prompt script i have, it's done in a very large function with lots of if/else and cases
16:42 osse ljharb: but is it always sane to have N different fallbacks ? It wasn't particularly sane in git push
16:42 Eryn_1983_FL joined #git
16:43 ljharb osse: yeah probably not, i may need to tweak it further.
16:43 ljharb the common use case is `git push $(git current)` so i probably do want --exact-match
16:43 thiago joined #git
16:43 osse in that case I'm pretty sure git push HEAD works
16:43 ljharb will that fail when i'm not on a tag or branch?
16:44 ljharb ah, well, snap.
16:44 _ikke_ HEAD is always valid (except when a new repo)
16:44 ljharb ok so that works on a branch but fails on a tag
16:44 ljharb maybe that's ok tho
16:44 _ikke_ You're never on a tag
16:44 _ikke_ You're either on a branch, or on a commit (that might accidentally have a tag pointing to it)
16:44 ljharb fair
16:45 osse or deliberately!
16:45 _ikke_ I mean incidentally
16:45 _ikke_ meant*
16:45 ljharb if i do `git rebase origin/HEAD`, will that work?
16:45 ljharb i guess i can try it
16:46 osse there is usually a refs/remotes/origin/HEAD
16:46 ljharb the use case there is, i might be on master, or on a branch B, and in the latter case i'd want it to be `git rebase origin/B`
16:46 davisonio joined #git
16:47 osse the reasonable thing to do imo is to use the remote tracking thing
16:48 osse in which case you can just do 'git rebase @{u}' or even just 'git rebase' if you set that option whose name I've forgotten
16:48 adino joined #git
16:49 unbalancedparen joined #git
16:49 BSaboia how can I add an existing SVN repo to a remote (please don't be mean because I am using SVN, I surely don't want to)
16:50 ljharb osse: what's "@{u}"?
16:50 mohabaks joined #git
16:50 _ikke_ @{upstream}
16:50 _ikke_ see man gitrevisions
16:50 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:51 ljharb oh just conceptually tho, it's not a git thing?
16:51 daynaskully joined #git
16:52 ljharb _ikke_: so when i do that, it rebases my current branch on top of origin's HEAD, which is not what i want
16:52 ljharb i want my current branch rebased on top of the remote branch of the same name
16:52 osse ljharb: if you do git branch -u origin/bleh bleh then it will work. it relies on that
16:52 osse -u = --set-upstream-to. analagous to push -u
16:53 _ikke_ ljharb: !HEAD
16:53 gitinfo ljharb: HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
16:53 ljharb osse: yes, i know how -u works - i'm telling you that `git rebase origin` on branch "foo" with -u set will rebase on top of origin/master, and i want on top of origin/foo.
16:53 osse ljharb: don't do that, then :P you can do 'git rebase' instead.
16:53 ljharb _ikke_: "HEAD" on the remote points to master. i want the remote name that matches the local HEAD
16:54 ljharb aha, ok so `git rebase` by itself might do what i want
16:54 _ikke_ ljharb: that's not exact science
16:54 ljharb has that been in git a long time?
16:54 jaguarmagenta joined #git
16:54 ljharb _ikke_: sure, but if my repo lacks a ref to the remote name, then i want it to error out :-)
16:54 ljharb _ikke_: or if pushing, i want it to create a new remote name
16:55 _ikke_ has what been in git a long time?
16:55 ljharb `git rebase` by itself rebasing the current branch on top of its upstream
16:56 ljharb so actually that won't do what i want, because i often have multiple remotes, and i want to specify one of the remotes and then use the matching name, and only one of them will be set as the upstream
16:56 ljharb (and i don't think i can set a different tracked upstream per-remote)
16:57 osse there is only one upstream per branch, yes
16:57 shinnya joined #git
16:58 osse if you want to rebase on top of something other than the upstream you have to do it by hand with vanilla git
16:59 inflames joined #git
17:01 MZAWeb joined #git
17:02 zivester joined #git
17:02 rubie joined #git
17:03 star_prone joined #git
17:05 crayon joined #git
17:05 ljharb right. which is why i'd composed my "git current" command in the first place :-p
17:06 osse btw, with rebase it doesn't make sense to fallback in case you're not on a branch
17:06 osse git rebase works with branches
17:06 osse wait.. does it work without one? not sure
17:06 _ikke_ it does
17:07 _ikke_ it can rebase commits, no need for a branch percee
17:07 ljharb it works without a local branch, but yes i agree my use case doesn't make sense without a local branch name
17:07 Khisanth joined #git
17:07 catag87 joined #git
17:09 ljharb thanks tho, this really does help a lot
17:10 osse Personally I try to leave as much magic up to git, since i trust git's code more than my own
17:10 osse that means using @{u} and the reflog and magic of that nature instead of whatever crappy script I manage to glue together myself
17:11 osse but of course I have my own set of aliases and scripts that are not exactly bullet-proof :p
17:11 ljharb :-p the goal is so i don't have to memorize or retype all the many options i use, like --committer-date-is-author-date on rebase or various log options
17:12 osse git log is probably  the most aliased command
17:12 osse at least it is in my case
17:13 hahuang61 joined #git
17:17 blackwind_123 joined #git
17:17 stoopkid joined #git
17:18 davisonio joined #git
17:18 mariuscc joined #git
17:19 evie_hammond joined #git
17:25 davisonio joined #git
17:25 Zamerick joined #git
17:27 wpaulson joined #git
17:28 wpaulson joined #git
17:32 Eryn_1983_FL joined #git
17:32 davidbz joined #git
17:32 Eryn_1983_FL joined #git
17:34 fahadash joined #git
17:35 Eryn_1983_FL joined #git
17:36 kfunk joined #git
17:36 Eryn_1983_FL joined #git
17:38 WaReZ joined #git
17:38 Eryn_1983_FL joined #git
17:39 yqt joined #git
17:39 rik316 joined #git
17:39 Eryn_1983_FL joined #git
17:41 danslo_ joined #git
17:44 rypervenche joined #git
17:46 ShapeShifter499 joined #git
17:46 rypervenche I have a scripts git repo that I use for personal scripts. I would like to find a good way to take one of those scripts and push it to github but keep it in the same scripts folder. I have seen some people say make two different .git folders for each and create alias to change the --git-dir, others say use submodules. Any suggestions on a good method for this?
17:46 SteffanW joined #git
17:48 tjc6185 joined #git
17:49 Limes__ joined #git
17:54 tjc6185 joined #git
17:55 eivarv joined #git
17:57 mariuscc2 joined #git
17:57 phaleth joined #git
18:04 ahmedelgabri joined #git
18:04 rbern joined #git
18:06 dreiss joined #git
18:09 nettoweb joined #git
18:10 mohabaks joined #git
18:11 RedShift left #git
18:13 hahuang61 joined #git
18:14 cdg joined #git
18:15 mariuscc joined #git
18:18 ytl joined #git
18:22 EvilPenguin joined #git
18:24 paul424 joined #git
18:24 mattcen joined #git
18:25 rgrinberg joined #git
18:27 ramsub07 joined #git
18:27 mingrammer joined #git
18:33 f3r70rr35f joined #git
18:37 dopesong joined #git
18:42 Tad3j joined #git
18:46 f3r70rr36f joined #git
18:47 str joined #git
18:48 fuchstronaut joined #git
18:48 nettoweb joined #git
18:52 pioiytr joined #git
18:55 jaguarmagenta joined #git
19:02 rubie joined #git
19:04 Noldorin joined #git
19:05 fuchstronaut joined #git
19:07 jetpack_joe joined #git
19:08 lindenle joined #git
19:09 titanium17 joined #git
19:12 Tachyon_ joined #git
19:12 watabou joined #git
19:19 Synthead joined #git
19:19 osse rypervenche: how about replacing the script in the script folder with a symlink?
19:20 osse I have a ~/bin with a bunch of stuff in it. some of them are symlinks and it works pretty well
19:21 khmarbaise joined #git
19:22 mingrammer joined #git
19:23 rypervenche osse: I could do that. Would git see the update to changes to that file or not because it's a symlink?
19:23 shaggycat_ joined #git
19:24 osse rypervenche: I mean the other way around: put the symlink in your script folder where the actually script used to be
19:24 osse and make it point to wherever the repo is
19:24 rubie joined #git
19:25 osse The answer to your question is no.
19:25 sagerdearia joined #git
19:25 apotry joined #git
19:26 PabloR joined #git
19:29 xaa joined #git
19:30 sanketdg how do I undo a git stash pop?
19:30 _ikke_ sanketdg: What part do you want to undo?
19:30 _ikke_ The changes on the working tree, or restore the stash?
19:30 thiago stash again
19:31 sanketdg the working tree as befoew
19:31 sanketdg s/befoew/before
19:31 _ikke_ did you have any changes before you did the pop?
19:31 sanketdg _ikke_: yes
19:31 _ikke_ Hmm, that becomes more tricky
19:31 sanketdg but I think that one file was not affected
19:31 thiago I think git stash takes the -p option and you can select what to stash
19:32 sanketdg okay so i just checked, I changed one file and it wasn't affected
19:32 sanketdg thiago: how does that help here?
19:32 _ikke_ sanketdg: do you still have the hash of the dropped stash?
19:32 _ikke_ (it should be output in the terminal)
19:33 sanketdg _ikke_: I dont seem to find it.. do you mean like stash@{0} and the likes?
19:33 sanketdg or a commit hash?
19:33 titanium17 joined #git
19:34 _ikke_ Right after the drop, it should give a hash
19:34 lucasem joined #git
19:35 sanketdg _ikke_: http://dpaste.com/3XM1GGS
19:35 sanketdg so its a merge conflict
19:37 osse in that case the stash is not actually removed
19:37 GavinMagnus joined #git
19:38 osse so you can nuke it all to hell with reset --hard
19:38 _ikke_ that would still undo his unrelated change
19:38 osse yes
19:38 osse i thought git stash didn't allow popping when you had changes
19:38 osse but it does
19:38 Synthead joined #git
19:39 _ikke_ yes, it does
19:39 osse has it always? :O
19:40 _ikke_ as far as I can remember
19:41 MattMaker joined #git
19:42 danslo_ joined #git
19:43 osse seems it was not allowed for a brief period between 2.4.10 and 2.4.10 :P
19:43 osse 19376104a825 and ed178ef13a26
19:43 _ikke_ that was very bried
19:43 _ikke_ brief
19:45 osse Weird, I swear I've seen "Cannot apply stash: Your index contains uncommitted changes." many many times
19:45 thiago if you try to apply a stash to a file that has modifications
19:45 osse but I don't think I've ever used some self-built untagged version between 2.4.9 and 2.4.10
19:45 shaggycat_ joined #git
19:45 nilg joined #git
19:45 _ikke_ osse: two months :P
19:45 fuchstronaut joined #git
19:46 osse thiago: yeah I must have confused it with that
19:47 osse stash refuses to do anything even when there's obviously no conflict
19:49 bonhoeffer joined #git
19:50 bonhoeffer i'm a member of the group of my .git directory, but i get error: cannot open .git/FETCH_HEAD: Permission denied
19:50 paul424 joined #git
19:50 thiago bonhoeffer: did you set the git config for group-mode sharing?
19:51 bonhoeffer no -- i'll look into that
19:51 _ikke_ thiago: He would have to have permissions before that would even work
19:51 _ikke_ need to have*
19:51 thiago yeah, only root can fix the issue
19:51 _ikke_ bonhoeffer: what is ls -ld .git return?
19:51 bonhoeffer i can sudo to get the pull
19:51 _ikke_ No, you should not do that
19:52 bonhoeffer drwxr-xr-x 8 www-data www-data 4096 Jul 30 11:39 .git
19:52 bonhoeffer i know -- i'm trying to fix it
19:52 jimi_ joined #git
19:52 _ikke_ you missing w for group
19:52 bonhoeffer good call
19:53 jokajak joined #git
19:53 k3rn31 joined #git
19:53 bonhoeffer hmm https://gist.github.com/tbbooher/​d3a86263fcd8ced122fb31b53421f545
19:54 yqt joined #git
19:54 bonhoeffer after sudo chmod g+w -R *
19:56 _ikke_ ls -l assets/styles/main.scss
19:57 _ikke_ (You should still set the shared setting)
19:57 bonhoeffer got it
19:57 bonhoeffer works now
19:57 bonhoeffer thanks
19:57 _ikke_ ok
19:57 robertg joined #git
20:00 davisonio joined #git
20:02 fuchstronaut joined #git
20:03 maarhart joined #git
20:06 Orion3k joined #git
20:06 AustinTheGrey joined #git
20:07 rubie joined #git
20:08 Rodya_ joined #git
20:08 Rodya_ joined #git
20:09 mehola joined #git
20:09 AustinTheGrey joined #git
20:10 acetakwas joined #git
20:18 khmarbaise_ joined #git
20:18 khmarbaise_ joined #git
20:18 cyan__ joined #git
20:20 eivarv joined #git
20:20 Repox joined #git
20:21 __Myst__ joined #git
20:21 Tachyon_ joined #git
20:21 Sazhen86 joined #git
20:21 __Myst__ I notice that whenever I merge branches via GitHUb
20:21 __Myst__ a merge commit is created and the history of there being a branch remains
20:21 __Myst__ How can I have this behavior thorugh the git cli?
20:22 ljharb `git merge`?
20:22 ljharb oh, `git merge --no-ff` maybe is what you mean
20:22 ljharb like, forcing a merge commit
20:22 __Myst__ alright, thanks ljharb, yes that's what I mean
20:24 fuchstronaut joined #git
20:24 dsdeiz joined #git
20:25 _ikke_ You can also setup a config to only do no-ff
20:25 sangy joined #git
20:26 __Myst__ _ikke_: How?
20:26 Nethereal joined #git
20:26 _ikke_ Was looking it up
20:26 __Myst__ mhm
20:27 _ikke_ Do you want it for all branches, or only a specific branch?
20:29 __Myst__ All branches
20:29 __Myst__ Well, I only merge into master
20:30 _ikke_ right
20:30 _ikke_ hold on
20:30 _ikke_ git config merge.master.mergeOptions "--no-ff"
20:31 __Myst__ what if I want it for all branches
20:32 _ikke_ Note that that could cause in a lot of unrelevant merges
20:32 _ikke_ git config merge.ff false
20:33 __Myst__ _ikke_: hm?
20:33 __Myst__ What do you mean?
20:33 ytl joined #git
20:35 jagob joined #git
20:35 cyphase joined #git
20:35 snowkidind joined #git
20:35 _ikke_ forcing merges when updating from upstream
20:38 fuchstronaut joined #git
20:39 mingrammer joined #git
20:43 cdg joined #git
20:43 __Myst__ Thanks the help ljharb and _ikke_
20:43 __Myst__ I'm going to leave now
20:43 __Myst__ left #git
20:45 grill joined #git
20:46 ahmedelgabri joined #git
20:48 hfp joined #git
20:48 Lunatrius joined #git
20:49 hfp_work joined #git
20:51 Guest97561 joined #git
20:55 justanot1eruser joined #git
21:01 lucyfx joined #git
21:01 vuoto joined #git
21:02 ncnm joined #git
21:05 Lunatrius` joined #git
21:06 mariuscc joined #git
21:07 moop joined #git
21:09 catag87 joined #git
21:11 _sjs joined #git
21:12 byteflame joined #git
21:13 khmarbaise joined #git
21:13 mingrammer joined #git
21:13 shinnya joined #git
21:14 Pulp joined #git
21:14 Guest9672 joined #git
21:15 adino joined #git
21:16 xall joined #git
21:18 Synthead joined #git
21:20 star_prone joined #git
21:21 waveclaw joined #git
21:23 ekinmur joined #git
21:24 WayToDoor joined #git
21:24 fuchstronaut joined #git
21:25 tristanp joined #git
21:26 WayToDoor joined #git
21:26 d5sx43 joined #git
21:30 spudowiar joined #git
21:30 BryzNSTY joined #git
21:31 zarubin joined #git
21:32 gtristan joined #git
21:34 sagerdearia joined #git
21:39 ribasushi joined #git
21:42 sx joined #git
21:42 d5sx43 joined #git
21:43 danslo_ joined #git
21:43 mehola joined #git
21:44 sx halp! I accidentally added some large files (70mb) to my repo and committed. i removed those large files and reset to a previous commit, but whenever I try to "push" it starts to compress and "writing objects" of these large files still.. not sure how to clean this up?
21:45 Hello71 !remove
21:45 gitinfo [!remove_commit] You can use rebase to remove commits: git rebase --onto <commit>~1 <commit> <branch>. Note this will !rewrite history.
21:45 Hello71 er
21:45 Hello71 !sensi
21:45 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
21:45 rik316 joined #git
21:45 dersand joined #git
21:46 watabou joined #git
21:47 dersand How do you "properly" rebase/merge two local branches so that a remote can update to it. Consider the following. 1. Checkout branch foo. 2. Make change. 3. Rebase/merge. 4. git branch -d foo. 5. Now push master and the remote's foo is gone.
21:47 fmcgeough joined #git
21:48 sx Hello71: after rebase, i still get "writing objects" of my old large files on "push"
21:51 BlaXpirit sx, yes, I think this comment does not apply, you don't need to rewrite history, you basically already did by getting rid of the only commit that had the files
21:52 sx but the files are still being "pushed" for some reason
21:52 sx how do I permanently remove?
21:52 _ikke_ git only pushes objects being referenced
21:52 _ikke_ So you need to make sure they're not referenced anymore
21:53 fractalized joined #git
21:53 Rodya_ joined #git
21:53 BlaXpirit hm i thought to suggest forcing garbage collect, but i'm inclined to believe _ikke_
21:53 BlaXpirit sx, check your assumptions, i guess. maybe the large files are still part of some commit in your repo
21:53 _ikke_ yeah, garbage collection has no influence on what's getting pushed
21:53 Eryn_1983_FL joined #git
21:54 _ikke_ Things ellegible for GC wouldn't get pushed in the first place
21:55 nettoweb joined #git
21:55 cagmz joined #git
21:56 fuchstronaut joined #git
22:00 qsx _ikke_: not necessarily, you could push an unreferenced commit that would otherwise be cleaned
22:00 sx I used git rm —cached to remove these files. now when I try `git status` i see they are deleted. should I also unstage?
22:00 _ikke_ But that requires to push something very specific, which I quietly assumed wasn't the case
22:00 sx for some reason it still writes these objects even though it's showing "deleted
22:00 cbreak sx: if you unstage the deletion, then they won't be deleted anymore
22:00 sx ok thats what i thought. thanks
22:01 _ikke_ git reset would to that
22:02 Lunatrius joined #git
22:02 _ikke_ Nice post about teaching in irc channels: http://chrisdone.com/posts/teaching
22:03 sx So I committed the "delete" and I see the large files (mp3s) were deleted: "delete mode <file>". but STILL when I try push after that it starts "writing objects" with very large MB
22:03 Mannn joined #git
22:03 sx also notably there is a "HEAD detached from <commit>" message when I try `git status`
22:03 mellernoia joined #git
22:04 _ikke_ sx: that explains
22:04 _ikke_ You are in a detached HEAD, so any changes do not affect the branches you are pushing
22:04 constant joined #git
22:05 BlaXpirit and in any case, make sure you're actually modifying old commits to not include the files anymore, instead of telling git "oh, please don't include these in the next commits"  which is what git rm --cached  does
22:05 trewe joined #git
22:06 sx ok, so how do I get out of the detached head?
22:06 BlaXpirit checkout some branch
22:06 _ikke_ sx: git checkout -
22:06 sx on it!
22:06 _ikke_ the dash says, checkout my previous branch or commit
22:06 zacts joined #git
22:07 mingrammer joined #git
22:07 sx so after checkout, then I can git push?
22:07 sx I just tried and the large files are still being written.
22:08 _ikke_ No, you are now on your branch, you need to fix this branch
22:08 Synthead joined #git
22:08 sx aha
22:08 _ikke_ You can update commits all you want, but unless the brach is updated to reflect that, for git nothing has changed yet
22:09 _ikke_ So you should see the large files now, correct?
22:09 sx `git checkout` does not remove the "HEAD detached" message
22:09 z8z joined #git
22:09 _ikke_ "git checkout -"
22:10 _ikke_ or "git checkout <branch>"
22:10 sx yep, still shows detached
22:10 _ikke_ then explicitly mention a branch
22:10 xall joined #git
22:10 sx i tried both
22:10 sx ok got it
22:10 sx i was checkout <commit> instead of <branch>
22:10 sx whops
22:10 _ikke_ :-)
22:11 _ikke_ yeah, checking out commits results in a detached HEAD
22:11 _ikke_ ok
22:11 _ikke_ So, the large files are now in your working tree, correct?
22:11 v0n joined #git
22:11 sx git status now shows: "nothing to commit, working directory clean"
22:12 _ikke_ The files were only in the last commit, right?
22:12 sx I think I need to revert a couple commits now
22:12 stevenbenner joined #git
22:13 dopesong joined #git
22:13 _ikke_ hold on
22:13 sx my most recent commit was trying to remove the files. the one before that actually added them. the one before *that* is where I need to be
22:13 _ikke_ ok
22:13 _ikke_ So the last two commits can be undone completely?
22:13 sx yes
22:13 sx would like to obliterate them
22:13 _ikke_ git reset --hard HEAD~2
22:13 _ikke_ That command would do that
22:14 sx looks good so far
22:14 _ikke_ ok
22:14 sx now the push??
22:14 _ikke_ yes
22:14 sx hellyes. you are a saint
22:14 _ikke_ yw
22:14 ShekharReddy joined #git
22:15 sx wait, it's still writing them!
22:15 sx ill try going back one further just in case
22:15 _ikke_ sx: it's better to first inspect
22:15 BlaXpirit careful!!
22:15 _ikke_ sx: Doing random things is often detrimental
22:15 Rodya_ joined #git
22:16 sx I'm using `git log --graph --decorate --oneline` to view my commit log
22:16 sx most recent is now: * 013ebc9 (HEAD, master) added renderers
22:17 sx one before that is: * e1a1747 (origin/master) msg space fix; yaml mode
22:17 sx i'm pretty sure the large files were added in a later commit. none of these should contain them
22:18 zarubin joined #git
22:18 _ikke_ Are you sure you made these commits on master?
22:19 sx not sure about anything any more :/
22:19 joki joined #git
22:19 _ikke_ sx: add --all to that command to see commits from all branches
22:19 sx i'm downloading the git GUI now.. desperate times
22:20 sx cool, yeah there are no other commits from other branches
22:20 _ikke_ sx: if you are confortable with the CLI, you can also use tig
22:20 m0j0 joined #git
22:26 sx ok I finally resolved it
22:26 rubie joined #git
22:26 sx in the GUI there were two identical branches named "master", one that said 'published' and one that wasn't. I just published the other one and now they appear to have merged
22:27 sx I wish I could say this ordeal was a learning lesson but I'm afraid it was the opposite
22:27 sx oh well. thanks for he help everyone!
22:28 _ikke_ I don't like those GUIs inventing their own language
22:28 _ikke_ it's often more confusing then that it helps
22:31 anu0 joined #git
22:37 justanotheruser joined #git
22:41 fuchstronaut joined #git
22:42 Gamecubic joined #git
22:42 Guest97561 joined #git
22:44 lindenle joined #git
22:49 ahmedelgabri joined #git
22:50 catag87 joined #git
23:04 l4v2 joined #git
23:11 rgrinberg joined #git
23:13 Synthead joined #git
23:17 Dro joined #git
23:20 mablae__ joined #git
23:23 mehola hi, what is the recommended way to deal with secrets in git?
23:24 mehola secrets being keys, passwords, etc.
23:24 ffabi joined #git
23:26 bremner don't/
23:26 bremner mehola: sounds like a special case of !config
23:26 gitinfo mehola: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
23:27 bremner mehola: be aware that git likes to remember things, so it's a bit annoying to remove secrets once they are there
23:28 fractalized joined #git
23:28 mehola yeah, I'm trying to find a proper way to keep track of keys etc. Even though I do most of my deployments from one laptop, it feels fragile having keys on laptop. (what happens if laptop bricks etc.)
23:29 Mikaela joined #git
23:29 mehola would be nice to have some type of vault for such files. I'm going to reach that gist and see the ideas proposed. thanks gitinfo
23:29 gitinfo mehola: you're welcome, but please note that I'm a bot. I'm not programmed to care.
23:30 mehola bahahaha
23:30 SwiftMatt joined #git
23:38 ahrc333ff joined #git
23:40 rewt put them in the cloud ;)
23:41 _xor joined #git
23:41 fuchstronaut joined #git
23:43 mehola rewt: :D
23:43 danslo_ joined #git
23:44 Mikaela joined #git
23:44 mehola rewt: preferrably in a folder named DO_NOT_HACK
23:46 eivarv joined #git
23:50 ahrc333ff0x2 joined #git
23:51 catag87 joined #git
23:51 cdg joined #git
23:52 jottr joined #git
23:53 rubie joined #git
23:53 l4v2 joined #git
23:55 mingrammer joined #git
23:56 aidalgol joined #git
23:59 m0viefreak joined #git

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