Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-14

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

All times shown according to UTC.

Time Nick Message
00:01 BlackMaria_netsp joined #git
00:02 hahuang61 joined #git
00:03 drodger joined #git
00:05 MZAWeb joined #git
00:12 fstd_ joined #git
00:12 chachasmooth joined #git
00:13 tristanp joined #git
00:14 mkopriva joined #git
00:15 Literphor joined #git
00:16 israelzuniga joined #git
00:28 tristanp joined #git
00:28 nettoweb joined #git
00:35 nettoweb joined #git
00:36 aidalgol Why would `git log --full-diff` still only print out the commit log?
00:37 ArchNoob joined #git
00:39 Sucks joined #git
00:40 pioiytr joined #git
00:41 spyroboy_ joined #git
00:42 jstimm_ joined #git
00:45 tristanp joined #git
00:45 elsevero joined #git
00:45 romerocesar joined #git
00:46 rahtgaz joined #git
00:48 i7c Maybe you confuse it with -p?
00:48 i7c --full-diff affects -p for example.
00:49 unbalancedparen joined #git
00:49 i7c Actually --full-diff only applies if you specify a path, like in git log --full-diff -p -- some/file
00:49 i7c This will give you all commits that change some/file but it will give you the full diff of those commits.
00:51 i7c Where as git log -p -- some/file will give you all commits that change some/file but it will give you only the diff of some/file, not any other changed files in those commits.
00:52 Dougie187 joined #git
00:52 _28_ria joined #git
00:54 boombatower joined #git
00:56 crayon joined #git
00:57 zacts joined #git
00:59 tristanp joined #git
01:00 SwiftMatt joined #git
01:02 sobersabre joined #git
01:02 hahuang61 joined #git
01:06 catag87 joined #git
01:07 dsantiago joined #git
01:09 mkopriva joined #git
01:13 tristanp joined #git
01:17 pks joined #git
01:19 sagerdearia joined #git
01:21 ochorocho__ joined #git
01:23 rnsanchez_ joined #git
01:23 ryez joined #git
01:24 cdg joined #git
01:25 b0nn joined #git
01:29 MattMaker joined #git
01:29 tristanp joined #git
01:32 b0nn left #git
01:32 devbug joined #git
01:32 rgrinberg joined #git
01:36 GT4066 joined #git
01:36 k-man joined #git
01:37 Goplat joined #git
01:38 Not_Whatever joined #git
01:42 Not_Whatever joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and pop music lyrics | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I kissed a git, and I liked it. I hope my repo don't mind it.
01:48 mwhooker joined #git
01:49 IWishIKnew joined #git
01:49 m1kk3l joined #git
01:51 Literphor joined #git
01:58 barteks2x joined #git
01:59 livingstn joined #git
02:01 drbean_ joined #git
02:02 naitsirhc joined #git
02:03 tristanp joined #git
02:08 cqi joined #git
02:09 dna113p joined #git
02:10 stantonk joined #git
02:10 dna113p What would be the best way to completely remove all files in my remote master branch and replace with completely new code i have locallY?
02:13 dna113p Like I have my local repository setup with the remote, and made a first commit locally but i have not yet pushed it
02:13 dna113p because i just want to replace it all
02:15 yitz left #git
02:15 david007 joined #git
02:15 xtraa joined #git
02:16 hexagoxel joined #git
02:17 romerocesar joined #git
02:18 kanyeezy joined #git
02:23 cuebix-wk joined #git
02:23 aidalgol joined #git
02:23 tristanp joined #git
02:26 texinwien_ joined #git
02:28 durham_ joined #git
02:28 a_thakur joined #git
02:29 jstimm_ joined #git
02:32 stantonk joined #git
02:35 rezrov joined #git
02:36 romerocesar joined #git
02:38 Dougie187 left #git
02:39 thiago joined #git
02:40 rubyonrailed joined #git
02:40 d4rklit3 joined #git
02:40 RustyShackleford This repo was just started
02:41 MattMaker joined #git
02:41 RustyShackleford there's a branch that is currently up to date with master
02:41 RustyShackleford I want to move it so that it's a branch of the 16.7 branch
02:42 RustyShackleford let me just start over, that came out all wrong
02:42 tristanp joined #git
02:43 RustyShackleford problem is, we make a featurn branch for version X which is a branch of master
02:43 RustyShackleford but it should be a branch of the vX release branch
02:47 azbarcea joined #git
02:47 the_cybersphinx joined #git
02:48 Darren_ joined #git
02:53 durham joined #git
02:53 nettoweb joined #git
02:57 mkopriva joined #git
02:57 xall joined #git
02:57 romerocesar joined #git
02:57 MattMaker joined #git
02:57 Rodya_ joined #git
02:58 howdoi joined #git
02:58 drewo joined #git
02:59 Chiko joined #git
02:59 violetqqy joined #git
03:00 Rodya_ joined #git
03:02 eizua joined #git
03:02 chachasmooth joined #git
03:03 tristanp joined #git
03:03 hahuang61 joined #git
03:10 FishPencil joined #git
03:10 FishPencil How can I get rid of all local changes/added files to a repo (staged or unstaged)? Basically resorting the repo to the master head
03:10 FishPencil restoring*
03:11 preaction reset --hard HEAD
03:13 nettoweb joined #git
03:13 a_thakur joined #git
03:14 ahr3n joined #git
03:14 a_thakur joined #git
03:14 MZAWeb joined #git
03:22 ochorocho__ joined #git
03:25 tristanp joined #git
03:27 romerocesar joined #git
03:28 treaki_ joined #git
03:29 theskillwithin joined #git
03:31 stantonk joined #git
03:31 ryez joined #git
03:33 arescorpio joined #git
03:34 d4rklit3 joined #git
03:36 SimonNa joined #git
03:38 dreiss joined #git
03:40 rchavik joined #git
03:41 tristanp joined #git
03:42 BSAlb joined #git
03:44 the_cybersphinx joined #git
03:51 mkopriva joined #git
03:52 dreiss joined #git
03:52 Doginal joined #git
03:54 the_cybersphinx joined #git
03:55 MattMaker joined #git
03:56 tristanp joined #git
03:58 romerocesar joined #git
03:58 MattMaker joined #git
04:04 hahuang61 joined #git
04:04 robotroll joined #git
04:09 ahhughes joined #git
04:09 ahhughes anyone know if a specific revision of either specific file or entire repo can be downloaded over http from gitbucket?
04:11 Not_Whatever joined #git
04:16 sanscheese joined #git
04:16 mehola joined #git
04:18 romerocesar joined #git
04:19 subhojit777 joined #git
04:21 ahhughes looks like I you can.... https://github.com/{username}/{projectname}/archive/{sha}.zip  (same for gitbucket)
04:21 lindenle joined #git
04:28 drodger joined #git
04:31 Darren_ joined #git
04:32 lindenle joined #git
04:33 dreiss joined #git
04:34 d4rklit3 joined #git
04:34 tristanp_ joined #git
04:40 tvw joined #git
04:41 anu0 joined #git
04:41 Cabanossi joined #git
04:43 Literphor joined #git
04:45 circ-user-b0xon joined #git
04:45 mkopriva joined #git
04:47 rchavik joined #git
04:48 zacts joined #git
04:50 Anupkumar joined #git
04:50 sangy joined #git
04:50 Anupkumar left #git
04:56 devbug joined #git
04:57 emPi joined #git
04:59 freimatz joined #git
05:02 d5sx43 joined #git
05:02 hahuang61 joined #git
05:03 OnBrokenWings joined #git
05:03 shgysk8zer0 joined #git
05:06 drodger joined #git
05:19 OnBrokenWings joined #git
05:20 lindenle joined #git
05:22 mwhooker joined #git
05:23 jeus2 joined #git
05:23 ochorocho__ joined #git
05:25 qt-x joined #git
05:27 stuh84 joined #git
05:28 romerocesar joined #git
05:29 monoprotic joined #git
05:29 a_thakur joined #git
05:32 netj joined #git
05:33 stantonk joined #git
05:35 romerocesar joined #git
05:37 toogley joined #git
05:37 nilg joined #git
05:38 muelli joined #git
05:39 mkopriva joined #git
05:42 phanimahesh joined #git
05:43 grift joined #git
05:44 xall joined #git
05:44 tmillc joined #git
05:45 tmillc I'm really confused as to how "Your branch and origin/gh-pages have diverged." I'm the only one pushing to the repository. I make changes, commit, and push them. And every once in awhile there's somehow a merge conflict.
05:46 rchavik joined #git
05:46 tmillc The only thing I can think of, and maybe this is bad practice and the cause, but I cloned master in one directory, and gh-pages in another, because I'm making gh-pages based on content in master and it was annoying to switch back and forth.
05:46 MattMaker joined #git
05:46 tmillc and if anything I've said is totally ridiculous, it's because I'm pretty new to git :)
05:49 tmillc and just for more context in case it's relevant: master has a bigBunchOfNotes.R with everything I've been learning about R, and I'm slowly translating it over to Rmd files which are turned into html
05:49 shachaf And you're never force-pushing?
05:49 moriko joined #git
05:50 harish_ joined #git
05:50 tmillc I do "git push -u origin gh-pages" or "git push -u origin master", depending on which directory I'm in
05:51 tmillc though I forgot why I decided I needed to use -u, I should look at that
05:51 tmillc (oh and the Rmd, html files are in gh-pages)
05:53 lindenle joined #git
05:55 shachaf I would look at the commits when there's a conflict to see what happened.
05:55 harish_ joined #git
05:56 zeroed joined #git
05:58 tmillc I changed merge.conflictstyle to diff3 because that was suggested as a better way to look at what's going on but it's really hard for me to tell what the heck I'm looking at, haha
05:58 shachaf You must be doing something odd.
05:58 shachaf How did these two commits happen? https://github.com/tmillc/R/commit/9ebc9 https://github.com/tmillc/R/commit/5b9b5
05:59 SimonNa joined #git
05:59 romerocesar joined #git
06:00 xlegoman joined #git
06:00 nnyk joined #git
06:00 tmillc what do you mean?
06:00 shachaf Run `git log --oneline --graph gh-pages` to see your history.
06:01 tmillc I'm looking at them and I don't really have a context for what I'm seeing other than they were early-on, adapting an example.Rmd
06:01 tmillc ok
06:01 shachaf You made a commit, "Initial github page"
06:01 tmillc wow that's handy ok I'll take a look. Also I'm realizing I should follow some kinds of standards for good commiting/pushing, heh. I started using --amend at least
06:01 shachaf Then you made the two commits I linked, listing that initial commit as parent.
06:02 tmillc hmm
06:02 shachaf They have the same description and timestamp but different contents.
06:02 shachaf Oh, maybe that's what happened.
06:02 shachaf You made a commit, pushed it, and amended it?
06:02 zacts joined #git
06:02 a_thakur_ joined #git
06:02 shachaf Then you had two different commits, one amended.
06:03 Literphor joined #git
06:03 tmillc maybe, I've been commiting and pushing like a madperson
06:03 shachaf In general you should not amend a commit after you push it.
06:04 shachaf If you're the only user of the remote repository, you can do a force-push to replace the original commit you pushed with the amended commit.
06:04 tmillc and with big blocks of text in multiple places. And looking at the html is impossible, since the Rmd->html generates some javascript=sfdkljsgk23h23ihslidjvlkzjv...
06:04 tmillc ahh hmm
06:04 GavinMagnus joined #git
06:04 tmillc I'm open to changing up how I work to avoid this sort of problem
06:04 tmillc it happens too often
06:05 Macaveli joined #git
06:05 mwhooker joined #git
06:06 pioiytr joined #git
06:07 shachaf Yes, the approach you're using is not good. You'll find yourself in a mess, as you've done.
06:07 shachaf I don't know of a document that describes a better approach. Probably someone else here does.
06:07 a_thakur joined #git
06:08 rscata joined #git
06:08 abb4s joined #git
06:09 tmillc is it atypical to have a /R-master and /R-gh-pages directory, each as (erm, not sure the word here) local clones of the branches master and gh-pages?
06:09 shachaf I would say the best thing to do is to get a good understanding of the git commit graph and so on, and what git-push, git-commit --amend, etc. do.
06:09 abb4s hey every body , i installed giggle , but there is not any thing to show , how can i add my remote  repository on github ?? should i use command line for it ? or it has a visual feature ??
06:09 shachaf I don't know whether it's typical. It seems fine, though.
06:09 bluezone joined #git
06:10 tmillc you think more the problem is amending after I push?
06:10 jeus2 joined #git
06:10 tmillc I think I'll set up a test repo that somewhat mirrors what I'm doing to try and replicate the problem in a more controlled way
06:11 shachaf Sounds like a good way to figure it out.
06:13 d4rklit3 joined #git
06:14 mycyber joined #git
06:14 satya4ever joined #git
06:15 Rodya_ joined #git
06:15 tmillc but I swear sometimes it felt like, especially after I became aware of the problem, I'd push on both branches and everything was fine.. I'd even pull to make sure everything was okay.. and then I'd make some changes, commit, push-- oops! conflict
06:16 tmillc oh but I guess that could be commit --amending something that was already pushed
06:16 shachaf Yes, that's what it is.
06:16 tmillc for awhile too I was just doing "git push" and it showed a big message that I kept meaning to read later... :P
06:17 tmillc about push.default 'matching' vs 'simple' but I skimmed it and it didn't seem to be a problem to go with default 'simple'
06:20 romerocesar joined #git
06:20 tmillc I think also that since what I'm doing is just for me I'll go with an initial commit, amending throughout the day, and pushing once a day
06:20 tmillc anyhow thanks for the help and the git graph, that will be very helpful
06:21 lindenle joined #git
06:22 dminca joined #git
06:24 earational joined #git
06:28 Andrew_K joined #git
06:29 DieguezZ joined #git
06:30 romerocesar joined #git
06:31 Duikb00t joined #git
06:31 Duikb00t o/
06:31 Duikb00t I made a mistake.
06:32 Duikb00t I have create a new repo for my another web project. But it was a clone of an other one. So I made a new repo on bitbucket but once I did this command :"git push -u origin --all # pushes up the repo and its refs for the first time"
06:32 Duikb00t It got pushed to another repo on bitbucket in this case.
06:32 Duikb00t Is it possible to roll that back?
06:32 Duikb00t Thanks a million
06:34 lindenle joined #git
06:35 JeroenT joined #git
06:36 freimatz joined #git
06:37 selckin i doubt it would let you push to existing branches, so it just added some new ones you can delete?
06:38 Duikb00t Well inside bitbucket I see: "7 minutes ago  " changed
06:38 Duikb00t On the wrong repo
06:38 Alienpruts joined #git
06:41 Duikb00t Can I remove for examle this commit? 046eb88
06:41 Duikb00t 'roll it back' because I just want to have the correct code base, now everything is overwritten inside the repository..
06:42 MattMaker joined #git
06:42 Duikb00t git revert 046eb88
06:42 Duikb00t ?
06:42 Brain joined #git
06:42 Duikb00t ( Im just a beginner and don't want to break everything )
06:42 selckin revert will add a new commit that undos a commit
06:42 dminca joined #git
06:42 selckin you can also rewrite history and make it like it never exists
06:43 Duikb00t git rebase -i 046eb88
06:43 selckin git reset --hard <ref> (will delete any uncommitted changes)
06:43 tristanp joined #git
06:44 Duikb00t All changed I had made were commited >< I just folled the instructions at bitbucket but didn't realise there was a /.git/ folder which is a duplicate of the project with all the config data in it.
06:44 Duikb00t git reset --hard <ref> is rewriting history?
06:45 Duikb00t Or shouldI go for git rebase?
06:45 selckin you can always recover committed changes
06:45 selckin git reset --hard <ref> will set the thead of the current branch to the ref
06:45 selckin you can also use rebase if you're more comfortable with that
06:46 Duikb00t omg git rebase -i 046eb88
06:46 Duikb00t Cannot rebase: You have unstaged changes.
06:46 Duikb00t Please commit or stash them.
06:46 dminca joined #git
06:46 selckin git status will tell you what fiels
06:46 Duikb00t But then I have another commit no?
06:46 jatin30_ joined #git
06:46 Duikb00t yes
06:46 lindenle joined #git
06:46 MattMaker joined #git
06:46 Duikb00t I see some files that have changed but aren't commited yet. but then I am setting up a new one? Also to that 'wrong' repo.
06:47 selckin should be an easy/safe way to share terminals, would make this shit so muche asier to follow/explain
06:47 kid__ joined #git
06:47 Duikb00t join.me
06:48 dminca joined #git
06:50 esc Seveas: jo, whats with the Python 3 compat of git-spindle?
06:50 dreiss joined #git
06:50 esc Seveas: http://dpaste.com/240SB21
06:51 Duikb00t selckin:  I've sendyou a link :p
06:52 Fijit joined #git
06:52 dminca joined #git
06:53 dminca joined #git
06:53 Ardethian\\work joined #git
06:55 elsevero joined #git
06:57 apotry joined #git
06:58 lindenle joined #git
07:03 leprechau joined #git
07:04 Oebele joined #git
07:06 PCatinean joined #git
07:08 lindenle joined #git
07:09 MZAWeb joined #git
07:10 jatin30 joined #git
07:10 jatin30 every time I run repo sync and then cherry pick I get this https://bpaste.net/show/0c4fc73db7e2 can someone tell how to get rid of this and why is this happening?
07:11 selckin what is repo sync
07:12 TomyWork joined #git
07:12 selckin the cherry pick failed/conflicted, it wants you to resolve it
07:12 fees joined #git
07:12 selckin so do the commit as it tells you
07:12 selckin or git cherry-pick --abort to cancel
07:12 erguven joined #git
07:14 selckin Duikb00t: !crlf
07:14 gitinfo Duikb00t: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/
07:14 erguven_ joined #git
07:17 muelli joined #git
07:17 monoprotic joined #git
07:18 erguven_ left #git
07:18 erguven joined #git
07:19 Dro joined #git
07:20 romerocesar joined #git
07:20 saedelaere joined #git
07:24 sbulage joined #git
07:25 sbulage left #git
07:27 djb-irc joined #git
07:27 mkopriva joined #git
07:28 kedare joined #git
07:29 jeus2 joined #git
07:32 jatin30 during resolving conflicts using mergetool, do we have to make the remote and server to be exactly like out local working copy after the cherry-pick?
07:33 dreiss joined #git
07:33 Hounddog joined #git
07:33 jmd joined #git
07:34 selckin not sure what you mean "remote and server" ?
07:34 selckin you only have to fix the merge, the originals are shown for context
07:35 jmd How can I set git so that when I type "git log" it automatically pipes to "less" ?
07:36 selckin thats default, you set it so it doesn't
07:37 jmd then the default is not working.
07:37 selckin is the output small enough to fit ?
07:38 jmd No.  Our repo has > 28000 commits
07:38 atmosx joined #git
07:38 jmd So its rather annoying if I forget to append |less
07:38 jmd then I have to either wait 5 mins or kill the terminal.
07:39 atmosx If I point remote branch "sample1" to local branch "sample2" and then "push -f" remote's history will be re-written right?
07:39 JeroenT joined #git
07:39 selckin jmd: git config -l |  grep pager
07:40 a_thakur joined #git
07:40 jmd selckin: empty string
07:40 cyan__ joined #git
07:40 jmd (and returns 1)
07:41 selckin jmd: env | grep PAGER or LESS
07:41 jmd both empty
07:41 selckin sounds wierd
07:42 selckin try setting core.pager to LESS -FRSX, but i'm fairly sure it was the default to use it
07:42 selckin *less
07:43 jmd git config --add core.pager less
07:44 lindenle_ joined #git
07:44 jmd Still doesn't make any difference.  Do I have to give the complete path to less?
07:44 selckin no
07:45 selckin try 'command git log'
07:45 jmd It runs without any pager
07:45 selckin i'm out of ideas, something seems broken
07:46 phanimahesh joined #git
07:48 a_thakur joined #git
07:50 mkopriva joined #git
07:50 multi_io joined #git
07:52 drewo joined #git
07:52 SporkWitch joined #git
07:53 Seveas esc: that's not what line 394 says in master
07:53 Seveas 7fda964b1b3d386f46b2209bc28c609a4631c962 fixed it months ago
07:54 Seveas hm, haven't done a release since then. Probably should :)
07:54 radicate joined #git
07:54 radicate Is there a hook that runs after 'git fetch'?
07:55 murph joined #git
07:55 Balliad joined #git
07:56 Seveas radicate: nope
07:56 MrMojito joined #git
07:56 MrMojito joined #git
07:56 radicate Seveas: Any.. workaround you'd suggest then?
07:56 jatin30 selckin, I aborted the cherry-pick but still the same issue https://bpaste.net/show/b5d8a6862650
07:56 MrMojito joined #git
07:56 Seveas radicate: that depends on why you would want a post-fetch hook
07:57 radicate Seveas: I want to update my bare repo by pulling from a remote and checkout the files right after
07:57 Seveas 'bare' and 'checkout' don't belong in the same sentence
07:57 MrMojito left #git
07:57 jatin30 +Seveas, can you tell me which is this not fixed https://bpaste.net/show/b5d8a6862650 ?
07:58 radicate I want to have my git repo outside of my public_html dir
07:58 Seveas right, take it a few steps back please
07:58 Seveas let me throw an !xy and !deploy at you
07:58 gitinfo 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...
07:58 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
07:58 pioiytr joined #git
07:59 radicate Seveas: You're one special guy huh?
07:59 radicate Lol
07:59 radicate Well again, I'm working on  a web project, I'm trying to have an easy time pulling the latest version from GitHub on my production server and put the files inside the public_html directory
07:59 Seveas jatin30: sorry, I don't use 'repo' and have no clue about how it mangles things.
08:00 mikecmpbll joined #git
08:00 jatin30 ok, Thanks anyways
08:00 radicate Obviously I want my git repo files outside the public_html
08:01 Sonderblade joined #git
08:02 Klumben joined #git
08:02 Seveas radicate: the simplest would be to deny access to .git in your webserver config and have a normal repo
08:02 radicate Seveas: Still kind of risky
08:03 radicate I'm working on a large number of projects and I'd rather be more sure that no one has access to my repos
08:03 radicate Feels more safe to have it outside entirely
08:03 xall joined #git
08:03 Douhan joined #git
08:03 Seveas slightly less simple would be writing a 'git-fnarble' command that does a fetch and copies the files. Could be as simple as #!/bin/sh\ngit fetch\ngit archive HEAD | tar -C public_html -x
08:04 sobersabre joined #git
08:04 Seveas I tend to do these as part of pushing to the server and using post-receive hooks, see https://git.seveas.net/simple-deployments-​with-git.html#simple-deployments-with-git for an example
08:04 sobersabre I've got a weird state of git repo: http://dpaste.com/1JYTF84
08:04 sobersabre in the .git/logs/HEAD I see the commits, and so in .git/refs/
08:04 sobersabre but something has messed up
08:05 Seveas the post-receive hook won't fire as part of the fetch, but you can use it as inspiration for your custom git subcommand :)
08:05 sobersabre Is there a way to link objects somehow ihto a tree manually ?
08:05 Seveas sobersabre: what does git for-each-ref say?
08:05 radicate Seveas: Oh that's neat
08:05 radicate Thanks!
08:06 sanketdg joined #git
08:06 Seveas radicate: and this is why I ask people to take a step back. Often solving the symptom 'why is there no post-fetch hook' isn't quite what they're really after :)
08:11 troulouliou_div2 joined #git
08:14 azerus joined #git
08:15 pneuma joined #git
08:16 SimonNa joined #git
08:17 zeroed joined #git
08:18 radicate Seveas: Creating a custom git command doesn't seem to work?
08:18 radicate Doesn't look like it can run bash scripts
08:18 radicate I probably did something wrong here, but could you please clarify how you'd configure such a thing?
08:21 cdown joined #git
08:21 d4rklit3 joined #git
08:21 mikecmpb_ joined #git
08:23 codebam so I cloned my git repo from github, but it only has one branch. git fetch origin didn't work
08:24 b_rare joined #git
08:25 jmd !didn't work
08:25 codebam the branch still isn't there
08:25 codebam it didnt fetch it
08:25 azerus joined #git
08:26 codebam my repo is a fork of someone else's if that makes a difference
08:27 jmd what do you see if you type "git log origin/<branch-name>"
08:29 codebam I have logs
08:29 raijin joined #git
08:29 jmd So you see: It is there after-all
08:30 codebam oh yeah I can change branches with origin/branch-name
08:30 codebam just not branch-name
08:30 codebam cool
08:30 codebam thanks :)
08:31 romerocesar joined #git
08:32 a_thakur_ joined #git
08:32 azerus joined #git
08:33 _ikke_ radicate: Unless you find a way to create (or get) a tree with that specific hash, you can't
08:33 _ikke_ radicate: Note sure if you can use git replace to mask it
08:33 _ikke_ not*
08:34 _xor joined #git
08:34 Beams joined #git
08:34 moriko joined #git
08:37 dimi1947 joined #git
08:38 govg joined #git
08:38 atmosx --set-upstream-to accepts branches like "branch" or "remotes/origin/branch" ?
08:38 jmd codebam: But you probably want to set up a remote tracking branch.
08:38 mezu joined #git
08:39 codebam so I should add a remote branch for my own repo as well as the upstream fork?
08:39 jmd Normally one would add a branch to track the remote.
08:40 jmd See the -b option to git-checkout.
08:40 codebam I did that
08:40 codebam thanks though :)
08:40 mutsy joined #git
08:41 JeroenT joined #git
08:41 bonerx2k joined #git
08:41 mutsy okay so... I rebased a time and now when I do "git status" it displays:
08:41 codebam that's actually what I was doing. fetching from the remote and merging the changes
08:41 mutsy On branch beta-version
08:41 mutsy Last commands done (2 commands done):
08:41 mutsy pick 76613d3 added commerce_credits;
08:41 ams__ joined #git
08:41 mutsy but .. I just pushed
08:41 mutsy and it  doesn't take the stuff I rebased with the commit
08:42 mutsy and I can't get it fixed to rebase again (since I got other changes from master I have to rebase again)
08:43 GavinMagnus joined #git
08:43 govg joined #git
08:44 kurkale6ka joined #git
08:44 acetakwas joined #git
08:46 drewo joined #git
08:47 mrkat joined #git
08:53 SimonNaa joined #git
08:53 tristanp joined #git
08:58 solf1re joined #git
08:59 Rish joined #git
08:59 aidalgol joined #git
09:01 xall joined #git
09:03 notebox joined #git
09:05 notebox joined #git
09:05 nnyk joined #git
09:06 JeroenT joined #git
09:08 pvinis joined #git
09:08 pvinis hello. how can i avoid this? http://imgur.com/K2FQoMD
09:08 pvinis we merge with no-ff. is that the only reason this happens?
09:09 canton7 that won't affect this, because 'master' will have commits which 'serviceplan' doesn't have
09:09 canton7 (i.e. the merge commits from 'serviceplan')
09:09 canton7 uh.. s/master/serviceplan-testing
09:10 canton7 if you sort strictly by date, you should see a more sensible history
09:10 pioiytr joined #git
09:10 pvinis yea, but this view is useful, to see where each branch is
09:11 pvinis except when this happens, then everything goes crazy
09:11 pvinis but why is that actually happening, i mean what should we *not* do to avoid that?
09:13 canton7 it's happening because you merge 'serviceplan' into 'serviceplan-testing' a lot, which is probably a fine workflow
09:13 canton7 the thing that's making it look horrible is the way in which that graph displays it
09:14 kashyap joined #git
09:14 zeroed joined #git
09:17 * kashyap wonders if his message got through
09:17 solf1re joined #git
09:17 kashyap "#git Cannot send to channel" -- Probably because I wasn't logged in.  Let me re-paste my mostly trivial q.
09:17 kashyap This one still shows the commit diff --  `git log --oneline -p foo.py`.   What is the magic incantation to avoid that?  I just prefer one line commit messages to that specific file
09:18 kashyap Ah, found it -- I just need to remove the "-
09:19 kashyap Ah, found it -- I just need to remove the "-p".
09:19 tvw joined #git
09:19 notebox joined #git
09:19 canton7 yeah, "-p" means "print the patch"
09:21 Kuukunen joined #git
09:21 cqi joined #git
09:23 cdown joined #git
09:25 mrkat joined #git
09:26 lordjancso joined #git
09:27 dangerousdave joined #git
09:31 testild joined #git
09:31 JeroenT joined #git
09:35 lindenle joined #git
09:35 xall joined #git
09:36 filter85 joined #git
09:37 jamesd joined #git
09:40 drewo joined #git
09:40 pvinis canton7: should i use some flag for the graph so it gets a bit more manageable?
09:40 pvinis magit, and gitx, both display it like that
09:40 canton7 pvinis, I suggested sorted by date
09:40 canton7 *sorting
09:41 pvinis but sorting by date doesnt give you a graph at all
09:41 canton7 huh?
09:42 canton7 gitk at least can sort by date and still give you a graph
09:42 canton7 not sure about magit and gitx
09:42 pvinis oh!
09:43 JeroenT joined #git
09:43 xall_ joined #git
09:43 nd- joined #git
09:43 pvinis canton7: indeed. magit can do that
09:43 pvinis gitx cant
09:43 cd-rum joined #git
09:44 pvinis great! thanks
09:44 canton7 better? cool! I find the algorithms that try and be smart about drawing the graphs can do a good job when there's an awful lot going on, but can make things harder to understand for simpler circumstances
09:45 LiohAu joined #git
09:45 pvinis do you recommend author date or commit date?
09:45 canton7 do you rewrite commits (rebase, commit --amend, etc)?
09:46 canton7 if you don't, it doesn't matter
09:46 pvinis rarely
09:46 pvinis i guess if we dont, then author and commit date are the same.
09:46 canton7 yep
09:46 pvinis so i should use commit date..
09:46 canton7 if you do rewrite a commit, the author date stays the same but the commit date changes
09:46 pvinis just in case something does change
09:47 cd-rum_ joined #git
09:47 pvinis thanks so much. that makes this so much better
09:48 anddam joined #git
09:48 kashyap left #git
09:48 anddam why isn't clean going to remove  linux-3.10.61/include/generated/ at  https://gist.github.com/anddam/9​6cdd227c3639a61210194d55f576f98 ?
09:49 selckin -d
09:50 * anddam checks man page again
09:50 anddam ohhh
09:50 anddam thanks
09:52 Jellyg00se joined #git
09:54 bruce_lee joined #git
09:54 jamesd joined #git
09:55 sdothum joined #git
09:56 Klumben joined #git
09:57 CausaMortis joined #git
09:59 arand_ joined #git
10:01 freimatz joined #git
10:02 romerocesar joined #git
10:02 jknetl joined #git
10:04 wspider I did pull + merge ( without commit ) and I want to reset my stagging area to before the pull, I looked up for the answer in google and they were suggesting git reset --hard sha
10:04 wspider but if that command also delete the push that I pulled from the online repository then it's not what I need... any help ?
10:04 CausaMortis hi guys, I consider myself still a rookie when it comes to using GIT and have gotten myself into a bit of a pickle. At the repository I am contributing to it is custom to create a separate branch in order to work on a new feature. I have done so, nicely commiting my work and eventually pushing to create a PR on GH. Because it was complaining of merge conflicts I tried to resolve them but the person helping me
10:04 CausaMortis figure that out wasnt very skilled at git either. What happend was that we resolved the conflict and tried a rebase but that pretty much went wrong and the commits I wanted to rebase upon were applied to the current branch / PR. Those commits are already part of master. My question is, how would I go about cleaning up my commit (git rebase -i) comes to mind so that these additional commits are no longer there
10:04 CausaMortis and I can safely merge into master once my PR is reviewed?
10:05 ac3takwas joined #git
10:05 Impaloo Can I discard the warning one gets when doing `git checkout FETCH_HEAD`?
10:09 totte joined #git
10:12 Seveas that depends on whether you know what 'git checkout FETCH_HEAD' actually does, and whether that's ok for you
10:13 jamesd joined #git
10:16 i7c CausaMortis, what is it that you want to do now? You have superfluous commits in your development branch and want to remove them?
10:16 CausaMortis i7c: sorry, I shouldve been more specific. i want to remove all the commits that ended up in my branch and should not be there
10:17 CausaMortis i7c: dont have to worry about it since they are already part of master. so I just want to clean up the branch commits that dont belong and keep my own
10:17 i7c Are they all at the end of your branch?
10:18 CausaMortis nope. oddly enough they are scattered
10:18 i7c Okay. Since you had a intact branch at one point and a rebase messed them up, your original commits might still be around.
10:19 i7c You can hopefully find them with git reflog <branchname>
10:19 artemisart joined #git
10:20 totte joined #git
10:20 totte joined #git
10:21 i7c If you suspect one of the log entries to be the orginal tip of your branch you can have a look at it by doing git log branchnane@{XX}
10:21 i7c !lol
10:21 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
10:21 i7c Maybe without the --all here.
10:22 pioiytr_ joined #git
10:23 murph joined #git
10:23 CausaMortis i7c: actually, in the reflog output it shows the merge and rebase after my commits
10:24 GeekMan joined #git
10:24 i7c CausaMortis, to clearify, reflog shows you the history of commits your branch pointed to.
10:24 i7c It's not the log as you see in git log.
10:25 i7c So if you create a new branch and then make commits A B C D, reflog will contain those entries. But if you then do a rebase it will contain A B C D A' B' C' D' where the X' are new commits with the new base.
10:25 CausaMortis i7c: thanks. I get that. I can see all my commits including the SHA and see that the rebase was applied onto my last commit
10:26 i7c CausaMortis, can you figure out which is the previous-to-mess-up tip of the branch?
10:28 CausaMortis Sorry, I dont quite follow. You want the SHA of the last commit I did myself, before the rebase or?
10:29 CausaMortis This is just another reminder to go over the docs and finish my mastering git trail on upcase -.-
10:29 i7c CausaMortis, well I'm assuming you want to go back to your last "correct" branch and then do the rebase or merge correctly.
10:29 King_DuckZ joined #git
10:30 hk238 joined #git
10:30 i7c And then yes, this SHA would be the tip of your untampered branch and you could make a clean PR from there, I suppose.
10:30 dsdeiz joined #git
10:31 King_DuckZ hi, I'm thinking to use some submodule the way it's described here http://stackoverflow.com/questions/273​79818/git-possible-to-use-same-submodu​le-working-copy-by-multiple-projects and I'd like cmake to automatically use the shared copy if any, so I'm wondering if detecting such scenario is as simple as grepping "gitdir: <path>" in the submodule's .git file
10:31 CausaMortis i7c: thats right :) but I fail to see how switching to that commit allows me to remove/undo the rebase I did afterwards. Can you please explain? :)
10:32 i7c CausaMortis, sure. The rebase you did creates new commits, their parent changes so they get a new SHA and git lets your branch name point at this new sha. But it also remembers the old one. So after the rebase you see only the rebased branch, but git works garbage collected, so the old commits are still around.
10:32 dsdeiz hello all, so let's say in a branch (foo) i've made some changes on a file. then i moved back to the master branch, created a new branch (bar) and moved the file to a new location.. is it possible if i go back to branch foo and rebased branch bar, the changes i made on foo would be applied to the moved file?
10:33 i7c CausaMortis, so git didn't throw away your original branch, it just isn't visible and reflog is the tool to find it again.
10:34 CausaMortis ah! so the branch info I see on GH is just an updated version of the old branch
10:34 King_DuckZ dsdeiz: just try? I think it should work if git detected the file change as a move (ie if its content didn't change too much)
10:34 nettoweb joined #git
10:34 CausaMortis which I should be able to make a new PR for?
10:34 mehola joined #git
10:34 i7c CausaMortis, yeah, on github you only see the current version, reflog is not visible there.
10:35 harish_ joined #git
10:35 i7c Try git branch myoriginalbranch <tip-of-original-branch-from-reflog> and see if this is what you want.
10:35 i7c You should have a new branch named myoriginalbranch and it should be exactly what you're looking for.
10:36 mischat joined #git
10:37 CausaMortis i7c: your a god
10:37 johnmilton joined #git
10:38 JeroenT joined #git
10:38 * i7c blushes.
10:38 CausaMortis i7c: thanks! that makes a lot of sense to me now. So rather than trying to fix up the branch that was formed after a rebase (which I didnt even understood correctly) I can just switch back to the old version and make a new PR for that :)
10:38 i7c yup :)
10:38 i7c git’s wonderful.
10:39 CausaMortis on a side note, since I already have the solution, (I know this is a bit frowned upon but still) would it be possible to remove commits from a branch with rebase and in that way solve the issue?
10:40 i7c Yes.
10:40 CausaMortis cause on upcase they talked about cleaning up commits with rebase -i in order to have better control over the whole git history (kind of defeating the purpose of version control to some extend)
10:40 i7c You can do git rebase -i <some commit back in the history> which will open your editor with the commits. You can simply remove lines of commits you don't want to.
10:40 i7c git will drop them.
10:41 i7c It *can* lead to conflicts which you will have to resolve manually. In practice, if your commits are good, it doesn't happen that often tho.
10:41 King_DuckZ is there at least some documentation about this .git file?
10:41 CausaMortis I shall play around with it a bit. for some reason I still feel a bit scared to actually give it a try, being afraid to screw up somewhere
10:41 i7c !backup
10:41 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
10:41 CausaMortis exactly x]
10:42 i7c Not much you can screw up in a copy of the repository. ;)
10:42 i7c It's good to play around.
10:42 CausaMortis :D
10:43 bremner King_DuckZ: do you actually mean a file, or the usual case of a directory?
10:44 King_DuckZ bremner: the file, as mentioned in the SO link I posted above
10:44 CausaMortis I really appreciate you taking the time to answer my silly question! now on to some tinkering with both solutions
10:44 CausaMortis i7c: take care
10:44 i7c CausaMortis, you’re welcome. Good luck.
10:45 CausaMortis ty!
10:47 dangerousdave I have a desktop application with a supporting web service. Conceptually, they are distinct, however a particular version of the webservice is only applicable to a particular version of the application. How do i record this coupling in git if each resides in its own repo?
10:47 selckin version number
10:50 rnsanchez joined #git
10:52 dangerousdave selckin how would you incorporate that into git?
10:52 Impaloo Seveas: re: checkout FETCH_HEAD. Yeah I know that it does, I just don't want git to print stuff to stderr
10:53 Impaloo to print the warning to stderr*
10:53 dangerousdave selckin, just a text file with the application that specifies the version of the web service to use?
10:54 deadnull joined #git
10:57 i7c Impaloo, git config --global advice.detachedHead false
10:58 jatin30 I tried to undo a merge by doing a "git reset --hard HEAD~" and then it said on running "git status" your branch is behind the upstream branch by 4 commits , use "git pull" and when I ran "git pull" the commit I did not want was back. what to do so that I dont have that commit and my local and upstream branches are in sync as well?
10:58 jatin30 https://bpaste.net/show/8971e66b92f8
10:58 i7c You want to remove the merge commit from your remote.
10:59 jeffreylevesque joined #git
10:59 i7c !rewrite
10:59 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:59 tristanp joined #git
10:59 sanketdg joined #git
11:00 FuzzySockets joined #git
11:01 Impaloo i7c: is it possible to do that without setting a config value?
11:02 Impaloo i.e. through an option to git-checkout(1)
11:02 i7c -q ?
11:02 Impaloo !man checkout
11:02 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
11:02 i7c I suppose. Never tried it. :)
11:02 romerocesar joined #git
11:02 Impaloo man git-checkout
11:02 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
11:03 Impaloo Oh, totally missed that one. Gonna try it
11:07 pioiytr__ joined #git
11:08 JeroenT joined #git
11:09 Ravana joined #git
11:10 Silenced_v2 joined #git
11:10 anbz joined #git
11:12 JeroenT_ joined #git
11:14 mischat joined #git
11:15 cyan__ joined #git
11:16 ojdo joined #git
11:18 mezu left #git
11:23 romerocesar joined #git
11:25 mezu joined #git
11:25 pdgwien joined #git
11:27 lowak joined #git
11:28 drewo joined #git
11:29 acetakwas joined #git
11:31 a_thakur joined #git
11:33 cdown joined #git
11:36 GenZai joined #git
11:36 lindenle joined #git
11:37 stantonk joined #git
11:37 mira|AO joined #git
11:38 mira|AO can I prevent (e.g. with some sort of pre-receive hook) at the server side to accept pushes that overwrite certain files?
11:38 mira|AO usage example:
11:38 mira|AO we use Flyway to manage the database schema, and an automated build and install of git master branch via Jenkins
11:39 mira|AO so I now need to prevent “practical” coworkers from modifying already-pushed schema files, forcing them to add changes as new files instead
11:39 mira|AO (yes, that will make me even more unliked, no that’s not a problem)
11:40 mira|AO only the new HEAD needs to be looked at (diffed against the old HEAD of master), intermediate commits, merges, etc. are not a problem
11:40 mira|AO web search (2 engines) for 'git prevent pushed files from modification' only shows people who want to ignore local changes or somesuch…
11:42 mrkat joined #git
11:43 pioiytr_ joined #git
11:46 Heisenberg1276 joined #git
11:51 Sadeukko joined #git
11:53 OnBrokenWings joined #git
11:57 BlackMaria joined #git
12:00 JeroenT joined #git
12:02 Chiko joined #git
12:02 tomog999 joined #git
12:03 OnBrokenWings joined #git
12:03 synthroid joined #git
12:04 dangerousdave I have a desktop application with a supporting web service. Conceptually, they are distinct, however a particular version of the webservice is only applicable to a particular version of the application. How do i record this coupling in git if each resides in its own repo?
12:07 bonerx2k joined #git
12:10 alcohol dangerousdave: depends on how you version and package your application
12:12 dangerousdave alcohol desptop app is deployed by download/CD with Install shield, Web service is deployed directly. Both have a year based versioning system
12:13 alcohol and why do you need a coupling in git?
12:13 mdw joined #git
12:13 dangerousdave If  we return to an older version of the desktop app, how do we retrieve its associated web service?
12:14 netj joined #git
12:14 Silenced joined #git
12:14 bremner use version numbers?
12:19 TooLmaN joined #git
12:20 cdown joined #git
12:21 a_thakur joined #git
12:21 nilg joined #git
12:22 dangerousdave bremner so would you incude a txt document in each repo, that would hold the version number of the other?
12:22 drewo joined #git
12:22 bremner dangerousdave: I would use tags that had matching numbers in them, eg. webapp-2016.01, desktop-2016.01
12:23 dangerousdave bremner so when either one is updated, it is tagged from the other?
12:24 bremner dangerousdave: I'm assuming some kind of sane release process. But since you mention webapp, that's probably silly of me.
12:24 bremner dangerousdave: if you really need commit by commit matching, then I guess a merged repo makes sense.
12:24 dangerousdave bremner its fairly stable actually
12:25 bremner but if you relase once a month / year, then I'd just make tags manually as part of the release process
12:27 rgrinberg joined #git
12:27 jerv joined #git
12:28 johnny56 joined #git
12:28 jerv what's the most idiomatic way to test if a commit is ahead of some other commit?
12:29 mischat joined #git
12:29 usm4n joined #git
12:30 a_thakur joined #git
12:31 fwdit joined #git
12:31 unbalancedparen joined #git
12:33 romerocesar joined #git
12:33 mikecmpb_ joined #git
12:35 fwdit joined #git
12:35 osse jerv: git merge-base --is-anscestor A B
12:36 jerv thanks osse
12:37 JeroenT joined #git
12:37 rnsanchez joined #git
12:37 JeroenT joined #git
12:37 tristanp joined #git
12:37 CheckDavid joined #git
12:38 mehola joined #git
12:40 fahadash joined #git
12:42 acetakwas joined #git
12:43 CausaMortis joined #git
12:46 fwdit joined #git
12:48 xPucTu4 joined #git
12:48 MrMojito joined #git
12:48 MrMojito joined #git
12:49 MrMojito joined #git
12:50 mrkat joined #git
12:50 rgrinberg joined #git
12:54 liquidjamm joined #git
12:55 fwdit joined #git
12:55 daniel_rose joined #git
12:58 Klipp joined #git
12:58 btree joined #git
12:59 btree left #git
13:00 stratos joined #git
13:01 rishi joined #git
13:03 xPucTu4 joined #git
13:04 romerocesar joined #git
13:04 jknetl joined #git
13:05 encod3 joined #git
13:05 Viewtiful joined #git
13:05 l4v2 joined #git
13:06 cuebix-wk joined #git
13:06 synchronous joined #git
13:07 mrkat joined #git
13:07 ryez joined #git
13:07 concerti joined #git
13:07 jimi_ joined #git
13:08 totte left #git
13:09 ormaaj joined #git
13:10 cdown joined #git
13:11 ShekharReddy joined #git
13:11 Macaveli joined #git
13:13 madduck several Git commands still don't output unicode characters to stdout, e.g. git diff --names-only, but instead include sequences like \123\234 in the output to encode the multibyte characters. Can this be fixed somehow such that proper utf-8 is printed?
13:14 achadwick joined #git
13:16 drewo joined #git
13:19 blackwind_123 joined #git
13:19 livingstn joined #git
13:19 ExoUNX joined #git
13:20 choki joined #git
13:26 raijin joined #git
13:26 usm4n_ joined #git
13:28 des_consolado Hey I'm working on a little project, say in the project1/ dir, and I'd like to have some stuff inside it that is some files/dirs from another repository, is this possible?
13:28 _ikke_ Git has nothign to 'borrow' files from another repository
13:28 rnsanchez_ joined #git
13:30 todd_dsm joined #git
13:31 mgaunard joined #git
13:31 mgaunard how can I get a diff with the name of the file on each line?
13:32 mgaunard that would make it easier for parsing
13:32 _ikke_ git diff --name-only
13:33 _ikke_ or git diff --name-status
13:33 mgaunard I want the full diff, not just the list of the files that changed.
13:34 romerocesar joined #git
13:34 fmcgeough joined #git
13:38 LionsMane joined #git
13:41 a_thakur joined #git
13:41 Dougie187 joined #git
13:42 a_thakur joined #git
13:44 chrispickard joined #git
13:48 Silenced joined #git
13:48 ascarter joined #git
13:49 kanzure p/win 2
13:50 cdg joined #git
13:51 CausaMortis i7c: I noticed you said that rebase makes a new branch. I assume that was to make things a bit more comprehensible right? Cause isnt a branch just a ref to a specific SHA?
13:51 nettoweb joined #git
13:51 nnyk_ joined #git
13:51 i7c uhm yeah, don't remember what I said. It does not create a branch.
13:52 irco joined #git
13:52 i7c It creates an equivalent for each commit that you rebase and does not throw away the old commits.
13:52 ome joined #git
13:52 i7c What I probably meant is that both versions of your branch (ie the commits) are still around afterwards.
13:53 i7c But after the rebase the branch (which is merely a pointer) points to the new commit.
13:54 espindola joined #git
13:54 romerocesar joined #git
13:56 usm4n joined #git
13:57 AaronMT joined #git
13:57 i7c mgaunard, and what will you do if git detects a rename?
13:57 aguimaraes1986 joined #git
13:59 mgaunard i7c: it would give minuses for the old file and pluses for the new one
14:00 i7c Mhm. I'm not aware that git-diff is able to do what you want.
14:01 cdown joined #git
14:03 Gamecubic joined #git
14:04 leeN joined #git
14:04 toogley joined #git
14:06 mgaunard well I can do git diff --name-only, loop over that, and do git diff $file for each of them
14:07 i7c Yes. That's probably cleaner than reading the --- a/ ... lines in the diff.
14:07 mdw joined #git
14:08 Silenced joined #git
14:08 MZAWeb joined #git
14:08 osse how is it easier to parse? :O
14:10 tristanp joined #git
14:10 Silenced joined #git
14:10 drewo joined #git
14:12 a_thakur joined #git
14:12 fwdit_ joined #git
14:14 jeffreylevesque joined #git
14:14 The_Phoenix joined #git
14:14 romerocesar joined #git
14:14 a_thakur joined #git
14:15 bonerx2k joined #git
14:17 The_Phoenix joined #git
14:18 The_Phoenix joined #git
14:19 The_Phoenix joined #git
14:20 Garen joined #git
14:20 ItSANgo joined #git
14:20 Pursuit joined #git
14:20 The_Phoenix joined #git
14:22 Pursuit anyone use lfs? I'm having some trouble getting it working. With GIT_TRACE=1, I can see that my git push stops at the 'git-lfs pre-push' step, but it just sits there giving no indication of what's going on
14:22 Pursuit also, this is with a self-hosted gerrit server and an lfs to s3 bridge
14:23 zumba_addict_ joined #git
14:23 MZAWeb joined #git
14:23 GodGinrai joined #git
14:23 xPucTu4_ joined #git
14:23 zumba_addict_ ok folks, it will be my second time to do a git revert
14:24 zumba_addict_ i have notes but didn't put enough explanation, lol
14:24 _ikke_ Thanks for the announcement :P
14:24 zumba_addict_ first was - git revert 324235235235325
14:24 zumba_addict_ then next command i wrote was - git reset --hard HEAD~
14:24 zumba_addict_ i just want to git revert back the push I just made a minute ago
14:25 zumba_addict_ so I have the commit string
14:25 mdw joined #git
14:25 _ikke_ git revert is not an undo command...
14:25 _ikke_ The only thing it does is to create a new commit
14:25 _ikke_ or commits
14:25 zumba_addict_ got it
14:25 zumba_addict_ do I git push now?
14:26 zumba_addict_ it's now saying this on screen - Your branch is ahead of 'origin/master' by 1 commit.
14:26 _ikke_ git revert + git reset --hard HEAD~ don't make any sense
14:26 _ikke_ You first revert a commit, then undo that revert again
14:26 zumba_addict_ i think i can git push it now after i execute git revert commitsha
14:26 GodGinrai zumba_addict_: git-revert is like publishing that you are removing previous changes.  It makes a commit and everything.  It's like a company changing back to an old policy.  They aren't changing history, just going back to their old ways.
14:26 _ikke_ Sure, you just push a new commit
14:27 zumba_addict_ cool
14:27 docmur joined #git
14:27 zumba_addict_ it worked
14:27 zumba_addict_ i'll changed my confusing notes
14:27 docmur If I did a bunch of commits and pushs with my user.email configured to the wrong address, can I do anything to the repo to re-address all the old commits so they show up under the right email?
14:28 zumba_addict_ i copied whatever is on screen
14:28 _ikke_ docmur: You can, but it requires rewriting history
14:28 docmur All the history is from me, so I don't mind doing that right now, one of the repo's has 7 commits and the other has 2, all done by me
14:29 sangy joined #git
14:29 _ikke_ ok
14:29 _ikke_ There is an example in man git filter-branch
14:29 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
14:29 bongjovi joined #git
14:30 _ikke_ "The --env-filter option can be used to modify committer and/or author identity."
14:30 rafalcpp joined #git
14:30 obiwahn joined #git
14:31 obiwahn hi
14:31 D-Boy joined #git
14:31 APic Hi
14:31 obiwahn i did a checkout in a submodule. now i like to commit my changes. what do i need to do to "update" the submodule to the current checkout?
14:31 Bennux joined #git
14:33 poisond joined #git
14:33 poisond hi :)
14:34 Garen joined #git
14:35 ojacobson joined #git
14:36 ejb joined #git
14:36 stantonk joined #git
14:37 phaleth joined #git
14:37 i7c Ohai
14:37 D[4]ni joined #git
14:37 catag87 joined #git
14:38 poisond I have trouble finding the commit which deleted a file. "git log --summary" only shows it beeing added. "git log --follow --" doesn't show it beeing renamed/deleted. And yet the file doesn't exist in a clean checkout O_o
14:38 docmur Awesome :) that did exactly what I wanted, glad I caught this early
14:39 mehola joined #git
14:41 cr3 joined #git
14:41 cr3 how can I find the first tag that included a certain commit?
14:41 jakesyl_mobile joined #git
14:42 grawity `git describe --contains` should be close enough
14:43 spriz joined #git
14:44 LeMike joined #git
14:44 cr3 grawity: interesting, thanks!
14:45 ojacobson joined #git
14:46 zumba_addict_ now I'm seeing the benefit of only committing that's related to the msg of your commit
14:46 zumba_addict_ if let's say on a single commit, i did 2 separate things and not related, and if I only want to revert one of them, it will be tough
14:46 zumba_addict_ am I right?
14:47 poisond yes
14:47 zumba_addict_ it happened yesterday, I cannot revert because of that commit i made. I had to manually code it again
14:47 zumba_addict_ cool
14:47 poisond you don't need to manually code it again
14:47 zumba_addict_ oh, how is it done?
14:48 Silenced_v2 joined #git
14:48 GodGinrai zumba_addict_: certainly
14:48 zumba_addict_ i updated 2 files and wanted to revert file-num-1
14:48 Silenced_v2 joined #git
14:48 zumba_addict_ so that's possible?
14:49 GodGinrai zumba_addict_: if you just want to revert a whole file, you can checkout a copy of that file from a previous commit, then stage it and commit
14:49 zumba_addict_ got it
14:49 poisond zumba_addict_: http://stackoverflow.com/questions/566​9358/can-i-do-a-partial-revert-in-git
14:49 zumba_addict_ thanks a lot
14:51 daniel_rose joined #git
14:55 moritz rewriting 18k commits is fun
14:55 moritz git-filter-branch++
14:55 clemf joined #git
14:56 unbalancedparen joined #git
14:56 moritz and finished after only about 20 minutes
14:56 poisond this is beyond me, according to history the file should exist, yet it doesn't O_o
14:56 moritz ... if I had to do that more often, I'd try to find a quicker solution :-)
14:57 chrisshattuck joined #git
14:57 madduck several Git commands still don't output unicode characters to stdout, e.g. git diff --names-only, but instead include sequences like \123\234 in the output to encode the multibyte characters. Can this be fixed somehow such that proper utf-8 is printed?
14:59 notebox joined #git
15:00 chrispickard joined #git
15:00 wrouesnel joined #git
15:02 Darren_ joined #git
15:03 DX1 joined #git
15:03 _ikke_ madduck: The !mailing_list is a much better place to request this. All the developers read the mailing list.
15:03 gitinfo madduck: The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
15:05 drewo joined #git
15:05 madduck _ikke_: thanks. will do.
15:06 NeverDie joined #git
15:07 happy-dude joined #git
15:07 ojacobson joined #git
15:08 madewokherd joined #git
15:08 NeverDie joined #git
15:08 LionsMane joined #git
15:10 BSaboia joined #git
15:10 ArchNoob joined #git
15:11 chrisshattuck joined #git
15:11 dmto joined #git
15:12 dhollinger joined #git
15:12 nnyk_ joined #git
15:15 romerocesar joined #git
15:17 ojacobson joined #git
15:17 lindenle joined #git
15:17 tyreld joined #git
15:19 spriz joined #git
15:22 Doginal joined #git
15:22 tristanp joined #git
15:24 foist joined #git
15:25 quetz joined #git
15:26 stefaus joined #git
15:27 stefaus left #git
15:27 a_thakur joined #git
15:28 TomyLobo joined #git
15:28 devbug joined #git
15:29 peepsalot joined #git
15:29 AaronMT_ joined #git
15:30 cyan__ joined #git
15:30 xall_ joined #git
15:30 madduck _ikke_: the answer to my question btw is:
15:30 madduck git config core.quotePath false
15:31 mira|AO ah good catch @madduck
15:35 romerocesar joined #git
15:35 spriz joined #git
15:37 rominronin joined #git
15:38 rbr joined #git
15:39 sneep joined #git
15:40 _ikke_ madduck: ah ok
15:40 mira|AO aww, too bad, git diff-tree doesn’t take -c core.quotePath=false
15:41 mehola joined #git
15:42 Alienpruts joined #git
15:44 dmarques joined #git
15:45 irco joined #git
15:45 mira|AO … and that’s precisely the one call in my generic post-receive-hook email script that needs it
15:45 IWishIKnew joined #git
15:46 quetz joined #git
15:47 anddam left #git
15:48 dmj` joined #git
15:48 troulouliou_divn joined #git
15:49 FuzzySockets joined #git
15:50 Noldorin joined #git
15:51 mira|AO ah nevermind…
15:51 mira|AO git -c core.quotePath=false diff-tree -p --stat --summary --find-copies-harder 728eda1ad18d9f3ba1188a9a2fbf494978df3067^.​.728eda1ad18d9f3ba1188a9a2fbf494978df3067
15:51 mira|AO this is how it works
15:52 Literphor joined #git
15:53 fahadash joined #git
15:53 nettoweb joined #git
15:54 al-damiri joined #git
15:54 mdw joined #git
15:55 skasturi joined #git
15:55 romerocesar joined #git
15:56 wrouesnel joined #git
15:56 durham joined #git
15:57 jstimm_ joined #git
15:58 durham joined #git
15:58 clemf_ joined #git
15:58 crose joined #git
15:58 zacts joined #git
15:59 drewo joined #git
16:01 mischat joined #git
16:01 clemf joined #git
16:02 ojacobson joined #git
16:03 daniel_rose joined #git
16:03 T2_ joined #git
16:04 narendraj9 joined #git
16:08 govg joined #git
16:12 T2_ left #git
16:13 shinnya joined #git
16:14 King_DuckZ can I assume the path one level above the one returned by git --rev-parse --git-dir to always be the current working tree? (for non-bare repos only)
16:14 King_DuckZ or is there a way to make git tell me?
16:15 Mirubiri joined #git
16:15 _ikke_ git rev-parse --show-toplevel
16:16 tristanp joined #git
16:16 dimi1947 joined #git
16:17 Mirubiri joined #git
16:17 diegoviola joined #git
16:17 King_DuckZ _ikke_: I tried that, but it's returning the very top level... I have main repo, submodule A inside it and submodule B inside A
16:17 Mirubiri joined #git
16:18 King_DuckZ I changed the .git file in submodule A to point to somewhere else on the disk, and from within submodule A dir, toplevel returns the main project's working dir
16:19 geoid joined #git
16:19 a_thakur_ joined #git
16:19 King_DuckZ well the current dir actually, so a path inside the top level project... but --git-dir does return the path I want, + /.git
16:22 d5sx43 joined #git
16:22 Arguggi joined #git
16:23 troulouliou_div2 joined #git
16:23 Mirubiri joined #git
16:24 Mirubiri left #git
16:26 Literphor joined #git
16:27 _ikke_ Hmmm, that
16:27 _ikke_ that's not what I would expect
16:27 turnstileJumper joined #git
16:27 mira|AO GIT_DIR can be moved to some other place, so, no.
16:28 emPi joined #git
16:29 d5sx43 joined #git
16:29 xpk joined #git
16:34 LionsMane joined #git
16:36 King_DuckZ _ikke_: I'm at a loss... I have two such submodules in the main project, one works as you said, the other one just returns the current submodule dir
16:36 romerocesar joined #git
16:36 King_DuckZ I've altered the .git file in both tho
16:36 King_DuckZ I must have done something wrong
16:36 jimi_ joined #git
16:37 clemf joined #git
16:37 Heisenberg1276 joined #git
16:38 circ-user-foXmx joined #git
16:38 Arban joined #git
16:38 rominronin joined #git
16:38 poisond no takers? ^^ I have file that according to git history should be there but isn't. git log --summary shows it beeing created but not deleted, yet the file isn't in the tree. How do I figure out how&when it got lost?
16:39 King_DuckZ ahh found the problem, I forgot to set core.worktree in the out-of-tree submodule
16:39 King_DuckZ sorry, that was my mistake
16:40 mira|AO poisond: rm or git rm without committing?
16:41 poisond mira|AO: no. working directory is clean, nothing is staged
16:41 mira|AO even with 'git status --ignored'?
16:42 mehola joined #git
16:42 nb_bez___ joined #git
16:42 mira|AO I've had something similar when a committed file matches a current gitignore pattern
16:42 poisond mira|AO: that only has a few .orig and ~ files ...
16:42 mira|AO ok…
16:42 mira|AO does 'git diff --stat somecommitwhenitwasstillthere' show it as being deleted?
16:44 mira|AO oh, easiest way is probably 'git log -- path/to/file'…
16:44 poisond mira|AO: 'git log -- path/to/file' is blank
16:44 poisond of course with the proper path
16:45 mira|AO then the file never was committed with that path
16:45 poisond mira|AO: it was ...
16:45 mira|AO I get this only with nonexistent files
16:45 mira|AO are you *sure* it was committed in a (any) parent of the current commit?
16:45 Tratos joined #git
16:46 mira|AO because 'git log -- path/to/file' will show at least the commit when it was added
16:46 mira|AO also, consider typos, pastos, invisible Unicode funny characters, etc.
16:46 poisond yes ... it shows up in git log --summary
16:46 mira|AO ok, what about the git diff --stat from above?
16:47 poisond mira|AO: I don't understand what you want me to diff
16:47 mira|AO you have a commit when it was created, right?
16:47 poisond yes
16:47 nnyk_ joined #git
16:47 mira|AO then take its hash and enter it after 'git diff --stat '
16:48 mira|AO is this a public repo? might be easier if people can directly look at it
16:49 poisond mira|AO: yes, shows up as beeing deleted
16:49 poisond mira|AO: and sadly not public and I can't make it so :/
16:50 mira|AO ok, if it shows up there, it will also show up in git log $hash..HEAD
16:50 obiwahn how do i swich the commit used in a submodule?
16:50 ash_workz joined #git
16:50 mira|AO possibly with --stat too
16:51 mira|AO as for Unicode, can you tell the difference between a ̷b and a/b ? ;-)
16:52 mira|AO or between A and А?
16:52 d5sx43 joined #git
16:52 mira|AO heh. another idea.
16:52 qsx obiwahn: cd $submodule; git checkout $commit
16:53 obiwahn modified:   wiredtiger (untracked content)
16:53 drewo joined #git
16:53 Cassiopaya joined #git
16:53 mira|AO does it show up in: git ls-tree -r --full-tree --name-only HEAD
16:53 poisond mira|AO: it shows up in git log --stat 79ec4f5c978cc086000d4bf907595f7d630c4fc5..HEAD, modified twice, never removed
16:54 poisond mira|AO: this is why I'm pulling my heair out
16:54 mira|AO (this is probably the appropriate time to plug my https://github.com/mirabilos/git-find utility)
16:54 dreiss joined #git
16:55 toogley joined #git
16:56 IlNominePatre joined #git
16:56 romerocesar joined #git
16:57 mira|AO another thing that comes to mind… can your filesystem handle it? some can’t handle things like \\ or : or precomposed Unicode
16:57 ochorocho__ joined #git
16:57 GenZai joined #git
16:57 obiwahn qsx: the guys build in source
16:58 qsx obiwahn: wat
17:00 nettoweb joined #git
17:00 d5sx43_ joined #git
17:01 SaraDR joined #git
17:01 cyan__ joined #git
17:01 SaraDR Hi humanoids. I've transfered a repo, how do I update my local folder to the new? It's still pointed to the old repo location.
17:02 tristanp joined #git
17:04 jhass git remote set-url
17:04 nilg joined #git
17:04 blackwind_123 joined #git
17:07 poisond mira|AO: http://paste.ubuntu.com/19383830/ ... it should be in all revisions ... but appearently randomly it either is or isn't O_o
17:08 Doginal joined #git
17:12 muelli joined #git
17:14 SaraDR left #git
17:14 kaldoran joined #git
17:15 King_DuckZ left #git
17:16 Peng__ joined #git
17:17 durham joined #git
17:20 freimatz joined #git
17:20 jwest joined #git
17:20 stantonk joined #git
17:23 lindenle joined #git
17:23 brandonw joined #git
17:24 Limes_ joined #git
17:25 LeBlaaanc joined #git
17:27 drewo joined #git
17:27 robotroll joined #git
17:28 drewo joined #git
17:29 robotroll joined #git
17:31 mira|AO hm true
17:31 mira|AO in that case I can’t say anything more without knowing more details
17:31 mira|AO try git fsck ;)
17:31 kaldoran joined #git
17:32 nilg joined #git
17:33 d5sx43 joined #git
17:34 mikecmpbll joined #git
17:35 SteffanW joined #git
17:35 phanimahesh joined #git
17:35 LiohAu joined #git
17:36 lindenle joined #git
17:36 LeBlaaan_ joined #git
17:37 romerocesar joined #git
17:37 rominronin joined #git
17:38 rominron_ joined #git
17:41 durham joined #git
17:42 osse joined #git
17:42 mehola joined #git
17:43 Rodya_ joined #git
17:44 nitin joined #git
17:46 ejb joined #git
17:48 mkoskar joined #git
17:48 jamesd joined #git
17:48 Ahmed90 joined #git
17:48 nnyk_ joined #git
17:49 thiago joined #git
17:50 ascarter joined #git
17:55 tristanp joined #git
17:56 romerocesar joined #git
17:57 mira|AO got an answer to my original question, too ☺ http://article.gmane.org/gmane.​comp.version-control.git/299535
17:57 mira|AO (with the caveat that even jessie’s comm(1) is too old)
17:59 azbarcea joined #git
17:59 lindenle joined #git
18:00 LionsMane joined #git
18:00 NeonSynth joined #git
18:02 Sasazuka joined #git
18:03 bb010g joined #git
18:03 Garen joined #git
18:04 catag87 joined #git
18:05 zacts joined #git
18:05 durham joined #git
18:06 osse joined #git
18:07 davisonio joined #git
18:08 Klumben joined #git
18:09 ExoUNX joined #git
18:09 toogley joined #git
18:09 pioiytr joined #git
18:09 kpease joined #git
18:10 robotroll joined #git
18:12 Literphor joined #git
18:13 GavinMagnus joined #git
18:14 xall_ joined #git
18:17 romerocesar joined #git
18:17 toogley joined #git
18:17 rgrinberg joined #git
18:18 iob- joined #git
18:19 toogley joined #git
18:20 Masterphi joined #git
18:21 f3r70rr35f joined #git
18:22 geoid joined #git
18:23 jost_ joined #git
18:23 kfunk joined #git
18:24 orion joined #git
18:24 orion left #git
18:26 pfil joined #git
18:26 spriz joined #git
18:28 jstimm_ joined #git
18:29 ProbabilityMoon joined #git
18:31 NeonSynth joined #git
18:31 NeonSynth joined #git
18:34 toogley joined #git
18:35 shgysk8zer0 joined #git
18:35 pcre joined #git
18:36 xPucTu4_ left #git
18:36 NwS joined #git
18:37 xPucTu4 joined #git
18:38 rominronin joined #git
18:39 ajf- joined #git
18:39 LeBlaaanc joined #git
18:43 mehola joined #git
18:45 elastix joined #git
18:45 chrisshattuck joined #git
18:48 Dazzyp joined #git
18:49 jknetl joined #git
18:50 daniel_rose joined #git
18:51 MacWinner joined #git
18:51 rahtgaz joined #git
18:52 phanimahesh joined #git
18:52 cr3 left #git
18:52 styx_ joined #git
18:56 toogley joined #git
18:56 apotry joined #git
18:57 phanimahesh joined #git
18:57 romerocesar joined #git
19:00 InfoTest joined #git
19:00 aep-shoutlet joined #git
19:02 clemf_ joined #git
19:03 ahr3n joined #git
19:04 clemf joined #git
19:05 rgrinberg joined #git
19:07 githogori joined #git
19:09 nitin joined #git
19:10 tristanp joined #git
19:10 andymaster01 joined #git
19:11 Brain joined #git
19:18 styx_ joined #git
19:19 NeverDie joined #git
19:21 m0viefreak joined #git
19:22 xall_ joined #git
19:22 jknetl joined #git
19:23 stantonk joined #git
19:23 Topic for #git is now Welcome to #git, the place for git help and surveys | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | rerere: the git that keeps on giving?
19:23 Topic for #git is now Welcome to #git, the place for git help and surveys | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | rerere: the git that keeps on giving
19:24 vuoto joined #git
19:24 PioneerAxon joined #git
19:26 antranigv joined #git
19:26 DieguezZ joined #git
19:28 vuoto joined #git
19:29 dreiss joined #git
19:29 paul424 joined #git
19:30 catag87 joined #git
19:30 theskillwithin joined #git
19:30 ynanm joined #git
19:31 Seveas rerere your boat, gently down the stream...
19:32 cdown joined #git
19:32 spudowiar joined #git
19:33 jstimm_ joined #git
19:34 qsx is that a song i should know?
19:34 Mirubiri joined #git
19:35 GodGinrai qsx: "row your boat", but with "rerere" from the topic
19:35 GodGinrai qsx: I don't get it, but that's what it is
19:35 Vinnie_win joined #git
19:35 qsx dunno this song is much better, don’t you think so Seveas? https://youtu.be/wzRHqOSg--s
19:36 Amit_t__ joined #git
19:37 mikecmpbll joined #git
19:37 RedShift joined #git
19:37 RedShift hi all
19:37 RedShift is there any software that's like github.com?
19:37 Mirubiri joined #git
19:37 qsx !host_gui
19:37 gitinfo There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.p​hp/Interfaces,_frontends,_and_tools
19:37 RedShift I don't need as much features, just some plain webinterface that allows me to create new repos with a click
19:37 Xe RedShift: gogs.io is what I use
19:38 preaction how about create new repos by pushing to a git repo?
19:38 romerocesar joined #git
19:38 RedShift cool it even looks like github.com
19:38 GodGinrai RedShift: yea, it's a straight up knockoff
19:38 cdg joined #git
19:38 Vinnie_win joined #git
19:38 GodGinrai RedShift: There's also Github Enterprise, but that's paid.
19:39 Amit_t__ Hello
19:39 gitinfo Amit_t__: 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.
19:39 Amit_t__ I have a basic query, created a "new" branch and made one commit to it now how can I push that commit  to "new"  branch ?
19:40 rominronin joined #git
19:40 cdg joined #git
19:41 cyan__ joined #git
19:43 LaptopBrain joined #git
19:44 mehola joined #git
19:44 Amit_t__ Anyone help me here
19:44 Amit_t__ is it ok to use git push origin ?
19:45 _ikke_ Amit_t__: git push origin <branchname>
19:45 piling joined #git
19:45 troulouliou_div2 joined #git
19:45 Amit_t__ _ikke_: like git push origin new, ?
19:46 azbarcea joined #git
19:46 _ikke_ yes
19:47 _ikke_ (add -u if you want to set tracking information (Which for example lets git say that you are x commits ahead and/or behind)
19:47 nwkj86 joined #git
19:48 Seveas qsx: long time no troll! How'ya doing?
19:48 MacWinner joined #git
19:48 qsx Seveas: yeah, studying, or at least i imagine :)
19:49 Amit_t__ __ikke_: ok, Thanks. It worked.
19:50 shgysk8zer0 joined #git
19:52 yqt joined #git
19:53 jast did someone say trolling? sounds like my kind of thing
19:54 Synthead joined #git
19:56 piling guys having problem with rebase
19:56 piling i'd like to merge last two commits
19:56 _ikke_ git reset --soft HEAD~ && git commit --amend -CHEAD
19:57 _ikke_ No rebase needed
19:58 romerocesar joined #git
19:59 rgrinberg joined #git
19:59 qsx jast: https://imgur.com/Mbko8yy was that you?
20:00 jast I have been advised by my legal team not to answer your question
20:00 piling _ikke_: thanks trying
20:00 catag87 joined #git
20:01 nwkj86 joined #git
20:02 tristanp joined #git
20:03 acetakwas joined #git
20:05 Silenced_v2 joined #git
20:06 Silenced_v2 joined #git
20:06 Darren_ joined #git
20:06 FuzzySockets joined #git
20:08 romerocesar joined #git
20:08 davisonio joined #git
20:10 dsantiago joined #git
20:11 * MTecknology hugs _ikke_
20:11 qsx Seveas: i’d love to visit amsterdam pride (some people from aachen are going), but i got an exam just two days after that, so …
20:12 ahmed_elgabri joined #git
20:13 dsantiago joined #git
20:13 Seveas qsx: $work is sponsoring a big boat there this year
20:13 Seveas you should come be my minion and you can be on that boa
20:13 Seveas t
20:14 Literphor joined #git
20:14 shgysk8zer0 joined #git
20:14 deBase joined #git
20:14 qsx hm. :D
20:14 Darren__ joined #git
20:14 diegoviola joined #git
20:16 catag87 joined #git
20:17 eight58 joined #git
20:19 djb-irc joined #git
20:20 ac3takwas joined #git
20:20 tristanp joined #git
20:21 catag87 joined #git
20:22 diegoviola joined #git
20:22 GT4066 joined #git
20:25 shaggycat joined #git
20:26 davisonio joined #git
20:27 boombatower joined #git
20:28 reim joined #git
20:29 xall_ joined #git
20:29 spudowiar joined #git
20:30 Darren_ joined #git
20:30 jeffreylevesque joined #git
20:32 ochorocho__ joined #git
20:32 jast Seveas: you mean like <http://j.mp/2adxaa2>?
20:34 Doginal joined #git
20:38 kbs joined #git
20:38 romerocesar joined #git
20:40 Literphor joined #git
20:41 rominronin joined #git
20:42 shum joined #git
20:42 leeN joined #git
20:42 BSaboia joined #git
20:43 tvw joined #git
20:43 BSaboia joined #git
20:44 netcarver joined #git
20:46 akiva joined #git
20:47 SimonNa joined #git
20:47 davisonio joined #git
20:49 Seveas jast: more like https://s-media-cache-ak0.pinimg.com/600x315/​e3/09/db/e309dbc47decdc774c486c98f38960e1.jpg
20:50 shaggycat joined #git
20:53 tty01 joined #git
20:53 tty01 anyone come across this one before? remote: [The commit with the hash "%s" has two parents, but merge commits are not allowed] The commit with the hash "<hash>" has two parents, but merge commits are nallowed
20:54 tty01 s/nallowed/not allowed
20:54 Seveas tty01: sounds like an anal update or post-receive hook that rejects any and all merges
20:54 tty01 for bitbucket
20:54 qsx Seveas: which one is you?
20:54 tty01 hmm ok let me see about what hooks are currently in place
20:54 Seveas qsx: the middle one
20:55 Seveas I've been doing a lot of building lately
20:55 qsx Seveas: and jast is the right one?
20:55 Seveas could be. The indian suits you
20:56 qsx how so?
20:56 Seveas dunno. Just feels right :)
20:56 DeaTheAngel joined #git
20:56 qsx m)
20:56 Seveas better than leatherman at least
20:57 antranigv what was the command for git+gtk?
20:57 qsx gitk
20:57 qsx oh, gtk
20:57 qsx er, there is gitg
20:58 antranigv well, I did compile git with gtk. now I'm not sure if that's the same as gitg
20:58 qsx wtf
20:58 qsx how did you do that?
20:58 antranigv looks not, I have another ebuild named gitg
20:58 romerocesar joined #git
20:58 antranigv qsx: USE flags of gentoo ebuilds? :))
20:58 hahuang61 joined #git
20:59 qsx + + gtk                      : Include the gitview contrib tool
20:59 qsx you know, you couldn’t just read the description?
20:59 antranigv aaa
20:59 Seveas no, gentoo users don't read descriptions
20:59 antranigv I'm used to |less after equery :D
20:59 qsx Seveas: WRONG
20:59 Seveas they just -funroll-loops
21:00 tristanp joined #git
21:00 qsx $ portageq envvar CFLAGS
21:00 qsx -O2 -pipe -march=native
21:00 qsx not really
21:00 antranigv actually yes, most of gentoo users read everything :)
21:00 Seveas only compiler output, to make them feel 1337
21:00 antranigv I just worked 12 hours today, now I need to push, no idea what I'm doing right now :D
21:00 qsx all generalizations are stupid.
21:01 arooni joined #git
21:02 CheckDavid joined #git
21:02 Seveas /ereralization/too user/ :P
21:03 eijk joined #git
21:03 eijk_ joined #git
21:05 qsx Seveas: https://youtu.be/JIPHWjScQVI?t=34
21:05 rbern joined #git
21:07 ejb joined #git
21:07 clemf joined #git
21:08 WaReZ joined #git
21:09 romerocesar joined #git
21:09 Orbitrix joined #git
21:12 mischat joined #git
21:13 aidalgol joined #git
21:13 elastix joined #git
21:15 ahr3n joined #git
21:20 joki joined #git
21:24 inflames joined #git
21:24 Rodya_ joined #git
21:26 rgrinberg joined #git
21:28 reim joined #git
21:29 nwkj86 joined #git
21:29 Doginal joined #git
21:30 joki joined #git
21:30 LeBlaaanc joined #git
21:33 yohnnyjoe joined #git
21:34 mdw joined #git
21:34 nwkj86 joined #git
21:37 stantonk joined #git
21:38 yohnnyjoe joined #git
21:39 romerocesar joined #git
21:39 MattMaker joined #git
21:40 tristanp joined #git
21:42 rominronin joined #git
21:43 davisonio joined #git
21:45 mehola joined #git
21:48 ShapeShifter499 joined #git
21:49 mwhooker joined #git
21:49 pioiytr_ joined #git
21:50 ceran joined #git
21:52 codebam if git apply gives no output does that mean that it has already been applied?
21:53 takwas joined #git
21:54 Dougie187 left #git
21:54 codebam oh I can use -v
21:56 nnyk_ joined #git
22:00 xall_ joined #git
22:02 krstf joined #git
22:02 mwhooker joined #git
22:04 cdown_ joined #git
22:05 joki joined #git
22:08 [Muslim] joined #git
22:09 romerocesar joined #git
22:09 tyler joined #git
22:10 Guest19939 left #git
22:11 stantonk_ joined #git
22:13 madewokherd joined #git
22:13 GT4066 joined #git
22:13 drew joined #git
22:15 davisonio joined #git
22:15 ceran left #git
22:15 apotry joined #git
22:15 tristanp joined #git
22:25 Flyers joined #git
22:26 ag4ve_ joined #git
22:27 ag4ve_ how do I flatten (remove) mu
22:27 ag4ve_ merge commits
22:27 Flyers joined #git
22:28 ag4ve_ trying a rebase and that's going to take some time
22:29 codebam why does this say committed with, if I wrote the commit? https://ptpb.pw/LcEZ.png
22:30 osse codebam: per commit git stores one author and one committer
22:30 mischat joined #git
22:30 [Muslim] left #git
22:30 osse codebam: this might happen if you make a commit, then send a patch by email, or if someone else (eg. a maintainer) rebases your commits
22:30 osse what's happened in this case specifically I dunno
22:30 ag4ve_ I'm guessing a filter-branch and remove any commit with more than one child - I have no idea how to do this a
22:31 leeN joined #git
22:31 codebam would it be because he committed this a while back, and commit the same thing?
22:32 Literphor joined #git
22:32 osse the message says "applied patch" so I guess that's what happened
22:32 osse or maybe the guy fiddled with the author/committer info by hand
22:34 codebam well I wrote the commit message
22:34 codebam which was "applied patch link"
22:34 NeverDie joined #git
22:35 mwhooker joined #git
22:36 NeverDie joined #git
22:36 osse codebam: what does git show --pretty=fuller 25d9572 say?
22:36 osse it should list both
22:37 Vgr_ joined #git
22:37 Vgr_ joined #git
22:37 NeverDie joined #git
22:38 codebam https://ptpb.pw/UBRz
22:38 osse yup, the Author and the Committer are different people
22:38 osse not sure how that happened
22:38 magicbit joined #git
22:38 osse but at least that's why github says what it says
22:38 codebam hmm
22:38 codebam okay well I applied the patch anyways
22:38 codebam lol
22:39 codebam was just wondering
22:39 osse so you're Sean Behan ?
22:39 NeverDie joined #git
22:39 catag87 joined #git
22:40 codebam yes
22:40 osse did you use 'git am' or somesuch?
22:41 codebam no I just used git apply patchfile.patch
22:41 codebam then git add .
22:41 codebam git commit -m "..."
22:41 codebam not actually ...
22:41 osse the patch mentioned in the message? Btu that patch's author is Benoît
22:41 osse strange
22:42 osse anyway, then you have a patch like that you're supposed to use git am. that way you keep the message etc. easier.
22:43 codebam oh okay
22:43 rominronin joined #git
22:45 codebam oh and yes, the patch mentioned in the message
22:45 tristanp joined #git
22:48 cdown joined #git
22:48 Jellyg00se joined #git
22:48 clevodearia joined #git
22:50 mischat joined #git
22:51 bonerx2k left #git
22:51 raijin joined #git
22:53 apotry joined #git
22:54 clemf joined #git
22:57 Literphor joined #git
23:05 yohnnyjoe joined #git
23:06 MZAWeb joined #git
23:07 stantonk joined #git
23:08 kbs out of curiosity, do you sign all your commits?
23:09 cd-rum joined #git
23:10 romerocesar joined #git
23:13 cd-rum_ joined #git
23:16 Limes_ joined #git
23:16 tristanp joined #git
23:19 bremner only in special purpose repos
23:19 bremner otherwise, just tags
23:22 ac_slater joined #git
23:23 ac_slater hey guys. I have 2 copies of a repo each with different branches, etc (it's a mess). How can I find the last commit where a file was changes on ALL branches? ie - search local and remotes in each repo for mods to a  specific file
23:23 kbs interesting, thanks. I assumed that (at a basic level) signing is only interesting in contexts where stuff is pulled by someone who doesn't necessarily trust the repo being pulled from
23:24 kbs signing commits seemed to me a bit interesting (maybe a solution looking for a problem sort of thing) hence I was curious...
23:25 FuzzySockets joined #git
23:25 jwarren_ joined #git
23:27 GavinMagnus left #git
23:27 * kbs idly wonders if step #1 might be to make an even bigger mess == union of both repos :) but will let the git experts opine
23:27 jwarren_ Howdy folks. We're migrating a heafty repo from Github to Bitbucket. Using Bitbucket's import feature is great, but no issues, PRs, or commentary on the former is moved. Is there any documented way to move all the meta with it, or is it just forever going to be confined to Github?
23:28 murph joined #git
23:29 FuzzySockets joined #git
23:35 njt left #git
23:37 dsantiago joined #git
23:41 Eugene jwarren_ - you'll need to use the API to export Issues; they're not stored as part of the git repo itself
23:41 Eugene This seems to be a problem that's been encountered before https://github.com/sorich87/gith​ub-to-bitbucket-issues-migration
23:42 jwarren_ Right, I was hoping that someone may have already been figured out.
23:42 Eugene Here's one in Python. https://github.com/maxcutler/gith​ub-issues-to-bitbucket-converter
23:42 jwarren_ Most of what I'm concerned about is Pull Requests and the conversations that are part of those.
23:42 Eugene !github_pull
23:42 gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/3342247
23:42 Eugene You can get those as a git object, and copy them into branches
23:42 jwarren_ Oooo, interesting.
23:43 jwarren_ Thanks for the info Eugene
23:43 Eugene That's just the PR itself; the comments metadata is tied in with Issues
23:43 Eugene disclaimer: No idea if any of those tools work; it was just random googling. good luck!
23:45 rominronin joined #git
23:45 unreal_ joined #git
23:45 Darren_ joined #git
23:46 Garen joined #git
23:46 mehola joined #git
23:48 tristanp joined #git
23:50 romerocesar joined #git
23:50 turnstileJumper joined #git
23:52 Kaisyu joined #git
23:55 pioiytr_ joined #git
23:56 Literphor joined #git
23:56 cdg joined #git
23:59 nnyk_ joined #git

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