Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-31

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

All times shown according to UTC.

Time Nick Message
00:01 mizu_no_oto joined #git
00:01 tristanp_ joined #git
00:02 spudowiar1 joined #git
00:03 rafalcpp joined #git
00:03 cagedwisdom joined #git
00:05 tristanp joined #git
00:06 drodger joined #git
00:07 tgies joined #git
00:07 netj joined #git
00:08 espindola joined #git
00:09 bgold joined #git
00:09 Trieste joined #git
00:11 r3c0d3x joined #git
00:11 Klumben joined #git
00:11 jstimm joined #git
00:12 tgies joined #git
00:12 scoobertron joined #git
00:12 sharpy joined #git
00:12 dreiss joined #git
00:14 jumpman This is kind of a weird question...
00:14 jumpman Let's say that there's a open source project that I really like and use frequently. Unfortunately, they've made a decision about a minor component that I disagree with
00:14 jumpman so, for my own use, I have some changes that takes care of my problem locally
00:15 jumpman I want to keep my changes while still updating the project
00:15 jumpman Is the best way to do this a fork?
00:16 Noldorin joined #git
00:21 flirc1 joined #git
00:21 L8D joined #git
00:22 Eugene jumpman - yup.
00:22 jumpman Thanks, Eugene
00:22 tgies joined #git
00:22 Eugene You'll need to merge from the upstream repo constantly, and if you ever want to contribute back you'll have to rebase or cherry-pick the specific commits.
00:23 Eugene (or get your entire fork merged....)
00:23 flirc1 left #git
00:23 bremner contribute? that's just crazy talk.
00:23 kus joined #git
00:23 jumpman P
00:23 Eugene You're crazy
00:24 justanotheruser joined #git
00:25 star_prone joined #git
00:27 Noldorin joined #git
00:30 tomog999 joined #git
00:32 tgies joined #git
00:32 orbitphreak joined #git
00:33 tristanp_ joined #git
00:35 variable joined #git
00:35 tristanp joined #git
00:36 rossome joined #git
00:37 tristanp joined #git
00:37 tgies joined #git
00:40 f3r70rr35f joined #git
00:41 f3r70rr35f hello ppl
00:41 gitinfo f3r70rr35f: 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.
00:42 tgies joined #git
00:43 jaguarmagenta joined #git
00:43 ediz_ joined #git
00:43 przemoc joined #git
00:44 rominronin joined #git
00:45 jumpman joined #git
00:45 ochorocho__ joined #git
00:47 tristanp_ joined #git
00:47 drodger joined #git
00:48 jumpman joined #git
00:48 bgold joined #git
00:50 tristanp joined #git
00:51 jstimm joined #git
00:51 trista___ joined #git
00:52 tgies joined #git
00:54 tristanp_ joined #git
00:55 IWishIKnew joined #git
00:55 eletuchy joined #git
00:57 drodger joined #git
00:57 tgies joined #git
00:57 eletuchy joined #git
00:59 eletuchy_ joined #git
01:00 mehola joined #git
01:01 eletuch__ joined #git
01:02 tgies joined #git
01:02 elastix joined #git
01:02 mellernoia joined #git
01:02 espindola joined #git
01:04 eletuchy joined #git
01:05 dermoth joined #git
01:06 ak1155 joined #git
01:06 drodger joined #git
01:06 eletuchy_ joined #git
01:07 tgies joined #git
01:09 eletuchy joined #git
01:10 orbitphreak joined #git
01:12 eletuch__ joined #git
01:12 tgies joined #git
01:15 eletuchy joined #git
01:17 eletuchy_ joined #git
01:18 tristanp joined #git
01:19 ferr joined #git
01:19 Noldorin joined #git
01:20 eletuchy joined #git
01:21 boombatower joined #git
01:21 Goobbue joined #git
01:21 tristanp_ joined #git
01:22 eletuch__ joined #git
01:23 tristanp joined #git
01:24 LeBlaaanc joined #git
01:24 linuxmint joined #git
01:25 eletuchy_ joined #git
01:25 Akagi201 joined #git
01:26 drodger joined #git
01:26 annoymouse joined #git
01:27 tgies joined #git
01:28 GavinMagnus left #git
01:28 dimi1947 joined #git
01:30 eletuchy joined #git
01:32 tgies joined #git
01:32 iovoid left #git
01:33 mmlb joined #git
01:35 liuzhen joined #git
01:35 dermoth joined #git
01:36 fuchstronaut joined #git
01:37 Tanger_ joined #git
01:37 tgies joined #git
01:39 tristanp joined #git
01:40 pks joined #git
01:46 rbern joined #git
01:46 tgies joined #git
01:46 Aerosonic joined #git
01:46 Shentino joined #git
01:46 Noldorin_ joined #git
01:46 BSaboia joined #git
01:46 ochorocho__ joined #git
01:48 tgies joined #git
01:49 harish joined #git
01:50 Limes_ joined #git
01:50 mattkrea joined #git
01:53 eletuchy joined #git
01:54 drupald joined #git
01:56 interne7y joined #git
01:59 inflames joined #git
02:01 tristanp joined #git
02:01 drbean joined #git
02:02 espindola joined #git
02:02 tgies joined #git
02:07 tgies joined #git
02:08 arescorpio joined #git
02:08 tarkus joined #git
02:10 doppo joined #git
02:11 gravitron joined #git
02:12 tgies joined #git
02:13 ticktock joined #git
02:14 ticktock can anyone tell me what is going on here? http://dpaste.com/2JMRDQA
02:14 Noldorin joined #git
02:14 eletuchy joined #git
02:17 hexagoxel joined #git
02:17 Lyqyd joined #git
02:17 tgies joined #git
02:21 d0nn1e joined #git
02:21 tristanp_ joined #git
02:23 tgies joined #git
02:24 tristanp joined #git
02:25 ceaucari joined #git
02:28 tgies joined #git
02:28 eletuchy joined #git
02:33 grill joined #git
02:33 tgies joined #git
02:33 david007 joined #git
02:34 grill joined #git
02:36 mizu_no_oto joined #git
02:37 Caelum joined #git
02:38 tgies joined #git
02:39 netj joined #git
02:39 dimi1947 joined #git
02:40 tristanp joined #git
02:41 rkazak joined #git
02:42 DolpheenDream joined #git
02:43 safe joined #git
02:44 jaguarmagenta joined #git
02:44 drodger joined #git
02:45 rominronin joined #git
02:45 JJM joined #git
02:47 liuzhen joined #git
02:47 tgies joined #git
02:47 faux___ joined #git
02:48 Grievre joined #git
02:48 tarkus How to add or set a remote (if it exists) with one command line? (it should be cross-platform)?
02:48 Grievre This is a dumb newbie git question: If git history is nonlinear, how can I checkout a commit hash?
02:49 Grievre I would assume that there are multiple continuities of commits that end with a given commit, so how does it decide which one to give me?
02:49 tarkus I wish I could do something like this `git remote add-or-set foo url`
02:51 rewt Grievre, each commit has a unique hash, so if you checkout a hash, there is no ambiguity
02:52 Grievre okay, but what if I have two different branches where the same commit is the most recent commit
02:52 Grievre if I check out that hash which branch do I get?
02:52 rewt you never get a branch if you checkout a hash
02:52 rewt you have to checkout the branch to get the branch
02:52 tristanp joined #git
02:52 ensyde__ joined #git
02:52 Grievre So I guess what my confusion is, is: A commit is a delta from before to after
02:52 tgies joined #git
02:53 Grievre how does a given commit hash both give me the delta /and/ the "before"?
02:53 rewt a commit is a snapshot of the working files
02:53 Grievre is it
02:53 rewt yes
02:53 Grievre ok
02:53 Grievre So where does this idea of nonlinear history come in
02:54 rewt unrelated
02:54 Grievre ok
02:54 rewt if you have multiple branches and you merge (non-ff), you have a nonlinear history
02:56 Grievre So let's say I have master and a branch. I make some commit to the branch, some other commits are made in both places before and after, then I merge the branch to master
02:56 Grievre does that one commit I mentioned not exist at some point in master's history?
02:57 interne7y joined #git
02:58 tgies joined #git
02:58 Grievre okay never mind I think I get it now
02:58 rewt every ancestor of the master branch is part of the master branch
02:58 rewt (in git, a "branch" is just a pointer to a commit)
03:01 aavrug joined #git
03:01 a_thakur joined #git
03:03 tgies joined #git
03:03 chachasmooth joined #git
03:04 a_thakur_ joined #git
03:04 drodger joined #git
03:05 ochorocho__ joined #git
03:07 hahuang65 joined #git
03:08 tristanp joined #git
03:08 tgies joined #git
03:10 liuzhen joined #git
03:13 tgies joined #git
03:13 inflames joined #git
03:15 liuzhen joined #git
03:15 lapras joined #git
03:16 przemoc joined #git
03:18 dodobrain joined #git
03:18 drodger joined #git
03:19 lapras I'm sorry but I've done research and can't figure out why. I've set git config --global user.name to my user name, and changed my email in the same way, I get a permission denied error, and it shows a different username.
03:19 lapras git config --global user.name shows the username I am wanting to use, and the repo is under that same username.
03:19 franl joined #git
03:21 rewt what does `git config user.name` show?
03:21 rewt when you're inside the affected repo dir
03:21 k3rn31 joined #git
03:22 Sonderblade joined #git
03:22 tgies joined #git
03:24 lapras I'm in the directory, writing "git config user.name" returns the username I want to be using
03:25 dodobrain so where are you getting the permission denied error?
03:26 drodger joined #git
03:26 tristanp_ joined #git
03:27 raijin joined #git
03:28 tgies joined #git
03:28 lapras In the same directory, writing "git push -u origin master" returns remote: Permission to lapras/Test.git denied to oldname. Requested URL returned error: 403
03:28 lapras I've already done git remote add origin https://github.com/lapras/Test.git
03:30 tristanp joined #git
03:32 Anderson69s joined #git
03:32 tvon joined #git
03:33 tgies joined #git
03:33 tvon joined #git
03:34 howdoi joined #git
03:36 _28_ria joined #git
03:36 eletuchy joined #git
03:37 fscala joined #git
03:38 tristanp joined #git
03:38 tgies joined #git
03:43 tgies joined #git
03:44 dodobrain lapras, are you able to successfully execute: ssh -T git@github.com   ?
03:45 lapras Hi oldname! You've successfully authenticated, but GitHub does not provide shell access.
03:45 lapras So apparantly my newname isn't showing there
03:46 dodobrain and your oldname is not 'lapras' on github?
03:46 dodobrain whatever the case. github knows you by the oldname
03:46 jeffreylevesque joined #git
03:46 dodobrain you haven;t added your new key to your ssh agent have you?
03:48 tgies joined #git
03:48 dodobrain and if you have both keys available, maybe you simply need to remove the old key from your agent
03:48 dodobrain ssh-add -l    will list the keys that can currently be used
03:50 SwiftMatt joined #git
03:50 lapras Thanks sir. I was able to fix it.
03:51 david007 joined #git
03:51 skylite joined #git
03:51 bjpenn joined #git
03:54 L8D joined #git
03:56 jstimm joined #git
03:56 tristanp_ joined #git
03:58 tgies joined #git
03:58 interne7y joined #git
04:02 k3rn31 joined #git
04:03 tgies joined #git
04:06 annoymouse My editor automatically converted all of the tabs to spaces in many files I have worked on. Now these "changes" are polluting my git. Is there some way to discard all changes from the working directory that just consist of changing tabs to spaces?
04:07 annoymouse The `--ignore-space-at-eol` option to `git diff` has been great. Maybe something along that line?
04:08 tgies joined #git
04:11 eletuchy_ joined #git
04:13 eletuch__ joined #git
04:17 UTAN_dev joined #git
04:18 tgies joined #git
04:22 tinajohnson___ joined #git
04:23 tgies joined #git
04:23 drodger joined #git
04:25 n00bdev joined #git
04:26 Anderson69s joined #git
04:26 jstimm joined #git
04:26 narendraj9 joined #git
04:28 tgies joined #git
04:29 settermjd joined #git
04:31 Cabanossi joined #git
04:32 r4z3r joined #git
04:33 tgies joined #git
04:36 eletuchy joined #git
04:36 mariuscc joined #git
04:37 prsn joined #git
04:38 tgies joined #git
04:39 tristanp joined #git
04:43 nilg joined #git
04:44 Dazzyp joined #git
04:44 jaguarmagenta joined #git
04:46 rominronin joined #git
04:47 waveclaw joined #git
04:48 BombStrike joined #git
04:48 tgies joined #git
04:52 jleclanche how can I perform a rebase and retain the original committer?
04:53 tgies joined #git
04:53 j416 jleclanche: that would be a lie, because now you are the committer
04:54 jleclanche j416: all rebases are lies
04:54 j416 I think you just did some fallacy
04:54 j416 anyway, I think you'll have to go through each commit and amend it with something flag
04:54 j416 not sure rebase gives you one out of the box
04:55 j416 you could filter-branch it afterwards and say GIT_COMMITTER_NAME=blabla
04:55 jleclanche mmh yeah ok
04:55 j416 use --env-filter for it
04:55 j416 man git-filter-branch
04:55 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
04:56 tristanp_ joined #git
04:57 baraba joined #git
04:58 tgies joined #git
04:59 interne7y joined #git
05:00 settermjd joined #git
05:01 italoacasas joined #git
05:03 tgies joined #git
05:06 ochorocho__ joined #git
05:09 hahuang65 joined #git
05:13 tgies joined #git
05:13 ceaucari joined #git
05:14 subhojit777 joined #git
05:14 eletuchy joined #git
05:18 eletuchy_ joined #git
05:18 ferr joined #git
05:18 tgies joined #git
05:19 eletuchy joined #git
05:21 faux___ joined #git
05:22 dimi1947 joined #git
05:22 eletuchy_ joined #git
05:23 Bombe joined #git
05:24 cyan__ joined #git
05:25 eletuchy joined #git
05:25 liuzhen joined #git
05:26 eletuch__ joined #git
05:27 qt-x joined #git
05:28 tristanp joined #git
05:28 tgies joined #git
05:31 prsn joined #git
05:32 consolers` joined #git
05:33 tristanp_ joined #git
05:33 tgies joined #git
05:33 leehambley joined #git
05:33 a3Dman joined #git
05:33 mwhooker joined #git
05:34 consolers` I cannot use worktree to substitute my workflow with `git-new-workdir' unless i can move the .git/worktree/admindir admindir into the worktree's directory. it turns out this is currently possible, ...
05:35 siprbaum_ joined #git
05:35 consolers` is there any reason to suspect that this will be sealed off at some point in the future and all admin files will have to be under .git ?
05:36 toothe joined #git
05:36 monoxane joined #git
05:36 toothe somewhere in my code base I added this line, and I'd be curious to find out where. How do I figure that out?
05:37 fuchstronaut joined #git
05:37 consolers` toothe see the git log -S<string> manpage
05:38 consolers` i've not gotten the behaviour i want, from it though
05:38 tristanp joined #git
05:38 tgies joined #git
05:38 toothe so, this lists two commit....
05:39 consolers` i mean git log -G<string>
05:39 forgot should name of a submodule match its path in .gitmodules?
05:41 ThomasLocke joined #git
05:43 tgies joined #git
05:43 hahuang65 joined #git
05:45 forgot my submodules were moved elsewhere, now they have mismatched name/path: http://sprunge.us/XQiC is it safe to just edit .gitmodules to sync them?
05:45 toothe i still need to learn how to use submodules.
05:46 monoxane joined #git
05:46 consolers` i dont use those myself, like notes this also turned out to be a "bureaucratic" solution to some problem, which is best addressed without these "bureaucratic" tools
05:47 orbitphreak joined #git
05:48 go1111111 joined #git
05:48 tgies joined #git
05:53 forgot it seems the names doesnt matter as long as the path is correct
05:54 consolers` good!
05:55 tristanp joined #git
05:56 rscata joined #git
05:57 ryanp joined #git
05:57 dsdeiz joined #git
05:57 eletuchy joined #git
05:57 dimi1947 joined #git
05:57 mwhooker joined #git
05:58 tgies joined #git
05:59 jaguarmagenta joined #git
06:00 interne7y joined #git
06:03 tgies joined #git
06:04 hendry joined #git
06:06 eijk_ joined #git
06:08 choki joined #git
06:08 tgies joined #git
06:09 zeroed joined #git
06:10 star_prone joined #git
06:11 rominronin joined #git
06:12 ramsub07 joined #git
06:13 rbern joined #git
06:13 tristanp_ joined #git
06:13 a_thakur joined #git
06:13 tgies joined #git
06:14 freimatz joined #git
06:15 bjpenn joined #git
06:16 emPi joined #git
06:17 tristanp joined #git
06:19 Guest35452 joined #git
06:19 Repox joined #git
06:20 JeroenT joined #git
06:20 Raging_Hog joined #git
06:21 tristanp_ joined #git
06:21 Repox joined #git
06:22 Juzzika joined #git
06:24 eletuchy_ joined #git
06:24 dreiss joined #git
06:24 knittl git on windows stopped working for me. I cannot run git-svn. any way to troubleshoot? the perl.exe.stackdump contains STATUS_ACCESS_VIOLATION, but no other indication
06:25 prsn joined #git
06:25 tristanp joined #git
06:26 djb-irc joined #git
06:27 eletuchy joined #git
06:28 tgies joined #git
06:28 lamppid joined #git
06:29 guampa joined #git
06:29 knittl git svn init/fetch are broken. git svn log works. perl.exe. works
06:30 consolers` kjfksdfj
06:31 consolers` (i dont have a clue) if only the stackdump told you what it was accessing that caused the violation
06:31 knittl consolers`: the only filename in the stackdump is perl.exe
06:31 knittl i installed 32bit yesterday, but it didn't change anything (it's a 64bit windows)
06:31 leehambley joined #git
06:32 consolers` later
06:33 tgies joined #git
06:34 tomboy64 joined #git
06:34 sandeepsihari joined #git
06:35 rominronin joined #git
06:35 fwdit joined #git
06:36 WayToDoor joined #git
06:36 hekto joined #git
06:37 cdown joined #git
06:38 tgies joined #git
06:39 knittl hm. something must've changed on my system unrelated to git. I tried re-installing old versions to no avail
06:39 Sceorem joined #git
06:40 yuhlw joined #git
06:41 knittl hu. wrong repository url results in a stackdump. wtf
06:43 tristanp_ joined #git
06:43 leehambley joined #git
06:43 tgies joined #git
06:45 FilipNortic joined #git
06:47 JRHaigh joined #git
06:48 eletuchy joined #git
06:48 tristanp joined #git
06:51 ryanp left #git
06:51 L8D joined #git
06:51 tristanp_ joined #git
06:52 hahuang65 joined #git
06:53 tgies joined #git
06:54 _ng joined #git
06:54 jagob joined #git
06:54 tristanp joined #git
06:55 Zireael07 joined #git
06:56 trista___ joined #git
06:56 Zireael joined #git
06:57 Zireael07 joined #git
06:58 tgies joined #git
06:59 Zireael07 I have 180 commits and I need to remove something that's in the first 20 from the commit history for good. is it doable or do I need to scrap the repo?
06:59 mwhooker joined #git
06:59 cbreak Zireael07: sure, possible
06:59 cbreak Zireael07: take a look at git rebase -i --preserve-merges
06:59 cbreak make backups before :)
06:59 cbreak (i.e. by tagging your current branch tip)
07:00 Zireael07 any written tutorial on git rebase?
07:00 Zireael07 I've heard of it but never used it in the 4 years of using git
07:01 cbreak !rebase
07:01 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.
07:01 cbreak hmm...
07:01 interne7y joined #git
07:01 tobiasvl !interactive_rebase
07:01 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
07:01 cbreak !cs
07:01 gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup
07:01 yuhlw_ joined #git
07:01 cbreak tobiasvl: this one was nice back in the days :)
07:01 tobiasvl probably still is!
07:03 TomyWork joined #git
07:03 Zireael joined #git
07:06 Zireael07 joined #git
07:07 Zireael07 my isp is crazy with dynamic IP and my IRC client sometimes tries to use default nickname even though I have one configured specially for Freenode - sorry about that
07:07 dopesong joined #git
07:07 Zireael07 I will read up on rebase, thanks
07:07 Rish joined #git
07:07 ochorocho__ joined #git
07:07 rbr joined #git
07:07 yuhlw joined #git
07:07 Psychiatrist joined #git
07:08 bjpenn joined #git
07:09 Gonzo89 joined #git
07:10 paul424 joined #git
07:10 Zireael joined #git
07:13 pootsmk joined #git
07:13 Zireael07 joined #git
07:13 sandeepsihari joined #git
07:14 nnyk_ joined #git
07:14 troulouliou_div2 joined #git
07:18 encod3 joined #git
07:19 prsn joined #git
07:20 irco joined #git
07:22 Zireael07 joined #git
07:22 PCatinean joined #git
07:22 Zireael07 read up on rebasing with SourceTree, why the warning on never rebasing something that's been pushed?
07:22 Zireael07 because in my case, it's been pushed :(
07:22 tobiasvl Zireael07: !rewrite
07:22 gitinfo Zireael07: 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
07:22 Zireael07 the repo is private though and no one else has access
07:23 dopesong joined #git
07:23 tobiasvl then it's ok
07:25 Zireael07 joined #git
07:26 tristanp joined #git
07:28 Balliad joined #git
07:28 tgies joined #git
07:29 Zireael07 great to know
07:30 Zireael07 I will work on rebasing once I'm back home
07:31 GavinMagnus joined #git
07:31 fees joined #git
07:32 tristanp joined #git
07:34 tgies joined #git
07:36 troulouliou_div2 joined #git
07:36 tristanp_ joined #git
07:41 leeN joined #git
07:42 lindenle joined #git
07:42 stuh84 joined #git
07:44 ahmedelgabri joined #git
07:44 tristanp joined #git
07:45 L8D joined #git
07:48 tgies joined #git
07:50 fscala joined #git
07:50 lite_ joined #git
07:52 eletuchy joined #git
07:53 tristanp joined #git
07:53 tgies joined #git
07:54 b00^wk joined #git
07:54 mase-tech joined #git
07:55 dcpc007 joined #git
07:55 b00^wk hello !
07:55 ril joined #git
07:56 b00^wk is there some git plugin for working with binary files in git ? for versioning binary files
07:56 b00^wk i saw that GitLab has some system for versioning large binaries , :https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/
07:56 b00^wk but this is a paid service with GitLab, you see ..
07:56 tristanp_ joined #git
07:57 osse b00^wk: are they large? will they change often?
07:57 ThomasLocke joined #git
07:57 clmsy joined #git
07:58 b00^wk osse,  they will likely change more often at the beginning say.   size im not sure, but below 1gig for sure
07:59 tgies joined #git
07:59 tristanp joined #git
07:59 osse git-annex is free. gitlab providing it may not be
07:59 osse !git-annex
07:59 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
08:01 trista___ joined #git
08:02 interne7y joined #git
08:04 tristanp_ joined #git
08:04 acetakwas joined #git
08:05 stuh84 joined #git
08:06 tax joined #git
08:07 tristanp joined #git
08:07 JeroenT joined #git
08:09 tgies joined #git
08:09 zeroed joined #git
08:09 zeroed joined #git
08:11 daynaskully joined #git
08:11 ocbtec joined #git
08:12 a_thakur joined #git
08:12 scoobertron joined #git
08:12 bongjovi joined #git
08:13 prsn joined #git
08:14 tgies joined #git
08:14 _pix joined #git
08:16 cdown joined #git
08:16 rasto joined #git
08:17 AnujSharma joined #git
08:19 AnujSharma Hello there, While installing git from source I am getting "/usr/bin/ld: cannot find -lcrypto". I found this library in /usr/lib64. I tried to add this location (explicitly) in LD_LIBRARY_PATH and with -L option in CXXFLAGS still the error is there. Anybody know how to pass this location to make directly?
08:21 marcogmonteiro joined #git
08:21 yuhlw joined #git
08:22 exospecies joined #git
08:23 exospecies hi
08:24 tgies joined #git
08:24 tvw joined #git
08:24 Rish joined #git
08:25 exospecies i have made a clone on a repo of mine, and made some changes... the thing is i would like to merge these changes with the original, rather than making a new commit, how can i do that? so far i have only made a clone and then edited the code
08:27 ramsub07 joined #git
08:27 cbreak exospecies: make a commit
08:27 cbreak then merge or cherry-pick that commit to where ever you want
08:29 Akagi201 joined #git
08:30 ferr joined #git
08:34 tgies joined #git
08:35 josuebrunel joined #git
08:37 weckl joined #git
08:38 weckl joined #git
08:39 tgies joined #git
08:39 xanadu_ joined #git
08:39 _rgn joined #git
08:39 weckl joined #git
08:40 L8D joined #git
08:40 weckl joined #git
08:43 jaguarmagenta joined #git
08:44 EY joined #git
08:44 tgies joined #git
08:47 tristanp_ joined #git
08:48 ahmedelgabri joined #git
08:48 SimonNa joined #git
08:48 drodger joined #git
08:49 tgies joined #git
08:51 tristanp joined #git
08:52 dreiss joined #git
08:53 kurkale6ka joined #git
08:53 exospecies thanks cbreak
08:54 tgies joined #git
08:54 tristanp joined #git
08:57 Jellyg00se joined #git
08:59 tgies joined #git
08:59 ahmedelgabri joined #git
09:01 CheckDavid joined #git
09:02 interne7y joined #git
09:03 mischat joined #git
09:04 wcpan joined #git
09:04 tgies joined #git
09:04 raijin joined #git
09:07 prsn joined #git
09:08 ochorocho__ joined #git
09:08 rasto joined #git
09:10 Wysi joined #git
09:13 ahmedelgabri joined #git
09:14 a3Dman joined #git
09:14 tgies joined #git
09:15 King_Hual joined #git
09:15 King_Hual joined #git
09:19 tgies joined #git
09:20 rvsjoen_ joined #git
09:21 mda1 joined #git
09:23 Silenced joined #git
09:24 tgies joined #git
09:28 King_Hual joined #git
09:28 Psychiatrist joined #git
09:28 tristanp_ joined #git
09:29 tgies joined #git
09:30 ewet joined #git
09:31 tristanp joined #git
09:33 ramsub07 joined #git
09:33 acetakwas joined #git
09:34 L8D joined #git
09:34 tristanp_ joined #git
09:36 sans_s3r1f joined #git
09:39 fuchstronaut joined #git
09:39 nowhere_man joined #git
09:40 eletuchy joined #git
09:41 b00^wk osse, oh , so that then needs a try
09:41 b00^wk osse,  have you used git annex then?
09:41 tristanp joined #git
09:42 FilipNortic joined #git
09:43 dsdeiz joined #git
09:43 acetakwas joined #git
09:44 lindenle joined #git
09:44 tgies joined #git
09:47 JeroenT joined #git
09:47 Guest___ joined #git
09:48 acetakwas joined #git
09:48 nilg joined #git
09:49 chipotle joined #git
09:49 tgies joined #git
09:50 dsdeiz_ joined #git
09:50 chipotle hi, i am new to git. please go easy on me. i did git clone electronjs and now i have ~/electron-quick-start in ~/ . i assume because when did git clone i was in ~/ in my terminal. i am on a mac and i was wondering can i move the directory or how do i unclone it and reclone it into a better directory? i would prefer to keep any software/web development inside the folder i created ~/Development
09:50 chipotle thanks
09:50 acetakwas joined #git
09:51 chipotle er, i mean the command i did was https://github.com/electron/electron-quick-start
09:51 tobiasvl chipotle: yes, just move the directory
09:51 chipotle er git clone https://github.com/electron/electron-quick-start
09:51 chipotle tobiasvl: okay, no issues with symlinks or anything?
09:51 tobiasvl nope
09:51 chipotle in the future, do i want to make sure i am in ~/Development when i clone something?
09:51 tobiasvl the git metadata is all contained inside ~/electron-quick-start/.git and will come with the repo
09:51 courrier joined #git
09:51 chipotle in git, anytime i am doing something with a specific project, i need to be inside that project's folder, right?
09:52 tobiasvl chipotle: correct
09:52 chipotle do i need to update git after moving the folder?
09:52 chipotle okay
09:52 tobiasvl chipotle: if you want to clone a specific place just say git clone https://github.com/electron/electron-quick-start ~/Development/electron-quick-start
09:52 tobiasvl but just being inside the directory where you want the clone is also fine
09:53 tobiasvl you don't need to do anything after moving the folder
09:54 chipotle tobiasvl: ah, right that makes sense
09:54 chipotle thank you
09:54 tgies joined #git
09:55 ahmedelgabri joined #git
09:55 chipotle git is a bit overwhelming. i am familiar with terminal/cli but git plus learning software dev (python) with the hopes of doing data analysis is a bit daunting, to be honest
09:55 chipotle it's SO many moving parts and it is hard to make sure you are following the current "best/proper" way
09:56 slappymcfry joined #git
09:57 tobiasvl I hear you
09:59 tgies joined #git
09:59 tax joined #git
10:01 chipotle thanks for that :)
10:02 fuchstronaut joined #git
10:02 AnujSharma left #git
10:02 pol123456 joined #git
10:03 interne7y joined #git
10:04 AnujSharma joined #git
10:04 tvw joined #git
10:05 raijin joined #git
10:07 digidog joined #git
10:07 cyan__ joined #git
10:09 osse b00^wk: nope
10:09 tgies joined #git
10:10 tristanp_ joined #git
10:10 acetakwas joined #git
10:11 WayToDoor joined #git
10:12 Sceorem joined #git
10:13 tristanp joined #git
10:14 tgies joined #git
10:18 cdown joined #git
10:19 tristanp_ joined #git
10:19 Grum joined #git
10:19 Junior joined #git
10:19 tgies joined #git
10:23 tristanp joined #git
10:24 irco joined #git
10:24 tgies joined #git
10:25 a_thakur joined #git
10:26 dadada joined #git
10:27 dadada hello
10:27 dadada is there a git gui that does well at cherry picking patches between branches
10:27 dadada I know it's not hard to do on the command line, just asking
10:28 L8D joined #git
10:29 tgies joined #git
10:29 selckin !gui
10:29 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
10:30 selckin not what i was expecting
10:30 McNozes joined #git
10:30 dadada selckin: ;-)
10:31 selckin my college likes the atlassian one
10:32 dadada looks good, too bad it is available for maxosx and windows only as far as I can see ...
10:33 selckin those are the people that want guis :)
10:37 a_thakur joined #git
10:37 ploop joined #git
10:38 BSAlb joined #git
10:38 BSAlb joined #git
10:39 BSAlb joined #git
10:39 dodobrain joined #git
10:43 armyriad joined #git
10:43 weckl joined #git
10:44 jaguarmagenta joined #git
10:44 tgies joined #git
10:45 tristanp_ joined #git
10:45 weckl joined #git
10:46 Shashikant86 joined #git
10:46 JeroenT joined #git
10:47 tristanp joined #git
10:48 weckl joined #git
10:48 donnib joined #git
10:49 weckl joined #git
10:49 tgies joined #git
10:50 weckl joined #git
10:50 khelkun joined #git
10:51 osse selckin: git-kraken maybe
10:51 osse that came up recently when talking about cherry-picking and such
10:51 donnib I have 3 folders inside an repo which i would like to take out to a separete repo with the history. What would be the easiest way ?
10:51 donnib I know i can use filter-branch and i also heard about subtree. I don't know
10:51 donnib which approach is best. Also i could use BFG to clean the repo for the things
10:51 donnib i don't want in the new repo so it's inverting the thinking. What's your take on this ?
10:52 weckl joined #git
10:52 weckl joined #git
10:53 tristanp_ joined #git
10:57 acetakwas joined #git
11:00 Psychiatrist joined #git
11:00 tgies joined #git
11:00 jbitdrop joined #git
11:04 interne7y joined #git
11:04 tvw joined #git
11:05 donnib any ideas ?
11:06 selckin !man git-subtree
11:06 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
11:07 achadwick joined #git
11:08 sdothum joined #git
11:08 donnib selckin: subtree is only for one folder and not multiple ?
11:09 ochorocho__ joined #git
11:09 blackwind_123 joined #git
11:09 peterz joined #git
11:09 tgies joined #git
11:10 Orion3k joined #git
11:14 tgies joined #git
11:15 cbreak git filter-branch would be my prefered solution
11:15 cbreak it's straight forward history rewriting
11:17 donnib oki doki i will go forward to do that
11:17 cbreak filter-branch has a subdirectory-filter, if you want to promote a single dir to root
11:17 WayToDoor joined #git
11:17 cbreak or index-filter for more arbitrary manipulations, such as deleting everything else
11:18 donnib great thx, i will have a look
11:18 Zeedox How can I get a list of refs that point to a specific commit (like the --decoreate option of git log). Can't find the right command.
11:18 _noblegas joined #git
11:18 ilmari git show --decorate?
11:18 donnib cbreak: it's just that filter-branch is awfully slow so i was hoping there was something faster
11:18 donnib like using BFG
11:20 nnyk_ joined #git
11:20 tgies joined #git
11:20 Zeedox ilmari: That shows the commit object as well, I'd just like the ref names (tags, branches, etc).
11:20 cbreak Zeedox: git branch and git tag have their own
11:21 ilmari Zeedox: --format=%D
11:21 cbreak but I think only tag has --points-at
11:21 tristanp joined #git
11:22 cbreak have you looked at man git-name-rev?
11:22 gitinfo the git-name-rev manpage is available at http://jk.gs/git-name-rev.html
11:22 JeroenT_ joined #git
11:22 L8D joined #git
11:22 Zeedox ilmari: Thanks, git log --format=%D -1 works for my purposes. I can grep/sed that to the needed format.
11:24 tristanp_ joined #git
11:25 Zeedox cbreak: git-name-rev sounds useful! But I couldn't make it list everything needed i.e. remote branches.
11:25 tgies joined #git
11:25 EY joined #git
11:25 cbreak I think it only creates one name
11:25 Zeedox What I'm looking to do is look for github pull-request branches pointing to the current commit
11:26 Zeedox Maybe I'm going about it in the wrong way
11:26 rnsanchez joined #git
11:28 eletuchy joined #git
11:28 k3rn31 joined #git
11:31 bsanford joined #git
11:35 mikecmpbll joined #git
11:36 liuzhen_ joined #git
11:37 sans_s3r1f joined #git
11:39 redeemed joined #git
11:40 Fijit joined #git
11:42 diogenese joined #git
11:42 nardev joined #git
11:42 johnmilton joined #git
11:44 denimsoft joined #git
11:49 C4ta|Work joined #git
11:49 tgies joined #git
11:54 diegoaguilar joined #git
11:55 maucar joined #git
11:56 maucar joined #git
11:56 maucar joined #git
11:56 tristanp joined #git
11:56 maucar joined #git
11:59 ws2k3 joined #git
11:59 ws2k3 left #git
11:59 Sceorem joined #git
11:59 ws2k3 joined #git
11:59 settermjd joined #git
12:00 tgies joined #git
12:00 nilg joined #git
12:01 Silenced joined #git
12:04 weckl joined #git
12:04 ncd|leeN joined #git
12:05 tgies joined #git
12:05 interne7y joined #git
12:06 ws2k3 im having a very strange issue with git. we work a following. user local git repo.(non bare) -> central local git repo(bare) -> production repo(non bare)i use this post-recieve hook on production : https://github.com/englishtown/stash-hook-mirror/wiki/Mirror-To-Non-Bare-Remote-Repo. we already use this for some time and its working good for us. now im trying to build the same setup somewhere else
12:06 ws2k3 and i just cant get it done. when we push from bare to non bare. the code is just not deployed. while when i pull(on non bare from bare) then its all working fine
12:06 italoacasas joined #git
12:07 selckin +x the hook
12:07 ramsub07 joined #git
12:08 ws2k3 selckin i already did
12:08 ws2k3 selckin i also tryed to just run git reset and git reset --hard in my working directory. but still files appeared
12:10 josuebrunel joined #git
12:10 tgies joined #git
12:10 nfk joined #git
12:12 blackwind_123 joined #git
12:12 cbreak ws2k3: !deploy
12:12 gitinfo ws2k3: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
12:12 jeffreylevesque joined #git
12:12 ws2k3 cbreak i know
12:12 cbreak ws2k3: after a reset --hard it should show the files at the rev you reset to
12:12 cbreak do you say it does not?
12:12 ws2k3 cbreak yes correctly it does not
12:13 tristanp_ joined #git
12:13 cbreak so git diff shows something after git reset --hard?
12:13 lss8 joined #git
12:14 ws2k3 cbreak let me check one moment
12:14 Ideocl4st joined #git
12:15 Ideocl4st left #git
12:15 liuzhen joined #git
12:15 tgies joined #git
12:15 synthroid joined #git
12:15 bjpenn joined #git
12:16 tristanp joined #git
12:16 L8D joined #git
12:16 ws2k3 cbreak it now tells me remote: fatal: Failed to resolve 'HEAD' as a valid ref.
12:16 JanC_ joined #git
12:17 ws2k3 cbreak i guess this is because my remote non-bare does not have any commits yet?
12:17 cbreak ws2k3: if it doesn't have any commits then ... why do you complain?
12:18 cbreak there are not supposed to be any files
12:18 Gloomy joined #git
12:19 ws2k3 cbreak cause i didnt push yet
12:19 tristanp_ joined #git
12:19 ws2k3 cbreak i made a fresh new repo to make sure everything is correctly
12:19 cbreak so... everything works as it is supposed to
12:19 ws2k3 not entirely no. i made a commit on the repo so the push would not fail
12:20 ws2k3 cbreak now i can push without any errors but still there are no files
12:20 tgies joined #git
12:20 ws2k3 cbreak evey after git reset --hard there are no files
12:20 cbreak ws2k3: do what I told you above: git diff
12:20 cbreak also git status
12:20 cbreak and pastebin that
12:21 ws2k3 cbreak cant actualy pastebin that cause the output is emty
12:21 WayToDoor joined #git
12:21 cbreak so git diff shows nothing, and git status shows nothing?
12:21 cbreak then the working dir is as it should be
12:21 cbreak and all files that the current commit requires are there
12:22 ws2k3 cbreak git status shows #on branch master (next rule) nothing to commit (working directory clean)
12:22 elsevero joined #git
12:22 cbreak that means that all is as the current commit wants
12:23 ws2k3 cbreak then maby there is something wrong with the commits
12:23 maucar joined #git
12:23 cbreak ws2k3: git ls-tree -r can show what is inside commits
12:24 tristanp joined #git
12:24 cdown joined #git
12:25 liquidjamm joined #git
12:25 tgies joined #git
12:25 ramsub08 joined #git
12:25 maucar joined #git
12:26 ws2k3 cbreak this is how my git push looks from the bare http://pastebin.com/EhGBGRva
12:28 ws2k3 cbreak all the git ls-tree commands i run return emty
12:28 cbreak git ls-tree -r somecommit?
12:28 cbreak that means all those commits contain no files
12:28 fstd_ joined #git
12:28 jstimm joined #git
12:29 ws2k3 cbreak realy strange.. cause when i run git pull here then it downloads everything nicely
12:29 cbreak ws2k3: so you didn't push the commits you wanted to push
12:29 cbreak ws2k3: git push works as: git push remotename branchname
12:30 tgies joined #git
12:31 a_thakur joined #git
12:33 isxek joined #git
12:33 thiago joined #git
12:34 ws2k3 cbreak i am going to try that now
12:35 chll joined #git
12:35 nilsi joined #git
12:36 lamppid joined #git
12:37 fmcgeough joined #git
12:40 Guest35452 joined #git
12:40 tgies joined #git
12:40 ws2k3 cbreak that seems to work thx for that
12:40 ws2k3 cbreak but then another question. when i am working in my own (non bare) local repo i can just do git push. then i dont have to say git push master
12:41 ws2k3 cbreak is that because i am currently checked out on the master branch?
12:42 Calrik joined #git
12:42 cbreak ws2k3: man git-config
12:42 gitinfo ws2k3: the git-config manpage is available at http://jk.gs/git-config.html
12:42 cbreak look for push.default
12:42 Calrik joined #git
12:42 cbreak normally, git push takes two arguments, the remote to push to (origin, or what ever), and the refs to push (i.e. master)
12:43 cbreak but it can deduce that from config
12:43 cbreak if you do a git push -u origin master once, it'll record that master is pushed to origin's master
12:43 cbreak and any further git push while on master will push there again
12:44 ws2k3 cbreak that explains it. thanks you Very much. im already working on this 2 days lol
12:44 NeverDie joined #git
12:45 teadrop_ joined #git
12:45 jaguarmagenta joined #git
12:45 tgies joined #git
12:45 deadnull_ joined #git
12:46 lindenle joined #git
12:52 fuchstronaut joined #git
12:54 nettoweb joined #git
12:55 SopaXorzTaker joined #git
12:55 SopaXorzTaker How do I add all the files containing {"AuthKey": "UXPS34xefT5"}
12:55 SopaXorzTaker to gitignore
12:56 KevinMGranger If you don't know what files they'll be in in advance, you can't .gitignore them
12:56 KevinMGranger But you *could* do a smudge/clean filter before they're added
12:56 KevinMGranger This smells of an XY problem though
12:56 liquidjamm joined #git
12:56 * selckin facepalms
12:57 fwdit_ joined #git
12:58 tristanp_ joined #git
12:58 tobiasvl !sensitive
12:58 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
12:58 tobiasvl ok, that just had filter-branch.
12:59 tobiasvl SopaXorzTaker: did you just give us your AuthKey though?
13:00 SopaXorzTaker tobiasvl, that was a joke
13:00 leehambley joined #git
13:00 tobiasvl ;)
13:00 tgies joined #git
13:00 SopaXorzTaker but I really wonder about exclusion of files containing specific text
13:00 trista___ joined #git
13:00 toogley joined #git
13:00 tobiasvl like KevinMGranger said, look at smudge/clean filters
13:01 BlessJah smudge/clean or pre-commit hooks
13:01 tobiasvl they're scripts that are run on checkout and staging, they can filter text for you
13:01 liquidjamm joined #git
13:01 tobiasvl yeah or hooks
13:01 KevinMGranger Again, I really need to stress that this is an XY problem. The problem isn't your problem-- it's how you've framed it
13:01 cdown joined #git
13:01 KevinMGranger Instead of figuring out how to guard against accidentally committing your credentials, perhaps one should ask "how can I keep my credentials away from my code but still easy to use"
13:02 grawity pre-commit hooks might be best
13:02 grawity smudge filters just make things quietly disappear
13:02 ciampix joined #git
13:02 tristanp joined #git
13:02 nettoweb joined #git
13:02 BlessJah grawity: I think it's better to abort commit with pre-commit rather than quietly remove some data
13:02 dimi1947 joined #git
13:02 grawity well yes, that's exactly my point
13:03 bsanford joined #git
13:03 SopaXorzTaker KevinMGranger, I originally meant the question as a joke
13:04 SopaXorzTaker though nice to know about the filters tho
13:04 selckin so it was your key and trying to save face
13:04 SopaXorzTaker selckin, it wasn't
13:04 selckin sure sure
13:04 SopaXorzTaker it was my emolyer's
13:04 SopaXorzTaker *employer
13:05 tgies joined #git
13:05 rahtgaz joined #git
13:05 cyan__ joined #git
13:05 Psychiatrist joined #git
13:06 interne7y joined #git
13:07 Horba joined #git
13:08 SopaXorzTaker selckin, my real keys are way longer
13:08 boudicca joined #git
13:08 Horba Is it possible to ignore content case changes when merging. I do not refer to case changes in paths.
13:09 cdg joined #git
13:09 SopaXorzTaker my real API key is b14506e6-2730-11e6-bb4e-011f71fb0989
13:09 ochorocho__ joined #git
13:09 grawity Horba: there's no built-in option for that
13:10 grawity Horba: what's the use case?
13:10 tgies joined #git
13:10 tinanoo joined #git
13:10 Horba WinForms designer isn't picky between "True" or "true" between different developers machines. Don't want to manually correct all those merge conflicts amongs _real_ conflicts.
13:10 jimi_ joined #git
13:11 grawity hmm
13:11 nnyk_ joined #git
13:11 cbreak Horba: normalize them
13:11 grawity if WinForms had a tool to reformat the files, like gtk does
13:11 grawity you could set it up as a filter in git, and use -Xrenormalize
13:11 tristanp joined #git
13:12 Horba True. I could make insignificant edits on both sides prior to the merge. That should normalise them.
13:12 ramsub07 joined #git
13:12 grawity huh?
13:12 Horba Hopefull my machine would choose between "True" and "true" consistently.
13:13 donnib how do i push all refs in my repo that points to origin to a new origin ?
13:14 offby1 joined #git
13:14 grawity local branches, or fetched ones?
13:14 lamppid joined #git
13:14 offby1 idle curiosity (and I'm too lazy to read the source): when I do "git bisect skip", how many revisions does it skip, and how does it choose that number?
13:14 Horba Thank you for your suggestions :) I'll go tinker.
13:14 donnib it's local branches (but once they did point to a origin which is different that the new one)
13:14 grawity offby1: it tries to skip exactly one, AFAIK
13:14 livingstn joined #git
13:14 grawity ...though it's been a while since I used it
13:15 tgies joined #git
13:15 offby1 grawity: that's what I'd thought, but (from looking at git bisect log) it seems to be skipping a bunch.  Which is actually probably fine in my case
13:16 grawity reading /usr/lib/git-core/git-bisect, it seems to be mostly using the same logic as 'git bisect good'
13:16 cbreak offby1: I'd expect it to skip half of them
13:16 cbreak it's a bisection after all
13:16 eletuchy joined #git
13:17 brandonw joined #git
13:17 rnsanchez_ joined #git
13:19 offby1 cbreak: interesting ... guess I'll have to look at the source after all
13:20 dsdeiz joined #git
13:22 dopesong joined #git
13:24 CEnnis91 joined #git
13:25 tgies joined #git
13:26 McNozes joined #git
13:26 rgrinberg joined #git
13:27 donnib so i have some branches in my repo which i am moving to new remote and i did git push origin refs/remotes/origin/*:refs/heads/* and it seems the branches are getting created wrong, what path should i use ?
13:28 donnib i mean the repo is moved to new remote so i want to push all the branches again to the remote (origin)
13:28 mmlb joined #git
13:30 tgies joined #git
13:31 unbalancedparen joined #git
13:32 ceaucari joined #git
13:33 donnib is it the wrong question i am asking ?
13:33 donnib i am very sure it's just a simple path mistake that i amdoing
13:33 JeroenT_ left #git
13:33 JeroenT joined #git
13:34 a_thakur joined #git
13:34 cbreak donnib: do a git ls-remote and look how it ended up being
13:34 selckin or like push --mirror , maybe i don't understand
13:34 cbreak selckin: I'd avoid mirror...
13:35 cactusfrog joined #git
13:35 selckin --all then?
13:35 tgies joined #git
13:36 ar1s left #git
13:37 scarabx joined #git
13:37 a_thakur_ joined #git
13:38 donnib cbreak: so i did git push --all and it only pushed the default branch, all other branches are locally in refs/remotes/origin
13:38 cbreak yes, --all only pushes local branche
13:38 donnib cbreak: so git needs to know explicitly to push those to the remote since they are not local branches
13:39 Goobbue joined #git
13:39 cbreak when I migrated, I made local branches for all branches I wanted to keep
13:39 cbreak (I used that opportunity to clean out legacy debris)
13:39 boudiccas joined #git
13:39 donnib cbreak: yes so i remember there was something like git push origin refs/remotes/origin/*:refs/heads/*
13:40 b00^wk left #git
13:40 donnib cbreak: yes i know but i have many and i need them all and i have done this before but can't remember the exact syntax
13:40 ash_workz joined #git
13:40 tgies joined #git
13:40 offby1 left #git
13:41 tristanp_ joined #git
13:43 cactusfrog hi, I am reading through the latest edition of the ebook Git Pro. One sentence in the book is really confusing me. "Because a branch in Git is in actuality a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy. Creating a new branch is as quick and simple as writing 41 bytes to a file (40 characters and a newline)." Does git actually create branch objects?
13:43 cactusfrog I know that git creates commit objects and then links them together. It is my understanding that a branch is a chain of commit objects, yet that sentence suggests that branches are actually objects in themselves. Can you help alleviate my confusion?
13:43 tobiasvl cactusfrog: a branch is just a pointer at a commit
13:43 a_thakur joined #git
13:43 tobiasvl the resulting chain is just looking at that commit's parents
13:44 Guest35452 joined #git
13:44 tobiasvl does that make sense?
13:45 tobiasvl cactusfrog: if you're a programmer, a commit object is an element in a linked list, and a branch is just a pointer at such an element.
13:45 cactusfrog tobiasvl: Okay, yeah that makes a lot of sense
13:45 cactusfrog tobiasvl: thank you for your help.
13:45 tobiasvl or well, a tree, since a commit can have more than one commit
13:45 tobiasvl np
13:45 selckin !gitcs
13:45 selckin or whats it called
13:45 tgies joined #git
13:46 k3rn31 joined #git
13:46 selckin http://eagain.net/articles/git-for-computer-scientists/
13:46 mbrzuzy joined #git
13:47 CJKinni`` joined #git
13:47 tristanp joined #git
13:47 Dougie187 joined #git
13:48 T4nk5bb0t joined #git
13:48 T4nk5bb0t Good morning
13:49 T4nk5bb0t I have a question that has to do with versioning.
13:50 Elysia Most people who come here do.
13:50 nu11_byte joined #git
13:50 tgies joined #git
13:51 T4nk5bb0t If I am using the major.minor.patch  versioning system, when I have 1.1.0 and I am working on 1.2.0 but I apply a patch, do I push 1.1.1 directly to master or should I push it to my development branch and then to master?
13:51 Elysia you want to apply it to the 1.1.0 branch
13:51 selckin i prefer to develop/fix on master, then backport/cherrypick to maintance versions
13:52 T4nk5bb0t hm...
13:53 wxg joined #git
13:54 JJM joined #git
13:54 raijin joined #git
13:55 tristanp joined #git
13:55 rwb joined #git
13:55 tgies joined #git
13:58 ahmedelgabri joined #git
13:59 grill joined #git
14:00 ramsub08 joined #git
14:00 tgies joined #git
14:01 grill joined #git
14:03 ramsub07 joined #git
14:03 realz__ joined #git
14:03 Gloomy joined #git
14:05 bitkiller joined #git
14:05 SwiftMatt joined #git
14:05 tgies joined #git
14:05 Gamecubic joined #git
14:06 ramsub08 joined #git
14:06 T4nk5bb0t I am trying to understand the meaning of an incompatible API change. I don't understand what this means. Does anyone have an example?
14:06 ahmedelgabri joined #git
14:07 duderonomy joined #git
14:07 interne7y joined #git
14:08 perlpilot T4nk5bb0t: an API call that works on version A that will NOT work on version B is an incompatible API change.
14:08 L8D joined #git
14:08 T4nk5bb0t perlpilot, Oh,you mean with external calls?
14:08 perlpilot T4nk5bb0t: if you need a more specific example, my brain isn't awake enough to do that yet :)
14:08 torbjorn how can i git delete all files in a directory when only some of them were in the repo in the first place?
14:08 selckin if the end user need to change something its not compatible
14:09 torbjorn git rm * wont do it because that matches those that are not in the repo
14:09 donnib osse: u arund ?
14:09 selckin torbjorn: rm -rf dir; git add -u
14:09 osse torbjorn: git rm '*'. Let git do the globbing
14:09 T4nk5bb0t perlpilot, selckin If this is an application that is never used by another developer but everything is internal, how do I deal with major changes then? There will never be an incompatible api change.
14:09 osse donnib: Maybe
14:09 torbjorn ah. thanks.
14:10 wxg4irc joined #git
14:10 donnib osse: i see u are, i need some help to push my remote branches from /refs/remotes/origin to my new origin but where should they be pushed to ? refs/heads/* ?
14:10 selckin T4nk5bb0t: semver only really makes sense for libraries, big gui changes or features whatever you want it to mean
14:10 cyan__ joined #git
14:10 T4nk5bb0t selckin, Ok, thanks!
14:10 tgies joined #git
14:11 mwleeds joined #git
14:12 dhollinger joined #git
14:12 BrianBlaze420 joined #git
14:12 blackwind_123 joined #git
14:15 ramsub07 joined #git
14:16 prsn joined #git
14:16 raininja joined #git
14:17 cuebix-wk joined #git
14:19 chris_99 joined #git
14:19 JeroenT_ joined #git
14:19 BSaboia joined #git
14:20 chris_99 Hi, i'm just wondering, am i right in thinking git only tries to use a single ssh key, such as id_rsa.pub
14:20 tgies joined #git
14:21 selckin git delegates to an ssh client, which will try all known keys
14:22 scarabx joined #git
14:24 kadoban joined #git
14:24 AaronMT joined #git
14:25 chris_99 oh, i see the issue, it seems i need to tell git somehow which ssh key to use, as it must be picking my key used for another github account, and noticing i don't have permission for this repo
14:25 quenode Is i possible to keep remotes (subtrees) in .git/config file so when I do git clone get my remotes ? tnx
14:25 tgies joined #git
14:25 selckin submodules maybe
14:26 quenode selckin: submodules I am trying to get away from that :)
14:27 osse donnib: yes
14:27 kevwil joined #git
14:27 selckin don't understand the qeustion then
14:27 quenode selckin: my q?
14:27 toogley joined #git
14:28 phaleth joined #git
14:29 sans_s3r1f joined #git
14:29 Calrik joined #git
14:29 todd_dsm joined #git
14:30 tgies joined #git
14:31 eletuchy joined #git
14:32 frem_ joined #git
14:32 WORMSS joined #git
14:34 WORMSS Hello, when I do `git tag test6 -s -m "test6"` I actually get a request for a passphrase for a sign I do not use, (thankfully I know the passphrase), but when I do gpg -k I am returned with blank.. As I deleted it.. So... where is git getting this sign from?
14:35 drodger joined #git
14:35 testbot_ joined #git
14:35 tgies joined #git
14:36 Sahweil joined #git
14:36 solars joined #git
14:36 solars if I just commited locally, want to push but realize there is one incoming change - what's the best way to resolve this without a merge commit?
14:37 selckin git pull --rebase
14:38 solars thanks selckin
14:38 fedexo joined #git
14:39 SwiftMatt joined #git
14:44 joki joined #git
14:45 tgies joined #git
14:47 mdw joined #git
14:48 drodger joined #git
14:48 aviraldg_ joined #git
14:50 King_Hual joined #git
14:50 ataldis joined #git
14:50 tgies joined #git
14:50 fuchstronaut joined #git
14:51 espindola joined #git
14:51 CalimeroTeknik how can I edit the patch of the last commit?
14:51 selckin commit --amend
14:52 CalimeroTeknik yes, that allows to amend the commit message, but I wanted to edit the patch
14:53 jast do you want to directly edit the diff, or just include a few more changes from your working tree?
14:53 CalimeroTeknik edit it directly
14:53 jast I don't know how to do the former, but the latter is straightforward
14:54 ataldis git add newfile; git commit -amend
14:54 osse git reset HEAD~; git add -p; g commit
14:55 jast that's not gonna work
14:55 jast oh well, it might, but only if you don't have any unrelated changes that have been staged but not committed
14:55 tgies joined #git
14:55 davidosomething joined #git
14:56 * osse hides behind his "It's not clear what the question is" cover
14:56 osse it lets you edit the patch, in the literal sense
14:56 clemf joined #git
14:57 ataldis don't do that if you already pushed your changes to a remote.
14:57 CalimeroTeknik yeah, I re-did the add -p, where I edited the patch wrong
14:57 kilo_bravo joined #git
14:57 CalimeroTeknik after reset HEAD^
14:57 CalimeroTeknik it would have been interesting to be able to edit the diff of the last commit, but I can always re-do the commit
14:58 CalimeroTeknik (and of course it's not yet pushed)
14:59 paul424 joined #git
14:59 osse why is this easier then modifying the files themselves and doing commit --amend ?
15:00 CalimeroTeknik well… I'm committing changes to the same line separately
15:00 paul424 joined #git
15:00 tgies joined #git
15:00 CalimeroTeknik the state of the intermediary commits never existed in the first place
15:01 CalimeroTeknik I managed to not botch it with the 'edit' function of add -p when re-doing the commit
15:03 grill joined #git
15:03 drodger joined #git
15:04 mischat_ joined #git
15:05 NeverDie joined #git
15:05 tgies joined #git
15:06 TomyLobo joined #git
15:06 bango2 joined #git
15:06 sieve joined #git
15:07 sieve So, I have been playing around with remote branches from pull requests
15:07 sieve with github "git fetch origin" shows you all your PR's which is pretty awesome
15:07 Gitzilla joined #git
15:07 sieve but I have this repo where I cant see the PR :(
15:07 Eugene !github_pull
15:07 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
15:08 sieve Andrews-MacBook-Pro-2:frontend andrew$ git branch --all
15:08 sieve * master
15:08 sieve remotes/origin/HEAD -> origin/master
15:08 sieve remotes/origin/master
15:08 interne7y joined #git
15:08 Eugene !pastebin
15:08 gitinfo [!paste] Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.
15:08 sieve Eugene: One line? Really?
15:08 GavinMagnus left #git
15:09 Eugene That's what the bot says
15:09 GavinMagnus joined #git
15:10 eletuchy joined #git
15:10 sieve Eugene: Maybe the bot needs some reeducation!
15:10 sieve Eugene: that is a great tip. Thanks very much!!!!
15:10 ochorocho__ joined #git
15:10 Eugene Patches normally welcome, but I'm willing to make an exception in this case ;-)
15:10 osse sieve: it varies from channel to channel what the maximum length of a snippet is
15:11 osse #git is on the end (or start) of the spectrum
15:11 Eugene (apparently I wrote that paste factoid.... so I'm to blame, oh well)
15:11 thiago joined #git
15:11 Eugene But have you tried the vomitb.in? It is the best bin
15:11 ramsub07 joined #git
15:11 jonno11 joined #git
15:11 * Seveas pust Eugene in the vomit bin
15:12 sieve Eugene: I'm really a gist type of chap.
15:13 sieve Eugene: but I really feel that anything 4 lines or less is fair game
15:13 Eugene That's an incorrect personal opinion that I am ill-equipped to help you with
15:14 sieve Eugene: Tabs or spaces?
15:14 Eugene I follow PEP8 or local equivalent
15:15 Eugene (tabs when in doubt, but I set the width to 4. #WatchTheWorldBurn)
15:15 ywvyeu joined #git
15:15 tgies joined #git
15:16 bjpenn joined #git
15:16 osse I use systemd-whitespacectl
15:16 osse was kicked by Eugene: That's not even funny, don't give them ideas
15:16 Topic for #git is now Welcome to #git1015FM, the place for git help and necessary violence | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | The beatings will continue until the jokes improve! https://madeitwor.se/git-jokes
15:16 Tim-SEM joined #git
15:17 Topic for #git is now Welcome to #git, the place for git help and necessary violence | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | The beatings will continue until the jokes improve! https://madeitwor.se/git-jokes
15:17 osse joined #git
15:17 WayToDoor joined #git
15:18 Tim-SEM left #git
15:19 madewokherd joined #git
15:20 jackburton joined #git
15:20 tgies joined #git
15:21 C4ta|Work joined #git
15:22 EduardoMartins1 joined #git
15:22 denimsoft joined #git
15:23 nnyk_ joined #git
15:24 sieve How do you do something if a new branch is found?
15:24 sieve What tools are typically used to trigger stuff upon new commits or PR's?
15:25 tgies joined #git
15:26 selckin CI
15:26 sieve selckin: there is a PR tool for Jenkins
15:27 Eugene Do you want to !deploy, or test(go look at Jenkins/Travis/etc)
15:27 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
15:27 cyan__ joined #git
15:27 sieve Eugene: We're using Travis currently but this does not deploy
15:27 sieve only tests/builds
15:27 selckin sieve: why are you telling m ethat
15:28 discopatrick joined #git
15:28 sieve selckin: I thought you might get a kick out of it
15:28 sieve selckin: obviously your bread is buttered on a different side
15:28 Noldorin joined #git
15:29 selckin ignored
15:29 ki0 joined #git
15:29 sangy joined #git
15:32 SteffanW joined #git
15:32 qpdb joined #git
15:34 mikecmpbll joined #git
15:34 rbr joined #git
15:35 scarabx joined #git
15:35 tgies joined #git
15:35 qpdb joined #git
15:35 IWishIKnew joined #git
15:37 harish_ joined #git
15:38 kpease joined #git
15:39 thiago joined #git
15:39 sarbs joined #git
15:40 tgies joined #git
15:41 drodger joined #git
15:42 lindenle joined #git
15:44 bango2 joined #git
15:44 rgrinberg joined #git
15:45 kpease joined #git
15:46 tgies joined #git
15:46 leehambley joined #git
15:47 peepsalot joined #git
15:47 acetakwas joined #git
15:49 diegoaguilar joined #git
15:50 eijk joined #git
15:51 tgies joined #git
15:52 sjohnson <osse> There's a big systemd demonstration in Dallas tomorrow  <osse> Prolly flip some cars and shit
15:53 DuckMaestro joined #git
15:56 T4nk5bb0t joined #git
15:56 tgies joined #git
15:57 ramsub07 joined #git
15:58 synthroid joined #git
16:01 tgies joined #git
16:01 subhojit777 joined #git
16:04 mischat joined #git
16:05 ajf- joined #git
16:06 tgies joined #git
16:06 BombStrike joined #git
16:07 espindola joined #git
16:07 scarabx joined #git
16:08 mischat_ joined #git
16:08 prsn_ joined #git
16:09 Noldorin joined #git
16:09 interne7y joined #git
16:09 douglascorrea joined #git
16:11 irco joined #git
16:11 tgies joined #git
16:11 mischat joined #git
16:12 fayimora_ joined #git
16:12 ciampix joined #git
16:13 mmkumr joined #git
16:13 imachuchu joined #git
16:14 DevAntoine joined #git
16:14 DevAntoine hi
16:15 cyan__ joined #git
16:15 DevAntoine I want to remove my last two (unpushed) commits
16:15 grawity git reset HEAD^^
16:15 mmkumr I want to create a remote repository for local
16:15 osse git reset HEAD~2
16:15 DevAntoine git reset --hard HEAD~2 will do the trick?
16:15 _ikke_ mmkumr: What do you mean with that?
16:15 DevAntoine --hard will delete changes while soft will only delete commits?
16:15 osse DevAntoine: yes that does the same as grawity's or my suggestion, and it *also* changes the files themselves on disk
16:16 tgies joined #git
16:16 mischat_ joined #git
16:16 rueben_ joined #git
16:16 fayimora_ Hey folks, i recently started signing some of my commits. Problem is I have to type in the passphrase everytime. Any idea how to make git remember this? even if it's for a few hours
16:16 DevAntoine thanks
16:17 fscala joined #git
16:17 grawity fayimora_: that's a gpg thing, not a git thing...
16:18 fayimora_ hmm ok
16:18 dhollinger joined #git
16:18 mmkumr _ikke_: When I am trying to creating repository git is creating it locally when I am trying to push it is showing error.
16:19 mischat__ joined #git
16:19 mmkumr _ikke_: So every time when I am creating a new repository I am going to github and creating it tell I am cloning.
16:20 Alejandro-25 joined #git
16:20 nu11_byte what error
16:20 mmkumr _ikke_: sorry I mean that I am cloning
16:21 nu11_byte fayimora_ what OS are you on
16:21 mmkumr nu11_byte: That that url is not there
16:21 nu11_byte set remote
16:21 fayimora_ @nu11_byte MacOS
16:21 nu11_byte yes there is a way to configure git for that
16:21 nu11_byte one second
16:21 sargas joined #git
16:21 nu11_byte git config --global credential.helper osxkeychain
16:22 nu11_byte https://help.github.com/articles/caching-your-github-password-in-git/
16:22 fayimora_ nu11_byte:  thanks i'll try it now
16:22 nu11_byte git config --global credential.helper "cache --timeout=3600"
16:22 nu11_byte is if you want to set a time limit
16:22 nu11_byte np
16:22 mischat joined #git
16:22 Thorn joined #git
16:23 nu11_byte you should only have to type the pw in once, and if you use the keychain helper the timeout from the second command wont matter
16:25 moei joined #git
16:25 tgies joined #git
16:31 tgies joined #git
16:31 gitmigration joined #git
16:31 mischat joined #git
16:32 ldleworker joined #git
16:32 ldleworker What is the thing I should learn if I want to say, reorganize the last 5 commits including changing what blobs the commits actually consist of?
16:33 _ikke_ rebase
16:33 osse the interactive kind
16:33 gitmigration Is there a python pre-receive hook that I can use to do per directory, file, branch based access control
16:33 hendry joined #git
16:33 ochorocho__ joined #git
16:34 Noldorin joined #git
16:34 _ikke_ I'm not aware of any
16:34 ldleworker _ikke_, osse: I'm familiar with interactive rebase for squashing and reordering, but not like, moving actual snippets around.
16:34 osse ldleworker: you can mark a commit for editing, which lets you amend it
16:35 raijin joined #git
16:35 osse change "pick" to "e" or "edit"
16:35 SwiftMatt joined #git
16:35 ldleworker And that will let me move one specific part of that commit to some other commit?
16:35 orbitphreak joined #git
16:35 ldleworker (if so that's pretty cool)
16:35 osse that too
16:35 jrun left #git
16:35 ldleworker I basically just committed the last 5 commits willy nilly and I want to put related changes in the same commits
16:36 durham joined #git
16:36 ldleworker osse: so I should learn how to ammend commits?
16:36 tgies joined #git
16:36 osse ldleworker: that part is easy: make changes, commit --amend
16:36 osse in this particular case maybe it's easier to do  git reset HEAD~5 and then git add -p
16:37 ldleworker osse: you mean, reset 5 commits ago, so all the changes for all 5 commits are unstaged, and then simply readd all the work back and commit the correct way?
16:37 osse yup
16:37 ldleworker interesting
16:37 fayimora_ nu11_byte: it didn't work :( Still asking for passphrase
16:37 leehambley joined #git
16:37 ldleworker osse: thanks
16:37 nu11_byte it should ask at least once
16:37 nu11_byte to add to keychain
16:37 elsevero joined #git
16:38 scarabx_ joined #git
16:38 nu11_byte type git credential-osxkeychain
16:38 fayimora_ yh it asked a second and third time
16:38 nu11_byte have you downloaded command line tools from xcode
16:39 fayimora_ lol yeah
16:39 eletuchy joined #git
16:39 fayimora_ usage: git credential-osxkeychain <get|store|erase>
16:39 fayimora_ i tried get
16:39 mohabaks joined #git
16:39 fayimora_ but it was asking for permission to an unrelated item
16:40 nu11_byte git config --global credential.helper osxkeychain
16:40 nu11_byte does that return anything?
16:40 fayimora_ nothing
16:41 tgies joined #git
16:41 nu11_byte when you type git credential-osxkeychain
16:41 nu11_byte are you prompted for an install
16:41 dreiss joined #git
16:41 Rooxo joined #git
16:41 nu11_byte i have used homebrew to manage my installs and perhaps thats why my experience differs, unless of course you have as well
16:42 fayimora_ no i get this: usage: git credential-osxkeychain <get|store|erase>
16:42 durham_ joined #git
16:42 nu11_byte https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage
16:42 fayimora_ i use Homebrew too :)
16:42 nu11_byte https://stackoverflow.com/questions/5343068/is-there-a-way-to-skip-password-typing-when-using-https-on-github
16:43 nu11_byte is your link ssh or https
16:43 nu11_byte your remotes
16:43 fayimora_ btw just to be sure, we are talking about a GPG passphrase not an SSH passphrase
16:43 jast fayimora_: do you have a gpg agent running?
16:44 msonntag joined #git
16:44 fayimora_ it's git@github so i'm guessing ssh?
16:44 nu11_byte remove -v
16:44 fayimora_ @jast  i think so but how do i very that?
16:44 nu11_byte git remote -v
16:44 ldleworker osse: does what I want to do have anything to do with cherry picking or is that something else
16:44 jast I don't know my way around osx very well, but presumably 'ps x' lists processes running in your account
16:44 osse ldleworker: a rebase is series of cherry-picks
16:45 nu11_byte um
16:45 nu11_byte thats an odd way to put it
16:45 nu11_byte fayimora_ if you are referring to signing check out https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work
16:45 ldleworker osse: also, if I reset head~5 or whatever, will the changes reflect how things were at head or will it reflect how things were HEAD~5?
16:45 ldleworker osse: like if commit 1 introduces a change, then commit 2 changes that change, and then commit 3 changes that change...
16:46 robotroll joined #git
16:46 osse ldleworker: the files on disk will not be touched
16:46 tgies joined #git
16:46 ldleworker fascinating
16:46 nu11_byte rebasing is branching off of the base and squashing what you want parsing out what messages you don't need and orphaning the previous branches... squares and rectangles
16:46 jast git itself sees commits as full snaphots
16:46 jast only some tools, e.g. rebase, operate in terms of changes/diffs
16:46 osse ldleworker: so after a git reset then git diff will show the "sum" of all the commits
16:46 jast and what they do internally is calculate the diffs on the fly
16:46 osse ldleworker: (plus any further uncommitted changes you had)
16:46 nu11_byte https://www.youtube.com/watch?v=1ffBJ4sVUb4
16:46 ldleworker osse: nice, so I don't have to "refigureout" the work inbetween each commit
16:47 jave joined #git
16:47 ldleworker osse: thank you
16:47 osse not unless you want to
16:47 shinnya joined #git
16:47 nu11_byte long and a bit annoying but will change the way you think about git in terms of understanding it from a lower level
16:47 denimsoft joined #git
16:47 ldleworker nu11_byte: I once read all of progit and had a lot of confidence in understanding the data model, but I just do wierd stuff so infrequently I lose it
16:48 nu11_byte well when you say weird stuff in respect to git there is an infinite amount of possibilities
16:48 nu11_byte https://git-scm.com/book/en/v2
16:48 nu11_byte everyone should take advantage that that is free
16:49 nu11_byte 2 schools of thought on rebasing, choose whichever works for you, just never rebase after pushing a commit upstream
16:49 mikecmpbll joined #git
16:51 tgies joined #git
16:51 fayimora_ @nu11_byte i'm guessing i should be able to find the gpg passphrase in keychain right?
16:52 nu11_byte really depends on your setup... but if there is anywhere you would find it thats first place to check
16:52 rom1504 there's keybase these days
16:52 fayimora_ yeah i see my ssh key in keychain but nothing with pgp/gpg
16:52 ajf- joined #git
16:52 nu11_byte if you are signing your work to that level of integrity the previously mentioned methods likely wont accomidate
16:53 fayimora_ @rom1504 been waiting for an invite forever
16:54 ldleworker is HEAD~1 1 commit or 2?
16:54 fayimora_ @nu11_byte looks like i'll just disable this because i cant be typing such a long passphrase everytime i commit :(
16:54 nu11_byte also commits signed in that fashion are typically overkill for most situations, depends on the project and team
16:55 ldleworker osse: how do I undo the reset if I just wanna go back
16:55 osse ldleworker: git reset HEAD@{1} (maybe). git reflog HEAD
16:56 tgies joined #git
16:57 ldleworker git reset HEAD@1 => fatal: ambiguous argument 'HEAD@1': unknown revision or path not in the working tree.
16:57 ldleworker oh you need the {}
16:57 ldleworker hmm, that just causes errors in my shell
16:57 ldleworker lol
16:58 osse quote it
16:58 githogori joined #git
16:58 ldleworker yeah :)
16:58 rom1504 fayimora_: I can send you one if you want
16:59 fayimora_ rom1504: yesssss i do want one :)
16:59 osse ldleworker: did you check that 1 is correcT?
16:59 osse might be 2 or 3
16:59 osse depends on what you did in the mean time
16:59 ldleworker osse: I did, and it was. You've been superhelpful!
16:59 osse That's merely because I am awesome
16:59 rom1504 fayimora_: well I need a mail then, send it in query or something
17:00 fayimora_ yh i just PM'd you
17:01 tgies joined #git
17:01 hendry joined #git
17:01 ldleworker woot, my history is pristine
17:01 osse but now it's wrong
17:01 osse it's not actually what happend
17:02 osse fascist!!
17:02 osse ldleworker: do you work in minitrue?
17:02 ldleworker Yeah I have heard this philosophical divide before
17:03 fuchstronaut joined #git
17:03 ramsub07 joined #git
17:04 osse ldleworker: i'm just kidding.
17:04 ldleworker osse: I'm not.
17:04 texasmynsted joined #git
17:04 osse Yeah I know about the philosophical divide, as you call it, but I agree with you
17:05 ldleworker I've witness yelling arguments over whether VCS history should show the history of the developer's actions, or should represent the developer's abstract intentions for function change
17:05 osse I prefer a commit history that reflects the overall intention
17:05 ldleworker same
17:05 ldleworker Sort of how like, philosophy or formal systems evolve an "argument"
17:05 osse the actual actions of the developer is more or less useless imho
17:05 ldleworker Its progression is just a natural automatic evolution from applying formal principles
17:06 osse git commit -m 'Fix typo in commit. Also went to the toilet'  no thanks
17:06 tgies joined #git
17:06 SimonNa joined #git
17:06 ldleworker If you squint and inhale some secondhand marijuana smoke, you can see a metaphor for how a piece of software has its own 'platonic' evolutionary future that is only uncovered by the developer
17:06 Darcidride joined #git
17:07 ldleworker Such as, to get from this functional state, to some other functional state, changes X, Y, and Z are the ones that mutate this source into the required source.
17:07 osse I think I'm gonna need something stronger for that
17:08 ldleworker haha
17:08 * osse pries open his third eye
17:08 Dyonisos joined #git
17:08 osse Them's a lot of big words, but I *believe* I agree with you.
17:09 jast big words for big mind--... okay, I see the problem ;)
17:09 tristanp joined #git
17:09 osse ;_;
17:09 interne7y joined #git
17:09 texasmynsted I want to find all the files in a particular commit with the text "foo" in them.  Git grep will show me "lines" of files but does not seem to find what I am looking for.
17:10 jast I agree with you, by the way. nobody cares about the developer's journey in minute detail.
17:10 jast a commit history is a story. stories are never quite what happened.
17:10 texasmynsted I can see what I want wit this.  find . -type f -iname '*.java' -exec grep -li 'foo' '{}' \;
17:10 texasmynsted But I need to see this for a particular commit
17:10 osse texasmynsted: git grep -l -e foo <commit>
17:10 osse -i
17:10 ki0 joined #git
17:11 cbreak joined #git
17:11 tgies joined #git
17:11 texasmynsted ok, trying
17:11 ki0_ joined #git
17:11 jast as it happens, -e is optional, so the invocation is almost exactly the same as in the original :)
17:12 texasmynsted Does not find it
17:12 jeffreylevesque_ joined #git
17:12 texasmynsted ohhh hmm
17:13 texasmynsted nope
17:13 texasmynsted It can't seem to find it but I can find it via the find command I showed.
17:13 texasmynsted What is happening.
17:14 texasmynsted If I can find it via
17:14 osse the find command searches the actual files on disk, regardless of what commit they correspond to
17:14 jast works in my case. are you sure the file exists with that content in that commit?
17:14 texasmynsted find . -type f -iname '*.java' -exec grep -li 'foo' '{}' \; then I should be able to see it via
17:14 jast you can look at the version in that commit: git show commit:path/to/file
17:14 texasmynsted git grep -l -e 'foo' HEAD
17:15 jast well, find will look at untracked files, 'git grep' won't
17:15 osse then it's an uncommitted change
17:15 ki0_ joined #git
17:15 osse or untracked file
17:15 jast oh hey, time to leave for me. have a good evening, y'all
17:16 bjpenn joined #git
17:16 tgies joined #git
17:16 tgunr joined #git
17:17 texasmynsted oh wow, I think you are right.  I think my find command was wrong
17:17 orbitphreak joined #git
17:18 c0ded joined #git
17:19 djb-irc joined #git
17:20 mdw joined #git
17:21 tgies joined #git
17:21 cbreak joined #git
17:21 sargas joined #git
17:22 sandeepsihari joined #git
17:22 sigma__ joined #git
17:24 sigma__ I have two branches -- b1 and b2. b2 was created as a branch from b1, and I need a few commits from b2 in b1 instead. Can I reset those commits, one by one, in b2 and checkout b1 and commit them there, then rebase b2 on b1?
17:24 sigma__ In other words, what's the right way to move commits from a feature branch to ots base branch?
17:24 sigma__ its*
17:25 osse sigma__: while on b1 cherry-pick them, then rebase
17:25 sigma__ I've not used cherry-pick. This will be a good learning experience.
17:25 Oebele joined #git
17:26 sigma__ osse: Should I be resetting those cherry-picked commits before the rebase?
17:26 osse not necessary
17:26 sigma__ E.g. checkout b1, cherry-pick commits from b2, checkout b2, reset those commits, rebase on b1?
17:26 sigma__ Okay. They won't appear twice after the rebase in b2's log?
17:27 osse git will recognize the duplicates and skip them
17:27 sigma__ Excellent.
17:27 sigma__ I'll read the cherry-pick documentation again. Thanks.
17:29 texasmynsted is there a way to grep back through history for a given file looking for a particular bit of text, like "foo"?
17:29 osse git log -Sfoo
17:29 deadnull_ joined #git
17:29 sigma__ left #git
17:30 texasmynsted wow
17:30 * texasmynsted mind blown
17:30 t4nkd joined #git
17:30 texasmynsted ok  Thank you
17:32 hahuang65 joined #git
17:33 zamba joined #git
17:33 prsn joined #git
17:33 mikecmpbll joined #git
17:34 fuchstronaut joined #git
17:36 tgies joined #git
17:36 Sasazuka__ joined #git
17:36 T4nkAbb0t joined #git
17:36 mwhooker joined #git
17:37 choki joined #git
17:38 AaronMT_ joined #git
17:39 bjpenn joined #git
17:39 sha1sum joined #git
17:40 LeBlaaanc joined #git
17:40 sha1sum Hey all. Is there a way to find the creator of a *directory* (or the creator of the first file in that directory)?
17:40 osse sha1sum: git log --reverse -- path/to/dir
17:40 preaction sha1sum: naive method would be look through the log in re... yeah
17:40 osse preaction got rekt
17:41 tgies joined #git
17:41 preaction curse my use of inefficient English!
17:41 sha1sum osse: thanks!
17:42 btree joined #git
17:43 ramsub07 joined #git
17:43 nu11_byte joined #git
17:44 btree left #git
17:44 Noldorin joined #git
17:46 jonno11 joined #git
17:46 tgies joined #git
17:49 israelzuniga joined #git
17:50 d0nn1e joined #git
17:50 mischat joined #git
17:51 tgies joined #git
17:51 cube__ joined #git
17:52 cube__ hey guys, i'm new to git, i just wrote a translation for a project (not mine) and would now like to "suggest" those files to the original author so he can include them in the official software
17:52 orbitphreak joined #git
17:52 cube__ do i need to do that via a pull request that compares his official software with my fork where i made the changes?
17:53 Chill_Surf joined #git
17:53 cube__ because i cant upload it to his project (of course) but i also cannot submit a pull request (this is what confuses me, it's a request, so that he reviews it, and if he likes the code adds it. no?)
17:53 texasmynsted well pull request is a github concept
17:54 texasmynsted is his software in github?
17:54 osse cube__: you push to your own repo, and request that they other guy merges your branch into his
17:55 texasmynsted yeah, that is all a pull request is really
17:55 cube__ osse: i see, so in any case i need to create a fork?
17:55 GodusX joined #git
17:55 osse cube__: yes
17:55 cube__ osse: thanks!!
17:55 cube__ texasmynsted: thanks u2
17:56 osse cube__: unless you have your own server you can host it on. but that techincally counts as creating a fork anyway :p
17:56 jeaye joined #git
17:56 tgies joined #git
17:57 jeaye Why does stashing require typing the GPG passphrase twice?
17:57 osse huh
17:57 mischat__ joined #git
17:58 osse because git stash creates commits under the hood, and they didn't think of making sure they aren't signed
17:58 jeaye It seems reasonable to enter it once, to sign my stash commit. It's odd that it makes two though.
17:59 neanderslob joined #git
17:59 osse a stash consists of two commits
17:59 jeaye That explains it then.
18:00 mischat joined #git
18:00 osse but it doesn't explain that they don't use --no-gpg-sign :p
18:00 orbitphreak joined #git
18:00 bjpenn joined #git
18:01 ochorocho__ joined #git
18:01 tgies joined #git
18:01 jeaye osse: Agreed.
18:01 Sendoushi joined #git
18:02 mischat_ joined #git
18:02 luxPerpetua joined #git
18:02 jeaye There is https://github.com/git/git/pull/186
18:02 osse but if you want to sign every single commit then maybe you want to sign those as well
18:03 osse isn't rebasing painful?
18:03 GavinMagnus left #git
18:03 jackburton joined #git
18:04 cdown joined #git
18:04 jeaye I'm ok with signing my stash; I was just curious why it prompted twice.
18:05 mischat joined #git
18:06 m0viefreak joined #git
18:06 tgies joined #git
18:06 MattMaker joined #git
18:07 Samy__ joined #git
18:07 Samy__ hey
18:07 Samy__ i created a branch but when i cloned the project the branch is not there and i just get the master
18:07 mischat__ joined #git
18:07 nurey joined #git
18:07 Samy__ why is that happening though the branch is listed in my github profile
18:08 blackpajamas joined #git
18:09 osse !remotr_tr > Samy__
18:09 osse Samy__: !remote_tr
18:09 gitinfo Samy__: [!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>
18:10 Samy__ my branch is not listed in git branch. It did got listed a few days ago but now i am unable to see it :/
18:10 osse -r
18:11 nilg` joined #git
18:12 Samy__ thanks does it list recursively all the branches on master?
18:13 osse read the move
18:13 osse abov
18:13 _tgunr joined #git
18:14 Psychiatrist joined #git
18:15 _ng joined #git
18:16 Samy__ what does "read only mirrors" stand for
18:17 Kicer86 joined #git
18:17 Samy___ joined #git
18:17 f3r70rr35f joined #git
18:18 nitin joined #git
18:18 jost joined #git
18:18 drodger joined #git
18:20 eletuchy joined #git
18:22 frankier joined #git
18:23 jbitdrop joined #git
18:24 hendry joined #git
18:26 tgies joined #git
18:27 jeaye left #git
18:31 T4nk5bb0t joined #git
18:31 tgies joined #git
18:31 ciampix joined #git
18:32 dimi1947 joined #git
18:32 nurey joined #git
18:33 choki joined #git
18:33 nwkj86 joined #git
18:33 multi_io joined #git
18:34 WayToDoor joined #git
18:34 mischat joined #git
18:35 romankl joined #git
18:36 tgies joined #git
18:36 romankl joined #git
18:38 L8D joined #git
18:39 bjpenn joined #git
18:39 eletuchy joined #git
18:41 mwhooker joined #git
18:41 tgies joined #git
18:42 hahuang65 joined #git
18:42 ochorocho__ joined #git
18:43 _rht joined #git
18:43 Sendoushi joined #git
18:45 LeBlaaanc joined #git
18:46 star_prone joined #git
18:46 ramsub07 joined #git
18:46 tgies joined #git
18:48 elsevero joined #git
18:51 fission6 joined #git
18:51 tgies joined #git
18:52 fission6 how do i compare master to master on 2016-05-23, i am trying to track down what the code look liked then when i solved a bug
18:52 grawity 1) find a commit with that date, 2) git diff <commit_id> master
18:53 aswen joined #git
18:53 preaction i believe one can "git log --date 2016-05-23"
18:54 preaction nope. i'm wrong :(
18:54 Repox joined #git
18:54 felipe__ joined #git
18:55 grawity there's the @{somedate} syntax but it is based on your reflog, not the actual log
18:55 fission6 thanks, how do i find the specific time of a certain commit?
18:55 choki joined #git
18:55 grawity git log
18:56 felipe__ was kicked by bremner: plz don't spam ops kthanksbye
18:56 tgies joined #git
19:01 nitin joined #git
19:01 tgies joined #git
19:02 Musok joined #git
19:02 espindola joined #git
19:04 mwhooker joined #git
19:04 kpease joined #git
19:06 ki0 joined #git
19:06 tgies joined #git
19:07 jackburton joined #git
19:09 pontre2k joined #git
19:11 dsdeiz joined #git
19:11 dsdeiz joined #git
19:11 espindol_ joined #git
19:11 interne7y joined #git
19:11 dave____ joined #git
19:11 tgies joined #git
19:12 NeverDie joined #git
19:13 dave____ left #git
19:14 espindola joined #git
19:15 dopesong joined #git
19:15 ochorocho__ joined #git
19:16 dopesong joined #git
19:16 tgies joined #git
19:17 lacrosse joined #git
19:20 pontre2k joined #git
19:21 mwhooker joined #git
19:21 espindol_ joined #git
19:21 fuchstronaut joined #git
19:21 tgies joined #git
19:22 heftig how good is libgit2 compared to git 2.8?
19:23 |meta joined #git
19:25 heftig i need an interface to manage git repos (creating repos, retrieving and updating refs and contents, creating signed tags)
19:25 nd_ joined #git
19:26 heftig i'm currently deciding between libgit2 and git proper
19:26 tgies joined #git
19:27 iota_pi joined #git
19:27 sarbs joined #git
19:28 sarbs joined #git
19:29 nickthetait joined #git
19:29 troulouliou_dev joined #git
19:30 yqt joined #git
19:31 sctskw joined #git
19:32 durham joined #git
19:32 Sendoushi joined #git
19:33 sandeepsihari joined #git
19:34 acetakwas joined #git
19:36 sq-one joined #git
19:36 tgies joined #git
19:37 ciampix_ joined #git
19:41 mutex_ joined #git
19:41 tgies joined #git
19:42 ciampix joined #git
19:43 nanga joined #git
19:43 nanga joined #git
19:43 _ikke_ heftig: I'm not too familiar with libgit2, but I recall it's not feature complete
19:43 _ikke_ So you'd have to research if it supports the things you need
19:47 paul424 joined #git
19:48 TomyLobo i have a directory with a ton of large files in my git/git-lfs. i want to check that out in a secondary location
19:48 TomyLobo i dont need to commit from that secondary location, but i would like to make use of anything that speeds up incremental checkouts
19:49 TomyLobo i.e. a secondary index
19:49 netj joined #git
19:49 josuebrunel joined #git
19:49 TomyLobo i might need to check out the same branch as on the main working copy
19:49 TomyLobo what should i use?
19:50 TomyLobo one thing i forgot to mention: i'd need to check out a sub-directory of that branch
19:51 tgies joined #git
19:54 djb-irc joined #git
19:55 crose joined #git
19:55 roundabout22 joined #git
19:55 TheCreepyPickle joined #git
19:55 roundabout22 is there a way to add files so that they are tracked but not staged?
19:56 crose joined #git
19:56 HeaTxTM joined #git
19:56 roundabout22 for example if I wanted to track a bunch of files but not commit them all at once, and instead do 'git add -p'
19:56 kadoban roundabout22: -N aka --intent-to-add
19:56 kadoban roundabout22: Can't you just do 'git add -p' ?
19:56 tgies joined #git
19:56 roundabout22 kadoban so git add -N -A?
19:57 roundabout22 they don't show up with git add -p
19:57 TomyLobo git add -p filename?
19:57 TomyLobo (s)
19:57 kadoban roundabout22: Try 'git add -p .' maybe? If not, yeah maybe -N is needed first.
19:58 roundabout22 is there a way to add filenames with wildcards? like git add *part_of_name* so I don't have to type out 300 char file paths?
19:58 roundabout22 I will keep in mind the -N option
19:59 yqt joined #git
19:59 Rooxo joined #git
19:59 roundabout22 nevermind I figured that out
19:59 roundabout22 thanks for the help
19:59 kadoban Sure, you just do wildcards.
19:59 mac10 joined #git
19:59 nickthetait joined #git
19:59 HenriettaSalt joined #git
20:00 inflames joined #git
20:00 roundabout22 kadoban I was missing single quotes. the -N option worked perfectly in combination with wildards, thank you
20:00 L8D joined #git
20:01 kadoban Cool
20:01 mac10 hey guys! how do i access the website of my repo thru github? for example my github acc is ‘newuser’ with the repo name ‘new-app’ . Why is newuser.github.io/new-app not working?
20:01 kadoban Ah, yeah without quoting it with your shell, usually the shell does the wildcard expansion, which works … differently from how git does it, typically.
20:01 mac10 i get a 404 when that happens
20:01 preaction mac10: did you push to the gh-pages branch of your project?
20:02 mac10 gh-pages?
20:02 preaction so, no?
20:02 preaction http://pages.github.com
20:02 polyzen mac10, #github
20:03 jstimm joined #git
20:03 nardev_ joined #git
20:03 ryouma joined #git
20:03 c0ded joined #git
20:03 ryouma i have a hash.  can i find out the branches it is in?
20:04 preaction git branch --contains iirc
20:05 hashpuppy joined #git
20:05 f3r70rr35f joined #git
20:05 mwhooker joined #git
20:06 tgies joined #git
20:07 Vinnie_win joined #git
20:08 mdw joined #git
20:08 _ikke_ correct
20:10 LeMike joined #git
20:11 eletuchy joined #git
20:11 ferr joined #git
20:11 tgies joined #git
20:12 dodobrain joined #git
20:12 TheCreepyPickle left #git
20:12 interne7y joined #git
20:13 ryouma thanks
20:14 fahadash joined #git
20:14 sctskw joined #git
20:14 luxPerpetua joined #git
20:16 tgies joined #git
20:17 tvw joined #git
20:17 rivarun joined #git
20:18 fission6 i just did two commits on master which i really don't want, whats the best way to chop them off and get back to before that
20:18 fission6 (i did not push upstream)
20:19 kadoban fission6: git reset --hard HEAD~2
20:20 nadim joined #git
20:21 nadim joined #git
20:23 MikeChernev @kadoban why so hard (pun intended)
20:24 preaction if you have to say pun intended, it's not a good pun :p
20:25 zivester joined #git
20:26 Impaloo joined #git
20:26 tgies joined #git
20:27 nadim joined #git
20:29 MikeChernev @preaction: https://i.ytimg.com/vi/qG717LVerPk/maxresdefault.jpg
20:30 leTali joined #git
20:32 tgies joined #git
20:32 dodobrain joined #git
20:32 HeaTxTM joined #git
20:32 sandeepsihari joined #git
20:32 eletuchy joined #git
20:33 leehambley joined #git
20:34 durham joined #git
20:35 satifant joined #git
20:36 eletuchy_ joined #git
20:36 ojdo joined #git
20:37 Ravana joined #git
20:38 kulelu88 joined #git
20:38 kulelu88 joined #git
20:39 durham_ joined #git
20:39 dopesong joined #git
20:41 HeaTxTM joined #git
20:41 DanZ3 joined #git
20:44 mwhooker joined #git
20:44 fuchstronaut joined #git
20:45 Felipe joined #git
20:47 tgies joined #git
20:47 eletuchy joined #git
20:47 jraccoon joined #git
20:47 ahmedelgabri joined #git
20:50 durham joined #git
20:50 chachasmooth joined #git
20:51 zeroed joined #git
20:51 ochorocho__ joined #git
20:51 Felipe left #git
20:51 DirtyCajun joined #git
20:51 boombatower joined #git
20:51 noidea joined #git
20:52 arooni joined #git
20:52 tgies joined #git
20:57 tgies joined #git
20:58 nnyk_ joined #git
20:59 rnsanchez_ joined #git
21:00 dopesong joined #git
21:01 GavinMagnus joined #git
21:02 heatxtm joined #git
21:02 tgies joined #git
21:03 whitby joined #git
21:03 ramsub07 joined #git
21:04 ramsub07 hello, how do i check the list of changed files post commit ?
21:05 aidalgol joined #git
21:05 L8D joined #git
21:05 whitby git show --stat $sha1
21:06 d4rklit3 joined #git
21:06 jast it even defaults to the most recent commit on current branch, conveniently
21:06 robinsmidsrod joined #git
21:06 jast there are various formats for the list of changes. personally I like --name-status best.
21:07 jast also, for a handy shortcut, 'git whatchanged'
21:07 orbisvicis joined #git
21:07 tgies joined #git
21:08 orbisvicis I've branched A then merged to master, branched B then merged to master, branched C then merged to master. Now I need to create a new branch that contains the changes from A and C, for a pull request
21:09 orbisvicis how to acocmplish this ?
21:09 tobiasvl orbisvicis: make a new branch and merge in A, B and C?
21:09 jast except without C :)
21:09 jast err
21:09 jast dang, I'm not making this better
21:09 jast I meant to say: without B :}
21:10 orbisvicis each branch contains all the changes of the last, so how do I exclude B ?
21:10 dermoth_ joined #git
21:10 radsy joined #git
21:11 orbisvicis ie I create a new branch D from A and merge C. But now I have changes from B as well ?
21:11 nadim joined #git
21:11 tobiasvl cherry-pick A and C then
21:12 ochorocho__ joined #git
21:12 tgies joined #git
21:12 orbisvicis so there is not automatic cherry-picking, like: git merge --exclude-commits-unique-to-branch B
21:13 interne7y joined #git
21:14 MattMaker joined #git
21:15 jast merge is all-or-nothing
21:16 jast anyway, no step you described added the changes in B to A or C
21:16 alex1a joined #git
21:16 jast it all ended up in master, of course, but it would only have ended up in the individual branches you had if you had manually merged it to each
21:17 jast or merged master back into each after you were done
21:17 tgies joined #git
21:17 jeffreylevesque joined #git
21:18 BrianBlaze420 joined #git
21:19 tobiasvl I think he merged A into master and then branched B out from master again
21:20 tobiasBora joined #git
21:21 jumpman Someone should write a guide that essentially is a list of imperative programming terms for me to pull from when writing commits
21:22 tobiasvl jumpman: what do you mean
21:22 jast was about to ask, too
21:22 ticktock left #git
21:22 BrianBlaze420 joined #git
21:22 tgies joined #git
21:24 kevwil joined #git
21:26 BrianBlaze420 joined #git
21:27 tgies joined #git
21:28 Orion3k joined #git
21:29 tax joined #git
21:29 mellernoia joined #git
21:29 BrianBlaze420 joined #git
21:32 cdown joined #git
21:32 tgies joined #git
21:33 BrianBlaze420 joined #git
21:37 jimi_ joined #git
21:37 tgies joined #git
21:39 nichi_ joined #git
21:39 GavinMagnus joined #git
21:40 johnmilton joined #git
21:42 durham joined #git
21:42 tgies joined #git
21:42 Nevik joined #git
21:43 tvw joined #git
21:43 latenightbj joined #git
21:45 latenightbj left #git
21:46 Dougie187 left #git
21:47 MattMaker joined #git
21:47 lmat How do I rebase a merge?
21:47 lmat I did a merge between two branches, then another corrective commit. I want that corrective commit squashed with the merge.
21:51 latenightbj joined #git
21:56 drodger joined #git
21:56 elastix joined #git
21:57 tgies joined #git
21:58 meatflaps joined #git
21:58 lmat So, something like     git merge other_branch;   (correct lots of conflicts)  git merge --continue;   (fix some more things)  git commit -a;  git rebase --interactive HEAD^^; doesn't give the expected output.
21:59 lmat It hsa lots of commits on there. It looks like it's rebasing all the merged commits (and not the merge commit itself).
21:59 solars joined #git
21:59 GavinMagnus joined #git
22:00 mwhooker joined #git
22:01 mac10 joined #git
22:02 tgies joined #git
22:04 ocbtec joined #git
22:05 latenightbj left #git
22:05 jstimm joined #git
22:07 tgies joined #git
22:08 ajf- joined #git
22:12 GavinMagnus left #git
22:12 tgies joined #git
22:13 diegoviola joined #git
22:13 GavinMagnus joined #git
22:14 diegoaguilar joined #git
22:14 interne7y joined #git
22:15 Noldorin joined #git
22:15 diegoaguilar joined #git
22:16 diegoaguilar joined #git
22:17 elisa87 joined #git
22:17 elisa87 hey how can i fix this? http://pastebin.com/vAvhqUMf
22:17 tgies joined #git
22:17 diegoaguilar joined #git
22:18 kadoban elisa87: Did you read it?
22:18 jast to summarize, since the push failed, the -u didn't go through, so for the very first push you have to specify the corresponding information manually
22:18 jast *the very first pull
22:18 diegoaguilar joined #git
22:19 ryouma i'd like to do a git diff (and also a git log -p) since a given hash.  --since is for dates.  any clues?
22:19 jast side note, it seems like there's existing commits on the github repo that are unrelated to your local commits. this looks slightly sketchy.
22:19 elisa87 so I also did a mistake and gave a wrong email to git config. I gave the correct email now and used -f but I don't see the information on github page :( https://github.com/lamiastella/Python_Playground/commits?author=lamiastella
22:19 jast ryouma: on one specific branch you can name?
22:19 TomyLobo ryouma, ranges can be specified by using A..B
22:20 elisa87 I selected jalal@cs.wisc.edu first but I should have selected jalal@wisc.edu now it says nothing to show for jalal@wisc.edu
22:20 diegoaguilar joined #git
22:20 jast elisa87: after you change the user info, you have to re-create the commits
22:20 jast how many commits do you have so far? give or take
22:20 TomyLobo ryouma, that's from A to B, excluding A, including B
22:20 elisa87 I did add and commit again actually just
22:20 elisa87 Monas-MacBook-Pro:PythonCodes mona$ git log
22:20 elisa87 commit de86bfd252a279e92bc9a3dd44ecbc25e1187682
22:20 elisa87 Author: mona <jalal@cs.wisc.edu>
22:20 elisa87 Date:   Tue May 31 17:14:28 2016 -0500
22:20 elisa87 first commit
22:21 TomyLobo elisa87, please use a pastebin
22:21 elisa87 git log doesn't still show information for jalal@wisc.edu
22:21 diegoaguilar joined #git
22:21 elisa87 I did this git config --global user.email jalal@wisc.edu
22:21 mwhooker joined #git
22:21 elisa87 so confused
22:21 jast so you did that before making the second commit?
22:22 ryouma TomyLobo: jast thanks i think hash.. will work
22:22 dreiss joined #git
22:22 elisa87 yes
22:22 jimi_ joined #git
22:22 tgies joined #git
22:23 jast right then. to understand what's going on... what does 'git config user.email' (no --global) output?
22:23 elisa87 now it shows https://github.com/lamiastella/Python_Playground
22:23 mmlb joined #git
22:24 nichi_ joined #git
22:24 eletuchy joined #git
22:24 atomicb0mb joined #git
22:29 mizu_no_oto joined #git
22:29 GavinMagnus left #git
22:29 GavinMagnus joined #git
22:32 arooni joined #git
22:32 tgies joined #git
22:32 peepsalot joined #git
22:32 happy-dude joined #git
22:33 durham joined #git
22:33 durham joined #git
22:34 sha1sum joined #git
22:34 GavinMagnus left #git
22:37 tgies joined #git
22:37 jstimm_ joined #git
22:41 eletuchy_ joined #git
22:42 linkleonard joined #git
22:43 oliverio_ joined #git
22:45 rgrinberg joined #git
22:46 linkleonard does "git archive master" ignore changes in the working directory?
22:47 jast linkleonard: yep
22:47 tgies joined #git
22:47 linkleonard cool, thanks
22:47 jast always takes contents from the tree object
22:48 jast (which, by the way, means you can export individual subtrees, too)
22:49 madewokherd joined #git
22:50 jimi_ joined #git
22:51 m_antis joined #git
22:53 cdesai joined #git
22:54 Lynxium joined #git
22:54 texasmynsted left #git
22:56 blr joined #git
22:56 CJKinni joined #git
22:57 tgies joined #git
22:57 rkazak joined #git
23:02 tgies joined #git
23:03 johnnyfive joined #git
23:03 sargas joined #git
23:03 ryouma is this a bug?  "git diff --since yesterday|wc -l;git log -p --since yesterday|wc -l" returns 0 and a large number
23:03 eletuchy joined #git
23:03 mda1 joined #git
23:04 ryouma same thing with midnight
23:04 ryouma i.e. git diff is not working
23:04 Eugene AFAIK diff doesn't accept --since
23:04 Eugene Sooooooo
23:06 mwhooker joined #git
23:07 tgies joined #git
23:07 DanZ3 joined #git
23:07 jackburton joined #git
23:08 frobnic joined #git
23:09 ochorocho__ joined #git
23:10 fahadash joined #git
23:10 Pyrogerg joined #git
23:10 bjpenn joined #git
23:12 tgies joined #git
23:14 LeBlaaanc joined #git
23:15 interne7y joined #git
23:19 nidr0x joined #git
23:22 L8D joined #git
23:22 bjpenn joined #git
23:22 tgies joined #git
23:23 SwiftMatt joined #git
23:27 zrts joined #git
23:27 mablae__ joined #git
23:27 tgies joined #git
23:29 _rgn joined #git
23:32 tgies joined #git
23:35 Noldorin joined #git
23:35 frobnic joined #git
23:36 kus joined #git
23:37 plujon joined #git
23:37 tgies joined #git
23:38 IWishIKnew joined #git
23:38 diegoaguilar joined #git
23:40 diegoaguilar joined #git
23:41 diegoaguilar joined #git
23:41 bjpenn left #git
23:41 Dazzyp joined #git
23:41 diegoaguilar joined #git
23:42 diegoaguilar joined #git
23:42 zrts joined #git
23:42 tgies joined #git
23:43 meadmoon joined #git
23:43 diegoaguilar joined #git
23:44 diegoaguilar joined #git
23:45 mattfoo joined #git
23:46 mwhooker joined #git
23:46 Noldorin joined #git
23:46 LeMike joined #git
23:47 dhcpfreely joined #git
23:48 jackburton joined #git
23:52 zrts joined #git
23:58 Gamecubic joined #git
23:58 nardev__ joined #git
23:59 xaptao joined #git
23:59 xaptao left #git

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