Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-28

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

All times shown according to UTC.

Time Nick Message
00:00 gnac Vampire0: so I did a git log -- file.cpp on the test file I changed. The latest change showing is from Septempter 13, not the one I made just now for the purpose of this demonstration.
00:01 Vampire0 gnac, what if you do               git show 4772659        ?
00:01 DeltaHeavy joined #git
00:01 gnac on the bare repo?
00:01 hahuang61 joined #git
00:01 Vampire0 ctcrnitv, move a branch head without changing the current worktree
00:02 Vampire0 gnac, there where you miss it
00:02 gnac okay, now I see the change!
00:02 Vampire0 gnac, well, then as I said, the change is there and the fetch worked
00:02 Vampire0 gnac, you are just not looking properly (with the proper commands, on the proper branches, whatever)
00:04 blr_ joined #git
00:05 gnac Okay, so perhaps I have somethign messed up in my branches. Why wouldn't it show the latest changes in git log? I notice that git fetch says " * branch            HEAD       -> FETCH_HEAD", but git branch returns master on both repos.
00:06 watersoul joined #git
00:06 Derperperd joined #git
00:08 mischat joined #git
00:11 gnac Here's what happens on a workspace that uses the local bare repository as its remote: http://paste.opensuse.org/20892062
00:13 netj joined #git
00:13 gnac updated with git show: http://paste.opensuse.org/64209390
00:14 flaguy48 joined #git
00:14 bmahe joined #git
00:15 thesquib joined #git
00:15 ollien joined #git
00:16 anuxivm joined #git
00:16 dome joined #git
00:16 gsingh93 joined #git
00:16 conrad__ joined #git
00:19 f4 joined #git
00:20 nettoweb joined #git
00:20 star_prone joined #git
00:21 gniourf joined #git
00:22 qws-user-1228 joined #git
00:24 gnac So, now I create a new workspace using the local bare repository as its remote, made a change to the remote workspace, pushed it up to its local remote, and then fetched it to the local repo. Then tried to fetch/pull into the new local workspace.
00:25 gnac http://paste.opensuse.org/10472829
00:25 nikivi joined #git
00:29 watersoul joined #git
00:31 star_prone joined #git
00:31 mrpackethead joined #git
00:31 red82 joined #git
00:34 Prawnzy joined #git
00:35 heroux joined #git
00:36 th6fri6nd1ymrt joined #git
00:37 fatalhalt joined #git
00:38 urda joined #git
00:38 Vampire0 gnac, of course you are not getting the change in your local workspace, why should you
00:39 HiddenPanda joined #git
00:39 Vampire0 gnac, you only fetched from the one to the other. As I told you already fetch only updates the remote tracking branches, not the local branches which are the ones that are fetched by another repository that uses it as remote
00:39 gnac Vampire0: my local workspace is using the bare repo as its remote. the bare repo fetched the changes from the remote repo. This has worked recently so I know I'm not entirely crazy.
00:40 HoierM joined #git
00:40 gnac how do I update the local branches then?
00:40 Vampire0 With a rebase or merge
00:41 Vampire0 pull = fetch + merge       or fetch + rebase       depending on configuration and parameters
00:41 HiddenPanda joined #git
00:41 StrongJava joined #git
00:42 Vampire0 gnac, but your local bare clone should probably be a mirror clone anyway
00:42 gnac Okay, so lets start with the bare local repo. I'm am used to being able to see the latest changes fetched from the remote. do I need to do a rebase after every fetch.?
00:42 fstd_ joined #git
00:42 gnac Vampire0: I need to push back up occasionally, mirror was deprecated for bi-directional setups.
00:44 SwiftMatt joined #git
00:44 fuchstronaut joined #git
00:45 chartractegg joined #git
00:46 chartractegg joined #git
00:47 chartractegg left #git
00:48 Prawnzy joined #git
00:49 nettoweb joined #git
00:50 chartrac_ joined #git
00:51 chartrac_ left #git
00:52 einnjo joined #git
00:54 irqq_ joined #git
00:55 Vampire0 gnac, ah, ok then not mirror
00:55 nettoweb1 joined #git
00:55 _cyril_ joined #git
00:55 Vampire0 gnac, as I said, if that is what you want to do, you can use pull. pull = fetch + merge or pull = fetch + rebase according to settings and parameters
00:56 ahr3n joined #git
00:56 ojdo joined #git
01:04 red82 joined #git
01:05 gnac Vampire0: ok, first thanks for your help, this has worked in the  past, but perhaps I changed my process and forgot ...
01:05 gnac on the bare repo, I can't do a pull, I can only fetch.
01:06 d^sh joined #git
01:06 gnac As seen, it doesn't recognize/list the fetched changes in the log. Then the working repo doesn't get them when it pulls from it.
01:06 gnac will git rebase work on the bare repo? I know git merge wont.
01:07 Vampire0 Probably not, I'm not sure. I usually do not use bare repos like that
01:07 gnac nevermind, answerd my own question: fatal: /usr/libexec/git-core/git-rebase cannot be used without a working treee
01:07 gnac Yeah, all of this is a lot of workaround some restrictive networks.
01:08 gnac Ideally, the "local" workspace would just use the remote repo as its upstream.
01:08 Vampire0 Did you maybe had a hook in place that did some magic after a fetch like resetting the branches that were fetched or something like that?
01:08 mischat joined #git
01:08 gnac but only the computer hosting the bare "local" repository can see the real remote repo. The local workspaces can only see the "local" bare repo.
01:09 gnac Vampire0: a cannot remember any fancy hooks or setup, as you can see, I like to keep things real basic and below my skill level.
01:10 rossome joined #git
01:11 red82 joined #git
01:12 howitdo joined #git
01:15 nettoweb joined #git
01:19 crayon joined #git
01:19 crayon joined #git
01:20 nettoweb1 joined #git
01:21 xall_ joined #git
01:21 Vampire0 Well, if you say it worked before then you obviously did something differently
01:25 emattiza joined #git
01:27 hck89 joined #git
01:30 finalbeta joined #git
01:31 UTAN_dev joined #git
01:32 Ph_ joined #git
01:32 gnac I'm not sure what I did originally, but I've got it working again. I had to add fetch = +refs/*:refs/* to the remote "origin" section of the bare repos config file.
01:33 gnac Now fetch shows the recent chagnes in log, and the downstream repos (that use remote.origin.fetch=+refs/he​ads/*:refs/remotes/origin/*) can git pull the changes.
01:34 gnac I can only guess its a a change to the upstream repo
01:34 inflames joined #git
01:35 gnac I don't really even know what that line does, I just saw it in a different repos configuration  for its upstream remote.
01:36 mazeto joined #git
01:37 Dougie187 joined #git
01:37 emattiza joined #git
01:37 hfp joined #git
01:38 hfp_work joined #git
01:38 StatutoryApe joined #git
01:38 krs93__ joined #git
01:39 kadoban joined #git
01:46 converge joined #git
01:46 Vampire0_ joined #git
01:46 Electrom_ joined #git
01:46 CEnnis91 joined #git
01:46 ke4nhw joined #git
01:46 fuchstronaut joined #git
01:46 hfp joined #git
01:46 liuzhen joined #git
01:46 hfp_work joined #git
01:47 thekrynn_ joined #git
01:48 ke4nhw I have a question. I am considering setting up a git server for vcs for java and other. Right now I will be the only one accessing it from multiple machines (mostly in-network with the server, sometimes from remote locations), but in the future there may be others who want to help with development. The install guide I am looking at uses ssh for access to it. Is ssh the only means of accessing the
01:48 ke4nhw git repos I setup?
01:48 Jameser joined #git
01:48 thekrynn_ joined #git
01:49 hfp joined #git
01:49 ke4nhw Reason I ask is that I would prefer, for myself and others, that access to this server be strictly by OpenVPN. If ssh is required, then it would be an ssh connection to the ovpn IP on that server.
01:50 hfp_work joined #git
01:50 gnac ke4nhw: no, you can use remote filesystem, http(s), or the git protocol. SSH is just very common, and pretty easy to use.
01:50 shpew12 joined #git
01:51 hfp joined #git
01:51 ke4nhw It is, and I use ssh quite a lot. But to protect the source and the server I'd prefer to use openvpn for its security.
01:51 gnac I am using one computer that can VPN into a remote network. It hosts a git repo, and uses NFS over the VPN to update/sync with a remote repo.
01:51 ke4nhw at least as the means of gaining access to the server...
01:52 ke4nhw okay
01:52 tax joined #git
01:52 gnac Then, the local computer, after syncing, can disconnect from the VPN and be accessed by the local network, either over ssh/nfs/git://
01:53 ke4nhw One thing I'll have to do is determine what Eclipse requires to access the code repos... I know at least for mine all my Java work is done using mostly Eclipse, and some IntelliJ
01:53 ke4nhw I also use JGrasp rarely, but one that I have stopped using is NetBeans
01:54 gnac Eclipse can use most of those protocols. If you are using a remote filesystem repo, your OS will have to set that up.
01:54 ke4nhw So I'll need to see what these require. OVPN access to the server can be handled by the OS, beyond that it'll be the IDE.
01:55 ke4nhw The git server will reside on a standalone server, so even in-network it might as well be treated as a remote repo since all computers will have to access it across the vpn network
01:56 gnac Then it depends on what you can do over the OVPN. Once you initiate the OVPN connection, you could use whatever protocol over that interface you want.
01:56 ke4nhw Currently that server also has Samba up and running, is that another way to access the repos or is that a bad idea, even over the OVPN tunnel?
01:57 gnac For example, you could set up a samba share on the remote server behind the VPN wall. Once the VPN connection is establihsed, use that share as your remote repo, eg git clone //remote_share/mygitrepo.git
01:57 theskillwithin joined #git
01:58 bruce_lee joined #git
01:58 gnac samba is a secure as you make it. no worse than others I suppose, as long as its hidden behind VPN and protected with user athentication, i.e. only share it to certain users or groups and set read/write permissions sanely.
02:00 ke4nhw Okay, step one let me look at what I'll need in CentOS to get the GIT server installed and up, and go from there. In my opinion Samba is loosely secure. I do have rwx and user permissions set up well, and that helps quite a bit, but I would never run samba in the open, even in the local network. Even in-house my samba always runs over an ovpn tunnel
02:02 gnac on CentOS, all you need to do is install git, if its not already there. If you are using file sharing, you don't need any additional server setup.
02:03 gnac If your VPN allows ssh, I would recommend that, i.e. open up your VPN, and then initiate an ssh connection to the git repo on the CentOS box. Only thing Centos box needs is git and ssh.
02:03 matoro joined #git
02:03 ke4nhw I use the same scheme in house and remote: I use very high settings for my certificate generation, etc... There won't be any additional configuration to get the git server configured and managing the folders and locations being used to house the source code and to setup the vcs?
02:03 d^sh joined #git
02:03 ke4nhw One thing that would be helpful, can you give me a URL for docs on configuring git?
02:04 bremner !book
02:04 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
02:05 User458764 joined #git
02:06 d0nn1e joined #git
02:07 ke4nhw I will take a look at these shortly, thanks :) I gotta help my wife with something so I will be back in a few minutes. Thanks for the help and I'll be back in a bit...
02:07 JamesBaxter joined #git
02:09 mischat joined #git
02:09 star_prone joined #git
02:10 liuzhen joined #git
02:10 danslo joined #git
02:11 gfixler joined #git
02:15 diogenese joined #git
02:15 Goplat joined #git
02:17 Ldip joined #git
02:17 sunri5e joined #git
02:18 shmuli joined #git
02:18 jaafar joined #git
02:19 dreiss joined #git
02:20 hexagoxel joined #git
02:23 sgtbigman joined #git
02:27 StrongJava joined #git
02:27 red82 joined #git
02:31 polyzen joined #git
02:33 hfp joined #git
02:34 hfp_work joined #git
02:34 SleePy joined #git
02:35 atrus joined #git
02:39 Limes joined #git
02:39 juicymooCA joined #git
02:40 dsantiago joined #git
02:41 lagothrix joined #git
02:42 zivester joined #git
02:43 Rodya_ joined #git
02:43 juvenal joined #git
02:43 al-damiri joined #git
02:44 Xuefer joined #git
02:46 fuchstronaut joined #git
02:49 jnewt_ joined #git
02:51 Dougie187 left #git
02:51 chachasmooth joined #git
02:52 tax left #git
02:58 ki0 joined #git
02:58 Remram joined #git
03:00 star_prone joined #git
03:00 flaguy48 joined #git
03:00 watabou joined #git
03:02 arescorpio joined #git
03:02 mizu_no_oto joined #git
03:03 PioneerAxon joined #git
03:03 drbean joined #git
03:05 aavrug joined #git
03:07 dsdeiz joined #git
03:10 shpew12 joined #git
03:10 mischat joined #git
03:11 User458764 joined #git
03:11 danslo joined #git
03:12 qws-user-1228 joined #git
03:12 cdown joined #git
03:13 xall_ joined #git
03:13 ojacobson osse: because deciding which of two tags to the same commit to use is a hard problem
03:15 fahadash joined #git
03:16 Vortex34 joined #git
03:18 railssmith joined #git
03:22 Mutter joined #git
03:22 sssilver joined #git
03:23 sgtbigman joined #git
03:25 staafl joined #git
03:26 mehola joined #git
03:29 Andrew_K joined #git
03:36 foist joined #git
03:37 mykespb joined #git
03:39 e14 joined #git
03:39 zulutango joined #git
03:41 justanotheruser joined #git
03:43 einnjo joined #git
03:47 fuchstronaut joined #git
03:49 a_thakur joined #git
03:50 e14 joined #git
03:52 cdown joined #git
03:53 sgtbigman joined #git
04:02 e14 joined #git
04:02 a_thakur joined #git
04:05 dsdeiz joined #git
04:05 dsdeiz joined #git
04:07 mrpackethead joined #git
04:07 astrofog joined #git
04:09 e14 joined #git
04:11 mischat joined #git
04:14 einnjo joined #git
04:19 gniourf joined #git
04:21 dreiss joined #git
04:26 User458764 joined #git
04:27 chandu20 joined #git
04:28 Cabanossi joined #git
04:28 Prawnzy joined #git
04:30 shmuli joined #git
04:34 OnBrokenWings joined #git
04:36 daey_ joined #git
04:36 subhojit777 joined #git
04:38 svm_invictvs joined #git
04:42 einnjo joined #git
04:48 fuchstronaut joined #git
04:50 pokalyis joined #git
04:51 kazantip joined #git
04:55 phanimahesh joined #git
04:57 skyres joined #git
04:58 freimatz joined #git
04:59 Random832 joined #git
04:59 ki0 joined #git
04:59 Prawnzy joined #git
05:02 blackwind_123 joined #git
05:04 justan0theruser joined #git
05:09 daurnimator how can I edit the author of a commit?
05:09 daurnimator (just one commit; not subsequent)
05:09 daurnimator (just author; not committer)
05:12 mischat joined #git
05:12 danslo joined #git
05:14 fscala joined #git
05:15 sgtbigman daurnimator: Are you aware and okay with the fact that changing the author of a commit rewrites history?
05:15 daurnimator sgtbigman: yes. I'm converting a repo from RCS to git.
05:16 daurnimator tried to use git filter-rebase but can't figure out the right invocation to only change a single commit
05:17 daurnimator I also don't want interactive; as this has to be repeatable with a bash script
05:17 mangolisk joined #git
05:17 daurnimator using 'git commit --amend' adjusts some of the dates to 'now'... it's complex to try and keep the existing date on the repo AFAICS
05:19 sgtbigman ah yes, I'm not sure the date changes are avoidable that way
05:20 daurnimator I think git filter-branch is the right solution. I just can't figure out how to make it apply only to a single commit
05:21 gniourf joined #git
05:22 jorj joined #git
05:22 sgtbigman I think you could end the filter-branch command with commit..commit
05:22 sgtbigman That's how you'd do a range, at least
05:22 daurnimator fails with: "Which ref do you want to rewrite?"
05:23 OnBrokenWings joined #git
05:24 dodobrain joined #git
05:25 a_thakur joined #git
05:25 aidalgol joined #git
05:26 lordjancso joined #git
05:26 GavinMagnus joined #git
05:30 bmahe joined #git
05:30 overlord_tm joined #git
05:32 PCatinean joined #git
05:32 rahtgaz joined #git
05:32 durham joined #git
05:32 sgtbigman Maybe add something like: `if test "$GIT_COMMIT" = "commit-hash"; then` to the filter
05:32 shmuli joined #git
05:33 a_thakur joined #git
05:34 ThomasLocke joined #git
05:37 GavinMagnus left #git
05:39 sgtbigman daurnimator: I tested locally, it works for me
05:39 sgtbigman any luck?
05:40 daurnimator mildly.... this is in a makefile: git -C "$@" filter-branch -f --env-filter 'if [ $$GIT_COMMIT = e95144742c86cf15f900f9ee5865ee5b84430a47 ]; then export GIT_AUTHOR_NAME="Roberto Ierusalimschy" GIT_AUTHOR_EMAIL="roberto@inf.puc-rio.br"; fi' e95144742c86cf15f900f9ee5865ee5b84430a47^..HEAD
05:46 sgtbigman seems to work
05:47 cyan__ joined #git
05:48 daurnimator yeah I think I can work with this....
05:48 daurnimator annoying though :P
05:48 daurnimator followup question: best way to 'insert' a commit?
05:48 sgtbigman at a specific point?
05:48 daurnimator yeah. between two commits
05:49 daurnimator I need to add an extra one with a given date/comitter.
05:49 Random832 why
05:49 Random832 also do you really need the committer, not the author?
05:50 GT4066 joined #git
05:51 fuchstronaut joined #git
05:51 daurnimator Random832: yes. I'm trying to reflect (RCS) history with git.
05:52 daurnimator I've been using various tools to do it; which have got me 99% of the way
05:52 liuzhen joined #git
05:52 daurnimator just a few fix ups I'm doing manually
05:52 Random832 does RCS even have a separate committer and author?
05:53 Random832 the problem with what you're trying to do is that committer metadata is mutable in a lot of the operations you'd normally use to change history
05:53 jstimm joined #git
05:54 Random832 but anyway you can do this with a rebase, but rebase gets rid of the committer metadata for all of the commits it changes
05:54 daurnimator Random832: no. this is info collected by interviewing the authors.
05:54 daurnimator (hence why tools don't do it for me :P )
05:55 K1ck3dByC0ns0l3 joined #git
05:55 daurnimator Random832: yeah. I need to keep the committer metadata
05:57 Random832 then you're going to have to do almost everything by hand
05:57 Random832 reset to the commit before the one you want to insert
05:58 Random832 make the changes and commit it (with GIT_COMMITTER_* set properly), and then cherry-pick each of the later changes (with GIT_COMMITTER_* set to the values you want for those commits)
05:59 xall joined #git
06:02 Raging_Hog joined #git
06:03 nilg joined #git
06:08 LucaTM joined #git
06:10 Anja joined #git
06:11 xall_ joined #git
06:12 ahr3n joined #git
06:12 mischat joined #git
06:14 freimatz joined #git
06:21 qt-x joined #git
06:25 dan2k3k4 joined #git
06:27 ych joined #git
06:29 sssilver joined #git
06:30 ISmithers joined #git
06:31 chele joined #git
06:31 sea-gull_ joined #git
06:34 lindenle joined #git
06:35 eivarv joined #git
06:36 anth0ny joined #git
06:37 elect joined #git
06:41 fees joined #git
06:41 jnavila joined #git
06:45 User458764 joined #git
06:46 jfr_ joined #git
06:47 Lor_ joined #git
06:48 Sceorem joined #git
06:48 ahr3n joined #git
06:49 leehambley joined #git
06:50 bocaneri joined #git
06:51 ldlework If I have a branch foo, with three commits; how can I take the second commit into a new branch based on master, IE a new branch with the single commit played ontop of master
06:51 fuchstronaut joined #git
06:54 ldlework ah I see
06:55 Anja joined #git
06:57 rchavik joined #git
06:57 Furai joined #git
06:57 Furai ls
06:58 _tpavel joined #git
07:00 ki0 joined #git
07:00 Pulp joined #git
07:00 deltab ldlework: make the new branch then cherry-pick foo^ I think
07:03 suexec joined #git
07:03 [twistii] joined #git
07:05 suexec Hey - I'm pretty new to git. Sorry if this is a stupid question. I have some source code that I have checked into the master branch. We are now two developers, and we have both branched the master to continue developing. Is this the correct procedure, and once we are done developing something we merge our branch into master?
07:05 danslo joined #git
07:05 mischat joined #git
07:05 lb suexec you can choose your workflow as you like
07:06 lb suexec both are valid workflows, you can even mix them.
07:06 User458764 joined #git
07:06 lb suexec master is not a special branch in any way, it's just the default
07:06 corsibu joined #git
07:06 Remram joined #git
07:06 ych joined #git
07:07 jfr joined #git
07:07 lb suexec so you can work in feature branches and merge them to master. or you can work in master directly.... your decision :)
07:07 suexec lb, I am happy with master being the "main" branch. Should I be merging my personal branch into there when I am happy with changes or should I just be pushing ?
07:07 danslo joined #git
07:08 lb suexec at some point you'll have to integrate feature branches, but you can share (push) them before merging so others can maybe review or comment on them
07:08 lb suexec but you can skip that and just merge your stuff into your "main" branch and just publish (push) that
07:09 maret joined #git
07:11 thebigj left #git
07:11 suexec lb, OK, thanks! So I guess I can commit and push changes to my personal branch.. then merge to master once I am happy etc. Thanks! :)
07:12 lb i think gitinfo has some triggers about workflows
07:12 lb !workflow
07:12 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
07:12 lb suexec ^
07:12 TomyWork joined #git
07:15 grift joined #git
07:15 suexec lb, Superb! So I am working in my personal branch. When I want to merge changes in my personal branch, to the master branch, do I switch to master, then chose merge and select my personal branch ?
07:16 lb suexec yes, git merge take the branch(es) you want to merge as argument and merges them into your currently checked out branch
07:16 suexec Perfect. Guess I am not a complete spaz after all! :D
07:17 [twistii] lb: that is a surprisingly succinct way of explaining merge, thank you
07:17 lb yw
07:17 suexec Thanks again for your time and patience! Much appreciated :)
07:17 lb suexec !trygit
07:17 gitinfo A quick, interactive, in-browser introduction to git is available at http://try.github.io
07:18 pks joined #git
07:18 eduardas_m joined #git
07:20 lindenle joined #git
07:20 fuchstronaut joined #git
07:20 fuchstronaut joined #git
07:23 GavinMagnus joined #git
07:23 jaguarmagenta joined #git
07:26 Balliad joined #git
07:27 thebigj joined #git
07:28 chandu20 joined #git
07:28 thebigj I configured mergetool to vimdiff. There is conflict when I try to merge one branch to my master. For resolving that conflict I run `git mergetool` and it opens vimdiff with 5 windows. 4 on top and one large on bottom.
07:29 thebigj But the problem is Top first window is blank. Bottom has title Local
07:29 pks joined #git
07:29 thebigj Other 3 on the top are not bank but the file
07:30 thebigj But the 3 on top are Local. They are representing the same file
07:30 thebigj And one large on bottom is also Local Same file
07:30 jfr joined #git
07:30 irqq joined #git
07:30 thebigj I suppose it should be On top <Local>, <Base> and <Remote>
07:30 thebigj But it is not that type
07:30 thebigj How can I solve that?
07:30 Alienpruts joined #git
07:30 thebigj Am I mistaking somewhere?
07:31 thebigj Many thanks!
07:33 PCatinean joined #git
07:37 Virox_ left #git
07:40 Virox joined #git
07:43 star_prone joined #git
07:44 mrpackethead joined #git
07:44 chris2 joined #git
07:49 User458764 joined #git
07:50 hyperair joined #git
07:51 mischat joined #git
07:51 encod3 joined #git
07:52 Anja joined #git
07:54 Jimmio92 joined #git
07:55 ahmedelgabri joined #git
07:57 DopeMeston joined #git
07:58 lindenle joined #git
07:58 brk_ joined #git
08:01 jozwior joined #git
08:01 disi joined #git
08:03 kimonorouge joined #git
08:04 jozwior joined #git
08:04 p4trix joined #git
08:08 mikecmpbll joined #git
08:08 t-mart joined #git
08:09 Anja joined #git
08:10 _ikke_ thebigj: Can you show your configuration?
08:11 maret joined #git
08:12 WayToDoor joined #git
08:12 qpdb joined #git
08:13 rorro joined #git
08:13 SporkWitch joined #git
08:14 laumann joined #git
08:20 Endarked joined #git
08:21 systemovich joined #git
08:23 JeroenT joined #git
08:23 jstimm joined #git
08:24 ki0 joined #git
08:24 leehambley joined #git
08:26 rkazak joined #git
08:26 finalbeta joined #git
08:29 xaa joined #git
08:29 marcogmonteiro joined #git
08:31 acetakwas joined #git
08:33 fuchstronaut joined #git
08:34 kimonorouge joined #git
08:36 Andrew_K|2 joined #git
08:37 ferr joined #git
08:37 mischat joined #git
08:39 K1ck3dByC0ns0l3 joined #git
08:39 pokalyis_ joined #git
08:40 liuzhen joined #git
08:41 clmsy joined #git
08:42 shmuli joined #git
08:46 Serpent7776 joined #git
08:46 kimonorouge joined #git
08:47 dan2k3k4 joined #git
08:49 corsibu joined #git
08:49 star_prone joined #git
08:52 RatSalad joined #git
08:52 Xuefer joined #git
08:52 tobiasvl today I learned about git add -N
08:53 RatSalad whats it do?
08:54 JeroenT joined #git
08:54 tobiasvl it adds a new file to the index, but without its content
08:54 tobiasvl so you can still use "git diff" and add the actual content later with commit -a or whatever you want
08:55 tobiasvl --intent-to-add
08:55 corpsicle how can i make git create a mergecommit even if theres nothing to merge?
08:55 RatSalad cool
08:55 grawity in place of a fast-forward?
08:55 grawity git [pull/merge] --no-ff
08:55 tobiasvl corpsicle: you mean even if there is no conflicts to resolve?
08:55 tobiasvl ie. what grawity said yes
08:55 grawity tobiasvl: no, that's not the same thing
08:56 tobiasvl hmm
08:56 grawity even with no conflicts, if the branches diverge you still get a merge commit
08:56 King_Hual joined #git
08:56 JeroenT_ joined #git
08:56 tobiasvl yeah, that's true.
08:58 corsibu joined #git
09:00 disi joined #git
09:00 bruce_lee joined #git
09:01 a3Dman joined #git
09:02 djb-irc joined #git
09:04 corpsicle tobiasvl: even if there were no changes at all, but i changed my mind, its stupid ^_^
09:06 lmatteis joined #git
09:07 armyriad joined #git
09:07 a_thakur joined #git
09:10 jeffreylevesque joined #git
09:11 K1ck3dByC0ns0l3 joined #git
09:13 ShekharReddy joined #git
09:14 mar77i joined #git
09:16 tvw joined #git
09:16 nettoweb joined #git
09:16 mischat_ joined #git
09:17 fuchstronaut joined #git
09:20 ismithers joined #git
09:21 diogenese joined #git
09:22 djb-irc joined #git
09:22 Wind0r joined #git
09:23 ieee joined #git
09:27 ghostlight joined #git
09:27 thebigj _ikke_: I started using fugitive conflict solver. Many thanks for replay. :)
09:30 phanimahesh fugitive conflict solver?
09:32 mrpackethead joined #git
09:32 BrianBlaze420 joined #git
09:33 SwiftMatt joined #git
09:33 pbrewczynski joined #git
09:35 _ikke_ vim plugin
09:36 davix[matrix] joined #git
09:36 shmuli joined #git
09:36 JeroenT joined #git
09:38 a_thakur joined #git
09:38 brk_ joined #git
09:40 Andrew_K|2 joined #git
09:40 thebigj phanimahesh: Actually it is helper for solving your conflicts. http://vimcasts.org/episodes/fugitive-vim​-resolving-merge-conflicts-with-vimdiff/
09:42 djb-irc joined #git
09:42 Ediz joined #git
09:43 satya4ever joined #git
09:43 cagedwisdom joined #git
09:44 unclechu joined #git
09:44 kikijiki[m] joined #git
09:44 Remramm joined #git
09:44 hallogallo[m] joined #git
09:44 saintaquinas[m] joined #git
09:44 M-mistake joined #git
09:44 Ineentho[m] joined #git
09:44 monomon[m] joined #git
09:44 Dhanya[m] joined #git
09:44 M-meznak joined #git
09:44 M-shine joined #git
09:44 aviraldg joined #git
09:44 musicmatze[m] joined #git
09:44 alaeri[m] joined #git
09:44 kjsage[m] joined #git
09:45 M64137[m] joined #git
09:45 Karazhan joined #git
09:46 phanimahesh _ikke_: I use fugitive, but never used :Gdiff for conflict resolution.
09:46 phanimahesh thebigj: thanks
09:46 _ikke_ me neither
09:49 thebigj phanimahesh: Same here. But After getting recommendation from I am trying that.
09:50 star_prone joined #git
09:53 phanimahesh I'll give it a try next time
09:54 phanimahesh been long since I encountered conflicts. :/
09:55 thebigj phanimahesh: Lolz
09:55 star_prone joined #git
09:55 thebigj phanimahesh: I am trying to merge 1 year old branch :P
09:56 K1ck3dByC0ns0l3 joined #git
09:56 phanimahesh thebigj: good luck mate
10:05 brk_ joined #git
10:08 thebigj phanimahesh: I seriously need that luck.
10:10 rnsanchez joined #git
10:13 alhariel joined #git
10:14 kazantip joined #git
10:16 fuchstronaut I have several commits in master that are release-commits. The commit messages look like this "release 1.2.45". Now I would like to tag them, so it will be easier to find the releases. Would you add a tag "release" to each of them, or "release <version>" ?
10:16 shaggycat joined #git
10:16 mischat joined #git
10:17 ilmari fuchstronaut: I'd put "Release <version>" as the message of the annotated tag <version>
10:18 fuchstronaut ilmari: I never used tags before. If the tag name is "<version>", wouldnt it be hard to find all releases?
10:19 fuchstronaut tought if the tag would be "release" i could just git tag -l 'release' to find all releases
10:19 ilmari you can't have multiple tags with the same name
10:19 fuchstronaut oh
10:20 ilmari if you use tags for other things than releases you might want to prefix the relase ones with something so you can list just them
10:21 fuchstronaut ilmari: so maybe "release" as prefix and then use tags like "release 1.2.35" ?
10:21 fuchstronaut so i could list releases with git tag -l 'release'
10:21 ilmari you can't have spaces in tag names (just like you can't in branch names0
10:21 ilmari release-<version> and git tag -l 'release-*'
10:22 fuchstronaut that sounds good
10:22 fuchstronaut thanks
10:22 fuchstronaut do i have to pull existing git tags from a  remote manually?
10:24 ilmari By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally.
10:25 ocbtec joined #git
10:25 ilmari if a tag changes (which they should not, but might), you can update them with 'git fetch --tags' (that also fetches tags that would not otherwise be fetched)
10:29 j416 joined #git
10:29 fuchstronaut thank you ilmari
10:30 JZA joined #git
10:30 ayogi joined #git
10:30 shmuli joined #git
10:31 JZA hi I have an issue, I did some changes to the master branch and saved before creating the feature branch, now I can switch to the new branch until I stash my changes. I havent pushed anything yet, so how can I just apply the changes to the new branch?
10:31 grawity git stash save; git checkout myfeature; git stash pop
10:31 grawity !float
10:31 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
10:33 daey what is the difference between 'git push origin master' and 'git push -u origin master'?
10:34 grawity the latter remembers it in .git/config
10:34 grawity `man git push`, see -u/--set-upstream-to
10:34 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
10:34 daey so its meant to be used only once in the beginning?
10:35 grawity for a given branch, it's only *necessary* to be used only once
10:35 daey meaning it renames 'git push' to 'git push origin master' ?
10:35 grawity yes
10:36 daey seems kinda useless :/
10:36 daey its not exactly much work to type git push origin master
10:36 grawity it's more than twice more work!
10:36 daey :D
10:37 grawity not to mention -u lets you use @{u} or @{upstream} in places
10:37 daey at least i know where im pushing to :p
10:37 grawity like `git log @{u}..` or `git log ..@{u}` to see what's new
10:37 daey ah i see, so theres more to it
10:37 daey i dont know the fancy stuff yet :)
10:37 grawity the same is also used by `git pull` / `git merge`
10:38 JZA grawity: thanks
10:41 einnjo joined #git
10:42 eivarv joined #git
10:45 disi joined #git
10:50 systemovich joined #git
10:53 re1 joined #git
10:54 realz joined #git
10:54 a_thakur joined #git
10:56 balance joined #git
10:56 balance hi
10:56 balance what's the differenceb etwee exclude and gitignore?
10:57 tobiasvl balance: exclude is local to your repo, while gitignore can be version controlled
10:58 balance tobiasvl, thanks
10:58 quackgyver joined #git
10:58 maret joined #git
10:58 leehambley joined #git
10:59 aspiers joined #git
11:00 shinnya joined #git
11:01 netj joined #git
11:01 kimonorouge joined #git
11:02 ronator joined #git
11:02 JeroenT joined #git
11:03 mischat joined #git
11:04 balance lets say there's file foo.txt, I added it, commited it, pushed it and the did another commit and pushed that one. now I want to remove foo.txt from local and remote repository. how can I do that?
11:05 raphink joined #git
11:05 raphink joined #git
11:05 grawity only from future commits, or also from past ones?
11:05 tobiasvl balance: you want to scrub it from the history? or just remove it?
11:06 balance grawity, from past ones, it should be gone as if it never was there tobiasvl history
11:06 tobiasvl balance: !sensitive
11:06 gitinfo balance: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
11:06 grawity balance: ^
11:06 jbitdrop joined #git
11:06 balance grawity, thanks
11:07 grawity history rewrites tend to be slightly painful (depending on developer count)
11:07 tobiasvl yeah, see also !rewrite
11:07 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
11:08 balance tobiasvl, thanks
11:08 xall_ joined #git
11:09 albel727 joined #git
11:10 cyan__ joined #git
11:12 tvw joined #git
11:17 sbeller_ joined #git
11:20 nicole joined #git
11:24 mkoskar joined #git
11:25 shmuli joined #git
11:27 Samual joined #git
11:27 Samual joined #git
11:30 jguillen joined #git
11:31 GavinMagnus left #git
11:33 thebigj left #git
11:33 lss8 joined #git
11:33 Ma5ter joined #git
11:35 Ma5ter joined #git
11:38 eduardas_m joined #git
11:41 wrouesnel1 joined #git
11:41 nettoweb joined #git
11:41 einnjo joined #git
11:43 mizu_no_oto joined #git
11:47 Xethron joined #git
11:47 nettoweb joined #git
11:48 akurniawan joined #git
11:50 converge joined #git
11:51 mizu_no_oto joined #git
11:52 disi joined #git
11:57 kado1 joined #git
11:58 hck89 joined #git
12:01 GavinMagnus joined #git
12:01 ManiacTwister joined #git
12:02 ismithers joined #git
12:03 lindenle joined #git
12:03 JeroenT joined #git
12:03 Endarked joined #git
12:03 synthroid joined #git
12:04 JeroenT_ joined #git
12:04 anonymuse joined #git
12:04 ManiacTwister joined #git
12:04 JeroenT_ joined #git
12:06 ManiacTwister joined #git
12:06 Puffball joined #git
12:06 mizu_no_oto joined #git
12:07 JeroenT joined #git
12:07 JeroenT_ joined #git
12:08 JeroenT_ joined #git
12:08 ManiacTwister joined #git
12:09 Neic0 joined #git
12:09 uranellus_ joined #git
12:09 jrm2 joined #git
12:09 yonatankoren_ joined #git
12:09 themayor_ joined #git
12:09 lss8_ joined #git
12:09 kimonorouge joined #git
12:10 JeroenT joined #git
12:10 ribasushi_ joined #git
12:10 bejeb_ joined #git
12:10 chrisml` joined #git
12:10 thekrynn joined #git
12:11 unCork joined #git
12:11 nhOmega joined #git
12:12 ManiacTwister joined #git
12:12 TheOrangeOne joined #git
12:13 sonOfRa joined #git
12:15 ManiacTwister joined #git
12:15 johnmilton joined #git
12:16 Ma5ter joined #git
12:16 sammyo joined #git
12:16 jeffreylevesque joined #git
12:17 netwoodle joined #git
12:18 Jameser joined #git
12:18 ManiacTwister joined #git
12:18 sammyo joined #git
12:19 shmuli joined #git
12:19 tomzx_ joined #git
12:19 nocbreak joined #git
12:19 pks_ joined #git
12:20 m0f0x joined #git
12:20 m0f0x joined #git
12:21 ManiacTwister joined #git
12:21 chandu20 joined #git
12:22 _eddy left #git
12:22 manuels joined #git
12:23 marlinc joined #git
12:23 ManiacTwister joined #git
12:24 Muzer joined #git
12:24 denimsoft joined #git
12:25 mniip joined #git
12:26 jason237 joined #git
12:26 CussBot joined #git
12:26 ManiacTwister joined #git
12:27 tomzx_ left #git
12:27 akurniawan joined #git
12:29 anonymuse joined #git
12:30 ghostlight joined #git
12:30 joki joined #git
12:30 anonymuse joined #git
12:30 ManiacTwister joined #git
12:30 kado1 left #git
12:30 Starky joined #git
12:32 JeroenT joined #git
12:33 sylario joined #git
12:34 ManiacTwister joined #git
12:35 robattila256 joined #git
12:35 a_thakur joined #git
12:35 clmsy joined #git
12:35 axisys joined #git
12:35 EgS joined #git
12:35 rahtgaz joined #git
12:35 styler2go joined #git
12:36 Marbug joined #git
12:36 bond joined #git
12:36 cworth joined #git
12:36 gnac joined #git
12:36 sorenb_ joined #git
12:36 hexagoxel joined #git
12:36 ELFrederich joined #git
12:36 murr4y joined #git
12:36 clmsy- joined #git
12:36 smithbone joined #git
12:36 nd joined #git
12:36 tristanp joined #git
12:36 fiete joined #git
12:36 krabat joined #git
12:36 gruetzkopf joined #git
12:36 daemoen joined #git
12:37 tomaw joined #git
12:37 ManiacTwister joined #git
12:38 Kobaz joined #git
12:38 dreiss joined #git
12:39 User458764 joined #git
12:40 bambams joined #git
12:40 adamm joined #git
12:41 forgot joined #git
12:41 ghostlight joined #git
12:41 jaguarmagenta joined #git
12:42 abra0 joined #git
12:42 denimsoft joined #git
12:43 denimsoft joined #git
12:44 denimsoft joined #git
12:44 denimsoft joined #git
12:45 Prawnzy joined #git
12:47 fuchstronaut joined #git
12:47 flopsec joined #git
12:49 GavinMagnus joined #git
12:50 joki joined #git
12:51 akurniawan joined #git
12:52 freimatz joined #git
12:53 jimi_ joined #git
12:55 thebigj joined #git
12:56 thebigj _ikke_: The problem was `Tagbar`!
12:57 ToBeFree joined #git
12:57 mindfart joined #git
12:57 thebigj _ikke_: While opening merge conflicts using `git mergetool` with vimdiff I was getting same file in all the windows. And instead of 3 uprow and one large file bottom I was getting 5 files. 4 in upper and one in downside.
12:57 thebigj The reason for that was `Tagbar`.
12:57 tapout joined #git
12:57 _ikke_ alright
12:57 thebigj In my configuration the `Tagbar` was bydefault open in supported file type.
12:58 thib joined #git
12:58 thebigj I desabled the default opening from my vimrc and now `git mergetool` with vimdiff works file :D
12:58 c0ded joined #git
13:02 chandu20 joined #git
13:04 GavinMagnus joined #git
13:05 berndl joined #git
13:06 thebigj Hello friends, I am using `Molokai (https://github.com/tomasr/molokai)` as my color scheme for coding work. I am finding it better when I use `vimdiff`. Can I have suggestion which color scheme will be better while using `vimdiff`?
13:07 mischat joined #git
13:07 multifractal joined #git
13:08 Starky joined #git
13:08 mrpackethead joined #git
13:08 anonymuse joined #git
13:08 nettoweb1 joined #git
13:11 pokalyis joined #git
13:11 JamesBaxter joined #git
13:12 zivester joined #git
13:12 CalimeroTeknik it seems that commit -p only works from the root of the repository, is that a bug?
13:12 shmuli joined #git
13:13 jeffreylevesque joined #git
13:13 CalimeroTeknik let's say I have a git repo in /tmp/foo; if I go to /tmp/foo/bar/ and git commit -p file it says it doesn't exist (which of course it does)
13:13 Cavallari joined #git
13:13 CalimeroTeknik and not even git commit -p bar/file works
13:13 ghostlight joined #git
13:14 CalimeroTeknik it's required to be at the root of the git repository and to supply a path relative to it
13:14 GavinMagnus joined #git
13:14 berndl Just using git commit -p works for me.
13:14 flaguy48 joined #git
13:14 CEnnis91 joined #git
13:14 berndl As long as you have changes in the dir. you're in, it should work.
13:15 jaafar joined #git
13:15 sdothum joined #git
13:15 CalimeroTeknik er, git commit -p takes all changes in the repo
13:15 CalimeroTeknik I didn't want to y/n through all of these
13:15 CalimeroTeknik using 2.10.1 by the way
13:16 berndl You're right.
13:16 Boniche joined #git
13:16 kimonorouge joined #git
13:16 berndl It doesn't work for me when I give it a file or dirc.
13:16 berndl I'm using 2.7
13:17 CalimeroTeknik yeah, the problem was the same back then, but I kind of remember some fix in 2.9
13:17 mjuxn[m] joined #git
13:17 CalimeroTeknik my memory is not reliable on that one. anyway, it used to work with a path relative to the root of the repo
13:17 CalimeroTeknik now it doesn't
13:18 fuchstronaut is there a way to list all tags that do NOT contain a string?
13:18 _ikke_ git tag | grap -v
13:18 osse However would grap help..?
13:19 _ikke_ don't you have grep aliased as grap? :P
13:19 berndl CalimeroTeknik: I guess you'll have to use git add -p for now.
13:19 BSaboia joined #git
13:19 CalimeroTeknik oh right, git add -p was the one that got fixed for this exact same issue in 2.9
13:19 qsx _ikke_: grab
13:19 flaguy48 joined #git
13:20 fuchstronaut is there something build-in in git ?
13:20 joki joined #git
13:20 fuchstronaut Some developers are using windows and I don't know if they can grep
13:21 Puffball joined #git
13:21 Cavallari1 joined #git
13:21 berndl fuchstronaut: git tag -l <pattern>
13:21 LucaTM_ joined #git
13:21 fuchstronaut berndl: yes, but I don't know how to negate a string with pattern
13:21 _ikke_ berndl: He wants to exclude pattern
13:22 kazantip joined #git
13:22 berndl Hmm...excluding is hard.
13:23 osse Git has no facilities for it.
13:24 osse Grep comes with grep on windows so if they blindly run a command you tell them to it will be fine
13:24 osse Grep comes with git I mean
13:24 berndl fuchstronaut: Can they try using ! for excluding?
13:25 CalimeroTeknik fuchstronaut, have them use "git bash", they'll get all they need
13:26 sammyo joined #git
13:26 samtheknife joined #git
13:27 ExeciN I just cloned a repo of mine. I added a new file locally. I did git add that.file then git commit -m "added that.file" then git push but for some reason I'm getting this error: https://gist.github.com/anonymous​/2e0896b05dce9e6f0d317dbe335e9d30
13:27 ExeciN what am I doing wrong?
13:27 sammyo joined #git
13:27 finster joined #git
13:28 _ikke_ Not sure, looks like a gitlab issue
13:28 finster hello all. is there a shortcut to show the contents of a file in branch b for time t?
13:28 Cavallari joined #git
13:28 finster git version 2.10.1
13:29 fuchstronaut berndl: ! does not seem to work, guess i will go with CalimeroTeknik idea
13:29 _ikke_ finster: git show @{date} branch:path/to/file
13:29 Es0teric joined #git
13:30 CalimeroTeknik alternatively if they're not developing for the windows platform itself (?) they could use unix-like systems
13:30 ExeciN gitlab.athena just points to 127.0.0.1
13:30 finster oh, I wasn't aware of the @{date{ syntax. thanks _ikke_
13:31 _ikke_ finster: that does rely on the reflog though
13:31 _ikke_ so does not go back much further than 90 days
13:32 jstimm joined #git
13:34 finster i suppose I can do a small-ish shell function that parses the output of git log --format='%h %at'
13:34 finster and uses that for subsequent git-show commands
13:34 red82 joined #git
13:34 JamesBaxter joined #git
13:35 DeltaHeavy joined #git
13:36 Dougie187 joined #git
13:36 jason237 joined #git
13:37 danslo joined #git
13:37 corsibu joined #git
13:38 unclechu[m] joined #git
13:38 kikijiki[m] joined #git
13:38 Remram[m] joined #git
13:38 saintaquinas[m] joined #git
13:38 meznak[m] joined #git
13:38 shine[m] joined #git
13:38 Dhanya[m] joined #git
13:38 mistake[m] joined #git
13:38 monomon[m] joined #git
13:38 hallogallo[m] joined #git
13:38 aviraldg[m] joined #git
13:38 musicmatze[m] joined #git
13:38 Ineentho[m] joined #git
13:38 alaeri[m] joined #git
13:39 M64137[m] joined #git
13:39 Learath2 joined #git
13:42 holgersson joined #git
13:43 mizu_no_oto joined #git
13:44 mischat joined #git
13:47 corsibu joined #git
13:47 finster left #git
13:47 danslo_ joined #git
13:47 ExoUNX joined #git
13:48 danslo_ left #git
13:48 danslo joined #git
13:48 codepython777 joined #git
13:48 flaguy48 joined #git
13:49 overlord_tm joined #git
13:50 joki joined #git
13:50 Derperperd joined #git
13:51 rnsanchez_ joined #git
13:53 afuentes joined #git
13:53 boombatower joined #git
13:54 GavinMagnus joined #git
13:55 ych joined #git
13:55 quite joined #git
13:56 codepython7771 joined #git
13:56 e14 joined #git
13:56 maret joined #git
13:56 Puffball joined #git
13:57 chris2 joined #git
14:00 Steini- joined #git
14:00 AfroThundr joined #git
14:01 PaulCapestany joined #git
14:01 GavinMagnus joined #git
14:02 berndl joined #git
14:02 ash_workz joined #git
14:02 cdg joined #git
14:03 eivarv joined #git
14:04 mrkake joined #git
14:04 King_Hual joined #git
14:06 steven_ joined #git
14:06 Es0teric joined #git
14:07 ayjay_t joined #git
14:07 gchristensen joined #git
14:08 cdg joined #git
14:08 gchristensen Hi #git, I'm a bit surprised by a signing behavior. I cherry-picked a signed commit from one branch to another, and it remained to be a valid signed by the original author / commit. What is actually signed in the commit?
14:08 armyriad joined #git
14:08 ivan_on_trac joined #git
14:09 omegak joined #git
14:09 spaceone joined #git
14:09 Zarthus I read that as singing, was amused.
14:10 grawity gchristensen: the whole raw commit object is signed
14:10 corsibu joined #git
14:10 grawity gchristensen: basically what you see in `git cat-file commit <foo>` minus the signature field itself
14:10 grawity though don't confuse signatures and signoffs
14:11 Puffball joined #git
14:11 Rodya_ joined #git
14:12 mischat joined #git
14:13 dan2k3k4 joined #git
14:13 irrep joined #git
14:13 gchristensen hrmmm I see, ok -- I think I need to do a bit more digging :)
14:14 jstein_ joined #git
14:14 Es0teric joined #git
14:15 irrep I have some upstream project. In order to compile it on my machine, I need a fix; that is in branch master->FIX. Now I want to do some changes in master->NEW. Before I can compile, I need to create a branch COMPILE which has both FIX and NEW in it. This seems like tedious nonsense. What can I do until upstream merges my changes? Should I just do master->FIX->new and later rebase master->NEW?
14:16 gchristensen grawity: this doesn't add up. the outputs of `git cat-file commit` are drastically different in every way here, _except_ for the gpgsig: https://gist.github.com/grahamc/​c14d7c2aedb92c7d485dcbf5b894877b
14:17 Es0teric joined #git
14:17 grawity oh, the gpgsig is also very different
14:18 hariel joined #git
14:18 gchristensen grawity: oh! heh I'm sorry, I'm talking regarding `git commit -S`
14:18 Murii joined #git
14:18 grawity look at the crc24 at the end, one has =fesQ and the other has =d5Ww
14:18 Darren_ joined #git
14:18 gchristensen hrmm sure enough
14:19 ResidentBiscuit joined #git
14:19 gchristensen ok :) I think I found my mistake, then. in one of my sample cases I cherry-picked a merge commit by mistake, I signed the merge commit, leaving the parent of the merge commit unaltered
14:19 gchristensen does that sound right / feasible?
14:20 joki joined #git
14:20 e14 joined #git
14:22 Derperperd joined #git
14:22 grawity nope
14:22 gareppa joined #git
14:22 grawity both signatures are made at different times
14:22 grawity well *maybe* you cherry-picked a merge commit or something, but
14:23 gchristensen right
14:23 gchristensen I think now we're in the territory of "weird stuff github is doing" and not actually what git is doing.
14:24 grawity github definitely wouldn't have signed your commit
14:24 gchristensen https://github.com/NixOS/nixpkgs/commit/​119159ba56b469693436eaee50faaa84e02e457d here GitHub is showing the signature by Tim Steinbach is good, when the actual commit is signed by me.
14:24 grawity unless you mean the github Windows app
14:24 gchristensen no -- how it displays
14:25 grawity https://gist.github.com/grawity/​7fa8c99d4fbde10e2a176681650214e6
14:26 stnly joined #git
14:27 einnjo joined #git
14:28 pokalyis joined #git
14:29 LucaTM joined #git
14:30 grawity I can't even find 83FF2ACAEB6C2D24 on a keyserver ._.
14:30 AaronMT joined #git
14:30 grawity but, otherwise it checks out
14:31 grawity the author of that commit is one Graham Christensen, and the committer is Tim Steinbach
14:31 grawity since it's a cherry-pick, it makes sense that it's re-signed by the committer
14:31 * Furai test
14:32 grawity though cherry-picking a merge is a bit weird
14:32 gchristensen yeah that was an accident :/
14:32 grawity and signing stuff with a key that's not public seems ... not very useful
14:32 gchristensen yeah I'll be having a chat with the owner of 83FF2ACAEB
14:33 grawity eh, just push it to a keyserver :D
14:33 gchristensen heh can I do that on his behalf?
14:33 gchristensen I've never tried such a thing
14:33 grawity most keyservers (i.e. the sks ones) don't require control of the private key
14:34 grawity they'll accept anything that looks valid
14:34 grawity I mean, assuming you have the public key...
14:34 jstimm joined #git
14:34 gchristensen grawity: the issue I'm showing with https://github.com/NixOS/nixpkgs/commit/​119159ba56b469693436eaee50faaa84e02e457d is github when you click "Verified" shows the signature of not the merge commit, but of what was being merged
14:34 grawity asking the key owner to do that *would* be nice, but otherwise that's `gpg --send-keys <keyid>`
14:34 gchristensen yeah I'll message him first and then can just do it myself
14:35 mischat joined #git
14:35 grawity gchristensen: how do you know that?
14:35 grawity is 83FF2ACAEB6C2D24 the same Tim Steinbach or not?
14:35 akurniawan joined #git
14:35 subhojit777 joined #git
14:35 stnly joined #git
14:36 user1-8492 joined #git
14:36 grawity because, even though I can't verify the signature on the cherrypick, gpg says it *was* signed by 83FF2ACAEB6C2D24
14:36 gchristensen d'oh, I'm awfully hard-headed today. I'm sorry -- I was chasing my own tail for a minute there.
14:37 aarobc joined #git
14:39 grawity fwiw, both `git log` and `git show [-q]` accept --format=fuller --show-signature
14:44 mischat_ joined #git
14:46 Prawnzy joined #git
14:50 user1-8492 left #git
14:52 lindenle joined #git
14:52 fahadash joined #git
14:53 sivteck joined #git
14:53 sivteck left #git
14:54 crose joined #git
14:55 anonymuse joined #git
14:55 rbern joined #git
14:56 mrpackethead joined #git
14:59 nidr0x joined #git
15:00 VagabondAzulien joined #git
15:00 ych joined #git
15:01 shmuli joined #git
15:01 e14_ joined #git
15:02 cdg_ joined #git
15:02 Ryanar joined #git
15:04 nickthetait joined #git
15:04 Miika-- joined #git
15:06 Miika-- left #git
15:06 Miika-- joined #git
15:07 nettoweb joined #git
15:07 jbeeze joined #git
15:08 akurniawan joined #git
15:09 GavinMagnus joined #git
15:09 Miika-- Hello, when I do git log, it works fine, but when I do git log -Ssomeword, I get ____     ]
15:09 Miika-- 18:04 [ ggherdov       ] [ Orphis_         ] [ zacts           ]
15:09 Miika-- sorry, I was saying that I get some permission error
15:10 lmatteis joined #git
15:10 Miika-- It says "Permission Error: Copying of text from this document is not allowed:"
15:10 crose joined #git
15:11 usm4n joined #git
15:12 canton7 Miika--, !repro
15:12 gitinfo Miika--: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:12 ELFrederich where is the Git plugin that lets me talk to a Mercurial repo?  My Goolge-fu is weak today.  I keep landing on pages that lets hg talk to git, not the other way around
15:12 grawity ELFrederich: git-remote-hg is probably the best one
15:13 grawity lets you `git clone hg::<url>` directly
15:13 grawity there's also git-hg that works like git-svn
15:13 zivester joined #git
15:13 gchristensen is there a way to have git-log and git-show show signatures by default?
15:13 grawity there's a config option for that
15:14 grawity log.showSignature, IIRC
15:14 marcogmonteiro joined #git
15:14 flaguy48 joined #git
15:14 RatSalad joined #git
15:15 dan2k3k4 joined #git
15:16 gchristensen ah ha! you're right, but for whatever reason my man pages are v2.7 where I have 2.10. I'll have to fix that. Thank you.
15:16 al-damiri joined #git
15:16 SourTrout joined #git
15:18 svm_invictvs joined #git
15:21 sangy joined #git
15:24 ayjay_t joined #git
15:25 converge joined #git
15:26 GavinMagnus left #git
15:26 Noldorin joined #git
15:28 Ryanar joined #git
15:30 dreiss joined #git
15:34 kimonorouge joined #git
15:35 |ifei5g00d joined #git
15:36 |ifei5g0_ joined #git
15:39 JanC joined #git
15:40 ych joined #git
15:40 mindfart left #git
15:41 ahmed_elgabri joined #git
15:42 e14 joined #git
15:42 m0viefreak joined #git
15:42 JanC joined #git
15:43 jccn joined #git
15:44 jost joined #git
15:47 eivarv joined #git
15:49 rkazak joined #git
15:49 basiclaser joined #git
15:50 likebutter joined #git
15:51 danslo joined #git
15:52 |ifei5g00d joined #git
15:53 Tazmain joined #git
15:53 akurniawan joined #git
15:54 Tazmain hi all, I have no changed my username, my email but still when I want to commit I keep getting, that the commit by Tazmain, was not made by Tazmain. -_-
15:54 Tazmain like the alias or so infront of the email is the only thing different now
15:55 shmuli joined #git
15:55 kpease_ joined #git
15:56 _cyril_ joined #git
15:58 nd_ joined #git
15:58 mischat joined #git
15:58 boondox joined #git
15:59 crayon joined #git
15:59 brett_ joined #git
15:59 aarobc joined #git
16:01 dviola joined #git
16:02 e14 joined #git
16:05 offtopik joined #git
16:05 ManiacTwister joined #git
16:06 oskarkv joined #git
16:08 synthroid joined #git
16:08 e14 joined #git
16:08 pfloyd joined #git
16:09 mizu_no_oto joined #git
16:09 synthroid joined #git
16:09 pfloyd I have two repositories, one of which was cloned from the other a long while back and has never been merged back to the original. what's the best way to find the point at which it forked off without parsing git log from both repos?
16:10 osse pfloyd: make git parse the log for you
16:10 Mixologi- joined #git
16:10 osse pfloyd: use git merge-base
16:10 kimonorouge joined #git
16:11 madewokherd joined #git
16:11 TomyLobo joined #git
16:11 Darcidride joined #git
16:11 pfloyd osse: sorry, not sure I follow. merge-base can show me all the common ancestors are you saying to use that to filter and find where it deviated?
16:12 osse pfloyd: I am saying 'git merge-base master origin/master' (or something to that effect) will tell you the exact fork point
16:13 pfloyd osse: I should have been more clear, this wasn't just a simple clone. it was a repo created with everything from the original pushed to it (at least that was my understanding, I wasn't there for that)
16:13 robotroll joined #git
16:13 kimonorouge joined #git
16:14 Ldip joined #git
16:14 crayon joined #git
16:16 osse pfloyd: not sure what than means
16:17 pfloyd osse: I think the way the repo was created was to create a new bare repo, then push the commits from the original to it. not just a git clone of it. so they had repo A. made repo B and ultimately push'd from A into the new repo B (both are bare repos)
16:18 pfloyd it's a weird situation. I think I'll just write a quick script that will backtrace all the commit SHAs to find the point at which they devidated
16:18 pfloyd s/devidate/deviated
16:18 osse pfloyd: in the new/forked repo, fetch the original  repo into it, then use git merge-base
16:18 gfixler joined #git
16:19 mehola joined #git
16:19 pfloyd osse: hmm yeah I guess I could just do that, good point
16:20 fuchstronaut joined #git
16:21 kbs joined #git
16:21 osse pfloyd: is the p short for pink ?
16:21 CheckDavid joined #git
16:21 madewokherd joined #git
16:21 pfloyd osse: yep!
16:22 red82 joined #git
16:23 SteffanW joined #git
16:24 Ramen_ joined #git
16:24 flaguy48 joined #git
16:26 pfloyd osse: hmm it seems some merges have happend from A -> B over time (but never B -> A). merge-base will show the "closest" one which would be the last time A was merged into B wouldn't it?
16:26 osse yes
16:26 osse but i think it has options to show all
16:27 qws-user-1228 joined #git
16:27 inflames joined #git
16:27 osse or you you can take re-run merge-base with the parent of the previous merge-base's result
16:27 nettoweb joined #git
16:27 pfloyd yeah -a shows to SHAs so I think I can take the older one
16:32 osse pfloyd: unless there are thousands of commits you can also eyeball it with  git log --oneline --graph --decorate branch remote/branch
16:32 osse maybe add --first-parent
16:32 danimal2 joined #git
16:32 algun joined #git
16:33 pfloyd osse: thanks!
16:33 shmuli joined #git
16:33 Dohplay joined #git
16:35 emPi joined #git
16:35 irqq_ joined #git
16:37 khfeng joined #git
16:38 durham joined #git
16:38 AfroThundr joined #git
16:39 overlord_tm joined #git
16:39 Ryanar joined #git
16:39 flaguy48 joined #git
16:39 kbs` joined #git
16:39 aarobc joined #git
16:40 crayon joined #git
16:40 FritzLakritz joined #git
16:41 martin_g joined #git
16:41 bbhoss joined #git
16:41 pfg_ joined #git
16:41 red82 joined #git
16:41 shennyg joined #git
16:41 daxroc joined #git
16:41 Whisket joined #git
16:41 cmosguy joined #git
16:41 stealthii joined #git
16:41 boxrick1_ joined #git
16:41 mizu_no_oto joined #git
16:42 imanc joined #git
16:42 Bigcheese joined #git
16:42 miklcct joined #git
16:42 cspotcode joined #git
16:42 timothy joined #git
16:42 XDS2010 joined #git
16:43 scarcry joined #git
16:43 satya4ever joined #git
16:43 BlessJah joined #git
16:43 BinGOs joined #git
16:43 nyuszika7h joined #git
16:43 johtso joined #git
16:43 gareppa joined #git
16:43 Tee_Pee joined #git
16:43 spr0tsuki joined #git
16:43 theresajayne joined #git
16:43 yena joined #git
16:43 flupke joined #git
16:43 joco42 joined #git
16:43 worstadmin joined #git
16:43 Peng_ joined #git
16:44 Bengi joined #git
16:44 CEnnis91 joined #git
16:44 barq joined #git
16:44 crayon joined #git
16:44 XDS2010 joined #git
16:44 ToeSnacks joined #git
16:44 elmcrest joined #git
16:44 JackMc joined #git
16:44 r3c0d3x joined #git
16:45 arooni joined #git
16:45 Awesomecase joined #git
16:45 asdofindia joined #git
16:45 al-damiri joined #git
16:45 SleePy joined #git
16:45 nedbat joined #git
16:45 teadrop_ joined #git
16:45 montyboy joined #git
16:45 angular_mike_ joined #git
16:45 Spydar007 joined #git
16:45 dpower joined #git
16:45 ojacobson joined #git
16:45 converge joined #git
16:45 n-st joined #git
16:45 batrick joined #git
16:45 swift1_ joined #git
16:45 jasom joined #git
16:45 SegFaultAX joined #git
16:45 hexagoxel joined #git
16:45 MeltedLux joined #git
16:46 mt joined #git
16:46 forrestv joined #git
16:46 daurnimator joined #git
16:46 barteks2x joined #git
16:46 POQDavid joined #git
16:46 pfloyd left #git
16:47 ixian joined #git
16:47 Prawnzy joined #git
16:47 Salander27 joined #git
16:48 Muzer joined #git
16:49 Didac joined #git
16:49 hashpuppy joined #git
16:49 jeffreylevesque joined #git
16:50 dsop joined #git
16:50 mooru joined #git
16:50 daabz0r joined #git
16:51 vuoto joined #git
16:54 rahtgaz joined #git
16:54 e14 joined #git
16:54 jjasinski joined #git
16:56 ghostlight joined #git
16:56 vuoto joined #git
16:56 nfk joined #git
16:59 mischat joined #git
16:59 overlord_tm joined #git
16:59 mischat joined #git
17:00 Gsham joined #git
17:00 jhe_ joined #git
17:01 Klumben joined #git
17:01 thiago joined #git
17:01 pokalyis joined #git
17:06 dreiss joined #git
17:06 fscala joined #git
17:09 gfixler joined #git
17:09 Darcidride joined #git
17:11 nettoweb joined #git
17:11 nitric joined #git
17:11 irqq joined #git
17:12 kbs` joined #git
17:13 DuckHuntDog joined #git
17:14 InfoTest joined #git
17:15 tyreld joined #git
17:15 refried_ joined #git
17:16 re1 joined #git
17:16 netj joined #git
17:17 Gsham_ joined #git
17:18 re1 joined #git
17:20 johnny56 joined #git
17:21 davimore joined #git
17:21 aax joined #git
17:22 Groscheri joined #git
17:23 xaa__ joined #git
17:24 robotroll joined #git
17:24 flaguy48 joined #git
17:24 fuchstronaut joined #git
17:27 mizu_no_oto joined #git
17:29 leeN joined #git
17:30 sea-gull_ joined #git
17:30 cagedwisdom joined #git
17:32 urda joined #git
17:32 mikecmpbll joined #git
17:33 SourTrout joined #git
17:33 urda joined #git
17:33 mostlybadfly joined #git
17:33 alhariel joined #git
17:34 shiriru joined #git
17:36 Limes joined #git
17:37 Gsham joined #git
17:37 ToBeCloud joined #git
17:37 phos1 joined #git
17:37 Prawnzy joined #git
17:38 phos1 I downloaded a project with a GIT folder in it, and commited that to my repository. I am now getting “No submodule mapping found”. I have removed the git folder, how do I remove that error message?
17:41 flaguy48 joined #git
17:41 Es0teric joined #git
17:42 Remram joined #git
17:43 dan2k3k4 joined #git
17:44 urda joined #git
17:45 SourTrout joined #git
17:47 johnmilton joined #git
17:47 tang^ joined #git
17:48 cagedwisdom joined #git
17:49 urda joined #git
17:52 xall_ joined #git
17:55 osse phos1: git rm path/to/project
17:55 webstrand Is there a way to detach_IO only for stdout? I'd like to preserve stderr
17:55 osse webstrand: welcome to #git
17:55 shgysk8zer0 joined #git
17:55 shgysk8zer0 joined #git
17:56 webstrand osse: my mistake
17:56 hariel joined #git
17:57 osse webstrand: no, it was the fault of the society we live in
17:58 anonymuse joined #git
17:59 davimore joined #git
18:00 juvenal joined #git
18:01 manuels joined #git
18:03 multifractal joined #git
18:04 t0by joined #git
18:06 davix[matrix] joined #git
18:06 Gsham_ joined #git
18:07 jakesyl_mobile joined #git
18:08 Sasazuka joined #git
18:08 refried_ joined #git
18:08 eivarv joined #git
18:09 Learath2 joined #git
18:10 unclechu joined #git
18:10 M-meznak joined #git
18:10 Remramm joined #git
18:10 saintaquinas[m] joined #git
18:10 kikijiki[m] joined #git
18:10 M-mistake joined #git
18:10 M-shine joined #git
18:10 hallogallo[m] joined #git
18:10 musicmatze[m] joined #git
18:10 aviraldg joined #git
18:10 Dhanya[m] joined #git
18:10 monomon[m] joined #git
18:10 alaeri[m] joined #git
18:10 Ineentho[m] joined #git
18:10 kjsage[m] joined #git
18:10 M64137[m] joined #git
18:11 Karazhan joined #git
18:11 red82 joined #git
18:12 Remramm joined #git
18:12 Remramm joined #git
18:13 relipse joined #git
18:14 relipse would anyone be able to help me write a script which searches directories until it finds a repo on branch foobar , for example find --git-branch foobar ./ would scan all folders that are currently on branch foobar or foobar123
18:15 jozwior joined #git
18:15 relipse branch-find / foobar      would find stuff like /path/to/blah {foobar is awesome} /path/to/foo {foobar}
18:15 zumba_addict joined #git
18:16 einnjo joined #git
18:16 zumba_addict is there any issue right now with logging in to github?
18:16 zumba_addict i can't login
18:16 OnBrokenWings joined #git
18:16 zumba_addict i'll try a different browser
18:17 zumba_addict browser issue
18:18 osse relipse: find . -type d -execdir git rev-parse --is-inside-work-tree \; -execdir sh -c '[ "$(git symbolic-ref HEAD)" = refs/heads/foobar ]' -print 2>/dev/null
18:19 osse ah no
18:19 osse relipse: find . -type d -exec git -C {} rev-parse --is-inside-work-tree \; -exec sh -c '[ "$(git -C "$1" symbolic-ref HEAD)" = refs/heads/foobar ]' sh {} \; -print 2>/dev/null
18:21 osse much faster and simpler to simply check for the presence of a directory named .git
18:21 osse find . -type d -name .git -execdir sh -c '[ "$(git symbolic-ref HEAD)" = refs/heads/foobar ]' sh {} \; -print
18:21 jmpp joined #git
18:22 cdown joined #git
18:23 relipse osse:  thank you but I can' get it working
18:23 Gsham joined #git
18:24 relipse i want to find all repos which are currently on branch "FOOBAR*" starting from the current directory, thus it wwill match branches named "FOOBAR123" and "FOOBARBAZ"
18:25 fuchstronaut joined #git
18:25 osse find . -type d -name .git -execdir bash -c '[[ "$(git symbolic-ref HEAD)" = refs/heads/foobar* ]]' bash {} \; -print
18:25 fuchstronaut joined #git
18:28 Jackneill_ joined #git
18:29 relipse osse: i'm getting fatal: ref HEAD is not a symbolic ref
18:29 osse relipse: add the 2>/dev/null
18:29 osse expected error. no big deal
18:30 relipse osse, i still can't get it to find anything
18:30 bannakaffalatta joined #git
18:30 relipse is it searching recursively?
18:30 osse maybe there is nothing to find
18:30 osse yes
18:32 mrpackethead joined #git
18:32 cdown joined #git
18:33 Derperperd joined #git
18:34 e14 joined #git
18:36 relipse osse: but there is something to find its not finding it
18:37 osse relipse: show me your terminal session
18:37 osse what command you run and what repo you expect to find
18:38 osse (and the output of git symbolic-ref HEAD and git branch in that repo
18:38 mooru joined #git
18:39 dsantiago joined #git
18:39 ki0 joined #git
18:39 JamesBaxter joined #git
18:41 StrongJava joined #git
18:41 pikajude joined #git
18:41 diogenese joined #git
18:42 kyan joined #git
18:43 dsantiag_ joined #git
18:45 Sasazuka__ joined #git
18:45 e14_ joined #git
18:45 BSaboia is anyone here signing commits with windows?
18:46 sssilver joined #git
18:46 alex1a joined #git
18:47 relipse osse how do I put this in a script? i tried find . -type d -name .git -execdir bash -c '[[ "$(git symbolic-ref HEAD)" = refs/heads/$1* ]]' bash {} \; -print 2>/dev/null
18:47 relipse see the $1
18:48 blackwind_123 joined #git
18:48 osse oh i see
18:48 osse my mistake in part
18:48 chris123456 joined #git
18:48 osse relipse: find . -type d -name .git -execdir bash -c '[[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash argumenthere \; -print 2>/dev/null
18:49 relipse what is argumentthere ?
18:49 osse relipse: whatever you want
18:49 _ADN_ joined #git
18:49 osse what you want $1 to be
18:49 K1ck3dByC0ns0l3 joined #git
18:49 bremner I want $1 to be a coffee.
18:50 osse find . -type d -name .git -execdir bash -c '[[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash coffee \; -print 2>/dev/null
18:50 relipse but i'm sticking this in a script
18:50 relipse so i can do branch-find foobar
18:50 osse find . -type d -name .git -execdir bash -c '[[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash "$1" \; -print 2>/dev/null
18:50 Ryanar joined #git
18:51 relipse that worked thanks osse
18:51 gho5t joined #git
18:51 relipse oh can you make it case-insensitive
18:52 osse put shopt -s nocasematch; before the [[ inside bash -c '...'
18:55 irqq joined #git
18:56 kimonorouge joined #git
18:57 Gsham joined #git
18:57 relipse find . -type d -name .git -execdir bash -c 'shopt -s nocasematch; [[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash "$1" \; -print 2>/dev/null <-- like this?
18:57 relipse that worked thanks
18:58 relipse my output looks like: ./foobar/.git is there a way to remove the .git from output?
18:58 d0nn1e joined #git
18:58 relipse sorry if i'm taking too much of your time
18:58 relipse feel free to not answer
18:58 mooru joined #git
18:59 emg since you're using GNU find, yes, use -printf and look in the man page how to do the basename
18:59 anonymuse joined #git
18:59 emg s/basename dirname
18:59 emg wow, that was... bad
18:59 OnBrokenWings joined #git
19:00 emg looks like %h
19:00 osse emg: hmm, what makes with require GNU find ?
19:00 emg so instead of -print do -printf %h
19:00 osse oh execdir
19:00 emg yep
19:00 emg or perhaps  -printf %h\\n
19:00 emg I've never used -printf before
19:01 rnsanchez joined #git
19:02 GenZai joined #git
19:03 stevenspasbo joined #git
19:04 Jimmio92 joined #git
19:06 Balliad joined #git
19:09 agileadam joined #git
19:09 nettoweb joined #git
19:09 HarryHallman joined #git
19:09 relipse emg ok i tried: find . -type d -name .git -execdir bash -c 'shopt -s nocasematch; [[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash "$1" \;  -printf "%h\n" 2>/dev/null
19:09 relipse but it's not displaying anything
19:09 e14 joined #git
19:10 User4587_ joined #git
19:10 relipse I don't know anything about bash scripting that's for sure
19:11 osse maybe it's time to remove the 2>/dev/null
19:12 Es0teric joined #git
19:12 emg eh, I'd probably just do:  find . -type d -name .git -execdir bash -c 'shopt -s nocasematch; for dir do [[ $(git symbolic-ref HEAD) == refs/heads/"$dir"* ]] && printf %s\\n "${dir%/*}"; done' bash {} +
19:12 emg relipse: also your   base "$1" \;   is wrong
19:12 emg you need   bash {} \;
19:12 Rodya_ joined #git
19:12 xelxebar joined #git
19:12 emg or use what I gave, just do the printing in bash, with as few instances of bash as possible
19:12 UTAN_dev_ joined #git
19:13 ki0_ joined #git
19:13 relipse emg: that didn't wokr
19:13 emg what do you mean by "didn't work"
19:14 relipse it spit out a bunch of fatal: Not a git repository and didn't find what I wanted
19:14 emg sayint "it didn't work" is useless. what did you expect to get? what did you get? etc.
19:14 emg oh, oops, yeah, I screwed up because I"m not used to -execdir
19:14 emg use yours, change "$1" to {}
19:14 emg I'd have to add cd inside the bash bit
19:15 osse you can use git -C foo rev-parse
19:15 osse akin to make and tar
19:15 brillenfux joined #git
19:16 NwS joined #git
19:16 tvw joined #git
19:16 aarobc joined #git
19:17 rorro joined #git
19:17 squaresurf joined #git
19:17 relipse its not wokring
19:18 relipse not finding what i'm looking for
19:18 relipse no output
19:18 strk joined #git
19:18 strk (how) can I make it so git-server distinguishes between git commandline and a browser ?
19:18 strk if possible at all...
19:19 bremner no sense your makes question.
19:20 eivarv joined #git
19:20 matoro joined #git
19:21 pirate21994 joined #git
19:21 anonymuse joined #git
19:22 sssilver joined #git
19:23 strk ok, here's the thing, I setup (somehow) a way to git clone https://strk.kbt.io/git/trac2gogs.git
19:23 strk but if you go there with your browser, nothing is shown :)
19:23 strk instead, I'd like you to be redirected somewhere
19:23 preaction put an http proxy in front and redirect
19:24 shgysk8zer0 joined #git
19:26 strk but the proxy would need to distinguish between git and browser
19:26 emg relipse: ok, reading the backlog I see where it went wrong
19:26 fuchstronaut joined #git
19:26 fuchstronaut joined #git
19:26 emg relipse: you need "$1" and {}
19:26 emg osse: you screwed up :-P
19:26 Sonderblade joined #git
19:26 preaction strk: sure. use the http user agent string, or look at the real urls that the git client fetches
19:27 emg no, no, I'm wrong again
19:27 relipse can you please paste me the full line so i can paste it into my editor
19:27 emg it's that freakin execdir thing
19:28 kimonorouge joined #git
19:28 emg relipse: ok, let me start a little fresher. can you pase the line that was working for you but still had the /.git you wanted to get rid of?
19:28 danimal2 joined #git
19:28 emg and can you test it again to make sure that much works
19:28 relipse find . -type d -name .git -execdir bash -c 'shopt -s nocasematch; [[ "$(git symbolic-ref HEAD)" = refs/heads/"$1"* ]]' bash "$1" \;  -print 2>/dev/null
19:28 relipse that works
19:29 emg and what version of find are you using? (find --version)
19:29 Dazzyp joined #git
19:30 osse emg: vous accusez moi?!?
19:30 emg osse: I was wrong
19:30 emg forgive me
19:30 relipse find -v or find --version does nothing
19:31 relipse i'm on a mac though
19:31 emg osse: I was very wrong
19:31 emg relipse: ok, bad assumption on my part, I thought -execdir meant you were using GNU find, but it seems you're probably using BSD find
19:32 relipse yes its bsd find
19:32 emg relipse: look in the man page, see if there's a -printf, and see what you'd use to print the dirname
19:32 relipse there is no printf
19:32 emg well then, there's the problem. ok, let me see how I'd do this
19:33 mykespb joined #git
19:34 emg find . -type d -name .git -exec bash -c 'shopt -s nocasematch; for dir do cd "$dir" || continue; [[ $(git symbolic-ref HEAD)" = refs/heads/"$0"*]] && printf %s\\n "${dir%/*}"; cd - || exit 1; done' "$1" {} +
19:34 emg try that
19:34 emg osse: want to double check that for me?
19:34 emg oops, space after * before ]]
19:34 mooru joined #git
19:34 ahr3n joined #git
19:34 strk preaction: you mean I could redirect unless /info/refs?
19:35 preaction i don't know, does that work?
19:35 Balliad joined #git
19:35 strk I guess so. Next I'll want to add some metadata into the repo to advertise the actual homepage for a repo
19:35 strk starts getting complex :)
19:35 emg relipse: hmm, may need to cd one level higher as that would put you into the .git directory, so...
19:36 emg find . -type d -name .git -exec bash -c 'shopt -s nocasematch; for dir do dir=${dir%/*}; cd "$dir" || continue; [[ $(git symbolic-ref HEAD) == refs/heads/"$0"* ]] && printf %s\\n "$dir"; cd - || exit 1; done' "$1" {} +
19:36 emg ok, try that
19:37 emg while I wait around for osse to tell me how it's wrong :-)
19:38 emg relipse: oh, you may also want to change   cd -    into    cd - >/dev/null
19:38 rnsanchez joined #git
19:38 relipse it doesn't work
19:38 emg s/may /
19:38 emg stop saying "it doesn't work" and tell me what the fuck happens
19:38 relipse unexpected EOF unexpected ? unexpected end of file
19:38 emg ok
19:39 emg time to start typing this in my editor instead of my irc client :-)
19:40 Gsham joined #git
19:40 boondox left #git
19:41 emg you put this in a file and rand it as   ./yourscript foobar    correct?
19:42 _cyril_ joined #git
19:43 dreiss joined #git
19:44 strk left #git
19:44 ShapeShifter499 joined #git
19:44 SwiftMatt joined #git
19:44 refried_ joined #git
19:45 Prawnzy joined #git
19:46 concerti joined #git
19:48 HoierM joined #git
19:48 pagliachi joined #git
19:50 kimonorouge joined #git
19:51 manuel joined #git
19:54 LucaTM_ joined #git
19:57 warthog9 joined #git
19:58 aidalgol joined #git
20:00 Vinnie_win joined #git
20:00 joki joined #git
20:00 maret joined #git
20:00 paul424 joined #git
20:01 tsutsu joined #git
20:04 Starky joined #git
20:04 maret joined #git
20:06 jmpp joined #git
20:06 Learath2 joined #git
20:07 ok91 joined #git
20:09 apotry joined #git
20:09 kimonorouge joined #git
20:09 phos1 left #git
20:11 diogenese joined #git
20:12 ManiacTwister joined #git
20:14 kimonorouge joined #git
20:14 rnsanchez joined #git
20:15 ManiacTwister joined #git
20:18 ManiacTwister joined #git
20:18 jozwior joined #git
20:20 mrpackethead joined #git
20:21 ScottChamberlain joined #git
20:21 ManiacTwister joined #git
20:22 afuentes joined #git
20:22 aidalgol Is it at all possible to stash either only my staged (or unstaged) changes?
20:22 hck89 joined #git
20:23 nitric joined #git
20:23 ManiacTwister joined #git
20:24 ScottChamberlain I am using "git push -q origin HEAD:MyBranch" and even though I added the -q switch I still get the following in stdErr (newlines replaced with \n) "[error]remote: \nremote: Analyzing objects... (3/3) (657 ms)        \nremote: Storing packfile... done (40 ms)        \nremote: Storing index... done (42 ms)"
20:24 ScottChamberlain Why am I still getting output to StdErr?
20:24 rnsanchez joined #git
20:25 ScottChamberlain HEAD is a detached head and git version reports "2.10.0.windows.1" (the one that is bundled with the TFS build agent)
20:25 refried_ joined #git
20:26 Dougie187 left #git
20:26 ManiacTwister joined #git
20:27 fuchstronaut joined #git
20:30 _ikke_ aidalgol: I don't think so
20:30 _ikke_ aidalgol: The closest is that you can stash everything, but keep staged changes
20:31 Eugene Seveas - major <3 for making a bind.vim that isn't total garbage.
20:31 ochorocho__ joined #git
20:31 _ikke_ Eugene: So it's still garbage?
20:31 askhat joined #git
20:31 Eugene It is vim
20:32 rorro joined #git
20:33 Lauven joined #git
20:36 danimal2 joined #git
20:37 vuoto joined #git
20:37 kbs joined #git
20:38 ochorocho__ joined #git
20:39 DuckHuntDog joined #git
20:39 Prawnzy joined #git
20:40 apotry joined #git
20:40 Xethron joined #git
20:44 nawwmz joined #git
20:44 jstimm joined #git
20:45 mooru joined #git
20:48 xall_ joined #git
20:48 re1 joined #git
20:48 re1_ joined #git
20:49 jozwior joined #git
20:50 offtopik joined #git
20:51 FilipNortic joined #git
20:52 mostlybadfly joined #git
20:55 DuckHuntDog left #git
20:58 Remram joined #git
21:06 theskill_ joined #git
21:07 theskillwithin joined #git
21:11 Gsham joined #git
21:11 JanC_ joined #git
21:11 stfn joined #git
21:12 prg3 joined #git
21:12 cdown joined #git
21:13 kimonorouge joined #git
21:14 Learath2 joined #git
21:16 nilg joined #git
21:16 howitdo joined #git
21:18 totallyhuman joined #git
21:19 mizu_no_oto joined #git
21:20 mooru joined #git
21:24 woodruffw joined #git
21:27 anuxivm joined #git
21:28 fuchstronaut joined #git
21:28 fuchstronaut joined #git
21:31 Vinnie_win_h joined #git
21:34 jmpp_ joined #git
21:34 kevwil joined #git
21:38 Lor_ joined #git
21:39 Lipp joined #git
21:39 grantwu joined #git
21:40 ronny joined #git
21:41 grantwu How do I get the commit message associated with a commit hash?
21:42 Zarthus `git show`
21:42 grantwu Zarthus: Thanks
21:42 grantwu left #git
21:43 _cyril_ joined #git
21:44 smemsh joined #git
21:44 smemsh left #git
21:44 Rodya_ joined #git
21:45 _28_ria joined #git
21:45 gho5t joined #git
21:45 smemsh joined #git
21:47 jmpp joined #git
21:48 jccn joined #git
21:48 smemsh hello, i rewrote my history and did "push --force" to my upstream.  however, other downstreams now when i do "pull --force" i get: "fatal: refusing to merge unrelated histories"
21:48 revoltingPeasant joined #git
21:49 revoltingPeasant can I restore code from the items in `git reflog`?
21:49 smemsh i want to just pull the new (rewritten) history
21:50 smemsh revoltingPeasant: yes just check out the commits mentioned in the reflog
21:50 revoltingPeasant smemsh: thanks
21:50 cdg joined #git
21:50 grawity smemsh: that's not what `git pull` does, then
21:50 grawity it's a fetch+merge command
21:51 grawity you want a fetch + reset [--hard] instead
21:51 jstimm joined #git
21:52 smemsh grawity: ok so fetch pulls in the new history, then i change my branch pointer to the new head with reset? how do i know the correct commit to point it to?
21:52 grawity the same way as always – you point it to the freshly fetched origin/master or origin/whatever
21:53 grawity @{u} / @{upstream} also works in this case
21:54 e14 joined #git
21:55 _28_ria joined #git
22:00 a3Dman joined #git
22:01 nwkj86 joined #git
22:03 Lipp joined #git
22:04 sssilver joined #git
22:04 pandbearit joined #git
22:04 mooru joined #git
22:08 nikivi joined #git
22:09 mrpackethead joined #git
22:09 smemsh i see, that makes sense, thanks
22:09 Darren_ joined #git
22:10 ahmed_elgabri joined #git
22:11 Lipp joined #git
22:11 juvenal joined #git
22:12 sssilver joined #git
22:12 e14 joined #git
22:13 durham_ joined #git
22:14 kyan joined #git
22:16 smemsh left #git
22:18 diegoaguilar joined #git
22:19 diegoaguilar Hello I have a branch pushed to remote, have commits A, B, C being C the last commit hash ... I need to remove B but keep and and C. tried git rebase --onto B^ B HEAD
22:19 diegoaguilar but now I don't know how to apply that to my branch and push it to remote
22:20 j416 diegoaguilar: interactive rebase may be easier for you
22:21 j416 diegoaguilar: go back to where you started (reset), then git rebase -i A^
22:23 refried_ joined #git
22:24 bannakaffalatta joined #git
22:24 j416 diegoaguilar: or, since your command was correct in essence, checkout your branch and then "reset --hard" that to your current HEAD, i.e.: git checkout yourbranch && git reset --hard HEAD@{1}
22:24 j416 diegoaguilar: also, !backup
22:24 gitinfo diegoaguilar: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
22:24 j416 diegoaguilar: next time, just don't add HEAD to the end of that command and it'll use your currently checked out branch directly.
22:28 kadoban joined #git
22:29 fuchstronaut joined #git
22:29 Prawnzy joined #git
22:30 led_belly joined #git
22:31 re1_ joined #git
22:31 abax left #git
22:34 jccn joined #git
22:34 zulutango joined #git
22:35 sdothum joined #git
22:35 re1_ joined #git
22:38 kazantip joined #git
22:41 DolphinDream joined #git
22:45 zivester joined #git
22:46 Rodya_ joined #git
22:47 pandbearit joined #git
22:47 pandabearit_ joined #git
22:49 Darren_ joined #git
22:49 converge joined #git
22:49 converge joined #git
22:49 xall joined #git
22:50 pandbearit left #git
22:51 pandabearit_ joined #git
22:54 red82 joined #git
22:55 e14 joined #git
22:55 pandabearit_ joined #git
22:56 anonymuse joined #git
22:57 Limes joined #git
22:59 bulletmark joined #git
23:01 durham joined #git
23:02 durham joined #git
23:03 pandabearit_ joined #git
23:03 pandabearit_ joined #git
23:04 mizu_no_oto joined #git
23:07 safe joined #git
23:08 jazzpi joined #git
23:09 cdg joined #git
23:11 flaguy48 joined #git
23:13 juvenal joined #git
23:14 svm_invictvs joined #git
23:14 dsantiago joined #git
23:15 pandabearit_ joined #git
23:22 _cyril_ joined #git
23:23 ahmed_elgabri joined #git
23:29 tristanp joined #git
23:30 fuchstronaut joined #git
23:31 pokalyis joined #git
23:31 fb| left #git
23:31 jstimm joined #git
23:35 ToBeCloud joined #git
23:35 leTali joined #git
23:39 hck89 joined #git
23:40 svm_invictvs joined #git
23:41 Ryanar joined #git
23:47 Rodya_ joined #git
23:48 madewokherd joined #git
23:52 multiproc joined #git
23:53 multiproc left #git
23:57 mrpackethead joined #git

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