Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-16

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

All times shown according to UTC.

Time Nick Message
00:01 nick123 joined #git
00:02 Derperperd joined #git
00:09 dirtyroshi_ joined #git
00:20 garethdaine joined #git
00:22 Derperperd joined #git
00:26 mizu_no_oto joined #git
00:26 mischat joined #git
00:27 xaviergmail joined #git
00:27 mischat joined #git
00:27 mischat joined #git
00:37 boombatower joined #git
00:40 r4nd0m0ne joined #git
00:42 metachr0n joined #git
00:43 GavinMagnus joined #git
00:44 hahuang61 joined #git
00:51 nettoweb joined #git
00:53 Guest87941 joined #git
00:53 teslazhang joined #git
00:53 xaviergmail joined #git
00:56 lindenle joined #git
00:57 arescorpio joined #git
01:01 ome joined #git
01:05 Nilesh_ joined #git
01:06 timvisher joined #git
01:06 Derperperd joined #git
01:08 donught joined #git
01:09 silnp_ joined #git
01:12 nettoweb1 joined #git
01:12 nidr0x joined #git
01:13 romerocesar joined #git
01:13 watabou joined #git
01:15 cqi joined #git
01:15 watabou joined #git
01:16 adrian_1908 joined #git
01:19 NeverDie joined #git
01:19 dsdeiz joined #git
01:19 dsdeiz joined #git
01:23 kyan joined #git
01:24 watabou joined #git
01:24 pks joined #git
01:25 nettoweb joined #git
01:25 Mobutils joined #git
01:26 GavinMagnus left #git
01:26 silnp joined #git
01:26 dsdeiz joined #git
01:26 dsdeiz joined #git
01:26 balancin joined #git
01:28 mischat joined #git
01:29 almy joined #git
01:33 a_thakur joined #git
01:34 UnnamedPlayer joined #git
01:41 timvisher joined #git
01:41 watabou joined #git
01:42 prg3 joined #git
01:44 lvh joined #git
01:45 lvh hi! is there something like git blame/annotate except I can provide custom data annotations myself?
01:46 lvh I'm trying to track meta-information of code in a way that works past commits.
01:46 energizer joined #git
01:46 robbie_ joined #git
01:47 energizer What is happening when git diff file1 file2 returns nothing but clearly differ
01:49 sangy energizer: could you elaborate?
01:49 thierryp joined #git
01:49 energizer sangy: turns out i needed git diff --no-index
01:50 sangy ah ok
01:51 robbie_ left #git
01:51 a_thakur joined #git
01:54 jason237 joined #git
01:55 Anja joined #git
01:56 netj joined #git
01:58 Derperperd joined #git
02:03 nick123 joined #git
02:06 drbean joined #git
02:08 Gsham joined #git
02:09 duderonomy joined #git
02:13 YuGiOhJCJ joined #git
02:15 Wulf4 joined #git
02:15 safe joined #git
02:17 brent__ joined #git
02:17 xaviergmail joined #git
02:22 jellycode2 joined #git
02:22 stfn joined #git
02:22 donught joined #git
02:23 gugah joined #git
02:23 rt joined #git
02:28 fahadash joined #git
02:28 pandeiro joined #git
02:29 mischat joined #git
02:29 tonyj joined #git
02:36 Gsham joined #git
02:38 d^sh joined #git
02:46 pks joined #git
02:46 hahuang61 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | 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 | This channel may contain users known to the state of California to cause cancer.
02:51 thierryp joined #git
02:54 romerocesar joined #git
02:55 aavrug joined #git
02:57 aavrug joined #git
02:59 stick-sh_ joined #git
03:02 done joined #git
03:03 jameser joined #git
03:03 jarshvor joined #git
03:03 dodobrain joined #git
03:04 nick123 joined #git
03:08 Poppabear joined #git
03:08 Poppabear joined #git
03:14 Guest40444 left #git
03:17 fakenerd joined #git
03:18 hexagoxel joined #git
03:19 chachasmooth joined #git
03:22 Vortex35 joined #git
03:30 mischat joined #git
03:31 sunri5e joined #git
03:38 diogenese joined #git
03:43 gautamsomani joined #git
03:44 hlzr joined #git
03:44 gautamsomani joined #git
03:44 fstd_ joined #git
03:47 howdoi joined #git
03:50 wendelmineiro joined #git
03:55 hasc joined #git
03:56 jason237 joined #git
03:57 a_thakur joined #git
03:58 spacelord_ joined #git
04:04 nick123 joined #git
04:11 hasc joined #git
04:11 GT4066 joined #git
04:15 hasc_ joined #git
04:17 tmcmahon joined #git
04:19 rchavik joined #git
04:21 hasc joined #git
04:26 robotroll joined #git
04:30 miczac joined #git
04:31 mischat joined #git
04:33 AlineGomes joined #git
04:35 done joined #git
04:40 miczac_ joined #git
04:40 justanotheruser joined #git
04:40 Raineer joined #git
04:41 s2013 joined #git
04:44 chachasmooth joined #git
04:46 hahuang61 joined #git
04:46 grill joined #git
04:49 subhojit777 joined #git
04:50 ayogi joined #git
04:52 thierryp joined #git
04:54 meloc joined #git
05:03 a_thakur_ joined #git
05:12 d1z joined #git
05:12 pks joined #git
05:26 Kaisyu joined #git
05:31 mischat joined #git
05:32 albel727 joined #git
05:35 lektrik joined #git
05:38 gautamsomani joined #git
05:40 Cabanossi joined #git
05:41 pietv joined #git
05:45 holodoc joined #git
05:45 Sleepy63 joined #git
05:54 ramsub07 joined #git
05:55 pks joined #git
05:57 Nokurn joined #git
05:58 Nikul joined #git
05:58 Nikul left #git
06:01 cdown joined #git
06:02 lektrik joined #git
06:05 cdown_ joined #git
06:08 dodobrain joined #git
06:10 gautamsomani joined #git
06:10 gautamsomani joined #git
06:17 lindenle joined #git
06:19 romerocesar joined #git
06:21 _ng joined #git
06:21 rscata joined #git
06:24 cust joined #git
06:25 tarkus joined #git
06:26 Guest82 joined #git
06:28 sarri joined #git
06:28 sarri joined #git
06:30 ihradek joined #git
06:32 mischat joined #git
06:37 grumble joined #git
06:39 mehola joined #git
06:42 overlord_tm joined #git
06:44 UniFreak joined #git
06:46 UniFreak I have a feature-v1 branch, a bug_resubmit branche, I do the bugfix in bug_resubmit then merged it to feature-v1 and pushed to origin. then the requirement changed so I created bug_resubmit2 branch, do the new bugfix logic then merged into feature-v1.
06:46 UniFreak now, how can I revert all changeds from feature-v1 that is merged from bug_resubmit?
06:47 hahuang61 joined #git
06:48 s2013 oh i dun goofed up
06:49 s2013 i made tons of changes, but on the wrong branch
06:49 s2013 can i git stash checkout to the correct branch and then git apply
06:49 s2013 would that work? or no
06:52 timvisher joined #git
06:53 thierryp joined #git
06:54 ThomasLocke joined #git
06:54 ThomasLocke joined #git
06:54 tarkus joined #git
06:55 Peuc joined #git
06:56 a_thakur joined #git
06:58 theoceaniscool_ joined #git
07:00 ankurk joined #git
07:00 Raging_Hog joined #git
07:02 ankurk I am trying to commit some changes in a file which are only couple of lines. But git shows the whole file as changed. I have also set core.autocrlf to false but it doesn’t seem to work. How do I fix this?
07:02 thierryp joined #git
07:03 albel727 joined #git
07:06 tobiasvl ankurk: there's no .gitattributes file?
07:07 tobiasvl s2013: yes. you can just checkout the correct branch without stashing too: !float
07:07 gitinfo s2013: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
07:07 ankurk Yes I have, it contains `* text=auto`
07:07 ankurk Or do I need to anything else?
07:07 ankurk *add
07:07 tobiasvl ankurk: well that overrides core.autocrlf so
07:07 s2013 yeah but it asked me to commit something i ened up stashing it anyways
07:08 ankurk So what would be the config I need to add
07:08 ankurk I have also set core.autocrlf to false as well
07:08 ankurk *locally
07:09 tobiasvl ankurk: yes, but the .gitattributes file overrides core.autocrlf
07:09 ankurk So I should remove it?
07:10 tobiasvl no idea, that
07:10 tobiasvl 's up to your project
07:10 tobiasvl have the line endings been normalized after .gitattributes were added?
07:11 tobiasvl perhaps see this SO question http://stackoverflow.com/questions/170961/whats-the-best-crlf-carriage-return-line-feed-handling-strategy-with-git
07:11 zeroed joined #git
07:11 zeroed joined #git
07:11 done joined #git
07:11 albel727 joined #git
07:12 JeroenT joined #git
07:12 ankurk I am looking at it right now. It’s an old project that was ported to git so I have no idea
07:13 lb1c joined #git
07:14 Murii joined #git
07:15 dreiss joined #git
07:16 albel727 joined #git
07:16 qt-x joined #git
07:16 bttf joined #git
07:19 govg joined #git
07:21 cdown joined #git
07:25 r4nd0m-0ne joined #git
07:26 freimatz joined #git
07:26 tvw joined #git
07:27 a_thakur_ joined #git
07:29 zeroed joined #git
07:29 zeroed joined #git
07:31 phanimah1sh joined #git
07:31 nidr0x joined #git
07:32 jozwior joined #git
07:33 mischat joined #git
07:33 muthu joined #git
07:33 forrestv joined #git
07:37 JeroenT joined #git
07:37 a_thakur joined #git
07:37 davimore_ joined #git
07:38 elect joined #git
07:38 djb-irc joined #git
07:38 Murii joined #git
07:39 timvisher joined #git
07:39 Anja joined #git
07:39 rasto joined #git
07:45 Spherical joined #git
07:51 nowhere_man joined #git
07:52 david__ joined #git
07:52 david__ left #git
07:53 nowhereman joined #git
07:54 cyan__ joined #git
07:54 Renter Had a discussion about pull / fetch here a while back, mainly that I've been using git for years and only now am discovering interesting rebase interactions and fetch. Just occurred to me that a major reason is that the IDEs I've used (eclipse, intellij idea) have all just had pull, instead of fetch
07:56 phroa fetch looks like a no-op in a graphical environment
07:56 romerocesar joined #git
07:56 _ikke_ phroa: If you show the remote tracking branches, it doesn't
07:57 netj joined #git
07:57 TomyWork joined #git
07:57 Renter _ikke_: how to figure out status of current ve remote is not immmediately obvious in any IDE I've used
07:57 djb-irc joined #git
07:57 Sceorem joined #git
07:58 _ikke_ Renter: Like git does
07:58 Renter ?
07:58 _ikke_ ahead x commits, behind y commits
07:58 Renter ah, there's that, I thought you meant by file
07:58 _ikke_ No, because that would not make sense anyway
07:59 ramsub07 joined #git
08:02 vmiklos joined #git
08:06 albel727 joined #git
08:10 acetakwas joined #git
08:11 nostrora joined #git
08:11 Furai joined #git
08:12 zefferno joined #git
08:16 chele joined #git
08:17 ronny joined #git
08:18 timvisher joined #git
08:18 Junior joined #git
08:19 lindenle joined #git
08:20 eduardas_m joined #git
08:22 absinthe joined #git
08:23 a_thakur joined #git
08:23 albel727 joined #git
08:25 jnavila joined #git
08:26 a_thakur_ joined #git
08:27 nowhereman joined #git
08:27 chipotle joined #git
08:29 a_thakur joined #git
08:31 albel727 joined #git
08:32 absinthe joined #git
08:33 aard_ joined #git
08:33 jagob joined #git
08:34 aidalgol joined #git
08:34 mischat joined #git
08:35 pietv joined #git
08:35 omegak joined #git
08:37 phanimahesh joined #git
08:43 dimi1947 joined #git
08:43 Balliad joined #git
08:44 JeroenT joined #git
08:47 hahuang61 joined #git
08:51 timvisher joined #git
08:51 thierryp joined #git
08:54 GavinMagnus joined #git
08:55 raspado joined #git
08:55 Lotlot joined #git
08:56 diogenese joined #git
08:58 Alienpruts joined #git
08:58 tfrangio joined #git
08:59 tfrangio joined #git
08:59 tfrangio2 joined #git
09:01 donught joined #git
09:03 lordjancso joined #git
09:05 acetakwas joined #git
09:09 eduardas_m joined #git
09:09 Snugglebash joined #git
09:10 mehola joined #git
09:12 Snugglebash joined #git
09:17 absinthe joined #git
09:18 marcogmonteiro joined #git
09:19 ferr1 joined #git
09:20 sbulage joined #git
09:22 leeN joined #git
09:23 PHPanos joined #git
09:24 gautamsomani joined #git
09:24 gautamsomani joined #git
09:24 timvisher joined #git
09:26 SwiftMatt joined #git
09:26 overlord_tm joined #git
09:26 raspado joined #git
09:28 JeroenT_ joined #git
09:28 JeroenT_ joined #git
09:30 Neon joined #git
09:31 Neon Can I somehow get a merge file (with these <<<<<<<<<< annotations) just from a changed file in the working dir? As if I wanted to merge the changed file with the one on HEAD.
09:32 * selckin throws SentranceParseException
09:32 grawity Neon: like a 2-way merge? probably not; what would you need it for?
09:34 Neon grawity: I have a file in my repo and I got a version with some changes from external and I need to merge them, i.e. keep some of my local parts and some of the new ones and having such a merge file would make things easier for me.
09:34 Neon For now I just replaced the old file so git thinks I just changed some lines.
09:34 grawity I'd say run a difftool on both files
09:35 grawity e.g. vimdiff
09:35 anohigisavay joined #git
09:35 anohigisavay hello!
09:35 tristanp joined #git
09:36 JeroenT joined #git
09:37 anohigisavay is it possible to force git to create diff by removing all lines from the original file and add all lines from the new file?
09:38 anohigisavay i removed a shell script and add a python script that basically does the same thing. there's no point in comparing against them
09:38 anohigisavay *comparing them
09:39 Neon What's so bad about the diff?
09:39 Snugglebash joined #git
09:39 selckin not possible, move on
09:40 anohigisavay well nothing too bad. _(:з」∠)_
09:40 albel727 joined #git
09:41 anohigisavay it's just when people review my commits they would look into the diff
09:41 Tobbi joined #git
09:41 Neon Maybe you could git rm it, commit, then git add and commit. But it will probably show the diff anyway, if you're telling it to compare later commits to earlier ones.
09:41 Neon Actually, I'd probably just not name the scripts the same. First would be a .sh, last a .py. :P
09:42 nettoweb joined #git
09:42 anohigisavay yea that's good suggestion
09:43 anohigisavay will probably do the same thing
09:43 minikN joined #git
09:43 anohigisavay thank you guys :)
09:44 overlord_tm joined #git
09:44 aax joined #git
09:46 JeroenT_ joined #git
09:47 ramsub07 joined #git
09:47 geoid_ joined #git
09:48 mischat joined #git
09:50 timvisher joined #git
09:50 ramsub07 joined #git
09:51 JeroenT joined #git
09:54 ramsub07 joined #git
09:54 byte512 joined #git
09:55 phanimahesh joined #git
09:56 heroux joined #git
09:58 Serpent7776 joined #git
09:59 King_Hual joined #git
09:59 King_Hual joined #git
10:00 Disgeae joined #git
10:00 JeroenT joined #git
10:06 chll_ joined #git
10:08 achadwick joined #git
10:09 nick123 joined #git
10:10 rnsanchez joined #git
10:10 dsdeiz joined #git
10:10 dsdeiz joined #git
10:16 rscata joined #git
10:17 timvisher joined #git
10:20 wombawomba joined #git
10:21 wombawomba So I'm trying to write a script that updates a local git repo. If I do `./my-script $my_ref`, I want the script to 1. fetch $my_ref from origin, and 2. point my repo at origin/$my_ref (if $my_ref is a branch) or $my_ref (if $my_ref is a commit). I don't care if my local repo is overwritten, but I don't want to clone the repo anew every time. What git commands and flags should I use to accomplish this?
10:21 danslo joined #git
10:21 moritz git fetch origin; git checkout -f origin/$my_ref
10:24 wombawomba moritz: that won't work if $my_ref is a commit id though, right?
10:25 wombawomba I'm thinking ideally I would like to force my tracking branches to update when fetching stuff from orign
10:25 moritz wombawomba: right, then check out $my_ref in that case
10:25 wombawomba that way I could just do `git checkout $my_ref` regardless if $my_ref is a commit or a branch or a tag
10:25 wombawomba is that possible?
10:25 canton7 if $my_ref is a commit, you can't fetch it directly from origin
10:25 canton7 you'll have to fetch everything and hope that your commit is in the stuff fetched - which should be fine
10:26 wombawomba moritz: hmm yeah... how do I tell if $my_ref is a commit though?
10:26 wombawomba canton7: yeah that's fine with me
10:26 moritz wombawomba: if git-rev parse $my_ref == $my_ref
10:27 wombawomba moritz: neat, thanks!
10:27 canton7 so, 1) 'git fetch' to fetch everything, 2) check whether $my_ref is a branch or commit, 3) if it's a branch, try and checkout origin/$my_ref, or if it's a commit, try and check out $my_ref
10:29 wombawomba Hey so here's a follow up question: if I've checked out origin/my_branch, how do I programmatically tell which branch was checked out?
10:29 wombawomba afaik doing that will put me in a 'detached head' state, which means I can't get the branch name back out of it
10:30 canton7 do you need to tell which branch is checked out, or do you only need to tell whether you have a particular branch checked out?
10:30 wombawomba however, if I had some way of updating my local tracking branch to point at the corresponding origin branch, it seems like I'd be able to use `git symbolic-ref HEAD`
10:30 wombawomba canton7: ideally I'd like to be able to tell which is checked out
10:32 wombawomba maybe I could do `git fetch origin; git checkout -B $my_ref; git reset --hard origin/$my_ref`?
10:32 wombawomba er, I mean `git checkout -fB`
10:32 Shashikant86 joined #git
10:34 afuentes joined #git
10:39 nettoweb joined #git
10:45 dersand joined #git
10:48 hahuang61 joined #git
10:54 GavinMagnus left #git
10:55 guardianJ joined #git
10:57 pijiu joined #git
10:58 guardianJ joined #git
11:06 YuGiOhJCJ joined #git
11:11 nick123 joined #git
11:12 dhollinger joined #git
11:12 guardianJ joined #git
11:13 pks joined #git
11:14 CussBot joined #git
11:15 acetakwas joined #git
11:16 _ng joined #git
11:16 guardianJ joined #git
11:18 guardianJ_ joined #git
11:22 lindenle joined #git
11:24 a_thakur joined #git
11:25 arnsa joined #git
11:25 arnsa hey
11:26 arnsa I just pulled a project from github repo, and when I type in "git branch" I only see master, even tho there are hundreds of branches. I tried git fetch and git fetch origin, but that didn't help
11:26 arnsa any ideas?
11:26 notebox joined #git
11:27 tobiasvl arnsa: git branch -r
11:27 grawity that's normal; remote branches do not automatically become local branches
11:27 grawity (also, your realname is a bit annoying)
11:27 arnsa tobiasvl okay, I am seeing a few branches now, but not all of them
11:27 grawity you can use `git checkout` or `git branch` to create local branches out of the remote-tracking ones
11:27 arnsa grawity, my realname?
11:28 grawity also use `git remote show origin` and `git ls-remote` to see what the server *really* has
11:30 arnsa tobiasvl, grawity so how do I checkout to remote branch?
11:31 arnsa I need to download it to have it locally?
11:31 grawity do you see it in `git branch -r`?
11:31 arnsa grawity, yea
11:31 tobiasvl you need to download anything to have it locally, yes
11:31 grawity then it's already downloaded
11:32 grawity use `git checkout foo` or `git checkout -b origin/foo foo` to make a local branch out of it
11:32 grawity (I was referring to this https://i.imgur.com/2jnXVZg.png)
11:32 a_thakur joined #git
11:33 a_thakur joined #git
11:34 arnsa grawity, tobiasvl I am wondering why there are no other branches in there (git branch -r)
11:34 arnsa I can see only a few
11:34 marcogmonteiro joined #git
11:34 grawity does `git ls-remote | grep refs/heads/` show more?
11:35 grawity also, what do you get from `git config --get-all remote.origin.fetch`
11:35 arnsa grawity, no, it doesn't show more, but git ls-remote does
11:35 arnsa grawity, +refs/heads/*:refs/remotes/origin/*
11:35 grawity then they're not branches!
11:35 mazert_ joined #git
11:36 canton7 what *exactly* does git ls-remote show?
11:36 arnsa grawity, canton7 19fc23ccb7dabe979f682cc5ce36bcf74e6688barefs/pull/97/head
11:36 arnsa something like this
11:36 grawity those are not branches
11:37 canton7 that's a special ref used by github - it's not a branch
11:37 grawity you can get them locally though
11:37 arnsa what's that then?
11:37 canton7 arnsa, read this: https://help.github.com/articles/checking-out-pull-requests-locally/
11:37 grawity git config --add remote.origin.fetch "+refs/pull/*/head:refs/pull/*" && git ftch
11:37 canton7 it contains instructions on how to check out those refs
11:38 canton7 (^ I used to do that, but now I prefer just fetching them individually as and when I need to)
11:38 arnsa grawity, canton7 well, those were local branches, that I pushed to github and made pull requests out of those
11:38 guardianJ_ joined #git
11:38 arnsa ohhhh, they were probably deleted after PR got merged
11:38 arnsa okay, I see, that makes sense
11:38 arnsa thank you guys :)
11:38 grawity did you PR them from your fork?
11:38 canton7 arnsa, no, those are refs created by github which reference the PR itself, not the branch used
11:38 arnsa grawity, what do you mean?
11:38 grawity because usually you push branches to your own repo, but the PR goes to the upstream repo
11:39 dsdeiz joined #git
11:39 dsdeiz joined #git
11:39 grawity they end up in different Github repos
11:39 pijiu2 joined #git
11:39 arnsa canton7, yeah, but if the branch got deleted after PR got merged, that's why these branches are not here
11:39 hhee joined #git
11:39 canton7 yeah. Are you sending PRs to your own repo from your own repo?
11:39 arnsa grawity, I create new branch for a new feature, add that feature, push the code to the new branch, make a PR and ask to merge it to develop branch
11:39 arnsa canton7, ^
11:40 canton7 is that a "yes"? I'm assuming the develop branch is in the same repo as the feature branch, but you dont explicitly say that
11:40 pijiu2 joined #git
11:41 arnsa canton7, yes
11:41 canton7 ok, cool
11:41 canton7 yeah, the branch was probably deleted when the PR was closed, then
11:42 arnsa canton7, yeah, I just asked the dev, he confirmed that branches are being deleted after PR is merged
11:42 arnsa all good, thanks guys :)
11:44 joki joined #git
11:45 finalbeta joined #git
11:46 oskarkv joined #git
11:47 JeroenT joined #git
11:48 relrod_ joined #git
11:48 relrod_ joined #git
11:50 acetakwas joined #git
11:51 netj joined #git
11:52 ertesx joined #git
11:55 guardianJ_ joined #git
11:58 finalbeta joined #git
11:58 timvisher joined #git
12:00 marcogmonteiro joined #git
12:02 Shashikant86 joined #git
12:02 mischat_ joined #git
12:04 mkoskar joined #git
12:04 phanimahesh joined #git
12:07 Cavallari joined #git
12:10 Snugglebash joined #git
12:11 absinthe joined #git
12:11 nick123 joined #git
12:11 Snugglebash joined #git
12:13 rivarun joined #git
12:13 fakenerd joined #git
12:15 GavinMagnus joined #git
12:15 borkr joined #git
12:18 a_thakur joined #git
12:19 notebox joined #git
12:20 sostenuto joined #git
12:21 manuelschneid3r joined #git
12:24 localh0st joined #git
12:26 localh0st Does anyone know if it's possible to use Git and SVN parallel on single project via Eclipse's plugins?
12:28 mgedmin IIRC github allows you to use an svn client to check out a git repo
12:28 mgedmin is that the sort of thing you're thinking about?
12:28 MapMan Hi! After removing a submodule from my repo, there's still submodule entry in .git/config file. Can I ignore that?
12:30 _ikke_ MapMan: Yes, or you can remove it (git config --unset)
12:30 _ikke_ But it has no meaning without a gitmodule entry in the tree
12:30 timvisher joined #git
12:31 ThiefMaster tbh, i wouldn't use either VCS integration with eclipse (or eclipse at all :p). the commandline git client has much better UX IMO
12:31 MapMan _ikke_: thanks!
12:33 Serious8 joined #git
12:34 pietv joined #git
12:36 localh0st mgedmin: yes, I know about git-svn but as far as I found out, Eclipse EGit plugin is not supporting this feature
12:37 eycsigfy joined #git
12:41 sunri5e joined #git
12:44 [0xAA] joined #git
12:44 davimore joined #git
12:45 sdothum joined #git
12:49 hahuang61 joined #git
12:50 garethdaine joined #git
12:56 Panacea joined #git
12:57 ojdo joined #git
12:58 marcogmonteiro joined #git
13:01 dede_ joined #git
13:01 Dandelock joined #git
13:01 overlord_tm joined #git
13:04 timvisher joined #git
13:06 NeverDie joined #git
13:07 b00jah joined #git
13:07 Sceorem joined #git
13:08 Orphis joined #git
13:08 aavrug joined #git
13:08 ct2034 joined #git
13:10 b00jah left #git
13:12 nick123 joined #git
13:14 PtxDK_ joined #git
13:15 masuberu joined #git
13:15 synthroid joined #git
13:19 a_thakur joined #git
13:20 Panacea joined #git
13:22 hanneso joined #git
13:23 nd_ joined #git
13:23 pilo joined #git
13:23 axisys joined #git
13:24 pilo how can i count the number of characters (not lines) contributed by each author in the current code of a git repo?
13:24 Serious8 joined #git
13:25 osse pilo: parse git blame
13:26 osse but the output will be inaccurate since blame is based on lines to begin with
13:26 pilo osse: what can I do for characters and not lines?
13:26 ws2k3 joined #git
13:27 canton7 also, do you mean how many characters contributed by each author survived to the current commit, or how many characters were contributed by each author even if they were subsequently removed?
13:27 osse i already gave you the best answer I can give
13:27 pilo osse: there are some nice one-liners for counting lines
13:27 osse to expand: run git blame on each file. count the length of each line
13:27 raspado joined #git
13:27 pilo osse: no problem, thanks for your help
13:27 timvisher joined #git
13:27 pilo canton7: i mean the former (but the latter would be acceptable as well)
13:28 canton7 osse's blame approach, then
13:28 canton7 I've seen some SO answers which provided shell snippets to do things like that, btw
13:29 vitorsousa joined #git
13:29 mischat joined #git
13:29 pilo canton7: there are nice one-liners here: http://stackoverflow.com/questions/1265040/how-to-count-total-lines-changed-by-a-specific-author-in-a-git-repository
13:29 synthroi_ joined #git
13:29 pilo but they seem to all be based on lines and not characters
13:30 canton7 probably because there's no easy way of getting the characters :P
13:30 canton7 also that means authors get credited more for writing longer variable names, which seems silly
13:30 canton7 (although the LOC metric is also a bit silly by most standards)
13:31 a_thakur_ joined #git
13:32 jast it's a useless metric by any standard
13:32 canton7 nah, it fits my ego-stroking standard pretty well
13:32 canton7 "ooh look, I've written all those lines of code..."
13:33 jast one of my most productive days ever was when I deleted 2500 lines of code
13:33 canton7 and how do you remember that that was a productive day? by remembering the number of lines of code you deleted!
13:33 jast (and added 500 lines that did the exact same thing)
13:34 canton7 without LOC, that'd be "when I deleted some largeish number of lines"
13:34 jast exactly. and now how is this metric going to tell you anything about deleted lines?
13:34 pilo canton7: actually I think my problem cannot even be solved by git blame. the repo I have is mostly text (latex), and some authors write full paragraphs without newlines, while some authors write only 60 char lines; then some authors like to add newlines in other authors paragraphs, so that messes up everything for git
13:35 canton7 I know I know - I completely agree with you. Just commenting on the fact that we still talk about LOC while still referring to them as a useless metric
13:35 jast in that case you're going to have to walk the history yourself and do your own diff calculations (or use word diff mode)
13:36 pilo there is no way to know for git to ignore the fact that one author is just adding newline to other people's paragraphs right?
13:36 jast in blame? no. in diffs? sure.
13:37 absinthe joined #git
13:37 tristanp joined #git
13:37 phanimahesh joined #git
13:38 leftriver40 joined #git
13:38 XeIte joined #git
13:39 garethdaine joined #git
13:41 pilo jast: this one does what I want I think: git log --shortstat --pretty="%cE" | sed 's/\(.*\)@.*/\1/' | grep -v "^$" | awk 'BEGIN { line=""; } !/^ / { if (line=="" || !match(line, $0)) {line = $0 "," line }} /^ / { print line " # " $0; line=""}' | sort | sed -E 's/# //;s/ files? changed,//;s/([0-9]+) ([0-9]+ deletion)/\1 0 insertions\(+\), \2/;s/\(\+\)$/\(\+\), 0 deletions\(-\)/;s/insertions?\(\+\), //;s/ deletions?\(-\)//' | awk 'BEGIN {n
13:41 pilo how can I limit the search to particular files?
13:42 jast add the names to the end of the 'log' command line
13:42 mda1 joined #git
13:43 jast side note, --numstat is easier to parse than --shortstat
13:43 rnsanchez_ joined #git
13:43 pilo thanks!
13:44 pilo jast: oh it still ignores the issue above that can be solved by git diff right?
13:44 ramsub07 joined #git
13:45 jast actually you can add -b to make stat ignore all whitespace changes
13:47 raspado joined #git
13:47 done joined #git
13:47 Ozw joined #git
13:48 pilo jast: but someone adding new line characters is technically also adding new lines full of characters; would this be ignored as well?
13:49 jast I'm not sure what exactly it does
13:49 amrits joined #git
13:50 jast in any case, if you want sub-line accuracy, consider parsing the output of --word-diff=porcelain --word-diff-regex=.
13:50 nettoweb1 joined #git
13:52 afuentes joined #git
13:54 timvisher joined #git
13:54 pilo thanks
13:54 phanimahesh joined #git
13:56 concerti joined #git
13:57 marcogmonteiro joined #git
13:58 CheckDavid joined #git
14:01 geoid__ joined #git
14:04 kpease joined #git
14:04 s2013 joined #git
14:05 kpease_ joined #git
14:05 ispn joined #git
14:06 crose joined #git
14:06 seni left #git
14:08 Endarked joined #git
14:08 Poppabear joined #git
14:08 Poppabear joined #git
14:08 Shashikant86 joined #git
14:09 rnsanchez_ joined #git
14:10 notebox joined #git
14:10 kpease_ joined #git
14:13 nick123 joined #git
14:13 overlord_tm joined #git
14:13 ELFrederich joined #git
14:13 ELFrederich is there a command line switch or environment variable which says which ssh identity to use?
14:14 yanome joined #git
14:14 osse ELFrederich: no. SSH reads .ssh/config as usual.
14:15 osse ELFrederich: you can use e.g.  export GIT_SSH_COMMAND='ssh -i somekey'
14:15 ELFrederich git config core.sshCommand "ssh -i ~/.ssh/id_rsa_example -F /dev/null"
14:16 dud225__ joined #git
14:16 ELFrederich I found that after googling... I will try that out inline with -c.... like git clone -c core.sshCommand "ssh -i ~/keys/someone_elses_rsa_key -F /dev/null" git@some_host:blah.git
14:17 osse basically the same thing as setting GIT_SSH_COMMAND
14:17 s2013 joined #git
14:17 chandu20 joined #git
14:17 ELFrederich osse: okay... cool, thanks
14:18 zeroed joined #git
14:18 zeroed joined #git
14:18 synthroid joined #git
14:25 gautamsomani joined #git
14:25 gautamsomani joined #git
14:25 lindenle joined #git
14:25 gautamsomani joined #git
14:26 Tobbi joined #git
14:26 gautamsomani joined #git
14:26 gautamsomani joined #git
14:26 gautamsomani joined #git
14:29 nettoweb joined #git
14:29 ankit01ojha joined #git
14:30 ShekharReddy joined #git
14:30 timvisher joined #git
14:31 garethdaine joined #git
14:31 XeIte joined #git
14:33 Shashikant86 joined #git
14:35 atrigent joined #git
14:35 atrigent joined #git
14:36 JeroenT_ joined #git
14:36 garethdaine joined #git
14:37 chipotle joined #git
14:40 auioa joined #git
14:40 a_thakur joined #git
14:40 sylario joined #git
14:44 _geoff joined #git
14:44 _geoff when i do `git branch -a` i get a list of branches
14:45 _geoff for one of those branches i do `git push origin --delete foo`
14:45 auioa joined #git
14:45 _geoff but I get an error: unable to delete `foo`: remote ref does not exist
14:45 auioa Hi, I would like to abuse git in order to somehow track changes on a file by file basis. Something like having a git repo for every single file inside one directory. Would this somehow be possible ?
14:46 _geoff auioa: i assume you are aware that one git repo could do that for you?
14:46 osse _geoff: do git fetch --prue origin. is git branch -a still listed?
14:46 Tobbi joined #git
14:46 osse if yes, show me 'git branch -a | grep foo'
14:46 GavinMagnus left #git
14:47 auioa _geoff: not exactly. The problem with one repo is that it also tracks constantly other files.
14:47 _geoff osse: `git fetch --prue` does not seem to be happy
14:47 osse _geoff: i mean --prune
14:48 _geoff nor does what i assume what you actually meant, `git fetch --pure`
14:48 _geoff ah
14:48 topcat joined #git
14:48 osse auioa: you could write a wrapper that sets GIT_DIR and GIT_INDEX etc. per file
14:48 _geoff osse: thanks that worked.  what was going on?
14:48 osse _geoff: the reason you couldn't delete it was that it was already deleted
14:49 sunri5e joined #git
14:49 _geoff but why did it show up in git branch -a
14:49 wCPO joined #git
14:49 wCPO joined #git
14:49 _geoff it was just cached i guess
14:49 osse _geoff: because such remote branches aren't automatically removed when the corresponding branch on the other end is
14:49 osse unless you use --prune
14:49 intellix joined #git
14:50 osse gti config --global fetch-prune true   and never worry about it again
14:50 _geoff osse: thanks
14:50 hahuang61 joined #git
14:50 osse ehh, fetch.prune
14:50 Gsham joined #git
14:50 _geoff auioa: i don't understand what you mean, why can't one git repo work?  you can choose which files to track
14:51 Endarked joined #git
14:51 finalbeta joined #git
14:51 auioa _geoff: hmmm maybe it would work with orphan branches that have a single file whitelisted
14:52 marcogmonteiro joined #git
14:52 topcat hey, how would I commit only the removal of computed but leave valid syntax? http://imgur.com/a/c6lUw
14:52 vuoto joined #git
14:52 cdleonard joined #git
14:52 _geoff auioa: i must be missing something.  gtracking changes to files in a directory is exactly what git does -- why can't a single repo work?
14:52 _geoff git add file1; git add file2;
14:53 osse topcat: git add -p -- file. press 'e' to edit the diff. follow the instructions
14:54 Sheogorath[m] joined #git
14:54 auioa _geoff: I want that every file has its own history without mixing in commits that touch other files. So yeah I will try the orphan branches.
14:55 osse auioa: but you can only have one branch checked out at a time
14:55 _geoff ah i see.  osse you can also use git log to just get the commits you care about
14:56 _geoff er auioa ^^
14:56 a_thakur joined #git
14:56 tristanp joined #git
14:56 _geoff git log --follow file1
14:57 Wind0r joined #git
14:57 theoceaniscool_ joined #git
14:57 jast visualizing history for each file separately is straightforward
14:57 auioa _geoff: yes but using this would still be difficulat to commit only changes that only touch one file
14:57 jast there's also https://github.com/Oblomov/zit if you want to make things more complicated :}
14:58 _geoff auioa: i suspose it puts the burden on the programmer to never commit more than one change at a time.
14:58 jast you can add a hook to check that :)
14:58 osse auioa: that is not difficult at all:  git add one-file; git commiy -m 'Change one-file'
14:58 auioa _geoff: it not for development but rather to track changes of the darn .config folder
14:59 topcat _geoff: I added an image, git's error "Patch failed line 85" I resume I now need to edit the line numbers in yellow? not sure how
14:59 timvisher joined #git
14:59 topcat presume*
15:01 _geoff_ joined #git
15:01 sostenuto joined #git
15:01 nowhereman joined #git
15:02 topcat _geoff_ (repeated as seen rejoined): I added an image, git's error "Patch failed line 85" I presume I now need to edit the line numbers in yellow? not sure how
15:03 Shashikant86 joined #git
15:03 chandu20 joined #git
15:04 mentazoom joined #git
15:05 mgedmin no, you don't need to edit the line numbers
15:05 mgedmin when editing a patch, be sure not to destroy context
15:05 YuGiOhJCJ joined #git
15:06 tarkus_ joined #git
15:07 mgedmin given your imgur paste, to remove just the "computed" bits, change the '-' to spaces on all the data: { ... }, lines, then remove all lines starting with '+'. then replace spaces with '-' on the lines that close the computed dict
15:07 AaronMT joined #git
15:07 mgedmin and that's a really weird diff, with vreg: "" being part of context?
15:08 mgedmin vim-fugitive would make this sort of partial commits easier, in case you already use vim
15:08 topcat mgedmin: yes it will look weird I've probably moved it wrong. I only want this partial to remove "computed.." bit vreg jsut got added by an earlier commit bit I've still not added the data function() change
15:09 vuoto joined #git
15:10 topcat but you see to change that to take out "computed: " would leave incorrect syntax in the file I think, because it doesn't remove closing braces. as that's replaced but data: func...
15:10 loredan13 joined #git
15:10 topcat but data is and always has been above computed
15:11 mischat_ joined #git
15:12 loredan13 Hello! Does somebody know why does git hangs while cloning. It goes through resolving deltas and then just nothing happens
15:12 grilled-cheese joined #git
15:13 nowhereman joined #git
15:13 lvh joined #git
15:13 finalbeta joined #git
15:14 nick123 joined #git
15:14 karthike1991 joined #git
15:15 selckin strace it
15:15 thierryp joined #git
15:15 pbrewczynski joined #git
15:16 karthike1991 i got "patch in merge conflict" in gerrit, when i click rebase its giving me "The change could not be rebased due to a conflict during merge.
15:16 karthike1991 "
15:16 karthike1991 can anyone help? how to fix this?
15:17 topcat mgedmin: :/ yeh I committed in a different order which was a bit easier but it's still created incorrect syntax in a commit. Kind of annoying.
15:18 mgedmin git rebase allows you to fix all errors, if you haven't pushed yet ;)
15:18 cagmz joined #git
15:20 yottabyte joined #git
15:21 topcat mgedmin: hmm yes, might have a go with that
15:21 fakenerd joined #git
15:24 grill joined #git
15:25 shinnya joined #git
15:27 IrishPrime joined #git
15:28 loredan13 write(5, "fff0\237\363$z%\257te-\37)\362\332\357L\346\362\2022o\364\36\217\370\356\255\32\340"..., 65520) = ? ERESTARTSYS (To be restarted if SA_RESTART is set)
15:28 loredan13 --- SIGALRM {si_signo=SIGALRM, si_code=SI_KERNEL} ---
15:28 loredan13 rt_sigreturn({mask=[]})                 = 1
15:28 loredan13 selckin: that's what it gives repeatedly every second now
15:29 yottabyte hi, if I'm in branch B, and I want to merge branch A, I currently do git checkout A, git pull, git checkout B, git merge A. is there a way I can get the latest code from A and direct it into B? in B, git pull origin A or something?
15:29 selckin loredan13: so wait
15:30 cdg joined #git
15:30 madewokherd joined #git
15:30 mgedmin yottabyte: git fetch origin && git merge origin/A
15:31 timvisher joined #git
15:32 Sri[m] joined #git
15:32 M-shine joined #git
15:32 kineticrootkit[m joined #git
15:32 spinningarrow[m] joined #git
15:32 M-nated joined #git
15:32 Dhanya[m] joined #git
15:32 saintaquinas[m] joined #git
15:32 enjunear[m] joined #git
15:32 kikijiki[m] joined #git
15:32 am2on joined #git
15:32 KevinMGranger[M] joined #git
15:32 M-meznak joined #git
15:32 unclechu joined #git
15:32 yottabyte mgedmin: what?
15:32 alaeri[m] joined #git
15:32 srkrishna[m] joined #git
15:32 aviraldg joined #git
15:32 Remramm joined #git
15:32 SpEcHiDe joined #git
15:32 musicmatze[m] joined #git
15:32 monomon[m] joined #git
15:32 UncleCJ joined #git
15:32 unilovelight[m] joined #git
15:32 Salander27 joined #git
15:32 patrickr[m] joined #git
15:32 Bloo[m] joined #git
15:32 daopu[m] joined #git
15:32 hallogallo[m] joined #git
15:32 yottabyte are those two separate commands?
15:33 loredan13 yottabyte: yes, but you can input them like that as one
15:33 cdg joined #git
15:33 topcat g rebase -i HEAD~2 just replays the commits and dumps be back to the terminal....
15:34 loredan13 yottabyte: this syntax just means that second one will be executed if first one is successful
15:34 yottabyte so git fetch origin gets all changes pushed to all branches?
15:34 mgedmin in bash <command1> && <command2> means run command1, then command2, but only if command1 succeeded
15:34 mgedmin yes
15:34 yottabyte what does git merge origin/A do?
15:34 yottabyte versus git merge A?
15:34 osse merges the upstream A branch instead of the local
15:34 canton7 merges in the branch origin/A, rather than the branch A
15:34 canton7 origin/A is the !remote_tracking_branch for A
15:34 gitinfo Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'
15:35 loredan13 selckin: ?
15:35 selckin loredan13: not hanging, still writing? wait for slow disk?
15:35 osse yottabyte: you cannot pull A without having A checked out. If the pull will result in a fast-forward it's possible to update it to get the same result as a pull would
15:35 subhojit777 joined #git
15:36 loredan13 selckin: still writing same identical line
15:36 thethorongil joined #git
15:36 loredan13 selckin: everything else works okay, disk is not full
15:39 Guest87783 joined #git
15:39 hasc joined #git
15:40 hahuang61 joined #git
15:42 Guest90141 joined #git
15:42 hasc_ joined #git
15:42 notebox joined #git
15:45 al-damiri joined #git
15:48 govg joined #git
15:49 ianmethyst joined #git
15:49 IrishPrime joined #git
15:50 TinkerTyper joined #git
15:51 zivester joined #git
15:54 chandu20 joined #git
15:56 timvisher joined #git
15:59 aarobc joined #git
15:59 fakenerd joined #git
15:59 intellix joined #git
15:59 aavrug_ joined #git
16:01 loredan13 selckin: half an hour in, still same lines
16:02 boombatower joined #git
16:03 selckin loredan13: don't know
16:06 marcogmonteiro joined #git
16:10 TinkerTyper joined #git
16:11 dud225__ left #git
16:11 crose joined #git
16:12 Cryp71c joined #git
16:13 Shashikant86 joined #git
16:13 chandu20 joined #git
16:13 Cryp71c I could swear I was able to do this before, but I reformatted my machine and now I can't get it to work. I have a repo (lets call it 'charlie') with submodules ('tango' and 'bravo'). I used to be able to cd into tango and "git checkout -some other branch of tango" but presently the only branches listed are the ones for 'charlie' ?
16:14 roflin joined #git
16:14 a_thakur joined #git
16:15 nick123 joined #git
16:17 _ikke_ then it's not a submodule according to git
16:18 buzzLightBeer joined #git
16:18 _ikke_ Cryp71c: Did you init + update the submodules?
16:19 mekeor joined #git
16:20 Cryp71c _ikke_, I didn't, at least...I don't think. Charlie is a chef repo, so its job is to provision for the inner environments. It could be part of the chef ruby provisioning scripts, or not.
16:20 thierryp joined #git
16:20 Cryp71c the submodule directories are definitely there.
16:21 _ikke_ Do they have contents?
16:22 rorro joined #git
16:22 Cryp71c _ikke_, lol, thanks
16:22 Cryp71c The provisioning stuff had put a settings file in, which kept the init / update from running correctly
16:22 Cryp71c since the directory existed
16:24 grill joined #git
16:24 _Patrick_ joined #git
16:25 flaviodesousa joined #git
16:25 [0xAA] joined #git
16:25 chandu20 joined #git
16:25 howdoi joined #git
16:26 timvisher joined #git
16:29 thebope joined #git
16:29 slixpk joined #git
16:30 chardan joined #git
16:31 jccn joined #git
16:33 done joined #git
16:37 TinkerTyper joined #git
16:40 brent__ joined #git
16:41 aavrug_ joined #git
16:42 mentazoom joined #git
16:45 WayToDoor joined #git
16:46 Oebele joined #git
16:52 timvisher joined #git
16:54 jagob joined #git
16:55 ddavidd joined #git
16:55 grill joined #git
16:55 gugah joined #git
16:56 mischat joined #git
16:57 acetakwas joined #git
16:57 Ntemis joined #git
16:57 Ntemis hi
16:57 mekeor hi Ntemis :)
16:57 hamster joined #git
16:57 Ntemis lately i am facing some issues with pushing to my github
16:58 Ntemis Permission denied (publickey).
16:58 Ntemis and i am now confused what i need to do next
16:58 osse generate new SSK keys
16:58 osse SSH
16:59 osse https://help.github.com/articles/connecting-to-github-with-ssh/
16:59 Ntemis i dont want to lose my current ones as i use them to remote login to a remote ssh build server
16:59 Ntemis :(
17:00 mekeor i'm not 100% sure but i'd guess you don't have to delete your old key-pair, Ntemis
17:01 Ntemis ssh-add ~/.ssh/id_rsa worked
17:01 Ntemis wtf
17:01 Ntemis why it forgot them
17:01 Ntemis ty
17:01 raspado joined #git
17:01 Ntemis changes are pushed ok
17:02 ShekharReddy joined #git
17:06 mekeor when i try to clone a repo over HTTPS, i get a "Problem with the SSL CA Cert" error altough I set my $GIT_SSL_CAINFO variable correctly and the file privileges are fine. (see https://asciinema.org/a/abd7ip9kv0hz25abna7ylumse )  any ideas on this?
17:07 perlpilot joined #git
17:10 nowhereman joined #git
17:11 chandu20 joined #git
17:15 ikelso joined #git
17:15 amdi_ joined #git
17:16 MineCoins joined #git
17:17 timvisher joined #git
17:17 GavinMagnus joined #git
17:18 robotroll joined #git
17:19 mozzarella joined #git
17:19 Guest9 joined #git
17:20 GavinMagnus left #git
17:20 MineCoins Hello, it's the first time I'm cloning a repo and git status / git diff shows that _content_ was modified (Changes not staged for commit:). You see, not line endings, but content. On a fresh cloned repo... Any Ideas how is it possible?
17:21 astrofog joined #git
17:22 fearless_man joined #git
17:24 osse MineCoins: What exactly is the diff?
17:24 Darren_ joined #git
17:25 MineCoins osse: you can try https://github.com/forknote/forknote
17:25 osse But I'm at the gym :/
17:26 MineCoins some files have mode diff, but a couple have 'real' changes : year 2015 vs 2017
17:26 doener joined #git
17:26 mischat joined #git
17:26 MineCoins it's crazy :)
17:27 chipotle joined #git
17:27 lindenle joined #git
17:28 finalbeta joined #git
17:30 imachuchu joined #git
17:30 romerocesar joined #git
17:31 marcogmonteiro joined #git
17:32 dreiss joined #git
17:32 finalbeta joined #git
17:32 svm_invictvs joined #git
17:33 mekeor MineCoins: is it possible that you already have a folder named 'forknote' which is a clone of the repo with changes?
17:33 mekeor :D
17:33 MineCoins no, fersh clone in empty /tmp/
17:33 uqs_ joined #git
17:34 grill joined #git
17:36 todd_dsm joined #git
17:37 r4nd0m0ne joined #git
17:37 stoopkid joined #git
17:38 sbulage joined #git
17:38 todd_dsm hey guys, git newb here. Is it possible to configure "git log --reverse" in the global file: ~/.gitconfig?
17:39 osse todd_dsm: No but you can create an alias to do so
17:40 cdown joined #git
17:40 TinkerTyper joined #git
17:40 osse git config alias.rlog 'log --reverse'
17:41 Eugene joined #git
17:41 cyan__ joined #git
17:42 MacWinner joined #git
17:42 todd_dsm osse: worked like a champ; thank you.
17:42 timvisher joined #git
17:45 inflames joined #git
17:47 iamthad joined #git
17:49 kadoban joined #git
17:50 nowhere_man joined #git
17:52 GavinMagnus joined #git
17:53 Shashikant86 joined #git
17:54 vdv joined #git
17:56 nick123 joined #git
17:58 davimore_ joined #git
17:59 treia joined #git
17:59 miczac joined #git
18:05 Mobutils joined #git
18:05 timvisher joined #git
18:06 boutcher joined #git
18:06 miczac_ joined #git
18:10 krillr joined #git
18:10 wombawomba joined #git
18:11 spacelord_ joined #git
18:11 fahadash joined #git
18:12 GavinMagnus left #git
18:12 crose joined #git
18:14 nowhereman joined #git
18:16 oskarkv joined #git
18:17 absinthe joined #git
18:17 ResidentBiscuit joined #git
18:19 marcogmonteiro joined #git
18:19 osse MineCoins: everything looks fine
18:19 osse MineCoins: a lot of files are marked as executable, though. seems weird
18:20 MineCoins osse: git diff? src/Platform/OSX/System/Context.h ?
18:20 miczac joined #git
18:20 phanimahesh joined #git
18:20 thiago useless note: Apple renamed their OS. It's "macOS" now, not OSX...
18:21 osse MineCoins: git diff is empty. that file has 2012-2015 at the top
18:21 nowhereman joined #git
18:21 MineCoins osse: wow...
18:22 Eugene It'll always be OSuX to me </s>
18:23 osse TIL
18:23 Darren_ joined #git
18:25 romerocesar joined #git
18:26 MineCoins osse: your OS?
18:26 osse MineCoins: ArchLinux
18:27 osse MineCoins: haha, if i clone it on windows three files get the date changed
18:28 osse that is the strangest thing i've seen
18:28 MineCoins osse: I don't understand... how is it possible at all ?
18:28 MineCoins You see -- it's not some kind of line endings issue...
18:28 MineCoins which is OS dependant
18:29 MineCoins I'm on macOS and getting diff :(
18:29 osse MineCoins: I know
18:30 osse MineCoins: Git for Windows and macOS get confused because there are files that differ only in case in file names
18:30 dreiss joined #git
18:30 osse MineCoins: I deleted the three files it reported as changed, and now git status says there are six files missing
18:30 MineCoins osse: Oh! good idea!
18:30 cdg joined #git
18:31 MineCoins thank you for pointing out...
18:31 osse My guess is someone screwed up. a lot of duplicate files
18:32 MineCoins osse: I will recheck, I got the direction... thank you so much!
18:32 mischat joined #git
18:32 mischat joined #git
18:33 absinthe joined #git
18:34 rnsanchez_ joined #git
18:35 MineCoins what about files with changed mode ?
18:35 timvisher joined #git
18:37 DolphinDream will using git rebase interactive for editing the commits messages change each commit's author? if so is there a way to keep everything intact except for the commit comment (which is to be edited) ?
18:37 thiago DolphinDream: no, author names are kept
18:38 DolphinDream everything else is not ? how about the original commit time/date ?
18:38 ikelso joined #git
18:39 Guest90141 joined #git
18:39 mostlybadfly joined #git
18:39 thiago the author datetime is kept too
18:39 thiago the committer and committer timestamp is changed
18:40 DolphinDream do you have to use: git rebase --committer-date-is-author-date SHA ?
18:41 thiago no, you don't
18:42 osse MineCoins: if the file system doesn't support modes properly git might be confused about that too
18:42 osse MineCoins: git config core.filemode false
18:43 ToxicFrog joined #git
18:44 LeBlaaanc joined #git
18:46 ToxicFrog joined #git
18:46 mephistorium joined #git
18:47 jost__ joined #git
18:49 Doginal joined #git
18:50 eihabarabia joined #git
18:52 yottabyte osse what do you mean by: "you cannot pull A without having A checked out. If the pull will result in a fast-forward it's possible to update it to get the same result as a pull would"
18:52 yottabyte does that mean git fetch origin will get origin/A, but not affect A when I do git checkout A? I still need to do "git pull"?
18:52 ams__ joined #git
18:52 yottabyte I don't know what you meant by the second sentence at all
18:54 thiago yes: git fetch  will update origin/A but not A
18:54 osse yottabyte: normally git will only affect the current branch (whatever is checked out). a pull might mean resolving merge conflicts etc, so if you're on B then git pull will not update A ever
18:54 thiago if you check out A and it already existed, A is still unmodified
18:57 garethdaine joined #git
18:59 yottabyte I see
19:00 yottabyte can I pull from another branch? is that the same as merging another branch? for example, in branch B, can I do "git pull A" and is that equivalent to "git merge A"?
19:02 osse yottabyte: if you mean git pull origin A then it's equivalent to git fetch origin; git merge origin/A
19:02 osse (AFAIK. Not 100% sure to be honest)
19:03 yottabyte no I meant git pull A
19:03 osse yottabyte: in that case you just get "fatal: 'A' does not appear to be a git repository"
19:03 yottabyte why does one do origin/A and another origin A
19:07 thiago because they are different
19:07 thiago git pull takes one extra argument, which is a remote name
19:07 ikelso joined #git
19:07 thiago so, "origin"
19:07 thiago it can take optional extra arguments that are names of branches in that remote. So, "A"
19:08 thiago once it downloads origin's A, it saves that in origin/A locally
19:08 osse !remote_tr > yottabyte
19:08 gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote
19:10 yottabyte gotcha
19:11 yottabyte so why are they called pull requests? is a pull request made when you try to merge into a branch that you don't have access to merge into and it needs to be approved? i.e. how does one appropriately use merge request and pull request
19:12 _ikke_ A pull request is literally just that, a request to someone to pull a branch from your repository\
19:12 Mobutils joined #git
19:12 dzho yottabyte: I'm not sure I've ever heard "merge request"
19:12 phroa it is a request for the maintainer to pull your code.  git ships request-pull, a tool to literally format an email asking someone to pull your code
19:12 phroa dzho: gitlab
19:12 _ikke_ dzho: gitlab calls it
19:12 dzho ah
19:12 ResidentBiscuit dzho: GitLab uses merge request
19:12 dzho thanks!
19:12 ResidentBiscuit Though its the same thing
19:13 ResidentBiscuit GitHub would probably rain lawyers if they used the term Pull Request
19:13 Oacbi joined #git
19:13 thiago yottabyte: a pull request is a request to perform a git pull
19:13 _ikke_ ResidentBiscuit: doesn't bitbucket also use pull requests
19:13 dzho yottabyte: but yes, you can only request that someone pull your code into their repo, if you don't have access to pull it in yourself.
19:13 _ikke_ >
19:14 ResidentBiscuit _ikke_: Maybe? Dont use bitbucket. Atlassian probably has better lawyers tho :)
19:14 absinthe joined #git
19:14 ResidentBiscuit They do use pull request too
19:14 thiago you can always aruge prior art from git-request-pull
19:14 _ikke_ ResidentBiscuit: Not sure if they own PR as a trademark
19:14 _ikke_ thiago: exactly
19:15 phroa if anyone, they'd go after gogs :P
19:15 Gsham joined #git
19:15 ResidentBiscuit Yeah probably not. Pull Request has become so synonymous with github though
19:15 thiago Gitorious used "Merge Request" before GitHub became famous
19:15 dzho there's also "git request-pull"
19:18 ikelso joined #git
19:18 MrMojito joined #git
19:18 MrMojito joined #git
19:18 NeverDie joined #git
19:18 gugah joined #git
19:19 absinthe joined #git
19:19 Sasazuka joined #git
19:19 _ikke_ dzho: like thiago mentioned
19:19 Nokurn joined #git
19:19 dzho quite so
19:20 yottabyte I use bitbucket and they use pull request
19:20 _ikke_ right
19:21 nanga joined #git
19:21 yottabyte so you have branch my-new-feature, and you make this pull request, so they have to approve it and it's like "git pull origin my-new-feature" for them?
19:22 _ikke_ Yeah, basically
19:22 ramsub07 joined #git
19:22 nanga joined #git
19:22 nanga joined #git
19:23 wombawomba joined #git
19:23 yottabyte but what if there's a conflict? do I have to git pull origin/their-branch, resolve the conflicts, and then do another pull request?
19:24 TinkerTyper joined #git
19:24 ResidentBiscuit If there's a conflict, GitHub won't let you merge
19:24 nanga joined #git
19:24 nanga joined #git
19:24 ResidentBiscuit So yes, you'll need rebase with whatever branch you're trying to merge into, fix the conflicts, push back to your branch, then merge
19:25 _ikke_ gitlab has a built in merge conflict editor
19:25 ResidentBiscuit ^
19:25 ResidentBiscuit Because GitLab is the best
19:25 nanga joined #git
19:25 ResidentBiscuit They ship new features faster than once a year
19:26 shiriru joined #git
19:26 nanga joined #git
19:27 yottabyte gitlab was having a lot of issues lately
19:27 yottabyte they were down
19:27 _ikke_ We self-host gitlab
19:27 _ikke_ (github has downtime from time to time also)
19:27 ResidentBiscuit Yeah I've noticed that too. They've been going down a lot the last couple months
19:28 dreiss joined #git
19:29 cyberz joined #git
19:30 mephistorium joined #git
19:32 loredan13 Okay, it looks like that my git hangs because of git-lfs
19:32 loredan13 Does anybody know abot
19:32 loredan13 *something about that?
19:33 sunri5e joined #git
19:33 Murii joined #git
19:34 aartist joined #git
19:34 aidalgol joined #git
19:34 _ikke_ Sorry, nope
19:36 rivarun joined #git
19:38 Raineer joined #git
19:38 Sasazuka_ joined #git
19:40 MineCoins left #git
19:40 nostrora joined #git
19:41 ericsupreme joined #git
19:44 TomyLobo joined #git
19:45 mischat joined #git
19:46 codemann joined #git
19:49 overlord_tm joined #git
19:49 ikelso joined #git
19:49 timvisher joined #git
19:50 a_thakur joined #git
19:56 Ntemis hey guys i need some help with git
19:56 Shock- joined #git
19:56 Ntemis my id_rsa is somehow lost after a while and i have to do a  ssh-add ~/.ssh/id_rsa to get it back
19:57 Ntemis rise repeat
19:57 Anja joined #git
19:57 Ntemis wt heck
19:57 Ntemis am i hacked?
19:57 osse Ntemis: no. ask your OS channel. Usually ssh-agent starts at boot or login
19:57 osse how to fix it depends on the OS etc
19:58 nwkj86 joined #git
19:58 Ntemis if i dont do that i get a Permission denied (publickey).
19:58 _ikke_ Perhaps the agent crashes
19:59 Ntemis hmm
19:59 Ntemis so if i add it and reboot will stick?
19:59 ezf joined #git
20:06 vuoto joined #git
20:11 oaao joined #git
20:14 Shock- joined #git
20:15 ramsub07 joined #git
20:16 netj joined #git
20:18 Corosauce joined #git
20:19 pbrewczynski joined #git
20:19 timvisher joined #git
20:20 gigq joined #git
20:21 chipotle joined #git
20:22 sunri5e joined #git
20:24 _ikke_ It should
20:24 _ikke_ Ntemis: I have ssh-agent running for days
20:24 Ntemis beats me what is happening
20:24 Ntemis am quite lost here and i annoying
20:24 Ntemis am quite lost here and is annoying
20:25 xmj left #git
20:25 _ikke_ Isn't ssh agent set with some kind of timeout?
20:25 habanera joined #git
20:27 Ntemis dont know really
20:31 mellernoia joined #git
20:32 Doginal joined #git
20:33 dreiss joined #git
20:37 thebope joined #git
20:38 mda1 joined #git
20:40 Sasazuka joined #git
20:43 gfixler joined #git
20:46 lindenle joined #git
20:47 timvisher joined #git
20:49 charlesr joined #git
20:50 cdown joined #git
20:50 m0viefreak joined #git
20:50 Jackneill joined #git
20:56 gugah joined #git
21:01 nidr0x joined #git
21:01 mehola joined #git
21:06 rorro joined #git
21:07 gajus joined #git
21:09 Doginal_ joined #git
21:09 AaronMT joined #git
21:10 Balliad joined #git
21:12 timvisher joined #git
21:12 blackwind_123 joined #git
21:16 SwiftMatt joined #git
21:17 AaronMT joined #git
21:17 borkr joined #git
21:21 SwiftMatt joined #git
21:21 jarshvor joined #git
21:25 dreaddymck joined #git
21:25 nick123 joined #git
21:29 timvisher joined #git
21:30 MrWoohoo joined #git
21:32 grilled-cheese joined #git
21:33 cdown joined #git
21:39 zivester joined #git
21:39 thebope joined #git
21:42 sleungcy joined #git
21:43 sleungcy Hi, what are tmp_pack files? I am getting a lot of tmp_pack files created that are >2G each in my repo... My disk completely ran out of space because of this. I am not sure why I am getting them.
21:46 habanera_ joined #git
21:46 thiago they are temporary files
21:46 thiago they should have been removed, but clearly whatever was using them was interrupted before it could
21:46 thiago just git gc, it'll erase them
21:47 acetakwas joined #git
21:47 mikeric joined #git
21:48 bremner the bigger question is why you have 2G packs.
21:48 bremner versioning binaries much?
21:49 timvisher joined #git
21:50 a_thakur joined #git
21:50 finalbeta joined #git
21:54 mizu_no_oto joined #git
21:55 et09 joined #git
21:55 et09 i have "Your branch is ahead of 'origin/master' by 4 commits.".  how do i convert those into a new branch?
21:56 et09 n/m found it
21:59 thebope joined #git
22:02 bremner !next
22:02 gitinfo Another satisfied customer. NEXT!
22:05 blackwind_123 joined #git
22:06 Sasazuka joined #git
22:07 jason237 joined #git
22:10 mmlb joined #git
22:12 chardan joined #git
22:12 timvisher joined #git
22:15 Gsham joined #git
22:18 satifant joined #git
22:20 GavinMagnus joined #git
22:20 druonysus joined #git
22:22 idohh joined #git
22:25 cr34ton joined #git
22:25 Tobbi joined #git
22:27 ResidentBiscuit Well, what was the solution?
22:27 nick123 joined #git
22:29 ikelso joined #git
22:30 Mobutils joined #git
22:31 cr34ton joined #git
22:31 Atm0spher1c joined #git
22:31 netj joined #git
22:32 cr34ton joined #git
22:33 WayToDoor joined #git
22:33 cpg joined #git
22:34 cpg hello, i come to dip again on the mother lode of git knowlege
22:35 cpg we had some issue a while ago and we just realized we did not recover ONE repo from our crashed server
22:35 cpg we have a copy of the latest code from a deployment server
22:35 cpg this copy appears to be a shallow repo
22:36 cpg it only has like 5 or so commits
22:36 cpg we do not care about the history for this small repo
22:37 cpg i cannot fetch —shallow because there is nothing to fetch from
22:37 cpg i guess i could just make a new repo, copy the code and be done
22:38 cpg i was wondering if this shallow repo can be pushed to a newly created origin  and let life go on like that
22:38 timvisher joined #git
22:38 thiago no, you can't push a shallow repo
22:38 cpg ok, so start over is best
22:39 kadoban joined #git
22:42 jstein_ joined #git
22:45 Celelibi I had a reboot just after I did some commits in a git.
22:46 Celelibi git fsck list some dangling commits.
22:46 Celelibi And dangling blobs.
22:47 Celelibi Could they just be objects not garbage collected yet? Or are they really a lost of any kind?
22:48 sdh joined #git
22:48 robattila256 joined #git
22:55 moei joined #git
22:55 Celelibi Well, my repo looks fine.
23:00 _rnsanchez_ joined #git
23:01 daurnimator joined #git
23:01 fmeerkoetter joined #git
23:01 timvisher joined #git
23:02 Seveas any rebase/amend causes dangling things
23:02 Seveas and there are other actions that can do so as well. Dangling commits and blobs are perfectly normal to have.
23:07 dsdeiz joined #git
23:08 GavinMagnus joined #git
23:09 madewokherd joined #git
23:09 kodnin joined #git
23:11 Vampire0_ joined #git
23:11 Celelibi Ok.
23:12 Celelibi I did many stash / rebase just before.
23:12 Celelibi So that's expected.
23:12 dsdeiz joined #git
23:12 dsdeiz joined #git
23:12 kodnin left #git
23:13 chardan joined #git
23:14 Gsham joined #git
23:14 lvh joined #git
23:16 cpg left #git
23:16 ctcrnitv joined #git
23:16 nowhereman joined #git
23:17 ctcrnitv hi, I read in this tutorial that gh pages doesn't have a way to deliver static assets
23:17 ctcrnitv so if I upload a project the images won't load
23:17 ctcrnitv the article was still pretty old, is this still the case?
23:17 Muzer joined #git
23:18 ctcrnitv it recommended uploading the images through a hack
23:18 ctcrnitv http://solutionoptimist.com/2013/12/28/awesome-github-tricks/
23:18 absinthe joined #git
23:18 GavinMagnus left #git
23:19 ctcrnitv http://www.nickbumbarger.com/2015/05/31/hosting_using_gh-pages.html
23:20 m0viefreak i think if you put a .nojekyll file in the root dir it serves everything statically
23:21 ctcrnitv I'm not using jekyll
23:22 ctcrnitv I probably should but I just uploaded a really simple html/css site
23:22 ctcrnitv without jekyll
23:22 m0viefreak so whats the problem?
23:23 Mobutils joined #git
23:23 ctcrnitv if I have a local project repo that I want to deploy to gh pages, is the technique in the links above the recommended way to do it
23:25 m0viefreak ive hosted simple gh-pages including css / images without problems
23:26 ctcrnitv how did you deliver the images?
23:26 m0viefreak just put them there?
23:27 ctcrnitv huh?
23:27 ctcrnitv did you link them from a site that hosted them
23:28 m0viefreak i put them on gh pages right next to the html
23:28 ctcrnitv i have images in a static assets folder, how do you suggest I put them there?
23:30 Kaisyu joined #git
23:30 m0viefreak huh?
23:30 timvisher joined #git
23:30 ctcrnitv do yo uknow what a static assets folder is?
23:31 ctcrnitv how is github supposed to get the images that are sitting locally on my computer
23:32 m0viefreak by committing and pushing to the gh-pages branch
23:35 prg3 joined #git
23:36 ctcrnitv so you're telling me this tutorial is wrong, I won't end up with broken links if I just push my directory of images, and you 100% know what you're talking about?
23:36 chardan joined #git
23:41 daurnima1or joined #git
23:45 Arban joined #git
23:45 ISmithers joined #git
23:48 m0viefreak every file that is on the branch gh-pages is served statically, so i don't under stand what the problem is
23:48 m0viefreak just get the files there, and you can access them
23:48 Vaelatern joined #git
23:51 kent\n ugh. Any good resources on dealing with "No files to merge" ?
23:51 mentazoom joined #git
23:51 kent\n `git status` has a file that was added on both sides, the file itself exists and has conflict markers.
23:51 kent\n git rebase won't continue, git mergetool won't merge it, and my only options left are "manually edit the file to be correct and then git add it"
23:52 kent\n and I'm really sick of taking that option because it feels wrong
23:52 ctcrnitv m0viefreak, I guess you're right I just tried it
23:52 ctcrnitv for some reason the tutorial said "if your project page included a directory of images, you will find that the links are now broken"
23:52 ctcrnitv either that changed or I'm misreading something
23:53 ctcrnitv http://www.nickbumbarger.com/2015/05/31/hosting_using_gh-pages.html
23:53 ctcrnitv under "including assets"
23:53 m0viefreak yeah, no idea
23:53 snits joined #git
23:54 m0viefreak jekyll fiddls around and blocks access to directories starting with _
23:54 m0viefreak but putting a .nojekyll in the root works around that
23:54 jellycode2 I want to to do 'git clone <repourl> <path> but I want git to create a new subdirectory inside of <path> based on the repo name (like it does by default when you don't specify a path).  Is this possible?
23:55 ctcrnitv I don't have directories starting with _ though, why would anyone
23:58 kent\n oh weird.
23:58 kent\n Turns out, all I need to do is unlike normal, is tell `git mergetool` which file to process.
23:59 spacelord_ joined #git

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