Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-23

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

All times shown according to UTC.

Time Nick Message
00:01 bannakaffalatta joined #git
00:02 catsup joined #git
00:03 tmsmith joined #git
00:03 sdothum joined #git
00:03 plateauoftrooper joined #git
00:04 cdown joined #git
00:04 tterrag joined #git
00:05 ygeLN joined #git
00:08 brechtm joined #git
00:08 cdown_ joined #git
00:08 catsup joined #git
00:08 anonymuse joined #git
00:08 brechtm Can anyone running Git for Windows paste their $PATH for me?
00:08 Siegfried joined #git
00:10 brechtm (from within Git bash)
00:12 Vampire0 brechtm, why?
00:13 brechtm Vampire0: I'm running MSYS2 with git-for-windows installed (using MSYS2's pacman), but I'm wondering what Git bash's PATH looks like
00:13 brechtm Specifically, does Git bash run cmd/git.exe or bin/git.exe?
00:14 catsup joined #git
00:14 feodaron joined #git
00:14 brechtm They handle paths differently. cmd/git.exe prints Windows-style paths, bin/git.exe POSIX-style
00:15 justanotheruser joined #git
00:15 brechtm Vampire0: but I don't suppose you're running Windows? :-)
00:15 meadmoon joined #git
00:18 brechtm I think I found an answer here: http://stackoverflow.com/a/14452151/438249
00:19 leptone joined #git
00:19 leptone how do i configure git so that I dont have to provide my github creds everytime i do a git push origin branch
00:20 catsup joined #git
00:21 Vampire0 brechtm, I use both *nix and Windows and there Git from the cmd.exe and from Cygwin, but I have a very custom PATH, so it is probably not the right example for you *g*
00:21 Tatou joined #git
00:21 Tatou I added a bunch of files to a folder under git
00:22 Tatou I never tracked them. How do you remove these? 'git clean -n' shows nothing
00:22 Vampire0 brechtm, it seems Git Bash is running /mingw64/bin/git.exe
00:22 brechtm Vampire0: you checked that on your system?
00:22 Vampire0 leptone, use SSH, not https
00:22 Tatou ah ha! I got it.
00:22 leptone Vampire0, huh?
00:23 Guest32_ joined #git
00:23 leptone Vampire0, i use: git push from command line
00:23 Vampire0 brechtm, yes
00:23 Tatou left #git
00:23 brechtm Vampire0: thanks
00:23 King_Hual joined #git
00:23 Vampire0 brechtm, and that is not what I normally run, as I normally use Cygwin with a symlink to cmd/git.exe
00:24 Vampire0 leptone, yes, still what I said, use ssh not https
00:24 Vampire0 leptone, you can have a remote URL like https://github.com... or git@github.com:...
00:24 leptone Vampire0, is that like in a config file or something?
00:24 Vampire0 leptone, use the second one
00:24 [0xAA] joined #git
00:24 Vampire0 leptone, it is the remote URL you have cloned from
00:24 Vampire0 leptone, man git remote
00:24 gitinfo leptone: the git-remote manpage is available at http://jk.gs/git-remote.html
00:25 leptone Vampire0, i feel like theres a way to save my gh cred in my git profile or something, no?
00:25 brechtm leptone: but you'll need to set up an SSH key, and use ssh-agent
00:25 jw4242 joined #git
00:25 leptone i use git push to origin from my mac and it doesn't ask for my cred each time
00:26 Darren_ joined #git
00:26 catsup joined #git
00:26 leptone but when i push to origin from ubuntu it does
00:26 Vampire0 leptone, check whether you use ssh or https on Mac, I guess you use ssh as I suggested
00:26 leptone is there a way to provide the os my creds one time so it has them saved and doesnt as for verification each time
00:27 Vampire0 leptone, !justdoit
00:27 gitinfo leptone: If you go to the trouble of asking questions, please go to the trouble of taking the advice offered, Take backups (type "!backup" as a reply to learn more) if necessary -- or in fact, it's a good idea anyway. You can almost always censor log messages if you have to.  We are literally helpless unless you tell us what we need or do what we ask.  Please, Just Do It™.
00:27 brechtm leptone: on Mac Keychain can manage SSH keys (or their passwords at least)
00:27 leptone Vampire0, pretty sure im using the same protocol, i set up origin by doing the git remote add command that GH gives me when i create a new gh repo
00:28 leptone Vampire0, dude.... im looking into your response
00:28 shgysk8zer0 joined #git
00:28 Vampire0 leptone, GitHub can give you both URLs, if I add a new repo it gives me the SSH url, not the HTTPS url
00:30 BrianJ joined #git
00:30 King_Hual joined #git
00:31 cdown joined #git
00:31 ResidentBiscuit joined #git
00:32 catsup joined #git
00:34 peepsalot joined #git
00:35 WhiskerBiscuit joined #git
00:36 rominronin joined #git
00:37 bb010g joined #git
00:38 catsup joined #git
00:43 eljefeloco joined #git
00:44 catsup joined #git
00:44 King_Hual joined #git
00:44 King_Hual joined #git
00:46 toothrot joined #git
00:46 toothrot joined #git
00:47 Guest32 joined #git
00:48 Gsham joined #git
00:50 catsup joined #git
00:50 King_Hual joined #git
00:50 King_Hual joined #git
00:50 Lancien joined #git
00:55 sysadmin joined #git
00:55 catsup joined #git
00:58 bronson joined #git
00:58 ome joined #git
00:58 WaReZ joined #git
01:01 catsup joined #git
01:02 weckstrom joined #git
01:04 WayToDoor joined #git
01:07 catsup joined #git
01:07 Rodya_ joined #git
01:11 shgysk8zer0 joined #git
01:12 chompolario joined #git
01:13 catsup joined #git
01:14 jccn joined #git
01:18 Gsham joined #git
01:19 catsup joined #git
01:20 dysfigured joined #git
01:21 tsdev joined #git
01:24 dysfigured when i clone a repo with https://… and then i try to push to it, i need to give credentials.. if i edit .git/config and s|https://|ssh://git@| this fixes it.. is there a way to automate this with a command?
01:24 JanC_ joined #git
01:24 osse dysfigured: man gitcredentials
01:24 gitinfo dysfigured: the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
01:25 catsup joined #git
01:26 Hello71 don't clone with https?
01:27 Hello71 "i did rm -rf / and it deleted all my files, if i use photorec this fixes it.. is there a way to automate this with a command?"
01:28 ktoverso joined #git
01:28 dysfigured Hello71: well sure, but that requires foresight, i'm just wondering if there's a better way to fix this mistake i keep making instead of fixing it manually.
01:29 dysfigured your analogy is a bit extreme. and completely unhelpful.
01:30 rewt you can change the origin url; man git remote
01:30 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
01:31 catsup joined #git
01:32 _rnsanchez_ joined #git
01:34 weckstrom joined #git
01:35 WayToDoor joined #git
01:36 catsup joined #git
01:38 nivag joined #git
01:42 catsup joined #git
01:46 Mavericks joined #git
01:47 Mavericks hello I've a bitbucket branch where I make commits/and do a rebase with team commits, and another main branch where team or collaborators push commits . how do I push my commits from the first branch to the second one and preserve the history/timeline of commits as is ?
01:48 Mavericks as in the first branch ?
01:48 sanjoyd left #git
01:48 catsup joined #git
01:52 nettoweb joined #git
01:54 catsup joined #git
01:54 pbrewczynski joined #git
01:55 Vampire0 Mavericks, you either merge your branch into the main branch, or rebase your branch onto the main branch, then you push the main branch
01:56 Mavericks Vampire0:  i did the second one ., thanks again
02:00 bronson joined #git
02:00 catsup joined #git
02:01 nettoweb joined #git
02:02 kwern joined #git
02:03 rchavik joined #git
02:05 Mavericks what rebase option do I specify to reorder commits based on time ?
02:05 Mavericks Vampire0:
02:06 d0nn1e joined #git
02:06 catsup joined #git
02:07 Goplat joined #git
02:07 rominronin joined #git
02:07 Vampire0 Mavericks, -i and then order as you like
02:09 howitdo joined #git
02:09 mda joined #git
02:12 dar123 joined #git
02:12 intransit joined #git
02:12 catsup joined #git
02:14 paraparity joined #git
02:18 finalbeta joined #git
02:18 catsup joined #git
02:21 Guest32 joined #git
02:22 ISmithers joined #git
02:24 catsup joined #git
02:27 ejb joined #git
02:27 plos joined #git
02:29 plos joined #git
02:30 catsup joined #git
02:31 jimi_ joined #git
02:31 plos joined #git
02:32 leah2 joined #git
02:32 thiago joined #git
02:32 pks joined #git
02:33 d^sh joined #git
02:34 ResidentBiscuit joined #git
02:35 ResidentBiscuit joined #git
02:36 catsup joined #git
02:40 plos joined #git
02:41 duderonomy joined #git
02:46 catsup joined #git
02:46 howdoi joined #git
02:46 Vampire0_ joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:49 Anja joined #git
02:52 chigang joined #git
02:53 e joined #git
02:54 catsup joined #git
02:55 aavrug joined #git
02:55 moei joined #git
02:57 thiago joined #git
03:00 catsup joined #git
03:00 bruce_lee joined #git
03:00 bruce_lee joined #git
03:02 rnsanchez_ joined #git
03:04 JamesBaxter joined #git
03:06 catsup joined #git
03:09 plos joined #git
03:11 Andrew_K joined #git
03:12 Gsham joined #git
03:12 chachasmooth joined #git
03:12 catsup joined #git
03:18 catsup joined #git
03:18 ejb joined #git
03:18 thiago joined #git
03:19 [Saint] joined #git
03:20 fzxi joined #git
03:21 pypi_ joined #git
03:22 cqi joined #git
03:24 catsup joined #git
03:24 frostythesnowman joined #git
03:25 pks joined #git
03:26 rafasc joined #git
03:27 rafasc is it possible to have sparse checkout only in one branch?
03:29 mostlybadfly joined #git
03:30 catsup joined #git
03:31 Siegfried joined #git
03:32 Nilesh_ joined #git
03:34 Vortex35 joined #git
03:36 catsup joined #git
03:37 Emperor_Earth joined #git
03:38 tmg joined #git
03:40 rominronin joined #git
03:41 Castor_Troy joined #git
03:41 Castor_Troy What is the normal practice followed to check if there are new commits on the remote? Do you guys check everyday in the morning?
03:42 catsup joined #git
03:42 hexagoxel joined #git
03:43 fk joined #git
03:44 eizua joined #git
03:45 fragMental joined #git
03:46 mand0 joined #git
03:48 catsup joined #git
03:50 HedgeMage Castor_Troy: It depends on the project and my role in it.
03:51 HedgeMage Castor_Troy: I can offer a couple of examples, if that helps.
03:52 HedgeMage Project A, small project, slow-moving, non-critical, 2-3 contributors:  I fetch when someone gives me a heads-up that they'd like me to look at something, or when something I'm working on is far enough along that I want to rebase and get it ready to merge to master.
03:53 rafasc left #git
03:53 fk joined #git
03:53 robnester joined #git
03:54 a_thakur joined #git
03:54 catsup joined #git
03:54 Castor_Troy Ok.
03:55 Castor_Troy I am getting confused on when to rebase and when to do merge. Is there a good article on the internet which explains in ELI5 terms ?
03:56 HedgeMage Project B, big project, complex, 15+ person team, I'm the software security expert, not a core developer: I fetch before I sit down to work on anything, but that can be a couple times/day or not for a couple of weeks depending on how often they really need me.
03:57 HedgeMage Project C, also big and complex with a huge team, but I'm still watching them pretty closely (also an infosec rather than a core dev role here): I have an automated fetch set up that runs some checks on the repo daily, but I also fetch when working.
03:57 Castor_Troy joined #git
03:57 sunri5e joined #git
03:57 HedgeMage wb, Castor_Troy
03:57 HedgeMage you missed:
03:57 HedgeMage Project C, also big and complex with a huge team, but I'm still watching them pretty closely (also an infosec rather than a core dev role here): I have an automated fetch set up that runs some checks on the repo daily, but I also fetch when working.
03:57 Castor_Troy My intenrnet is not good.. Thanks for reposting
03:58 Castor_Troy automated fetch setup. how does that work. do we run some scripts?
03:58 joebobjoe joined #git
03:59 HedgeMage Project D, I'm a consumer rather than a contributor.  I fetch when I'm considering doing something with a new version when it goes stable and I want to get nosy and see what's coming up.
03:59 ochorocho__ joined #git
03:59 HedgeMage Castor_Troy: Yeah, I just have a couple of custom scripts on one of my spare boxes @work.
04:00 joebobjoe left #git
04:00 catsup joined #git
04:00 bronson joined #git
04:00 Castor_Troy question about rebase. I know that doing a merge will add an auto-commit, is that the only difference between merge and rebase ?
04:06 catsup joined #git
04:06 Castor_Troy HedgeMage, ??
04:08 HedgeMage !rebase
04:08 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.
04:08 Samual joined #git
04:08 HedgeMage Castor_Troy: Does that help?
04:09 Castor_Troy not really. i know that rebase could be used to make commits look like linear. dont know when i should use rebase and when i should use merge.
04:09 Sasazuka joined #git
04:09 safe joined #git
04:09 Castor_Troy i know this topic cant be explained on irc, but i will search for some articles on the internet.
04:09 HedgeMage Castor_Troy: Are you familiar with the idea of branching models in general?
04:10 Castor_Troy yes. git branch <branchname> or git checkout -b branch
04:10 HedgeMage Well, those are some commands associated with using branches, but that's not what's meant by a "branching model"
04:11 HedgeMage That's like saying "woden beams and doors" is what's meant by "architecture"
04:11 Castor_Troy ok. i know that we create branches when we want to work on some features
04:11 Castor_Troy i think i should read that progit book.
04:11 HedgeMage A branching model is a particular project's approach to organizing work into branches, tagging, etc.
04:11 HedgeMage yes :)
04:12 Castor_Troy I read it long back, but havent worked on git.. so i forgot everything. will read that book. thanks
04:12 HedgeMage When to merge vs. rebase depends a lot on your branching model -- your strategy for managing and organizing within branches. :)
04:12 catsup joined #git
04:12 Castor_Troy I dont seem to understand the benefits of using merge.
04:13 kadoban Castor_Troy: merge records what actually happened, and doesn't change history
04:14 kadoban Changing history is typically to be avoided when that history has been shared.
04:14 Muzer joined #git
04:14 svm_invictvs joined #git
04:14 Castor_Troy I better read that book instead of bothering you guys with all this trivial stuff.
04:14 HedgeMage if I have a small feature branch, I'm probably going to rebase before publishing, especially if it's been sitting on my hard drive a while.
04:15 breezy_ joined #git
04:15 Castor_Troy I think my problem is that i dont have any thing to practice this stuff on.
04:17 HedgeMage However, if I'm taking the big collaborative dev branch and merging it to stable to make a release, that's a merge.
04:17 HedgeMage *to master to make a release
04:18 catsup joined #git
04:18 Castor_Troy Oh, I get it.
04:19 tmsmith joined #git
04:23 swalladge_ joined #git
04:23 svm_invictvs joined #git
04:23 shgysk8zer0 joined #git
04:24 catsup joined #git
04:25 Castor_Troy thanks HedgeMage
04:28 fstd_ joined #git
04:29 tmsmith joined #git
04:29 rowanj joined #git
04:30 Sasazuka joined #git
04:30 catsup joined #git
04:33 shgysk8zer0 joined #git
04:36 catsup joined #git
04:37 cebor joined #git
04:37 jimi_ joined #git
04:38 GodGinrai joined #git
04:39 tcurdt joined #git
04:39 Vaelater1 joined #git
04:40 kpraveen joined #git
04:42 catsup joined #git
04:43 khagler joined #git
04:44 Limes joined #git
04:46 aruns joined #git
04:47 catsup joined #git
04:49 breezy_ joined #git
04:53 catsup joined #git
04:53 Anja joined #git
04:55 Anja joined #git
04:55 venmx joined #git
04:58 subhojit777 joined #git
04:59 catsup joined #git
05:00 bronson joined #git
05:00 Derderde1d joined #git
05:05 catsup joined #git
05:05 weckstrom joined #git
05:07 Siegfried joined #git
05:10 catsup joined #git
05:12 Derderderd joined #git
05:14 Siegfried joined #git
05:14 brent__ joined #git
05:14 ochorocho__ joined #git
05:15 GT4066 joined #git
05:16 johnny56_ joined #git
05:16 catsup joined #git
05:19 Cabanoss- joined #git
05:21 ayogi joined #git
05:21 Siegfried joined #git
05:22 catsup joined #git
05:24 Raging_Hog joined #git
05:25 svm_invictvs joined #git
05:28 catsup joined #git
05:31 Sasazuka joined #git
05:31 anonymuse joined #git
05:31 diogenese joined #git
05:33 catsup joined #git
05:34 dar123 joined #git
05:36 Naan joined #git
05:37 howitdo joined #git
05:39 catsup joined #git
05:43 Sasazuka joined #git
05:45 catsup joined #git
05:45 a_thakur joined #git
05:45 nckpz joined #git
05:46 Shentino joined #git
05:46 aw1 joined #git
05:50 snowkidind joined #git
05:50 catsup joined #git
05:56 catsup joined #git
06:02 catsup joined #git
06:04 freimatz joined #git
06:05 Siegfried joined #git
06:08 catsup joined #git
06:08 clemf joined #git
06:10 ayjay_t joined #git
06:10 rijun joined #git
06:10 ayjay_t joined #git
06:11 rominronin joined #git
06:13 bocaneri joined #git
06:14 catsup joined #git
06:15 ochorocho__ joined #git
06:16 ayjay_t hey is there a way to get http-backend to redirect to a webpage if someone navigates there by browser
06:18 Siegfried joined #git
06:19 catsup joined #git
06:20 rnsanchez_ joined #git
06:21 svm_invictvs joined #git
06:21 star_prone joined #git
06:25 catsup joined #git
06:27 kpraveen joined #git
06:30 svm_invictvs joined #git
06:31 catsup joined #git
06:31 rtm1046 joined #git
06:35 svm_invictvs joined #git
06:36 catsup joined #git
06:38 jaguarmagenta joined #git
06:39 GodGinrai joined #git
06:41 nydel07 joined #git
06:42 catsup joined #git
06:44 ThomasLocke joined #git
06:47 catsup joined #git
06:50 [0xAA] joined #git
06:51 Domhack joined #git
06:52 SwiftMatt joined #git
06:53 catsup joined #git
06:55 hendry joined #git
06:55 cqi joined #git
06:56 venmx joined #git
06:58 catsup joined #git
07:00 dermoth joined #git
07:02 nisseni joined #git
07:03 catsup joined #git
07:05 zzz joined #git
07:07 zeroed joined #git
07:07 cdown joined #git
07:08 phanimahesh joined #git
07:09 catsup joined #git
07:09 cdown_ joined #git
07:11 Doginal joined #git
07:13 rominronin joined #git
07:15 venmx joined #git
07:15 star_prone joined #git
07:15 ogny joined #git
07:17 Darren_ joined #git
07:17 byte512 joined #git
07:18 roelmonnens joined #git
07:20 qt-x joined #git
07:22 zeroed joined #git
07:22 zeroed joined #git
07:22 zeroed joined #git
07:24 phanimahesh joined #git
07:25 pwnz0r joined #git
07:26 cyan__ joined #git
07:27 nidr0x joined #git
07:30 jast ayjay_t: not in http-backend itself, but you can detect what kind of request you're getting. in man git-http-backend the ScriptAliasMatch config for Apache is an example of how you might set it up. basically you take only the specific requests that are used by git's HTTP transport and send them to git-http-backend
07:30 gitinfo ayjay_t: the git-http-backend manpage is available at http://jk.gs/git-http-backend.html
07:30 freimatz joined #git
07:37 lordjancso joined #git
07:43 m1dnight_ joined #git
07:44 xpk joined #git
07:51 cyan__ joined #git
07:53 ctcrnitv joined #git
07:53 GodGinrai joined #git
07:54 SwiftMatt joined #git
07:54 ctcrnitv is there a way to make git track any/all changes to file permissions?
07:55 ctcrnitv it seems to track some changes to permissions, but not others
07:55 rvalue Pretty sure it tracks anything that maps to *nix user/group/other read/write/execute
07:56 netj joined #git
07:57 _ikke_ It tracks only the x bit
07:57 Singmyr joined #git
07:57 ctcrnitv yeah. any way I could force it to track w change?
07:57 venmx joined #git
07:57 _ikke_ nope, not within git
07:57 ctcrnitv not even a hacky way?
07:57 rvalue _ikke_: that makes sense, I'd expect the user who checked out the file to be able to read and write it
07:58 SteffanW joined #git
07:58 rvalue Yeah, just use a post-update hook
07:58 ayjay_t thanks jast!i ended up fidning it in the man, i guess i skipped over it when i first read it
07:59 jast ctcrnitv: you could look at how, for instance, etckeeper does it. I believe it adds an extra file with permissions metadata or something.
08:00 jast !etckeeper
08:00 gitinfo etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://etckeeper.branchable.com
08:00 ctcrnitv hm, interesting stuff. I'll look into it thanks for the advice
08:01 jast you'll definitely have some scripting ahead of you, no matter how you do it
08:02 spacelord_ joined #git
08:03 rvalue left #git
08:06 m1dnight_ joined #git
08:06 rvalue joined #git
08:09 troulouliou_div2 joined #git
08:11 PHPanos joined #git
08:12 ayjay_t joined #git
08:13 a_thakur joined #git
08:13 googleye-bukolay joined #git
08:14 star_prone joined #git
08:14 star_prone joined #git
08:14 googleye-bukolay left #git
08:15 www-bukolay-com joined #git
08:15 overlord_tm joined #git
08:16 theoceaniscool joined #git
08:16 ochorocho__ joined #git
08:17 m1dnight2 joined #git
08:17 _rnsanchez_ joined #git
08:18 finalbeta joined #git
08:22 [0xAA] joined #git
08:23 a_thakur joined #git
08:24 diogenese joined #git
08:27 heroux joined #git
08:33 dreiss joined #git
08:39 a_thakur joined #git
08:40 flaviodesousa joined #git
08:40 Balliad joined #git
08:43 eduardas_m joined #git
08:48 ktoverso joined #git
08:49 diogenese joined #git
08:52 pwnz0r joined #git
08:56 SwiftMatt joined #git
08:56 nettoweb joined #git
08:56 PCatinean joined #git
08:57 elastix joined #git
09:02 rory joined #git
09:02 brechtm joined #git
09:03 rory Hi. I have forked a large project around a year ago. Since then, the codebase has changed beyond recognition, and I have found it would have been better to take a "hard" fork at the time because I'm not interested in the pre-fork history
09:03 rory Most of the size of the repository is in large binary blobs from the old project, which have been removed in early commits
09:03 rory Is there any way to flatten the entire history before my fork point, and remove blobs which are no longer present?
09:03 YuGiOhJCJ joined #git
09:04 phanimahesh joined #git
09:04 brechtm dysfigured: re https/ssh - pushInsteadOf might be useful
09:07 mahendratech joined #git
09:08 venmx joined #git
09:08 cyan__ joined #git
09:10 brechtm dysfigured: for example, add to your .gitconfig a section     [url "git@github.com:"]      with entry     pushInsteadOf = https://github.com/
09:11 afuentes joined #git
09:13 kurkale6ka joined #git
09:14 tarkus joined #git
09:22 marcogmonteiro joined #git
09:23 rominronin joined #git
09:23 vuoto joined #git
09:23 rominron_ joined #git
09:26 troulouliou_div2 joined #git
09:27 hegge joined #git
09:28 b100s joined #git
09:28 Jackneill joined #git
09:31 willlondon joined #git
09:31 grift joined #git
09:34 rtm1046 joined #git
09:34 bernardio joined #git
09:37 pwnz0r joined #git
09:39 jaguarmagenta joined #git
09:39 Vortex35 joined #git
09:41 Juzzika joined #git
09:44 zeroed joined #git
09:44 zeroed joined #git
09:48 hardenedapple joined #git
09:49 ktoverso joined #git
09:56 achadwick joined #git
09:59 g5pw joined #git
10:00 zeroed joined #git
10:00 zeroed joined #git
10:02 Gr33nW0lf joined #git
10:02 rory I cloned a repo with "git clone --mirror" so I could run BFG on it. I've now run BFG on it, how do I turn it back into "real" copy of the repo so I can do regular git stuff?
10:03 rory I have this directory "repo.git"
10:04 Serpent7776 joined #git
10:04 overlord_tm joined #git
10:08 Hink joined #git
10:09 mazert joined #git
10:09 venmx joined #git
10:13 timothy rory: git clone repo.git repo
10:14 dviola joined #git
10:16 howitdo joined #git
10:16 Gloomy joined #git
10:17 ochorocho__ joined #git
10:17 somaReverse joined #git
10:20 Gr33nW0lf joined #git
10:27 a_thakur joined #git
10:38 a_thakur joined #git
10:45 a_thakur_ joined #git
10:49 g_zen joined #git
10:49 rominronin joined #git
10:50 GavinMagnus joined #git
10:51 dan2k3k4 joined #git
10:51 ToBeCloud joined #git
10:52 gareppa joined #git
10:54 thunderbirdtr joined #git
10:54 troulouliou_div2 joined #git
10:56 a_thakur joined #git
11:00 a_thakur joined #git
11:00 davimore_ joined #git
11:01 dan2k3k4 joined #git
11:02 ki0 joined #git
11:10 venmx joined #git
11:19 hardenedapple joined #git
11:23 dave0x6d joined #git
11:26 lordjancso joined #git
11:26 codezera joined #git
11:27 m0viefreak joined #git
11:28 plos joined #git
11:32 vrlx joined #git
11:34 Gloomy joined #git
11:36 Nikitaw99 joined #git
11:38 chll_ joined #git
11:39 plos joined #git
11:40 jaguarmagenta joined #git
11:41 eljefeloco joined #git
11:43 thunderbirdtr joined #git
11:48 mazert hello, under my git directory, i've got a directory that i cannot see using git status, and my .gitignore is ok. How to show it ?
11:48 timothy mazert: empty directory?
11:48 mazert timothy: no, it containes 6 files
11:49 a_thakur joined #git
11:50 _Patrick_ joined #git
11:51 mazert timothy: hmm sorry, you are right. the directory A contains a directory B who contains files, but B is blacklisted in .gitignore
11:52 mazert so git consider A as empty
11:52 Cavallari joined #git
11:55 codezera_ joined #git
11:57 WaReZ joined #git
12:00 codezera joined #git
12:03 freimatz joined #git
12:03 Hink joined #git
12:04 nettoweb1 joined #git
12:05 mikecmpbll joined #git
12:08 gareppa joined #git
12:10 masuberu joined #git
12:10 LBV_User joined #git
12:11 venmx joined #git
12:14 jnavila joined #git
12:15 hussam joined #git
12:16 Hink joined #git
12:18 ochorocho__ joined #git
12:19 roelmonn_ joined #git
12:20 codezera joined #git
12:26 codezera joined #git
12:26 re1 joined #git
12:27 isysd joined #git
12:27 mikecmpbll joined #git
12:27 cdown joined #git
12:28 subhojit777 joined #git
12:28 manuelschneid3r joined #git
12:28 shinnya joined #git
12:29 Rhonda joined #git
12:31 spacelord_ joined #git
12:37 safe joined #git
12:38 Hink joined #git
12:38 ismithers joined #git
12:38 GavinMagnus joined #git
12:40 treehug88 joined #git
12:41 lucazz joined #git
12:41 ktoverso joined #git
12:47 _rht joined #git
12:49 theoceaniscool joined #git
12:50 vrishab joined #git
12:51 markelite joined #git
12:53 bl0w_ joined #git
12:53 lightstalker joined #git
12:53 bl0w_ left #git
12:54 virtx joined #git
12:54 virtx hello
12:54 gitinfo virtx: 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.
12:55 ktoverso joined #git
12:56 virtx I am new with git and I have a stupid doubt: I am in my local git directory, when I create a new branch the sources files on current directory are for master o branch?
12:56 ojdo joined #git
12:57 virtx I mean, if I open a file and work on it after git checkout mybranch, this file is changed on my filesystem and in the branch, but when I return to master the file on current directory are the same that I changed on branch
12:57 Bombe virtx, if you create a new branch everything stays like it is.
12:57 j416 virtx: nothing is on a branch unless it has been committed
12:57 Bombe What happens when you change branches depends on whether you modified files.
12:58 virtx yes, but if I modify the files on my file system after git checkout mybranch
12:58 j416 virtx: if you switch branches without committing, Git will try to "float over" your changes
12:58 virtx those file are modified also when I return to master
12:59 j416 if it cannot float them over, it will refuse to check out the branch.
12:59 roelmonnens joined #git
12:59 sdothum joined #git
12:59 virtx so when I switch to master the file on file system will be modified to the master branch?
13:00 j416 master stays the same
13:00 plos joined #git
13:00 j416 your changes will also stay the same
13:00 virtx mmmm
13:01 j416 unless you commit them first, in which case they will be on the branch you had checked out when you did "git commit"
13:01 virtx my concern is on file system not on staging or remote
13:01 virtx because I work on files on the same directory
13:01 j416 remotes are not related
13:01 virtx correct
13:02 j416 git is local unless you fetch or push
13:04 synthroid joined #git
13:04 virtx this is what I mean http://pastebin.com/NZjpyRY3
13:05 j416 correct
13:05 j416 virtx: what is your question?
13:05 gribouille joined #git
13:05 gribouille hi
13:05 virtx my question is: how can I work on master and branch at same time?
13:06 virtx I should always commit a change in branch before switch to master
13:06 j416 virox: you want to work on two branches in parallel?
13:06 johnmilton joined #git
13:06 virtx or I should to use 2 different directory for branch and master?
13:06 j416 virtx: ^
13:06 virtx yes.
13:06 Virox j416: no
13:06 Virox ;D
13:06 j416 virox: sorry :)
13:06 virtx j416, yes
13:06 j416 virtx: normally I'd commit.
13:07 virtx so if i commit on mybranche and switch to master the files on filesystem will come back as master or like in the pastebin example?
13:07 j416 virtx: you can replace the commit with something proper later. I often end up with work-in-progress commits in a branch or two.
13:08 j416 virtx: they will reflect master.
13:08 virtx so I cant work on 2 different branches in the same directory
13:08 gribouille is the commit datetime set before of after executing the hooks?
13:09 j416 virtx: explain how you imagine that would work
13:09 virtx j416: I don't know, that is why I am asking :)
13:09 virtx I found it http://stackoverflow.com/questions/8470360/h​ow-to-work-simultaneously-on-a-few-branches
13:10 j416 yes, you can use git-worktree. But that is a fairlh recent addition, it's useful for some edge cases but typically I seldom use it.
13:11 virtx what is the alternative?
13:11 j416 commit and checkout
13:11 j416 or stash and checkout
13:11 synthroi_ joined #git
13:11 virtx with svn I tipically used to create 2 separate work directory and checkout the branch on it
13:11 j416 but commits are often easier to work with in my experience
13:11 j416 git is not svn
13:12 j416 in svn a branch is a directory
13:12 j416 in git, not so
13:12 virtx if I commit and checkout with git, the working directory contains the files modified not the checkout'd branch
13:12 virtx so I should to use different dirs
13:12 venmx joined #git
13:12 j416 what so you mean?
13:12 j416 do*
13:13 virtx git checkout mybranch ; ...chenge files ... ; git commit ; git checkout master ;  now files on filesystem are modified as in branch
13:13 j416 virtx: did you try it?
13:14 virtx not this particular case, but am i correct? it was a question, sorry :)
13:15 neuro_sys joined #git
13:16 j416 virtx: not correct
13:17 Hink joined #git
13:17 diogenese joined #git
13:17 j416 virtx: as I told you above
13:17 Hetu joined #git
13:17 holodoc joined #git
13:17 j416 14:07:32  virtx so if i commit on mybranche and switch to master the files on filesystem will come back as master or like in the pastebin example?
13:18 j416 14:08:21  j416 virtx: they will reflect master.
13:18 virtx ok, thanks
13:19 j416 welcome
13:19 VSpike joined #git
13:29 VSpike I'm trying to sort out a mess someone has created in a git repo. Due to cherry picking and god knows what, he has lots of commits in a branch that have different messages and ids, yet include changes in other commits already merged
13:30 VSpike Is there way to show the result of applying a particular change to the current HEAD? I want to see if a given commit is already merged somewhere
13:30 _ikke_ VSpike: look at man git cherry
13:30 gitinfo VSpike: the git-cherry manpage is available at http://jk.gs/git-cherry.html
13:30 VSpike Currently doing it by looking at the diff, then looking at current source code, and seeing if the change is there by inspection
13:31 VSpike What I really want is a way to say "If I applied this commit to my current working, what (if anything) would change?"
13:31 khagler joined #git
13:32 VSpike Something like diff file.c <(git dry-run-apply $ID -- file.c)
13:32 _ikke_ VSpike: have you looked at the man page?
13:34 jeffreylevesque joined #git
13:35 miczac joined #git
13:40 ktoverso_ joined #git
13:40 jaguarmagenta joined #git
13:41 scarcry joined #git
13:41 adino joined #git
13:41 GavinMagnus left #git
13:43 re1 joined #git
13:44 King_Hual joined #git
13:44 aw1 joined #git
13:44 VSpike _ikke_: thanks yeah ... was just finishing my thought to clarify to myself what I was trying to do :) Are you suggesting to use cherry-pick -n and then git diff to see what's changed? And then git reset HEAD . to go back
13:49 _ikke_ no, git cherry is something different
13:49 _ikke_ related, but different
13:50 WayToDoor joined #git
13:50 anonymuse joined #git
13:54 jnavila joined #git
13:58 ShekharReddy joined #git
13:59 VSpike _ikke_: that's pretty awesome... I didn't know that existed
14:01 mizu_no_oto joined #git
14:05 netj joined #git
14:05 razdvabryak joined #git
14:06 razdvabryak left #git
14:10 Kulrak joined #git
14:11 Kulrak joined #git
14:11 text1 joined #git
14:11 kadoban joined #git
14:13 Gsham joined #git
14:13 venmx joined #git
14:14 vuoto joined #git
14:16 ExoUNX joined #git
14:17 frobnic joined #git
14:18 ochorocho__ joined #git
14:20 ochorocho__1 joined #git
14:24 sagerdearia joined #git
14:26 darkbit joined #git
14:26 ogny joined #git
14:26 jnavila joined #git
14:27 YuGiOhJCJ joined #git
14:27 ij joined #git
14:28 ktoverso joined #git
14:29 ShekharReddy joined #git
14:30 ij There can be many root commits in a single repo, right? So if I've two repos that don't share commits, but share files, I cherry-pick from the other tree after adding and fetching it as another remote?
14:31 achlys joined #git
14:32 mazert joined #git
14:33 _ikke_ right, note that cherry-picking might run into conflicts as the branches don't have any merge-base
14:33 achlys joined #git
14:34 theoceaniscool joined #git
14:35 jaguarmagenta joined #git
14:37 dan2k3k4 joined #git
14:37 PHPanos joined #git
14:38 Dougie187 joined #git
14:38 ok91 joined #git
14:38 ij Are you sure? Doesn't it only look at the diff?
14:38 ktoverso joined #git
14:38 ij I know how to make a testcase without doing everything twice.
14:39 ij git rebase --root -i
14:41 ploop joined #git
14:49 jacob123 joined #git
14:51 ktoverso_ joined #git
14:54 re1 joined #git
14:55 tmsmith joined #git
14:55 jacob123 joined #git
14:57 FilipNortic_ joined #git
14:58 bannakaffalatta joined #git
14:59 ij _ikke_, It didn't run into conflicts!
15:00 Gsham joined #git
15:01 ij Oh, I don't even have to make two repos.
15:02 ktoverso joined #git
15:02 narendraj9 joined #git
15:03 raatiniemi joined #git
15:03 plos joined #git
15:04 eljefeloco joined #git
15:06 plos joined #git
15:06 d0nn1e joined #git
15:07 mazert joined #git
15:08 Rapture joined #git
15:12 BrianJ joined #git
15:13 siddart joined #git
15:13 jnavila joined #git
15:14 venmx joined #git
15:14 rnsanchez joined #git
15:16 Surfer2010 joined #git
15:17 Spec-Chum joined #git
15:18 publio joined #git
15:19 troyt joined #git
15:23 Prem joined #git
15:23 leeN joined #git
15:26 Noldorin joined #git
15:26 cdown joined #git
15:28 cdown joined #git
15:32 boombatower joined #git
15:34 Guest57838 joined #git
15:38 PaulCapestany joined #git
15:40 umbSublime joined #git
15:40 umbSublime joined #git
15:42 dsdeiz joined #git
15:47 diogenese joined #git
15:50 Darren_ joined #git
15:50 brian_penguin joined #git
15:50 dar123 joined #git
15:56 Starky joined #git
15:57 cdown_ joined #git
15:58 jrm joined #git
16:00 subhojit777 joined #git
16:00 newbie1 joined #git
16:03 cyphase joined #git
16:05 PaulCapestany joined #git
16:09 PCatinean joined #git
16:11 madewokherd joined #git
16:13 PaulCapestany joined #git
16:13 zacts joined #git
16:14 refried_ joined #git
16:15 venmx joined #git
16:19 cyphase joined #git
16:24 PaulCapestany joined #git
16:28 jasondockers__ joined #git
16:29 jasondockers__ joined #git
16:30 [log] joined #git
16:30 krabat joined #git
16:30 amdi_ joined #git
16:31 Khisanth joined #git
16:32 WayToDoor joined #git
16:33 SwiftMatt joined #git
16:35 [log] joined #git
16:38 nidr0x joined #git
16:42 synthroid joined #git
16:42 cyan__ joined #git
16:43 f3r70rr35f joined #git
16:44 shgysk8zer0 joined #git
16:51 ok91 joined #git
16:51 arnoldoree joined #git
16:55 jccn joined #git
16:57 zzz_ joined #git
16:58 [log] joined #git
16:59 siddart joined #git
17:01 gzox joined #git
17:06 jstimm joined #git
17:08 Singmyr joined #git
17:10 snowkidind joined #git
17:11 howitdo joined #git
17:13 Gsham joined #git
17:15 venmx joined #git
17:20 robotroll joined #git
17:21 Pieter joined #git
17:21 codezera joined #git
17:23 codezera joined #git
17:25 codezera joined #git
17:25 Gsham joined #git
17:26 spacelord_ joined #git
17:26 CheckDavid joined #git
17:27 algun joined #git
17:29 cdown joined #git
17:30 Domhack joined #git
17:31 Starky joined #git
17:31 ki0 joined #git
17:38 refried_ joined #git
17:40 dreiss joined #git
17:41 vuoto joined #git
17:42 shgysk8zer0 joined #git
17:43 navidr joined #git
17:43 ktoverso_ joined #git
17:50 Salander27 joined #git
17:51 Anja joined #git
17:53 thiago joined #git
17:54 sea-gull joined #git
17:55 jacob123 joined #git
17:55 ki0 joined #git
17:57 re1 joined #git
18:00 Starky joined #git
18:03 shgysk8zer0 joined #git
18:04 cyphase joined #git
18:04 ktoverso joined #git
18:06 nydel07 joined #git
18:06 overlord_tm joined #git
18:07 cdown joined #git
18:07 Vinnie_win joined #git
18:08 hyperair joined #git
18:10 jacob123_ joined #git
18:10 vuoto joined #git
18:11 SpeakerToMeat joined #git
18:14 hahuang65 joined #git
18:14 Raed joined #git
18:16 hahuang65 joined #git
18:16 venmx joined #git
18:18 pwnz0r joined #git
18:21 kpraveen joined #git
18:21 SwiftMatt joined #git
18:22 ktoverso joined #git
18:22 Surfer2010 joined #git
18:26 jacob123 joined #git
18:29 NeverDie joined #git
18:30 cagedwisdom joined #git
18:31 mjuszczak joined #git
18:32 thiago joined #git
18:35 ktoverso_ joined #git
18:35 NeverDie_ joined #git
18:38 ktoverso joined #git
18:38 thiago_ joined #git
18:39 ianmethyst joined #git
18:40 duderonomy joined #git
18:41 pwnz0r joined #git
18:41 ianmethyst joined #git
18:42 nckpz joined #git
18:44 venmx joined #git
18:47 cyphase joined #git
18:47 whomp joined #git
18:47 ianmethyst joined #git
18:48 nsanden joined #git
18:49 Nerbrun joined #git
18:50 sysadmin joined #git
18:50 nsanden i made some changes (havent commited yet) but realized im in the wrong branch. any way to commit those to master branch instead of the branch i made the changes in?
18:51 qqx nsanden: If there weren't any previous changes to the same files you can just `git checkout master` and then commit.
18:51 jacob123 joined #git
18:53 nsanden in this branch i made and pushed previous commits that arent in the other branch
18:53 nsanden qqx
18:54 ayjay_t joined #git
18:54 sarbs joined #git
18:54 perlpilot nsanden: If you haven't committed the changes yet, they aren't "in a branch"
18:56 perlpilot nsanden: git checkout master; git commit;  # If git won't let you switch branches, you might need to git stash; git checkout master; git stash apply
18:57 cdg joined #git
18:57 ulaj joined #git
18:57 JamesBaxter joined #git
18:58 SJr joined #git
18:58 markovh joined #git
19:01 nsanden thanks +perlpilot didnt realize that my changes werent "in a branch" yet. i just switched to master and seems i can commit them now. awesome!
19:05 svm_invictvs joined #git
19:06 kadoban joined #git
19:08 Surfer2010 joined #git
19:09 kyan joined #git
19:13 ianmethyst joined #git
19:14 xaviergmail joined #git
19:15 siddart_ joined #git
19:15 xaviergmail joined #git
19:16 jstein_ joined #git
19:17 xaviergmail joined #git
19:19 vuoto joined #git
19:19 hashpuppy joined #git
19:20 conrad_ joined #git
19:20 joki joined #git
19:20 hashpuppy you guys know of any alternatives to `overcommit`, which manages git hooks for a project?
19:21 tang^ joined #git
19:21 [log] joined #git
19:22 MrLawrence joined #git
19:23 MrLawrence Hello, how do I view the diff for X commit?
19:23 MrLawrence In my situation two commits before
19:25 osse MrLawrence: git show X
19:25 dviola joined #git
19:25 MrLawrence osse, Thanks
19:26 diego2 joined #git
19:27 diego2 joined #git
19:27 hashpuppy git show HEAD~2
19:27 tyreld joined #git
19:29 hashpuppy my git skills are lacking, but i think this also works if it was a merge of a pull request, which would probably have no output
19:29 hashpuppy git diff HEAD~3..HEAD~2
19:29 dreiss joined #git
19:29 osse hashpuppy: tip: you can use  git diff X^!
19:29 osse in this case git diff HEAD~2^!
19:29 hashpuppy ahh
19:29 hashpuppy nice
19:30 osse ^! is MagicK for "except all parents" or something. anyway it works.
19:31 rnsanchez joined #git
19:32 osse hashpuppy: also @ is short for HEAD
19:39 Electrometro joined #git
19:41 JamesBaxter joined #git
19:42 Electrometro joined #git
19:43 nilg joined #git
19:47 jstein__ joined #git
19:48 dling` joined #git
19:49 jccn joined #git
19:52 anuxivm joined #git
19:53 multi_io joined #git
19:55 bmahe joined #git
19:55 Rapture joined #git
19:56 kristofferR joined #git
20:00 SpeakerToMeat joined #git
20:01 Random832 joined #git
20:01 siddart joined #git
20:03 crawler joined #git
20:06 siddart_ joined #git
20:06 Surfer2010 joined #git
20:07 Lyqyd joined #git
20:08 cyphase joined #git
20:09 meadmoon joined #git
20:10 ianmethyst joined #git
20:11 WayToDoor joined #git
20:12 vuoto joined #git
20:14 WhiskerBiscuit joined #git
20:14 jnavila joined #git
20:16 dreiss joined #git
20:18 BSaboia joined #git
20:19 vuoto joined #git
20:19 Rapture joined #git
20:21 Mikerhinos joined #git
20:26 xaviergmail joined #git
20:26 rnsanchez_ joined #git
20:26 ianmethyst joined #git
20:29 venmx joined #git
20:29 al-damiri joined #git
20:29 vdv joined #git
20:30 Ardethian\ joined #git
20:31 metachr0n joined #git
20:32 ispn joined #git
20:32 lordjancso joined #git
20:36 KV joined #git
20:36 dan2k3k4 joined #git
20:37 isysd joined #git
20:38 Ardethian\ joined #git
20:38 derk0pf joined #git
20:40 dan2k3k4 joined #git
20:41 Surfer2010 joined #git
20:43 JanC_ joined #git
20:44 jacob123 joined #git
20:48 refried_ joined #git
20:50 pothepanda joined #git
20:50 whomp joined #git
20:52 ianmethyst joined #git
20:52 elastix joined #git
20:52 amdi_ joined #git
20:55 axl__ joined #git
20:58 bannakaffalatta joined #git
20:59 derk0pf joined #git
21:01 AfroThundr joined #git
21:02 minikN joined #git
21:03 ianmethyst joined #git
21:05 re1 joined #git
21:10 Random832 joined #git
21:10 howitdo joined #git
21:12 dreiss joined #git
21:16 Surfer2010 joined #git
21:23 kristofferR joined #git
21:27 dreiss joined #git
21:27 axl__ joined #git
21:30 WayToDoor joined #git
21:39 timewalk1r joined #git
21:40 mephistorium joined #git
21:42 mmlb joined #git
21:45 jacob123 joined #git
21:46 sea-gull joined #git
21:46 a3Dman joined #git
21:47 aw1 joined #git
21:47 nivag joined #git
21:48 nilg joined #git
21:49 fatalhalt joined #git
21:52 buzzLightBeer joined #git
21:53 ktoverso joined #git
21:54 sysadmin joined #git
21:55 nwkj86 joined #git
21:56 nettoweb joined #git
21:57 troulouliou_dev joined #git
21:59 venmx joined #git
22:02 Dougie187 left #git
22:03 cyphase joined #git
22:06 sysadmin joined #git
22:12 nisseni joined #git
22:12 whomp joined #git
22:13 dsantiago joined #git
22:13 sexa joined #git
22:13 jacob123_ joined #git
22:16 robotroll joined #git
22:18 rideh joined #git
22:19 blackjid joined #git
22:19 TomyLobo joined #git
22:19 marvi joined #git
22:20 Atrumx joined #git
22:21 treehug88 joined #git
22:21 sammyo joined #git
22:22 pizzaops joined #git
22:22 Bengi joined #git
22:24 rideh joined #git
22:25 XDS2010 joined #git
22:28 shgysk8zer0 joined #git
22:28 SwiftMatt joined #git
22:29 infernix joined #git
22:29 VoidFox joined #git
22:33 nickthetait left #git
22:35 tanuki joined #git
22:35 gtristan joined #git
22:36 Guest45778 joined #git
22:39 sysadmin_ joined #git
22:39 thiago joined #git
22:40 AfroThundr joined #git
22:40 ToBeCloud joined #git
22:41 phillip joined #git
22:44 phillip Hey, how can I use git reset --hard HEAD, to remove a bunch of files, which are protected by .gitignore? Deleting git ignore first does not work, as it seams to me that it will be pulled in later. Thank you :)
22:45 osse phillip: Maybe man git-clean can help
22:45 gitinfo phillip: the git-clean manpage is available at http://jk.gs/git-clean.html
22:46 dsantiago joined #git
22:46 whomp joined #git
22:46 GGMethos joined #git
22:48 phillip osse: ahhhh yeah, thanks a lot, I just don't saw the -x switch before
22:49 jost joined #git
22:49 svm_invictvs joined #git
22:51 uranellus joined #git
22:51 uranellus joined #git
22:55 ki0 joined #git
22:57 ktoverso_ joined #git
22:58 arescorpio joined #git
23:01 fmeerkoetter joined #git
23:04 fahadash joined #git
23:07 diogenese joined #git
23:15 whomp joined #git
23:16 mellernoia joined #git
23:17 justanotheruser joined #git
23:19 Guest32_ joined #git
23:21 YuGiOhJCJ joined #git
23:22 jimmyeatworld joined #git
23:22 m0viefreak joined #git
23:30 venmx joined #git
23:31 xaviergmail joined #git
23:31 KV joined #git
23:35 whomp joined #git
23:35 troyt joined #git
23:37 bronson joined #git
23:37 Salander27 joined #git
23:42 Surfer2010 joined #git
23:44 LukeLR joined #git
23:45 thunderbirdtr joined #git
23:48 jimmyeatworld joined #git
23:51 carpii joined #git
23:54 thiago joined #git
23:55 carpii I develop locally and push to a bare repo. A remote server then pulls from that bare repo, and there are never any commits done from the server. Pretty standard stuff...... But I now find that my remote server is 55 commits ahead of master/origin, which seems very odd. How is this even possible?
23:56 phillip carpii: how do you pull? Maybe there are merge commits?
23:57 carpii its automated, so I ssh into the remote server (via a script), and then instruct it to git pull). Any errors should show in up my automated script though
23:57 phillip carpii: use git pull -r
23:57 carpii If i compare the git log frmo remote erver, it seems to be up to date, except it has an extra 'merge commit' as the most recent
23:57 carpii -r is rebase?
23:58 phillip carpii: yeah, so you dont get anymerge commits
23:58 carpii im not entirely sure why this is necessary though. If i push from local, and pull from remote, why would the git log end up different ?
23:59 carpii since local also uses bare repo as its origin
23:59 carpii its the same model Ive used for many years now, but the only difference with this is that ium routinely pushing a git tag with every deployment

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