Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-06

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

All times shown according to UTC.

Time Nick Message
00:02 Oatmeal joined #git
00:02 anuxivm left #git
00:03 Lyqyd joined #git
00:03 dsdeiz_ joined #git
00:04 NeverDie joined #git
00:08 netj joined #git
00:12 Tobbi joined #git
00:13 telephone joined #git
00:13 telephone joined #git
00:14 yuuray_ joined #git
00:17 Lunatrius joined #git
00:19 bronson joined #git
00:20 am55 joined #git
00:21 drodger joined #git
00:25 Es0teric joined #git
00:27 orbyt_ joined #git
00:28 ivanfon joined #git
00:28 hashtagstrashtag joined #git
00:30 ToBeFree joined #git
00:31 thebope joined #git
00:31 dnukem|2 joined #git
00:32 Rodya_ joined #git
00:32 peepsalot joined #git
00:35 sim590 joined #git
00:36 aw1 joined #git
00:36 kaldoran joined #git
00:37 howdoi joined #git
00:38 kiltzman joined #git
00:44 dstw joined #git
00:46 shinnya joined #git
00:47 aidalgol joined #git
00:53 thebope joined #git
00:53 nowhereman joined #git
00:56 zezba9000 left #git
00:58 bronson joined #git
01:00 Rodya_ joined #git
01:02 netj joined #git
01:02 DarkPsydeLord joined #git
01:06 star_prone joined #git
01:07 LionsMane joined #git
01:07 aw1 joined #git
01:09 drodger joined #git
01:09 cqi joined #git
01:10 a3Dman joined #git
01:11 theiostream joined #git
01:12 raijin joined #git
01:15 ahrs joined #git
01:15 prg318 joined #git
01:16 fstd_ joined #git
01:18 peterbec` joined #git
01:20 robattila256 joined #git
01:21 kyan joined #git
01:24 Ph_ joined #git
01:26 livingstn joined #git
01:26 digidog joined #git
01:28 a_thakur joined #git
01:29 finalbeta joined #git
01:32 MarioBranco joined #git
01:32 pks joined #git
01:35 menip joined #git
01:35 drodger joined #git
01:35 meLon joined #git
01:35 darkbit joined #git
01:36 nexemacs joined #git
01:36 meLon joined #git
01:38 nexemacs Hey guys, could someone please remind me who the reference bot is on this channel or how I go about finding that out via irc commands? I have some basic questions about rebase and I think a few bot queries might just do the trick
01:39 a3Dman joined #git
01:40 cyphase joined #git
01:41 sunri5e joined #git
01:46 dsdeiz joined #git
01:46 Zarthus !rebase
01:46 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.
01:46 Zarthus !help
01:46 gitinfo What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 duderonomy joined #git
01:50 nexemacs joined #git
01:53 nexemacs ,bots
01:53 nexemacs !bots
01:53 gitinfo [!botsnack] Om nom nom
01:54 bronson joined #git
01:55 Cabanossi joined #git
01:58 Es0teric joined #git
01:59 jokajak joined #git
02:00 a3Dman joined #git
02:00 swalladge anyone know if there's a command that tells you the state of a particular file - for example `git check-state some/random/file.txt`?
02:00 dermoth joined #git
02:01 swalladge i know there's check-ignore, but i'm looking for something that gives you more info in a single command
02:04 ghmn joined #git
02:05 chigang joined #git
02:08 netj joined #git
02:09 nexemacs joined #git
02:11 Ryanar joined #git
02:12 Emperor_Earth joined #git
02:12 TbobbyZ joined #git
02:12 Rodya_ joined #git
02:15 lagothri1 joined #git
02:17 dsdeiz joined #git
02:18 hexagoxel joined #git
02:18 livingstn joined #git
02:19 peterbec` joined #git
02:19 safe joined #git
02:22 meLon joined #git
02:23 kyan joined #git
02:26 TikityTik joined #git
02:26 dsdeiz joined #git
02:26 dsdeiz joined #git
02:28 ojdo joined #git
02:28 bluepixel joined #git
02:29 Goplat joined #git
02:29 Cabanossi joined #git
02:29 nexemacs So I’ve been using magit and I love it. However I can’t seem to find anything in gitinfo about cherry picking. I just pulled from remote and I have all these ‘pick’ symbols next to a bunch of commits. I think I”m rebasing because of the pull. Anyone know what ‘pick’ means?
02:30 dhollinger joined #git
02:32 dsdeiz joined #git
02:32 dsdeiz joined #git
02:34 jeffreylevesque joined #git
02:34 skypuke joined #git
02:36 dsdeiz joined #git
02:36 dsdeiz joined #git
02:44 SwiftMatt joined #git
02:46 MattMaker joined #git
02:47 chachasmooth joined #git
02:49 patrickmn joined #git
02:50 TbobbyZ joined #git
02:51 mns joined #git
02:55 Vortex35 joined #git
02:58 ayogi joined #git
02:59 bluepixel joined #git
02:59 LeBlaaanc joined #git
03:03 theiostream joined #git
03:06 inflames joined #git
03:08 peterbecich joined #git
03:11 acetakwas joined #git
03:14 nexemacs joined #git
03:19 marianina8 joined #git
03:22 JanC_ joined #git
03:23 SantaClauze joined #git
03:25 canoon joined #git
03:26 TbobbyZ joined #git
03:29 Cabanossi joined #git
03:30 aavrug joined #git
03:30 nevodka joined #git
03:31 aavrug joined #git
03:36 drodger joined #git
03:41 hvxgr joined #git
03:41 durham joined #git
03:41 durham joined #git
03:41 netj joined #git
03:46 Cabanossi joined #git
03:46 amosbird joined #git
03:49 robotroll joined #git
03:50 darkbit joined #git
03:50 ZyX-I joined #git
03:58 mehola joined #git
03:58 amosbird joined #git
03:58 pks joined #git
04:00 raspado joined #git
04:02 blr_ joined #git
04:05 HurricaneHarry_ joined #git
04:06 fuchstro1aut joined #git
04:06 hahuang62 joined #git
04:07 Orphis_ joined #git
04:08 pionen joined #git
04:09 Andrew_K joined #git
04:09 nd joined #git
04:09 telephone_ joined #git
04:09 ajpiano_ joined #git
04:09 guampa_ joined #git
04:09 MatthewAllan93_ joined #git
04:10 Murr joined #git
04:10 mozzarella joined #git
04:11 WakiMiko joined #git
04:11 h12o joined #git
04:12 akkad joined #git
04:12 a_thakur joined #git
04:13 grift joined #git
04:13 a_thakur joined #git
04:15 cyberz joined #git
04:17 m1dnight_ joined #git
04:17 davidosomething joined #git
04:17 nod joined #git
04:18 mmattice joined #git
04:18 Random832 joined #git
04:19 jost_ joined #git
04:19 a_thakur joined #git
04:19 permalac joined #git
04:19 justan0theruser joined #git
04:20 thebope joined #git
04:23 navidr joined #git
04:26 a3Dman joined #git
04:26 xall joined #git
04:35 earnestly joined #git
04:38 qsx joined #git
04:39 ayogi joined #git
04:46 moei joined #git
04:48 a3Dman joined #git
04:51 axisys joined #git
04:57 Noodlewitt joined #git
05:00 blunaxela joined #git
05:00 freimatz joined #git
05:00 a3Dman joined #git
05:01 diogenese joined #git
05:02 z8z joined #git
05:02 Cabanossi joined #git
05:02 Anja joined #git
05:04 venmx joined #git
05:07 LordRyan joined #git
05:07 LordRyan Is there any documentation over the "smart" Git over HTTPS protocol?
05:09 blunaxela joined #git
05:09 sbulage joined #git
05:11 LordRyan I'm not trying to get git-http-backend working with my setup, I want to use the *actual* protocol; git-http-backend as a CGI setup isn't compatible with Tornado, the framework I'm using for the web app.
05:12 Introoter joined #git
05:15 dec0n joined #git
05:16 fakenerd joined #git
05:16 grawity LordRyan: Documentation/technical/{pack-format,http-protocol}.txt in git.git
05:17 LordRyan Alright.
05:18 Oatmeal joined #git
05:18 a3Dman joined #git
05:19 grawity most of the protocol is just passed down to `git {upload-pack,receive-pack} --stateless-rpc ...`, but you'll still have to implement a HTTP wrapper around it
05:19 LordRyan That's fine with me; I'm just not able to use the `git-http-backend` that it insists on me using.
05:20 LordRyan grawity: i don't suppose there's a web version? i'm stuck in a situation wtihout the ability to use `git`.
05:21 grawity https://github.com/git/git/tree/master/Documentation/technical
05:21 grawity https://github.com/git/git/blob/master/http-backend.c
05:21 grawity (though, imho, it might be easier to put a reverse proxy in front of the webapp and route some paths to cgi, and the rest to tornado...)
05:22 LordRyan I would do that but it seems faster to do it this way.
05:22 LordRyan I'll try both.
05:22 Brski joined #git
05:28 blunaxela joined #git
05:28 jfelchner joined #git
05:28 stardiviner joined #git
05:29 stardiviner How to *un-commit* a commit (undo commit, put the commit changes back to stage)?
05:30 LordRyan git reset --hard HEAD~1
05:30 LordRyan oh
05:30 a3Dman joined #git
05:30 LordRyan --soft ? perhaps?
05:30 LordRyan yea
05:30 LordRyan stardiviner: git reset --soft HEAD~1
05:31 grawity either --soft or --mixed
05:32 stardiviner Thanks
05:32 kusznir joined #git
05:33 prg3 joined #git
05:36 LordRyan https://github.com/git/git/blob/master/Documentation/technical/http-protocol.txt#L338 :(
05:36 LordRyan i am really debating making a dumb server :P
05:36 LordRyan i'm gonna upload via ssh anyways.
05:37 Raging_Hog joined #git
05:38 LordRyan does anyone know the approximate speedup between 'git + smart https' vs 'git + dumb https' ?
05:40 overlord_tm joined #git
05:47 armyriad joined #git
05:56 chachasmooth joined #git
05:57 blunaxela joined #git
05:57 Wikiscratch joined #git
05:59 imack joined #git
06:00 Cabanossi joined #git
06:01 rt joined #git
06:03 diogenese joined #git
06:04 dave0x6d joined #git
06:05 rscata joined #git
06:08 Bock joined #git
06:09 zerow joined #git
06:11 inflames joined #git
06:11 alexggordon joined #git
06:11 LeBlaaanc joined #git
06:12 jagob joined #git
06:12 pierre_ joined #git
06:12 chele joined #git
06:13 thierryp joined #git
06:13 plexigras joined #git
06:14 LeBlaaanc joined #git
06:15 d^sh joined #git
06:16 xaa__ joined #git
06:17 pierre367 joined #git
06:17 reznord I am on master branch and I forgot to change the branch before I made changes in the code
06:17 NwS joined #git
06:17 reznord So, I have committed the changes to master branch
06:17 JeroenT joined #git
06:18 reznord is there a way to get those changes back on the branch that I want?
06:18 pierre367 hi!
06:18 gitinfo pierre367: 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.
06:19 zeroed joined #git
06:20 Silmarilion joined #git
06:21 JuPaname joined #git
06:21 LordRyan reznord: git reset --soft HEAD~1
06:21 LordRyan git checkout <other branch>
06:21 LordRyan git commit <whatever>
06:21 LordRyan i *think* that would work
06:22 reznord ah okay !! , will give it a try and see
06:22 jfr joined #git
06:22 reznord thanks LordRyan :-)
06:22 tango_ joined #git
06:24 sword joined #git
06:25 cworth joined #git
06:26 JeroenT joined #git
06:27 pierre367 I have a simple question while using git. I clone a distant repository locally. I do changes to check the repository out in a new branch, modify some files, add somes, and so on. Now a few weeks past, and I want to fetch the most recent version from the distant repository. How to do that cleanly please? I'm confused with git rebase, is this the right thing to use?
06:27 LordRyan i am pretty sure it is not
06:27 LordRyan you can use `git fetch`
06:28 LordRyan then `git merge <your-remote>/master <your-new-branch>`
06:28 LordRyan that merges the changes from the remote's master into your local branch
06:29 blunaxela joined #git
06:29 freimatz joined #git
06:29 _ng joined #git
06:30 pierre367 ok thanks
06:30 TbobbyZ joined #git
06:30 canoon joined #git
06:31 jameser joined #git
06:31 zeroed joined #git
06:31 zeroed joined #git
06:33 MattMaker joined #git
06:37 JeroenT joined #git
06:37 drodger joined #git
06:38 a_thakur joined #git
06:40 bronson joined #git
06:42 zefferno joined #git
06:44 qt-x joined #git
06:46 rokups joined #git
06:46 star_prone joined #git
06:47 Cabanossi joined #git
06:49 star_prone joined #git
06:49 pks joined #git
06:53 a_thakur joined #git
06:55 a_thakur_ joined #git
06:56 jnavila joined #git
06:57 chardan joined #git
06:58 a_thakur joined #git
07:00 Tobbi joined #git
07:00 thierryp joined #git
07:02 a_thakur_ joined #git
07:03 manuelschneid3r joined #git
07:04 ShapeShifter499 joined #git
07:04 dvaske joined #git
07:05 dvaske_ joined #git
07:07 eMBee joined #git
07:07 ronskisika joined #git
07:09 eMBee good afternoon: i am getting an error trying to rebase a series of commits with empty messages. could not find any option to tell rebase to proceed anyways. this happens when rebasing a github gist onto a repo with recursive theirs merge strategy
07:09 selckin what error
07:10 eMBee Aborting commit due to empty commit message.
07:10 King_Hual joined #git
07:10 King_Hual joined #git
07:10 grawity as you're rewriting these commits anyway, I'd suggest just adding dummy messages to them (e.g. via filter-branch)
07:11 grawity or even better, real commit messages
07:11 eightg joined #git
07:11 eMBee they are not my commits, and i want to preserve them as original as possible
07:12 TomyWork joined #git
07:12 eMBee a regular rebase works fine, and doesn't complain about empty messages so it looks to me that either one of these behaviors is a bug
07:13 grawity you're rebasing them; you've crossed that bridge already
07:14 selckin google '--allow-empty-message rebase' for a quick example to replace the commit msg
07:14 King_Hual` joined #git
07:15 flaviodesousa joined #git
07:17 gfixler joined #git
07:17 eMBee still, it should not be my burden to fix others commits, rebase should just accept commits as they are, either that, or it should always complain. as it is, the behavior is inconsistent
07:17 theoceaniscool joined #git
07:18 Forlorn joined #git
07:18 selckin you can end up with empty commits due to rebasing, and it wants to tell you
07:19 aard_ joined #git
07:19 prg3 joined #git
07:19 grawity no, if you end up with empty *commits*, I believe rebase just skips them quietly
07:20 eMBee it's not an empty commit, i have seen those before, they are easy do deal with by skipping. this is an empty message, and rebase should just accept that
07:20 nckpz joined #git
07:20 eMBee and it does, except when i use -X theirs
07:21 schleppel joined #git
07:22 finalbeta joined #git
07:22 eahmedshendy joined #git
07:22 a3Dman joined #git
07:23 selckin seems to be all bash scripts, maybe you can hack in the option
07:26 a_thakur joined #git
07:27 JeroenT joined #git
07:27 Tobbi joined #git
07:27 selckin my rebase -i seems to be using --allow-empty-message and can't find that error message
07:28 kurkale6ka joined #git
07:28 selckin other rebase uses format-patch and am rom what i can see
07:28 selckin eMBee: what git version?
07:30 nlhdqc joined #git
07:30 sea-gull joined #git
07:32 sotoz joined #git
07:34 MattMaker joined #git
07:34 dersand joined #git
07:35 a3Dman joined #git
07:35 eahmedshendy joined #git
07:35 a_thakur_ joined #git
07:40 bronson joined #git
07:41 jnavila joined #git
07:46 star_prone joined #git
07:47 oskarkv joined #git
07:48 a3Dman joined #git
07:48 eMBee selckin: git version 2.10.1 (Apple Git-78)
07:48 KevinDF joined #git
07:48 selckin newer then mine, wonder where its hiding the error message
07:49 prg3 joined #git
07:49 KevinDF joined #git
07:56 govg joined #git
07:59 afuentes joined #git
08:02 venmx joined #git
08:02 tocka joined #git
08:03 yuuray_ joined #git
08:03 zerow joined #git
08:05 a_thakur joined #git
08:05 netj joined #git
08:06 hurricanehrndz joined #git
08:08 a3Dman joined #git
08:09 aidalgol joined #git
08:09 tgm joined #git
08:09 rchavik joined #git
08:12 tgm Hi all. Branch "feature" is branched out from "dev". Work has continued in both branches since. Now when merging dev -> feature to get the latest work from dev, merge succeeds but lots of file changes in dev are not visible in feature. Don't really know where to begin. Any pointers appreciated
08:13 BSAlb joined #git
08:14 kadobanana tgm: Did anyone merge previously and revert the merge? Were any reverts done on either, maybe someone cherry-picked some stuff and reverted it?
08:15 tgm no reverts or cherry-picking. But there is one scenario that might be relevant. feature was branched to feature2 - then for some reason merged feature2 -> dev before doing feature -> dev
08:15 kadobanana Were there any conflicts in either merge?
08:15 tgm no
08:16 kadobanana Perhaps someone resolved conflicts incorrectly?
08:16 kadobanana Then I'm not sure, incorrect conflict resolution or reverted merges or something are the usual culprits.
08:16 tgm and I just explained it mirrored :-S Correct explanation: dev was branched to dev2, then dev2 merged to feature, then dev merged to feature
08:16 tgm kadobanana, ok
08:17 tgm I realize it's hard to give a general answer, but anywhere I should start looking to resolve this?
08:17 kadobanana Well, merging dev to feature in that case won't redo the changes that were in dev2 of course. Did feature just simply make changes that undid some of the things you're looking for?
08:17 star_prone joined #git
08:18 tgm no, the files that have things missing are untouched in feature branch
08:18 kadobanana Hard for me to say, I'm not quite sure what you're seeing. I'd look for exact changes that you expect to be in feature that aren't, and find where they were made in the first place, and find what undid them.
08:20 tgm yes, good approach. The changes I expect to see in feature were committed on dev, and I see the commit. I've gone through all commits since then and none of the subsequent commits change this file. And still after merging to feature, the file differs
08:21 MineCoins joined #git
08:21 kadobanana Then I'd strongly suspect that one of the merges was faulty.
08:21 redeemed joined #git
08:22 kadobanana git log --patch -- the_file    could help, or  git log with uhm, I think it's -S or -G, to show when lines appeared or disappeared
08:22 tgm ok. I'll try locally without pushing to reset both branches back to before the merges - and try from there. If that works, I only have a few commits to redo manually
08:22 tgm git log, will try. thx
08:22 kadobanana Sorry I can't give clearer guidance. Good luck
08:23 tgm Thanks kadobanana, not easy without seeing my setup I know. Appreciate the feedback!
08:25 Tobbi joined #git
08:26 a_thakur joined #git
08:27 a_thakur_ joined #git
08:27 govg joined #git
08:28 marcogmonteiro joined #git
08:30 DaveTaboola joined #git
08:31 kexmex joined #git
08:33 pks joined #git
08:34 elect_ joined #git
08:35 MattMaker joined #git
08:37 dstw1 joined #git
08:38 seni joined #git
08:38 moei joined #git
08:38 a3Dman joined #git
08:39 notebox joined #git
08:40 dstw joined #git
08:41 bronson joined #git
08:44 Anja joined #git
08:45 feodaron joined #git
08:45 eightg joined #git
08:46 rafalcpp joined #git
08:46 Cabanossi joined #git
08:46 qypan_ joined #git
08:46 leeN joined #git
08:48 prg3 joined #git
08:50 raijin joined #git
08:52 fakenerd joined #git
08:57 netroxen joined #git
09:01 bronson joined #git
09:01 feodaron joined #git
09:01 reactormonk[m] I want to pregenerate some commit message, how would I do that - where would the script go?
09:02 Vampire0 reactormonk[m], there is a hook for that. Look at man git hooks
09:02 gitinfo reactormonk[m]: the git manpage is available at http://jk.gs/git.html
09:02 Vampire0 reactormonk[m], there is a hook for that. Look at man githooks
09:02 gitinfo reactormonk[m]: the githooks manpage is available at http://jk.gs/githooks.html
09:02 marcogmonteiro joined #git
09:02 Vampire0 reactormonk[m], prepare-commit-msg iirc
09:02 cqi joined #git
09:03 reactormonk[m] Nope
09:03 Vampire0 reactormonk[m], what nope?
09:03 masuberu joined #git
09:03 Vampire0 reactormonk[m], prepare-commit-msg is for pre-generating commit message, then getting the result for editiong, commit-msg is after user-editing where you also can modify the message
09:03 xall joined #git
09:03 Vampire0 reactormonk[m], what do you mean by Nope?
09:04 canton7 the only response to "Nope" is "Yup!"
09:04 reactormonk[m] Ah, found it, thanks.
09:04 reactormonk[m] Sorry, wrong manpage.
09:04 jnavila joined #git
09:05 Vampire0 reactormonk[m], yeah, one space too much in the first message, sry
09:05 gitinfo reactormonk[m]: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
09:06 canoon joined #git
09:07 Tobbi joined #git
09:07 synbit joined #git
09:09 theskillwithin joined #git
09:09 theskillwithin joined #git
09:10 nowhereman joined #git
09:10 MatthewAllan93_ left #git
09:10 aw1 joined #git
09:10 MatthewAllan93 joined #git
09:11 jameser joined #git
09:12 star_prone joined #git
09:15 ziombelas joined #git
09:16 tymczenko joined #git
09:16 synchronous joined #git
09:17 sotoz Is there a way to git diff a specific commit from one branch with another commit on a specific branch on remote?
09:18 m0rdonez joined #git
09:23 rorro joined #git
09:23 ronskisika joined #git
09:23 umbSublime joined #git
09:24 warthog9 joined #git
09:26 theskillwithin joined #git
09:26 theskillwithin joined #git
09:27 dnukem|2 joined #git
09:34 TbobbyZ joined #git
09:36 b100s joined #git
09:37 MattMaker joined #git
09:38 Vampire0 sotoz, yes, just do it
09:39 sotoz how do I syntax the git diff command? "git diff local-branch:commit-hash remote-branch:commit-hash" something like that?
09:39 Vampire0 sotoz, commits are not associated with any branch
09:39 sotoz oh right
09:39 D092M joined #git
09:39 Vampire0 sotoz, just `git diff commit-ish-a commit-ish-b`
09:39 sotoz so I just git diff their hashes
09:40 sotoz suure ok...
09:40 Vampire0 exactly, their hashes or any other way to reference them
09:40 sotoz stupid question... sorry :)
09:40 Vampire0 No problem. :-)
09:40 gitinfo sotoz: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
09:40 sotoz thank you Vampire0 :)
09:43 lyxus joined #git
09:45 Silmarilion joined #git
09:46 tvw joined #git
09:47 Cabanossi joined #git
09:48 YuGiOhJCJ joined #git
09:49 jfr_ joined #git
09:54 tlaxkit joined #git
09:56 h12o joined #git
09:58 ribasushi joined #git
10:03 m0rdonez joined #git
10:06 prg3 joined #git
10:06 ssarah joined #git
10:09 star_prone joined #git
10:11 jaeckel joined #git
10:12 prg3 joined #git
10:13 mikecmpbll joined #git
10:15 mda1 joined #git
10:17 stardiviner joined #git
10:18 Murii joined #git
10:18 failed_ joined #git
10:19 prg3 joined #git
10:20 temhaa joined #git
10:20 temhaa Hello
10:22 temhaa we use git flow model. I wonder is there a way code review. For example. we have feature branch. we  need to do code review before merge to devel. There is a way in github with pull request. But we have own git server.
10:22 failed_ joined #git
10:23 Zarthus use an instance of gitlab which has pull request support?
10:23 Zarthus git flow is separate from PR review
10:24 temhaa I mean, maybe git has some feature for code review.
10:24 bremner temhaa: what part of code review are you missing? obviously someone can just checkout the branch and send email in response.
10:24 Zarthus there is a request-pull command which just sends an email, developer wise you want something like bitbucket/github/gitlab
10:24 Zarthus and yeah, there's that.
10:24 acetakwas joined #git
10:24 temhaa What does request-pull do?
10:25 Zarthus send an email :P
10:25 temhaa Does it create a new branch to merge?
10:25 temhaa like github?
10:25 grawity github doesn't create a new branch either
10:25 grawity you have to do all that yourself before PR'ing it
10:25 theoceaniscool joined #git
10:26 Tobbi joined #git
10:27 temhaa grawity, how does github handle. I though github created a branch for this. hmm just its linking feature branch to devel branch
10:27 sorenb joined #git
10:27 failed_ left #git
10:27 grawity *you* create a branch, push it off to Github, and click the "Create a pull request from this branch" button
10:28 ronator joined #git
10:30 freimatz joined #git
10:30 temhaa grawity, I know how to create a pull request. I just though what does github do in its background.
10:31 irqq joined #git
10:31 Cabanossi joined #git
10:31 temhaa nevermind github, I am looking for code review for projectholders (we have own git server). does git have this feature or not?
10:31 temhaa **best code review practice
10:33 al-damiri joined #git
10:35 TheWild joined #git
10:35 jast there's nothing built into Git to do code review (unless your process works by sending patches via e-mail in which case it's a natural consequence)
10:36 jast "the Git way" to do code review is to not give random people push access to your target repository/branch. instead, have some person (or several) serve as a gatekeeper, adding things to the official place only once things have been reviewed
10:36 jast anything more formal needs extra tools
10:38 prg3 joined #git
10:38 MattMaker joined #git
10:39 sunri5e_ joined #git
10:40 pbrewczynski joined #git
10:42 dendazen joined #git
10:43 darkbit joined #git
10:47 olaf_ joined #git
10:48 sunri5e joined #git
10:49 olaf_ Is there a way to ignore paths during git cherry-pick -x $rev? I have a bunch of commits that need to be backported. But they touch unrelated files as well, which leads to errors.
10:49 prg3 joined #git
10:50 olaf_ some sort of filter-diff should be used during the process.
10:50 selckin if its a lot of commits think i'd create a new branch, filter those paths out, and cherry-pick those
10:50 selckin otherwise probably just manually
10:51 olaf_ I would like to avoid the manual thing. But hey...
10:51 GT joined #git
10:51 python476 joined #git
10:51 selckin if its like 5 commits probably still faster
10:51 python476 hi there
10:51 gitinfo python476: 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.
10:53 python476 I'm having troubles cloning a bitbucket repo under windows (version 2.12.2), while I have no troubles doing so on a linux laptop
10:53 Vampire0 python476, !repro
10:53 gitinfo python476: [!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
10:54 borkr joined #git
10:55 python476 Vampire0: https://gist.github.com/anonymous/9b8bebb78112a50373c6f0c8b03cb10d
10:55 python476 git CMD shell shows "empty password" .. could it be a bug in the dialog
10:56 python476 oh... I closed the dialog, and now git clone asks the passwod in the shell.. which now works
10:56 python476 so odd
10:56 Vampire0 python476, good if it works now :-)
10:57 Vampire0 python476, maybe you need a different credentials helper
10:57 aielima joined #git
10:57 Vampire0 python476, or you should work with SSH keys instead of username/password
10:57 python476 Vampire0: is it documented how to switch ?
10:57 TikityTik joined #git
10:57 Vampire0 python476, sure, man git config
10:57 gitinfo python476: the git-config manpage is available at http://jk.gs/git-config.html
10:58 python476 Vampire0: my brain is allergic to ssh keys for some reason, I need a mentor to get a grasp of keys (I always forget..what a shame)
10:58 python476 Vampire0: thanks a lot my dear
10:58 Vampire0 python476, there search for credential.helper
10:59 Vampire0 python476, there is also a complete page with info I think at man gitcredentials
10:59 gitinfo python476: the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
10:59 Vampire0 python476, what problem do you have with keys? If you ask, maybe we can make you enlightened :-
10:59 Vampire0 s/:-/:-)/
10:59 python476 I'll try to read, I think this time the issue is my brain cannot imprint the whole security thing (it's not at all a problem on git or its doc)
11:00 python476 and thanks again for being so willing to help
11:00 python476 I'm still at the level of following instructions blindy and not understanding the process in details
11:01 prg3 joined #git
11:02 bronson joined #git
11:02 Vampire0 python476, with keys you have a public part and a private part. You add the public part to your GitHub account. Then for authentication simplified spoken you sign something with your private part that only you have and GitHub can verify that you signed this with your private part, using the public part you uploaded
11:02 Cabanossi joined #git
11:03 python476 OK, this I get
11:04 python476 then there's the pageant setup right ? or is it unnecessary
11:08 Vampire0 python476, for this I cannot help, sorry. I don't use PuTTY, but Cygwin when I'm on Windows
11:08 python476 Vampire0: aight, I'll help myself on that part
11:10 Vampire0 python476, maybe this will help: https://help.github.com/articles/connecting-to-github-with-ssh
11:11 tkore joined #git
11:11 tkore joined #git
11:11 Ryanar joined #git
11:13 rchavik joined #git
11:18 star_prone joined #git
11:18 unclfred joined #git
11:20 compengi joined #git
11:21 compengi Hello, I'm trying to rebase to an svn repository but I receive the following error: fatal: cannot create directory at '...': Filename too long could not detach HEAD rebase refs/remotes/git-svn: command returned error: 1
11:22 compengi How to solve this?
11:22 compengi I'm working on windows
11:23 Vampire0 compengi, well, as it complains that a path is too long, I'd try to move the git repo up in the filesystem hierarchy
11:25 compengi Vampire0 you mean to move it one directory up?
11:27 demize Or more, depending on how long the path is.
11:27 Stummi or, shorten the path in the repo
11:28 compengi But if I move .git directory, won't I loose the commits?
11:30 demize The whole repo, not just the .git directory.
11:33 s17 here's one, bitbucket is saying my repo is too large and I have removed the large files and not tracking them, but the .git/objects directory is over 600MB. how can I clean that up?
11:34 canoon joined #git
11:34 demize s17: The only way to is to rewrite history.
11:34 Forlorn joined #git
11:34 demize Can be done using git-filter-branch.
11:34 s17 ok
11:35 demize There's also BFG that's simpler to use.
11:35 demize https://rtyley.github.io/bfg-repo-cleaner/
11:35 compengi okay, thanks
11:37 livingstn joined #git
11:37 Ryanar joined #git
11:38 TbobbyZ joined #git
11:38 yuuray__ joined #git
11:39 unclfred Hey, guys! I'm reading git help config about --add option. It says "This is the same as providing ^$ as the value_regex in --replace-all." But ^$ means empty line, right? Shouldn't it be just "$"?
11:39 MattMaker joined #git
11:40 unclfred Am I missing smth?
11:41 neredsenvy joined #git
11:42 neredsenvy I have branch B which is a clone of A I added some new files to B. Now B is not complete yet but these files are I want to move just these files to A what's the proper way ?
11:42 neredsenvy Just manually copy and commit files or
11:43 maxxe joined #git
11:44 maxxe if I have a master branch already, how can I create a 'gh-pages' branch?
11:44 canoon neredsenvy, the file's aren't commited correct?
11:44 neredsenvy correct
11:45 neredsenvy they don't exist in A yet
11:45 canoon just do git checkout A and the files will stay and you will be on the other branch
11:45 HoierM joined #git
11:45 earnestly joined #git
11:46 olaf_ left #git
11:46 maxxe was it that simple :)
11:47 Vampire0 demize, there is also a !bfg trigger I think :-)
11:47 gitinfo demize: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
11:47 masuberu joined #git
11:47 h12o joined #git
11:48 jimi_ joined #git
11:49 neredsenvy canoon: Thanks it worked
11:50 Vampire0 unclfred, if you do --replace-all with '$', then you replace all line endings with what you give. I assume git config ensures that there is an empty line in the end, so that '^$' would match exactly that empty line
11:53 python476 hmm bfg cleaner sounds nice
11:53 unclfred Vampire0: but that's exactly what --add should do, effectively replace line endings with what's given
11:53 scottjl joined #git
11:54 unclfred Vampire0: in other words, append given value to the line
12:03 swalladge joined #git
12:03 bronson joined #git
12:05 jagob joined #git
12:05 ski7777 joined #git
12:07 scoobert1on joined #git
12:07 justanotheruser joined #git
12:08 prg3 joined #git
12:09 barteks2x_ joined #git
12:11 barteks2x__ joined #git
12:11 finalbeta joined #git
12:11 MineCoins joined #git
12:12 barteks2x__ joined #git
12:13 barteks2x__ joined #git
12:13 dendazen joined #git
12:14 sotoz joined #git
12:16 Vampire0 unclfred, nope, that is not correct. --add adds a value to a config property that can have multiple values on multiple lines
12:16 Vampire0 unclfred, at least that is what the manpage says
12:17 Vampire0 unclfred, look at the examples where a new proxy is added
12:19 ispn joined #git
12:21 Tobbi joined #git
12:22 notebox joined #git
12:23 unclfred Vampire0: hmm... looks like you're right
12:24 unclfred somehow in my head "new line" meant something different
12:24 h12o joined #git
12:24 marcogmonteiro joined #git
12:24 unclfred Vampire0: yeah, it's all clear to me now. Thanks a lot!
12:25 Vampire0 you're welcome
12:26 IRQ` joined #git
12:28 pothepanda joined #git
12:31 Cabanossi joined #git
12:31 g105b joined #git
12:32 kpease joined #git
12:33 seni joined #git
12:33 ChiLL_SurF joined #git
12:34 tymczenko joined #git
12:41 MattMaker joined #git
12:41 dsdeiz joined #git
12:41 dsdeiz joined #git
12:41 notebox joined #git
12:45 nd_ joined #git
12:45 darkbit joined #git
12:45 h12o joined #git
12:47 plos joined #git
12:49 jeffreylevesque joined #git
12:52 Silenced joined #git
12:53 prg3 joined #git
12:55 s17 demize: I used that bfg tool, following the instructions.  now my local repo shows 200MB (du -h), but the bitbucket one is showing 2.0GB, when before cleaning it was 1.8GB :(
12:56 tvw joined #git
12:57 kexmex joined #git
13:00 dvaske joined #git
13:01 dvaske_ joined #git
13:02 fakenerd joined #git
13:03 TheWild http://kopy.io/8r06X
13:03 mvensky joined #git
13:03 brokensyntax joined #git
13:04 zerow joined #git
13:04 bronson joined #git
13:04 TheWild how I can switch to different branch without touching any file in my repository?
13:05 tobiasvl TheWild: !xy
13:05 gitinfo TheWild: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
13:05 swift1 joined #git
13:06 fmcgeough joined #git
13:07 mda1 joined #git
13:08 prg3 joined #git
13:08 TheWild say I did "git checkout -b fix_112" then made some changes and... wait. I don't think a separate branch is suitable here, let's go back to master.
13:08 TheWild but I don't want to lose my changes
13:09 tobiasvl TheWild: ah, ok. then you can just go back to master, any _uncommitted_ changes will !float
13:09 gitinfo TheWild: 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.
13:10 TheWild ooh, thanks. Now I'm sure I won't screw anything up.
13:14 King_Hual joined #git
13:16 blackwind_123 joined #git
13:17 prg3 joined #git
13:18 strk joined #git
13:19 strk I need to invoke trac-admin for each non-merge commit entering a git repository, but the post-receive hook doesn't seem to be enough
13:19 strk should it be done by update, I guess ?
13:21 netj joined #git
13:22 netroxen joined #git
13:24 Milos joined #git
13:25 ankit01ojha joined #git
13:28 Anja joined #git
13:30 CEnnis91 joined #git
13:31 Random832 i learned it as git stash pop, is apply different?
13:31 rwb joined #git
13:31 dnukem joined #git
13:31 elsevero joined #git
13:31 tobiasvl Random832: apply leaves the changes stashed
13:32 tobiasvl so pop = stash + drop
13:32 tobiasvl uuuh pop = apply + drop
13:33 indistylo joined #git
13:33 Stummi joined #git
13:34 Stummi left #git
13:36 strk ok now I see what happens in post-receive, I get all incoming revisions on stdin
13:37 a_thakur joined #git
13:37 mgoodwin left #git
13:38 Tobbi joined #git
13:38 Gsham joined #git
13:40 lavalamp joined #git
13:40 djb-irc joined #git
13:41 strk what are old_rev, new_rev, ref_name in post-receive ?
13:41 livingstn joined #git
13:42 MattMaker joined #git
13:43 tobiasvl strk: old_rev is the current revision of ref_name, and new_rev is the one you received
13:43 publio joined #git
13:43 dnukem joined #git
13:43 strk what about ref_name ?
13:43 tobiasvl it's the ref in question
13:43 tobiasvl eg. the branch
13:44 Dougie187 joined #git
13:44 dave0x6d joined #git
13:44 gugah joined #git
13:45 strk it sounds like this is bogus: https://trac.edgewall.org/wiki/TracRepositoryAdmin#Git
13:45 strk as it goes: git rev-list --reverse "$newrev" "^$oldrev" --
13:45 strk in a while read oldrev newrev refname loop
13:45 strk shouldnt it then instead be: git rev-list --reverse "$newrev"..."$oldrev" --
13:47 tobiasvl no
13:47 jxupte joined #git
13:47 Cabanossi joined #git
13:47 Es0teric joined #git
13:47 tobiasvl that first one means all commits reachable by $newrev but not by $oldrev
13:48 strk ah! I was confused by the caret position
13:48 strk would they still be equivalent though ?
13:48 tobiasvl yeah, I'm not sure if it's used a lot of places. should be documented in man git rev-list at least
13:48 gitinfo the git-rev-list manpage is available at http://jk.gs/git-rev-list.html
13:49 zerow joined #git
13:49 strk the ... version would sound faster (if I think about implementation)
13:49 shinnya joined #git
13:49 tobiasvl strk: no, $newrev...$oldrev is all commits that are reachable by $oldrev or $newrev but not both
13:49 tobiasvl exclusive or
13:49 strk ops, I though to...from
13:49 devin- joined #git
13:49 devin- yo
13:49 strk I actually get 2 with: git rev-list --reverse HEAD^^...HEAD
13:49 tobiasvl I was wrong, the pre-caret can be used a lot of places
13:50 devin- ugh
13:50 strk ah, now I see the difference
13:50 strk ok thanks then :)
13:50 tobiasvl strk: that makes sense, HEAD can reach two commits (HEAD^ and HEAD^^) that HEAD^^ cannot reach
13:50 tobiasvl or HEAD and HEAD^ …
13:51 strk now why does post-receive get multiple olderev newrev refname rather than just one ?
13:51 strk how can one possibly push non-linear blocks of history ?
13:52 dave_uy joined #git
13:53 DarkPsydeLord joined #git
13:53 tobiasvl strk: not sure what you're seeing, but you can push more than one ref at a time
13:54 bannakaffalatta joined #git
13:54 prg3 joined #git
13:54 oleo joined #git
13:54 strk uhm, yes it makes sense indeed
13:55 notebox joined #git
13:56 yehowyada joined #git
13:58 Tacoder joined #git
13:58 AaronMT joined #git
14:02 sz0 joined #git
14:02 crose joined #git
14:02 fees joined #git
14:04 bronson joined #git
14:06 fcrick joined #git
14:06 Tobbi joined #git
14:08 mac-_ joined #git
14:08 toogley joined #git
14:08 dtype_ joined #git
14:08 angular_mike_ joined #git
14:09 Tee_Pee joined #git
14:10 tmz_ joined #git
14:10 davidstrauss_ joined #git
14:11 LeBlaaanc joined #git
14:11 naquad joined #git
14:12 rudi_s joined #git
14:13 prosody joined #git
14:13 CustosLim3n joined #git
14:14 ResidentBiscuit joined #git
14:14 QshelTier joined #git
14:15 manitu joined #git
14:15 bittyx joined #git
14:15 Renter joined #git
14:15 milkshoes joined #git
14:16 voker57 joined #git
14:16 voker57 joined #git
14:16 [diecast] joined #git
14:16 gregwork joined #git
14:16 nickenchuggets joined #git
14:16 GameGamer43 joined #git
14:17 Spydar007 joined #git
14:17 Spydar007 joined #git
14:17 bcardarella joined #git
14:17 i7c joined #git
14:17 tterrag joined #git
14:18 YuGiOhJCJ joined #git
14:18 yena_ joined #git
14:18 dAnjou joined #git
14:19 Worki joined #git
14:20 ash_workz I don't suppose there is an accepted symbol to describe a directory as a repository?
14:20 ash_workz like how @ is a symbolic link
14:20 ash_workz and / is a directory
14:20 ash_workz ?
14:20 Worki because of reasons too insane to explain, i have a setup where i have multiple git repos chained. (D clones C, C clones B, B clones A and A is what nightmares are made of). i work with D, but when i push do C, C doesnt in turn push to B and A - is there a way to tell push to go 'up the chain' ?
14:20 boombatower joined #git
14:20 manuelschneid3r joined #git
14:20 UrsoBranco joined #git
14:20 Rodya_ joined #git
14:21 strk left #git
14:21 jast ash_workz: I don't think so
14:22 gitinfo joined #git
14:22 ash_workz of course not :P
14:22 ash_workz thanks jast
14:22 jast Worki: possibly something involving git-slave
14:22 jast !gitslave
14:22 jast please stand by while the bot is booting... ;)
14:22 gitinfo gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
14:22 Worki jast: so this kind of chain push is not what is supposed to happen on its own ?
14:23 LionsMane joined #git
14:23 jast no. Git itself treats nested repositories as completely independent unless submodules are involved... and submodules don't really cover the 'push' part of things
14:23 Es0teric joined #git
14:25 Worki and there is no simple setting to change this ? the only reason i use these chained repos is because my ide plugin has problems dealing with multiple origin destinations, so i figured id put a bare repo in between to 'hide' the dual upstream configuration
14:25 Tobbi joined #git
14:25 Vampire0 Worki, do you mean D is a clone of C and C a clone of B and B a clone of A, or do you mean A is a "subrepo" of B and B a "subrepo" of C and C a "subrepo" of D? I think jast assumed the latter, I'd interpret what you said to be the former
14:26 jast oh, yeah, my bad
14:26 TikityTik joined #git
14:27 Vampire0 Worki, you can add A and B and C as remotes to D and then make an alias that pushes to A, B and C or you can make hooks in B and C that automatically push-on if you push into them
14:27 jast you can set up a repository that pushes changes somewhere else as soon as it receives them, using hooks (in this case, probably a post-update or post-receive hook), again not done by default
14:27 moritz or, like avoid that crazy setup altogether
14:27 Vampire0 ash_workz, what exactly would you try to achieve with this symbol?
14:27 ohcibi joined #git
14:27 Worki no, its just clones. here is the actual sad setup: our master is a branchless SVN (seriously). so i set up subgit (repo A), which is nice. but our branchless SVN has no proper interface, so i figured id want to use gitlab, so i set up repo B, in which i cloned the subgit repo and added the gitlab repo as a second upstream. but eclipse couldnt deal with dual upstreams, so i made a 3rd repo, repo C, where i just
14:27 livingstn joined #git
14:27 Worki did 'git clone b' and imported that in eclipse
14:28 ash_workz Vampire0: I'm just denoting it while writing down what I think an FS should look like
14:28 Worki but when i push in repo C, it doesnt go to repo A unless i manually go to repo B and do a git push there too
14:28 ash_workz I ended up using ????
14:28 ash_workz heh
14:29 govg joined #git
14:29 Vampire0 That didn't render properly here
14:29 jast time to join the 21st century, maybe? :P
14:30 Vampire0 ah, copied it to decodeunicode.org and now I see. :-D
14:31 lmatteis joined #git
14:31 Vampire0 jast, is there a fixed-width font having this glyph? In programming related IRC chats I prefer fixed-width font, besides that it is the default in XChat here :-)
14:32 jast works with Input Mono
14:32 sbulage joined #git
14:34 Worki obviously im not the one who makes the decision, or we wouldnt be stuck with svn
14:34 Worki a branchless one on top of that!
14:34 Vampire0 jast, hm, don't have it here, but this is a veeeery aged Ubuntu
14:35 orbyt_ joined #git
14:35 jast it's not a Free font, just free (for any use that doesn't involve publishing)
14:36 jast though I'm not actually sure the font contains these glyphs. I'm on one of these crazy OSX thingies right now, who knows what additional magic they do
14:37 zerow_ joined #git
14:37 Worki so any 'cheap' way to get my stuff to work the way i want it to ?
14:38 mikecmpb_ joined #git
14:39 Vampire0 jast, hm, there is Ubuntu Mono, but it also does not have a glyph for that character
14:39 spvensko_ joined #git
14:40 Vampire0 Worki, depends on what you consider cheap, is none of the two methods I told you is acceptable?
14:41 TbobbyZ joined #git
14:41 dnukem joined #git
14:42 spvensko_ joined #git
14:43 mikecmpbll joined #git
14:43 MineCoins joined #git
14:44 MattMaker joined #git
14:44 Worki Vampire0: my bad, i appear to have skipped over them during a local disconnect, ill read up on those, the hook ones sound reasonable, the first one wont work, because the whole reason i have D is that egit doesnt play well with multiple remotes
14:45 ziombelas joined #git
14:45 Vampire0 Worki, does it not
14:45 Vampire0 Worki, strange
14:46 pe3z joined #git
14:48 raspado joined #git
14:51 Lunatrius joined #git
14:51 drodger joined #git
14:52 Es0teric_ joined #git
14:53 zerow joined #git
14:54 arunpyas- left #git
14:56 Dookie12 joined #git
14:57 kevwil joined #git
15:00 unclfred left #git
15:01 chris3492 joined #git
15:01 olaf_ joined #git
15:01 scoobertron joined #git
15:02 drodger joined #git
15:03 rebrec_ joined #git
15:03 olaf_ left #git
15:05 dnukem joined #git
15:05 Es0teric joined #git
15:05 TbobbyZ joined #git
15:06 rominronin joined #git
15:07 felixjet joined #git
15:07 zxd joined #git
15:08 zxd how to make my current branch to track remote branch ?   git branch mycurrentbranch remotename/branchname ?
15:08 zxd mycurrentbranch already exists locally
15:09 Vampire0 zxd, `git branch --set-upstream-to=remote/branch current`
15:09 Vampire0 zxd, or use `-u` when you push
15:09 Tobbi joined #git
15:10 overlord_tm joined #git
15:10 gareppa joined #git
15:10 LyndsySimon I have both "work" and "personal" git repos on my machine, and I want to use a different email address for each. Is there any way to make it so every git repo under a specified path uses on email, and all others use another?
15:10 LyndsySimon I know how to use global and repository configs, but I'd prefer not to have to set up each repo individually.
15:11 demize s17: Things you already pushed won't be deleted automatically.
15:11 Vampire0 LyndsySimon, I don't think so, except if you use different user accounts
15:12 LyndsySimon > if you use different user accounts
15:12 LyndsySimon How so?
15:14 star_prone joined #git
15:14 star_prone joined #git
15:15 zxd thansk
15:15 mikecmpb_ joined #git
15:15 gitinfo zxd: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
15:15 User458764 joined #git
15:16 tang^ joined #git
15:17 LyndsySimon ^ you can also PM the bot to check karma and such outside of this channel :)
15:17 permalac_ joined #git
15:18 Pieplay joined #git
15:18 VladGh joined #git
15:18 pspletinckx joined #git
15:19 Vampire0 LyndsySimon, well, you have system-wide config, user-wide config and repo-wide config. If you do the setting in user-wide config and work with two different users, you will get different config
15:22 cdg joined #git
15:22 zxd what's the page that shows precedence   like  my ($foo) = split ' ', $line;       (my ($foo) = split ' '), $line   or my ($foo) = (split ' ', $line)
15:22 theiostream joined #git
15:23 zxd wrong channel
15:23 zxd sorry
15:24 blackwind_123 joined #git
15:25 svm_invictvs joined #git
15:25 Murii joined #git
15:25 mikecmpb_ joined #git
15:27 mehola joined #git
15:28 thiago joined #git
15:28 LyndsySimon Vampire0: Ah, OK. I'm on macOS, so you're saying I could set up a second user account for use with my personal stuff, and put the config settings in that account's ~/.gitconfig
15:28 LyndsySimon Vampire0: that actually makes a lot of sense. I'll consider it.
15:30 indistylo joined #git
15:31 Cabanossi joined #git
15:31 Snugglebash joined #git
15:32 nivag joined #git
15:33 VladGh joined #git
15:34 imack joined #git
15:34 imack joined #git
15:35 ZyX-I joined #git
15:35 imack joined #git
15:35 Anja joined #git
15:36 Vampire0 LyndsySimon, yes, that was what I meant
15:36 imack joined #git
15:36 LyndsySimon Vampire0: Thanks :)
15:36 Bennux joined #git
15:36 imack joined #git
15:37 Nvm joined #git
15:37 imack joined #git
15:37 _Vi joined #git
15:38 lavalamp joined #git
15:41 Dougie187 left #git
15:42 Dougie1871 joined #git
15:44 DarkPsydeLord joined #git
15:45 MattMaker joined #git
15:45 durham joined #git
15:47 drodger joined #git
15:47 berndj idea: a --word-diff mode that still outputs diffs like -u but with only the changed words green or red, rather than the whole +/- line
15:47 Gustavo6046 joined #git
15:48 theiostream joined #git
15:48 ToBeFree joined #git
15:48 t0by joined #git
15:48 t0by joined #git
15:49 rosiu joined #git
15:50 choki joined #git
15:52 svm_invictvs joined #git
15:53 MineCoins joined #git
15:53 felixjet can i ask about something that is indirectly related to github?
15:53 cjohnson You just did
15:53 cjohnson bwahaha
15:54 felixjet xD
15:54 cjohnson just kidding I don't see why not. if nobody knows nobody will answer. as long as it's vaguely related to git
15:54 ziombelas joined #git
15:54 felixjet i'm trying to git clone a public repo, and i'm getting "Permission denied (publickey).". if its public... why?
15:55 cjohnson if you are using a git:// url, it will use ssh to negotiate the connection
15:55 cjohnson which uses your ssh key and if that's not tied to any account, the ssh connection will fail before it ever gets to the git stuff
15:55 cjohnson use https url for cloning if you don't have a github account tied to your key
15:55 qqx cjohnson: git:// URLs don't use ssh.
15:56 cjohnson Really? Why does it use the ssh key then?
15:56 cjohnson some sort of janky ssh-look-alike ?
15:56 julia_c it doesn't use an ssh key
15:56 felixjet git+ssh:// is what it does
15:56 felixjet right?
15:56 rominronin joined #git
15:56 s17 demize: do you know what I can do?  even I look at the activity on bitbucket and it shows a list of "Commit deleted ..." after going the bfg cleanup
15:57 freimatz joined #git
15:57 felixjet julia_c, whats the error here then?
15:57 s17 should I just delete the remote and then push the repo again? :x
15:57 cjohnson oh woops I'm sorry
15:57 cjohnson git@
15:57 cjohnson that's what I meant to say
15:57 cjohnson so if your url is git@github.com that will use ssh
15:57 madewokherd joined #git
15:58 thiago felixjet: ssh://
15:58 thiago felixjet: are you asking what public keys are?
15:58 felixjet no
15:58 thiago felixjet: or are you asking just how to solve this problem?
15:58 cjohnson felixjet: what's the url you are cloning
15:58 felixjet i'm asking why i get permission denied on a public repo
15:58 thiago felixjet: because the server did not accept your key
15:58 felixjet i don't have any key
15:58 thiago felixjet: either the server is misconfigured or your ssh sent a wrong key
15:58 thiago that's also a reason
15:58 cjohnson felixjet: that's why then
15:58 cjohnson you are using an ssh url, it sounds like
15:58 cjohnson git@github.com is an ssh url
15:58 felixjet yes, i am
15:58 thiago the SSH server is configured to only accept authentication via keys. If you have none, there's no authentication. No access.
15:58 cjohnson so yeah that's why
15:59 cjohnson you can't connect to their ssh server
15:59 felixjet oh...
15:59 cjohnson to then clone git repo over
15:59 felixjet i guess someone has to update a readme then
15:59 cjohnson use the https url
15:59 cjohnson in the clone box on github you can select https in the second tab
15:59 felixjet i know
15:59 cjohnson well nah it's usually expected most people have github logins
15:59 cjohnson when they're cloning from github
15:59 felixjet i was just copy-pasting lazily the instructions from the readme
15:59 nexemacs joined #git
15:59 felixjet so i'll also PR the readme to the https URL
15:59 thiago SSH can be configured to accept anonymous authentication
16:00 thiago but GitHUb doesn't do that
16:00 cjohnson most people would prefer it to be the ssh url tbh felixjet
16:00 cjohnson I don't think you can push to https
16:00 felixjet but then you need a github account to download it?
16:00 qqx cjohnson: You can push via https
16:00 cjohnson yeah
16:00 cjohnson ok well I'm 0 for 2
16:00 cjohnson there's something disadvantageous about the https url
16:00 felixjet it doesn't make much sense. at least here -> https://github.com/TryGhost/Ghost#ghost-10-alpha-developer-install
16:00 qqx I'd say that https would probably be the more likely to just work for the most people.
16:00 thiago cjohnson: yeah, it doesn't use SSH keys :-)
16:01 felixjet maybe they're doing it this way because it's an alpha version
16:01 cjohnson thiago: something more practical than that
16:01 felixjet but i'm gonna create an issue anyway and ask for that, because it should be https
16:01 marcogmonteiro joined #git
16:01 felixjet ghost is a mainstream platform
16:01 felixjet it should work out of the box for most people
16:01 cjohnson Oh wait thiago is right
16:01 cjohnson the lack of ssh keys makes it inconvenient to develop for
16:02 cjohnson since you have to enter your github user/pass instead
16:02 cjohnson that's why I always use the git@ url
16:02 cjohnson if I'm devleoping for it
16:02 felixjet yeah, when you plan to make changes
16:02 cjohnson which it seems like those instructions are geared toward
16:02 cjohnson it says "developer" install
16:02 felixjet but this is a blog installation, doesn't make much sense to have the git@ url
16:02 cjohnson could be wrong on that though
16:02 qqx Git can be configured to do the substitution. I configure it to always use ssh for pusing to GitHub no matter how I did the clone.
16:02 felixjet yeah, maybe it's because its the alpha version
16:02 qqx https://github.com/aschrab/dotfiles/blob/master/config/git/config#L149-L153
16:03 cjohnson thanks qqx I will set that up
16:03 hhee joined #git
16:03 cjohnson beautiful
16:03 felixjet +1 on that alias
16:03 qqx That config and the following couple of lines also let me use gh:user/repo
16:04 LyndsySimon qqx: Thank you. That's beautiful.
16:05 LyndsySimon I always like to see others' dotfiles. Here's my gitconfig: https://github.com/lyndsysimon/dotfiles/blob/master/git/gitconfig
16:06 bronson joined #git
16:06 cjohnson https://github.com/chrisjohnson/home
16:06 rominron_ joined #git
16:07 Butt-Plugh joined #git
16:07 Butt-Plugh left #git
16:09 ToeSnacks joined #git
16:09 zeller joined #git
16:11 relipse joined #git
16:12 relipse I had some code that I need to delete. But I already merged the branch into my other "develop" branch. I've deleted the branch but how do I get the code off of develop. I tried git revert -m 1 47cb7826a0a
16:12 LyndsySimon qqx: There's a lot for me to chew on in your config...
16:12 masuberu joined #git
16:12 livingstn joined #git
16:13 LyndsySimon relipse: Is the merge of the code you want to remove the last commit on the branch?
16:13 YuGiOhJCJ joined #git
16:14 relipse LyndsySimon: not sure
16:14 dviola joined #git
16:14 marcogmonteiro joined #git
16:15 dviola joined #git
16:15 LyndsySimon Output of this command, please: git log --pretty=format:'%h|%s'
16:15 LyndsySimon Feel free to trim it to just after the commit you want to remove.
16:16 relipse Revert "merge branch '...'; Merge branch 'something else'
16:16 relipse no it is not the last commit
16:16 LyndsySimon Is there anything you want to keep after the merge?
16:16 relipse absolutely
16:16 LyndsySimon I'm out, then :)
16:16 relipse out of ideas?
16:17 LyndsySimon Nah, I know about what you need to do, but it's tricky enough I'm not comfortable walking you through it.
16:17 relipse shouldn't it revert -m 1 47cb7826a0a do the trick?
16:17 LyndsySimon You have two basic options as far as I know. The first is to do a revert commit, which really adds a new commit to the head of your branch that undoes the merge commit in question. It looks like you've done that.
16:17 relipse it = git
16:18 LyndsySimon Are you wanting to undo the merge, or remove the commits from the history?
16:18 relipse but how does reverting a merge commit undo all the commits in the merge?
16:18 elsevero joined #git
16:18 LyndsySimon If the commit you're reverting adds a line, the new commit revert creates removes it (and vice-versa)
16:18 blackwind_123 joined #git
16:18 cjohnson relipse: http://stackoverflow.com/a/7100005
16:19 jagob joined #git
16:20 LyndsySimon If what you're trying to do is actually remove the commits from the branch's history, you're looking at an interactive rebase. There are tons of reasons why you shouldn't do that.
16:21 cjohnson I agree on preferring revert over rebase
16:22 LyndsySimon Rule of thumb: you should never change history of a branch that someone else might have pulled. "Change history" includes rebasing or amending a commit.
16:23 Dougie1871 relipse: A revert commit undoes the changes that a commit brings in. If you revert a merge, you need to tell it which side of the merge you want to return to. So it undoes all of the changes that one side of the merge brings in as a result.
16:23 borkr joined #git
16:23 mehwork left #git
16:23 nitric joined #git
16:24 relipse yeah i'm confused
16:24 relipse what does -m 1 do?
16:25 Dougie1871 -m 1 chooses the side of the merge you want to return to.
16:25 Dougie1871 the 1 is the "parent number"
16:26 Dougie1871 so, you either get 1, or 2, in a 2 sided merge.
16:26 relipse so what is parent #1?
16:26 relipse and why are there 2 parents
16:26 Dougie1871 Because you merged two branches.
16:26 relipse no I didn't
16:26 Dougie1871 You did.
16:26 marianina8 joined #git
16:26 Dougie1871 A merge takes at least 2 branches.
16:26 Dougie1871 The one you're on, and the one you're merging in.
16:27 relipse ok i was on develop and I merged in foobar lets say
16:27 relipse now i want to unmerge foobar
16:27 Dougie1871 Right. So develop is the first parent.
16:27 Dougie1871 foobar is the second parent .
16:27 kexmex joined #git
16:27 osse joined #git
16:27 Dougie1871 so `git revert -m 1 <hash_to_merge_commit>` would "un-merge" foobar.
16:27 relipse so if i undo the merge commit with -m 1 that means I will keep develop?
16:27 Dougie1871 It doesn't really unmerge it though. It just removes the changes.
16:28 mknod joined #git
16:28 Dougie1871 relipse: yes.
16:28 relipse ok thank you
16:28 relipse and if i did -m 2 it would undo develop?
16:28 elsevero joined #git
16:28 osse joined #git
16:28 relipse i'm confused
16:28 Dougie1871 relipse: correct
16:29 drodger joined #git
16:29 relipse so that would be horrible if I did that
16:30 Dougie1871 It'd be unlikely that it's what you want in this specific case.
16:30 relipse i would undo everything done on develop and push it back up to the sserver
16:30 Dougie1871 no, it doesn't undo everything.
16:30 Dougie1871 It just undoes the changes brought in by that merge.
16:30 relipse then what's the point in specifying a parent?
16:30 Dougie1871 It creates a new patch that returns that specific merge commit back to one of the sides of the merge.
16:31 Dougie1871 Because you need to pick which side you want to return to.
16:31 rorro joined #git
16:31 kfoonamalik joined #git
16:31 Dougie1871 Ok, lets say you have develop and foobar merged in 5 commits ago.
16:31 relipse but you just said it undoes changes brought in by that merge
16:31 Dougie1871 So, it goes <a> - <b> - <c> - <d> - <e>
16:31 relipse ok...
16:31 Dougie1871 Where <a> is the merge commit you're working on
16:31 Dougie1871 err, the one you want to "remove"
16:32 livingstn joined #git
16:32 Dougie1871 `git revert -m 1 <a>` is going to make it look like: <a> - <b> - <c> - <d> - <e> - <f>
16:32 LyndsySimon For the purposes of this conversation, the history of commits on a branch are immutable. You are not changing history.
16:32 Dougie1871 Where <f> removes the changes in <a> by merging in foobar. So, it makes <a> look like <a>^ (it's parent, which was develop at the time).
16:33 LyndsySimon You are adding a new commit that does the opposite of the commit you're reverting.
16:33 Dougie1871 But, in a merge opposite is vague since there are multiple opposites.
16:33 relipse yes I understand that makes sense and that is what I want to do
16:33 Dougie1871 So, you need to pick which "opposite" you want to keep.
16:33 relipse but what if I choose -m 2
16:34 Dougie1871 If you choose -m2 it does the same thing (makes a new commit that's like <f> in the case above) but instead of having <f> revert <a> to <a>^, it reverts <a> to <a>^2
16:34 relipse now I'm confused again
16:34 relipse what is <a>^2 ?
16:35 Dougie1871 relipse: Ok, I think the best thing for you to do is play with it.
16:35 Dougie1871 <a>^2 is the second parent of <a>
16:35 relipse so at least tell me this
16:35 * LyndsySimon is going AFK for a bit.
16:35 relipse the majority of merge undos are with -m 1
16:35 Dougie1871 It depends a lot on your workflow.
16:35 Dougie1871 Or what you're trying to accomplish.
16:35 relipse i just don't see the need for -m 2
16:36 marcogmonteiro joined #git
16:36 Dougie1871 Until you have a need for -m 2
16:36 Dougie1871 relipse: It's not really safe to assume you won't need something like that ever.
16:36 relipse essentnially i want to revert all the commits in the branch that's it
16:36 relipse i have no idea wht the parent is
16:36 Dougie1871 But you do know what the parent is.
16:36 Dougie1871 It's part of the graph history.
16:36 rts-sander what about -m 3 for a three way merge
16:36 Dougie1871 `git log --oneline --graph --decorate`
16:36 Dougie1871 rts-sander: or -m 8 for an 8 way merge
16:37 Dougie1871 relipse: You can do  that log command I wrote to see the parents. First parents are on the left (I think at least). Alternatively, if you know the hash for <a> you can do: `git log -n 1 <a>^` to see what the first parent was and `git log -n 1 <a>^2` for the second parent.
16:38 dave0x6d joined #git
16:38 Dougie1871 relipse: Also, you can do `git log -n 1 <a>` and it'll say "merge <hash1> <hash2>" in the log output, where <hash1> is the first parent, and <hash2> is the second parent.
16:38 relipse ok i already did -m 1 hopefully that worked
16:39 relipse i still don't know what the 2nd parent is
16:39 relipse develop -- foobar -- but foobar descended from master
16:39 Dougie1871 relipse: http://stackoverflow.com/a/2222920
16:39 relipse ok thank you
16:41 drodger joined #git
16:41 theiostream joined #git
16:41 nexemacs joined #git
16:41 jnewt joined #git
16:42 rorro joined #git
16:45 elsevero joined #git
16:45 netj joined #git
16:45 MattMaker joined #git
16:48 mkoskar joined #git
16:49 ethali joined #git
16:56 yena joined #git
16:56 a3Dman joined #git
16:56 a3Dman joined #git
16:59 prg3 joined #git
17:05 Darcidride joined #git
17:11 mikecmpbll joined #git
17:11 aw1 joined #git
17:12 Es0teric joined #git
17:13 nowhereman joined #git
17:13 TomyLobo joined #git
17:13 snits joined #git
17:17 Darren_ joined #git
17:18 hhee joined #git
17:19 nixjdm joined #git
17:19 xcouop joined #git
17:23 dviola joined #git
17:23 Endarked joined #git
17:23 cahoots joined #git
17:23 cahoots hi, how can i git blame a line through a series of commits that only affected its leading whitespace?
17:24 thiago joined #git
17:24 robotroll joined #git
17:25 fenikso joined #git
17:25 yarekt cahoots: You'll have to extract the diffs for that line and do some processing of it
17:25 yarekt s/it/them/
17:27 cahoots yarekt, kk thx
17:27 User458764 joined #git
17:29 hahuang65 joined #git
17:29 j416 yarekt: nah
17:29 j416 cahoots: man git-blame look for -b
17:29 gitinfo cahoots: the git-blame manpage is available at http://jk.gs/git-blame.html
17:30 dviola joined #git
17:31 dviola joined #git
17:31 cahoots j416, thx :)
17:32 j416 :partyparrot:
17:32 * j416 convinced it's the idea that counts ^
17:33 j416 cahoots: actually I was wrong; I should probably check the man page myself before giving such advice; what I mean is -w
17:33 j416 cahoots: (git diff takes both -b and -w, where -b would have been preferable in your case)
17:36 msm joined #git
17:38 rominron_ joined #git
17:38 kpease joined #git
17:39 Brski joined #git
17:39 strayArch joined #git
17:41 MattMaker joined #git
17:43 livingstn joined #git
17:43 cagomez joined #git
17:43 dviola joined #git
17:44 prg3 joined #git
17:45 dviola joined #git
17:45 tyreld joined #git
17:45 SKYRAN joined #git
17:46 SKYRAN left #git
17:48 raynold joined #git
17:48 hahuang61 joined #git
17:50 Zialus joined #git
17:50 joki- joined #git
17:50 tvw joined #git
17:51 earnestea joined #git
17:56 elsevero joined #git
17:56 Dookie12 left #git
17:57 cagomez if I have a file with "changes to be committed", and I made some more changes, should I re-add the file, or reset the file, then add it again?
17:57 aielima joined #git
17:57 nexemacs joined #git
17:57 perlpilot cagomez: you don't "add a file" so much as you "add changes", so .... that first thing :)
17:58 cagomez perlpilot: so if I commit, will it contain the cumulative changes I have made?
17:58 SebastianFlyte joined #git
17:58 diogenese joined #git
17:59 perlpilot cagomez: after you've added those changes, sure.
17:59 timvisher joined #git
17:59 perlpilot cagomez: to see what will be committed, you can do "git diff --cached"
17:59 cagomez cool thanks!
18:00 unbalancedparen joined #git
18:01 perlpilot cagomez: also, you might find "git add -p" useful when you've made bunches of changes but only want to commit some of them
18:01 theiostream joined #git
18:02 MattMaker joined #git
18:03 zeroed joined #git
18:03 zeroed joined #git
18:03 Sasazuka joined #git
18:05 drodger joined #git
18:07 Es0teric joined #git
18:12 ertesx joined #git
18:13 Junior joined #git
18:14 theiostream joined #git
18:15 PioneerAxon joined #git
18:17 a3Dman joined #git
18:18 ash_workz when you install git, is that basically just unpacking commands?
18:18 ash_workz (and checking for SSH deps and what not?)
18:19 cagomez what happens if I git pull master while im in a branch? will it try to merge master into my branch?
18:21 hagridaaron joined #git
18:21 d^sh joined #git
18:23 Ryanar joined #git
18:24 d^sh joined #git
18:25 Es0teric joined #git
18:29 mgoodwin joined #git
18:29 cahoots so i see there's a new merge conflict with my branch and master, but i don't want to rebase my branch, merge master, or anything like that, because it would invalidate my cached build artifacts. how can i do a merge of a single file, or just see exactly what the conflicts are?
18:30 cahoots one thing would be to git apply the diff of that file between when my branch diverged and current master, but even that might invalidate the cache
18:30 cahoots j416, any thoughts?
18:31 osse cahoots: try the git-merge-file command
18:31 a3Dman joined #git
18:31 a3Dman joined #git
18:31 scoobertron joined #git
18:31 osse if you apply the diff then you just get the other version. you can use git checkout -p master -- file  to apply parts of it
18:32 ethali joined #git
18:32 j416 it seems like an odd workaround hm
18:32 Rodya_ joined #git
18:32 j416 cahoots: what exactly causes build artifacts to become invalidated?
18:33 j416 .s/causes/causes your/
18:33 cahoots j416, changes to files
18:33 osse also what does it mean ? :O
18:33 j416 cahoots: then, how can you merge _anything at all_?
18:33 j416 cahoots: do nothing; done.
18:34 j416 cahoots: what is your goal?
18:34 t0by joined #git
18:34 t0by joined #git
18:34 madewokherd clone your git repo and do it there
18:34 j416 cahoots: is it that you just want to see what will conflict in the merge?
18:34 j416 cahoots: in that case, just merge and then reset away the merge after.
18:35 j416 cahoots: if there's a conflict, you don't even have to do the full merge, just "git merge --abort" to abort.
18:35 cahoots osse, i see "git merge-file README.my README README.upstream". i want to do merge my current branch's README.my with master's, how would i do that?
18:36 j416 >.>
18:36 cahoots j416, but that will change the files, won't it?
18:36 j416 cahoots: so will merging one file.
18:36 cahoots madewokherd, yeah, it's just a really big repo and i'm running out of space
18:36 cahoots j416, yes but just one file, not lots. fewer artifacts invalidated
18:36 lyxus joined #git
18:36 j416 cahoots: building takes a lot of time, is that it?
18:37 cahoots yes
18:37 j416 I see.
18:37 unbalancedparen joined #git
18:38 j416 cahoots: and your build system looks at modified timestamp and not file contents?
18:39 cahoots j416, something like that
18:40 cahoots osse, i tried "git merge-file myfile base:myfile master:myfile"
18:40 j416 I've never been in that situation. :/
18:40 j416 cahoots: you could use git-worktree
18:40 j416 except that would create a new checkout
18:41 j416 and you can't afford that either maybe
18:41 madewokherd that'd be the same as cloning?
18:41 j416 no
18:41 ethali joined #git
18:41 j416 it'd not duplicate the repo, just the currently checked out filew
18:41 j416 files*
18:41 Squiggs joined #git
18:41 madewokherd but the objects in the newly cloned repo would be hard-linked by default anyway
18:42 j416 if cloned locally, true.
18:42 j416 cahoots: ^
18:43 j416 but then again I still don't know what the purpose of this merge is
18:43 * j416 times out
18:43 j416 o/
18:44 govg joined #git
18:45 theiostream joined #git
18:46 Gsham joined #git
18:47 mgoodwin left #git
18:48 kalpu joined #git
18:48 MineCoins joined #git
18:49 peterbecich joined #git
18:50 jaggz_ joined #git
18:52 de-vri-es joined #git
18:52 jaggz_ left #git
18:52 Dougie1871 left #git
18:56 User458764 joined #git
18:57 Es0teric joined #git
19:01 peterbec` joined #git
19:03 MarioBranco joined #git
19:03 AleksandarMNE joined #git
19:04 pothepanda joined #git
19:06 armyriad joined #git
19:07 TikityTik joined #git
19:09 rominron_ joined #git
19:09 Marumarsu joined #git
19:09 Zialus joined #git
19:11 dave0x6d joined #git
19:12 nicolai86 joined #git
19:17 Cabanossi joined #git
19:18 osse cahoots: you tried that. ok. then what happened?
19:18 osse it looks correct to me
19:19 toothe is there any software that'll analyze the dates of your git commits?
19:19 toothe like, to provide you with a general "you worked a lot during these months, not a lot during these" ?
19:19 Cabanossi joined #git
19:20 tango_ toothe: I wrote a script to do that
19:21 islesarev[m] joined #git
19:21 tango_ toothe: give me some 15 minutes and I'll try to share it
19:22 toothe okay!
19:23 Cabanossi joined #git
19:24 nicolai86 joined #git
19:25 Cabanossi joined #git
19:27 qsx joined #git
19:28 _rubik joined #git
19:28 cahoots osse, it didn't work, i had to write out the files from those branches to local files. which is fine, just not quite as easy
19:29 _rubik I was hoping someone here could tell me what web interface hes using on his personal vps:   https://code.fsociety.info/
19:29 prg3 joined #git
19:29 Rodya_ joined #git
19:30 mellernoia joined #git
19:30 mehola joined #git
19:35 osse cahoots: what exactly do you want?
19:35 osse edit the file merge-file produced, overwrite where you want the result to go with it. the end.
19:35 osse or... ?
19:40 theiostream joined #git
19:40 mohan joined #git
19:41 hahuang61 joined #git
19:43 Rodya_ joined #git
19:44 flavius joined #git
19:44 _Vi joined #git
19:44 leeN joined #git
19:44 chachasmooth joined #git
19:44 MarioBranco joined #git
19:45 zerow joined #git
19:46 sea-gull joined #git
19:50 marianina8 joined #git
19:51 re1 joined #git
19:52 Zialus joined #git
19:54 Marumarsu joined #git
19:54 jost_ joined #git
19:54 drodger joined #git
19:55 Squiggs joined #git
19:56 lb1c joined #git
19:56 duderonomy joined #git
19:56 Silenced joined #git
19:57 marianina8 joined #git
19:57 Marumarsu joined #git
19:58 ethali joined #git
19:59 LeMike joined #git
19:59 shinnya joined #git
20:00 raijin joined #git
20:02 ResidentBiscuit joined #git
20:06 Vortex35 joined #git
20:06 ZeroZeroZeroZero joined #git
20:08 Cabanossi joined #git
20:09 MattMaker joined #git
20:10 LionsMane joined #git
20:10 Marumarsu joined #git
20:11 MineCoins joined #git
20:12 m0viefreak joined #git
20:12 courrier joined #git
20:12 lb1c joined #git
20:14 kalpu left #git
20:14 orbyt_ joined #git
20:15 marianina8 joined #git
20:15 marianina8 joined #git
20:16 pwnz0r joined #git
20:17 h12o joined #git
20:18 tymczenko joined #git
20:18 durham_ joined #git
20:18 prg3 joined #git
20:19 raijin joined #git
20:19 anony joined #git
20:19 anony left #git
20:20 cdg joined #git
20:22 lyxus joined #git
20:23 _rubik joined #git
20:24 lucido joined #git
20:26 theoceaniscool joined #git
20:26 theiostream joined #git
20:26 Bennux joined #git
20:27 LeMike joined #git
20:27 kexmex joined #git
20:28 durham joined #git
20:29 tango_ toothe: https://github.com/Oblomov/git-chart
20:29 pks joined #git
20:30 skered joined #git
20:30 ResidentBiscuit joined #git
20:30 toothe ncie man!
20:32 peterbecich joined #git
20:36 tango_ toothe: it's complete crap, you might also want to look at flashcode/gitchart
20:36 tango_ which might be more mature and maintained, this is just something I hacked up a couple of years ago
20:37 toothe ahh
20:37 toothe in a nutshell, how does it work?
20:37 toothe does it read the .git directory directly?
20:38 qqx joined #git
20:41 irqq joined #git
20:41 rominronin joined #git
20:41 flavius joined #git
20:41 xaa__ joined #git
20:42 shgysk8zer0 joined #git
20:43 unbalancedparen joined #git
20:44 ivanfon joined #git
20:46 def_jam joined #git
20:46 eb0t_ joined #git
20:48 ojacobson toothe: through Git's command-line API: https://github.com/flashcode/gitchart/blob/master/gitchart.py#L157-L161
20:49 tango_ toothe: for mine, just run git-chart from the workdir of the repository
20:49 tango_ you might need to add it to the path
20:49 rschneberger joined #git
20:49 tango_ (in fact, if it's in the path you can simply use `git chart` without the dash)
20:50 Marumarsu joined #git
20:51 ddavidd Someone didn't pull my edits and ended up mashing over a change. Can I pull a specific file from a commit and merge it with the current?
20:51 _Vi joined #git
20:52 flavius joined #git
20:55 pks joined #git
20:55 peterbec` joined #git
20:56 zerow joined #git
20:57 _Vi joined #git
20:58 vdv joined #git
20:59 vdv hi all
20:59 vdv in a bare repository, fsck --unreacheable reports a bunch of blobs and commits
20:59 vdv how can i remove them? git gc --prune=now --all does not do it
21:00 ToxicFrog ddavidd: git checkout <commit> -- <path> ?
21:00 Emperor_Earth joined #git
21:05 thiago joined #git
21:08 oleo joined #git
21:09 BananaDog joined #git
21:09 cahoots osse, how might i do a git log for changes to a specific file, and it would also show me what the change was with each commit?
21:11 MarioBranco joined #git
21:12 qqx cahoots: git log -p <path>
21:12 jimi_ joined #git
21:15 thierryp joined #git
21:16 MattMaker joined #git
21:16 jost__ joined #git
21:16 MattMaker joined #git
21:17 MarioBranco joined #git
21:17 aidalgol joined #git
21:17 govg joined #git
21:18 theoceaniscool joined #git
21:19 raijin joined #git
21:20 gk_1wm_su joined #git
21:20 askb joined #git
21:20 eb0t joined #git
21:20 eblip joined #git
21:22 tymczenko joined #git
21:23 cahoots thanks
21:23 cahoots qqx
21:25 meLon joined #git
21:25 meLon joined #git
21:26 alexander joined #git
21:27 star_prone joined #git
21:27 Guest51648 left #git
21:28 dsdeiz joined #git
21:28 dsdeiz joined #git
21:28 cahoots_ joined #git
21:29 rwb joined #git
21:29 Ryanar joined #git
21:30 theiostream joined #git
21:31 mehola joined #git
21:32 jeffreylevesque joined #git
21:33 b100s joined #git
21:33 aidalgol joined #git
21:33 theiostream joined #git
21:36 unbalancedparen joined #git
21:37 raijin joined #git
21:37 karols146 joined #git
21:38 sunrunner20 Is it still needed to keep checkins to subtrees and the root project desperate?
21:40 durham joined #git
21:43 aielima joined #git
21:43 govg joined #git
21:48 relipse Hello
21:49 relipse my git is not exactly right.  It won't let me git checkout <branch> I have to do git checkout origin/<branch> and then it is in detached head state
21:50 durham joined #git
21:51 Vampire0 relipse, !repro
21:51 gitinfo relipse: [!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
21:52 pks joined #git
21:53 mrcirca joined #git
21:54 Dougie187 joined #git
21:54 relipse https://gist.github.com/anonymous/300116611ba7d4cabe9962fbee374403
21:54 mrcirca hello, how can i change the author mail at previous commits?
21:55 marianina8 joined #git
21:57 qqx relipse: What version of git are you using?
21:57 Vampire0 relipse, what Git version is this?
21:57 Vampire0 relipse, current versions should create a local branch named like the remote branch and check it out if you use the first variant
21:58 relipse git version 2.11.0 (Apple Git-81)
21:58 Ryanar joined #git
21:58 Vampire0 relipse, hm, strange
21:58 Vampire0 relipse, you can do it manually of course by using `git checkout -b feature/SETUAT-150-custom-report-request origin/feature/SETUAT-150-custom-report-request'
21:58 cagomez joined #git
21:58 Vampire0 relipse, but I think it should simply work
21:59 preaction mrcirca: you can use git-rebase or git-filter-branch. this will !rewrite history though
21:59 gitinfo mrcirca: 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
21:59 govg joined #git
21:59 qqx relipse: Do you have multiple remotes with a matching branch?
21:59 Vampire0 Ah, that could be
21:59 relipse I don't know?
21:59 relipse I don't think so?
22:00 Vampire0 relipse, what does `git remote -v` say`
22:00 Vampire0 ?
22:00 relipse oh you are right!
22:00 relipse how do i dleete my duplicate remotes
22:00 Vampire0 relipse, man git remote
22:00 gitinfo relipse: the git-remote manpage is available at http://jk.gs/git-remote.html
22:00 tmg joined #git
22:01 p4trix joined #git
22:01 h12o joined #git
22:01 marianina8 joined #git
22:01 peterbec` joined #git
22:01 lavalamp joined #git
22:04 mrcirca i only wrote the history, but i had not config my email
22:04 raijin joined #git
22:06 futuristic joined #git
22:06 styx_ joined #git
22:07 lavalamp joined #git
22:09 afuentes joined #git
22:09 courrier joined #git
22:13 rominronin joined #git
22:17 hahuang61 joined #git
22:18 aielima joined #git
22:20 kbeflo joined #git
22:22 raijin joined #git
22:22 fatalhalt joined #git
22:24 thiago joined #git
22:25 Acerific joined #git
22:25 Acerific joined #git
22:30 kbeflo_ joined #git
22:31 pwnz0r joined #git
22:32 kbeflo__ joined #git
22:37 lmatteis joined #git
22:41 raijin joined #git
22:46 thierryp joined #git
22:47 todd_dsm joined #git
22:49 venmx joined #git
22:50 oskarkv joined #git
22:56 safe joined #git
23:01 om_henners joined #git
23:02 P4nther joined #git
23:03 peterbec` joined #git
23:04 theoceaniscool joined #git
23:05 dviola joined #git
23:07 plasticle joined #git
23:08 peterbecich joined #git
23:10 madewokherd joined #git
23:12 Marumarsu joined #git
23:21 warthog9 joined #git
23:21 digidog joined #git
23:28 menip joined #git
23:31 venmx joined #git
23:32 mehola joined #git
23:32 h12o joined #git
23:36 a3Dman joined #git
23:36 a3Dman joined #git
23:38 nowhereman joined #git
23:39 zumba_addict joined #git
23:40 zumba_addict hey folks, is there something wrong with naming a branch like this? 1.1.1
23:40 preaction no
23:40 zumba_addict thanks
23:40 zumba_addict i'll have to reclone it since our Jenkins job is failing
23:40 Svecify joined #git
23:41 zumba_addict i think something is wrong with our code
23:41 zumba_addict I see jenkins can check it out
23:41 Noodlewitt joined #git
23:43 DarkPsydeLord joined #git
23:44 rominronin joined #git
23:47 irqq_ joined #git
23:48 thierryp joined #git
23:49 pwnz0r joined #git
23:50 wizardedit joined #git
23:50 wizardedit joined #git
23:50 Uneliasmarsu joined #git
23:50 kbs left #git
23:52 zumba_addict i can't figure it out. I'm not sure why our npm install is doing this command `git rev-list -n1 somestring`
23:53 iamthad joined #git
23:54 drodger joined #git
23:54 juvenal joined #git
23:59 sbeller_ joined #git

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