Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-21

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

All times shown according to UTC.

Time Nick Message
00:03 atomicb0mb joined #git
00:04 mingrammer joined #git
00:06 MattMaker joined #git
00:06 fuchstronaut joined #git
00:06 fuchstronaut joined #git
00:08 frogonwheels joined #git
00:12 MattMaker joined #git
00:13 t-ask joined #git
00:15 t-ask hi, I just applied some commit patches with "git apply ...". NOw I think it would have been better to use "git am .." instead because then I could keept the commiter's msg. How can fix this?
00:15 milki t-ask: !fixup
00:15 gitinfo t-ask: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
00:15 milki t-ask: probably just a git reset back to your original state before you applied
00:19 lizzin joined #git
00:19 t-ask milki: ok sounds good. let me read first.
00:22 t-ask Welll, I think I messed womething up before :( I reverted the wrong commit, too ... :(
00:23 Ineentho[m] joined #git
00:23 M-mistake joined #git
00:23 M-meznak joined #git
00:23 dilfridge joined #git
00:23 rahtgaz joined #git
00:24 t-ask not good.. all of that happend in a new branch, which I already pushed upstream... I guess, just deleting the branch would be the easiest, But is it the right thing to do?
00:24 btree left #git
00:24 zerosignal_ joined #git
00:25 ochorocho__ joined #git
00:26 milki if its a new branch that no one cares about yet, sure
00:27 t-ask milki: yes it is new and only in my github fork
00:27 durham joined #git
00:28 t-ask I'm just concerned, that all of that is logged and I mess up the upstream puch log ... while I hope it is just like staging
00:29 zerosignal_ left #git
00:29 t-ask so if I delte the branch local, then push it, everythign is back before the branch was created, right?
00:29 _zerosignal joined #git
00:30 t-ask ok, looks fine
00:31 * t-ask is just a bit careful not to mess it up more :)
00:34 dan2k3k4 joined #git
00:39 israelzuniga joined #git
00:42 EvilJStoker joined #git
00:42 MrWoohoo joined #git
00:47 raijin joined #git
00:50 eycsigfy joined #git
00:50 Jon28_ joined #git
00:53 tesuji_ joined #git
00:53 kus joined #git
00:53 ochorocho__ joined #git
00:53 BrianBlaze420 joined #git
00:53 yena_ joined #git
00:54 evanc joined #git
00:59 fractalizator joined #git
01:00 CheckDavid joined #git
01:02 t-ask milki: just found this http://justinhileman.info/article/git-pretty/
01:03 pks joined #git
01:06 d^sh joined #git
01:07 fuchstronaut joined #git
01:07 fuchstronaut joined #git
01:12 flavster joined #git
01:12 mingrammer joined #git
01:15 zacts joined #git
01:15 MattMaker joined #git
01:17 mehola joined #git
01:18 milki ah
01:18 milki !pretty
01:18 gitinfo [!gitpretty] git pretty is a flowchart of how to get yourself out of trouble http://justinhileman.info/article/git-pretty/
01:19 eciohc joined #git
01:19 milki its got some colloquialisms -.-
01:20 t-ask milki: well, makes it a bit better to digest :)
01:21 Serus left #git
01:21 t-ask milki: I'm still a bit stuck. I deleted the banch locally. Now I want to revert (delete branch) in my github fork (origin) too.
01:22 t-ask milki: actually I want to create the same branch again afterwards to restart the workflow
01:22 mattcen joined #git
01:23 milki you can delete remote branches with git push --delete
01:23 milki or you can rewrite the branch with a new branch with git push --force
01:24 milki !danger
01:24 milki darn
01:24 milki !destroy
01:24 gitinfo The operation/command sequence just mentioned will destroy uncommitted changes. Please apply caution.
01:24 milki hm... thats not really it
01:24 milki o well
01:24 durham_ joined #git
01:25 Vampire0 joined #git
01:28 t-ask milki: I think it was "git push origin :branchname"
01:30 t-ask ok, now I can mess it up agian :P
01:30 Puhe joined #git
01:32 EvilJStoker joined #git
01:32 milki t-ask: that is an alternate syntax which is more prone to error since its less explicit
01:35 t-ask milki: well "git push --delete branchname" did't work
01:36 t-ask btw. if I create a new branch form within a subdirectory is this still ok?
01:37 preaction branches don't have subdirectories, so yes
01:37 preaction the branch is for the whole repo. git lets you run commands from any directory inside the repo
01:38 Eryn_1983_FL joined #git
01:38 t-ask good to know :)
01:38 diprotic joined #git
01:40 ericsupreme joined #git
01:46 t-ask Is [-q | --quiet] the option to make a "git am *.patch" dry run? Like --check with "git apply *.patch" ?
01:46 yena joined #git
01:46 t-ask ok reading the man it is not
01:46 t-ask the only way for a dry run might be to use interactive mode and skip patches
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:49 rgrinberg joined #git
01:52 ytl joined #git
01:57 stevenbenner joined #git
02:00 blake joined #git
02:00 Lyqyd joined #git
02:02 pks joined #git
02:03 bket joined #git
02:03 axisys joined #git
02:06 d0nn1e joined #git
02:07 realz joined #git
02:08 fuchstronaut joined #git
02:10 chachasmooth joined #git
02:15 Vampire0_ joined #git
02:16 p4trix joined #git
02:16 BenderRodriguez joined #git
02:16 kpease joined #git
02:23 Jon28__ joined #git
02:24 mingrammer joined #git
02:26 Rodya_ joined #git
02:31 lagothri1 joined #git
02:35 hexagoxel joined #git
02:37 ericsupreme joined #git
02:45 diogenese joined #git
02:46 ochorocho__ joined #git
02:46 tesuji joined #git
02:48 shams joined #git
02:50 kn-928 joined #git
02:51 kn-928 joined #git
02:52 kn-928 joined #git
02:55 yaewa joined #git
02:56 fstd_ joined #git
03:00 raven-au joined #git
03:07 heroux joined #git
03:08 fuchstronaut joined #git
03:08 fuchstronaut joined #git
03:11 cdown joined #git
03:12 lestrade joined #git
03:14 djb-irc joined #git
03:15 sleepee joined #git
03:19 mingrammer joined #git
03:28 sebboh joined #git
03:28 inflames joined #git
03:28 ws2k3 joined #git
03:30 moei joined #git
03:30 vdv joined #git
03:30 Dyonisos joined #git
03:33 cqi joined #git
03:35 l4v2 joined #git
03:45 realz_ joined #git
03:46 ochorocho__ joined #git
03:52 realz__ joined #git
03:55 arescorpio joined #git
03:59 SwiftMatt joined #git
04:01 thecomedian joined #git
04:02 rj1 joined #git
04:03 safe joined #git
04:06 zacts joined #git
04:08 EricPoe joined #git
04:09 duderonomy joined #git
04:10 justanot1eruser joined #git
04:16 Cabanossi joined #git
04:18 mingrammer joined #git
04:24 mohabaks joined #git
04:24 rubie joined #git
04:30 ldlework joined #git
04:30 klean joined #git
04:31 ItSANgo joined #git
04:32 bmahe joined #git
04:42 toogley joined #git
04:47 languitar joined #git
04:47 ochorocho__ joined #git
04:48 eivarv joined #git
04:52 ytl joined #git
04:53 shinnya joined #git
04:55 LeBlaaanc joined #git
04:58 daynaskully joined #git
05:00 MrWoohoo joined #git
05:00 toogley joined #git
05:01 raven-au joined #git
05:03 govg joined #git
05:03 dhollinger joined #git
05:09 mingrammer joined #git
05:10 dhollinger joined #git
05:21 rgrinberg joined #git
05:25 JacobsLadd3r joined #git
05:25 valar joined #git
05:30 MrMojito joined #git
05:30 MrMojito joined #git
05:36 ghostlight joined #git
05:38 skamath joined #git
05:38 blahdodo joined #git
05:39 miklcct joined #git
05:40 skamath Hey, I made some changes on my master branch accidentally, but this should have been originally part of another branch. How can I move these changes to a new branch (need to create a branch). I have not yet staged the files.
05:41 KnownSyntax joined #git
05:42 ShekharReddy joined #git
05:43 kadoban skamath: !float
05:43 gitinfo skamath: 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.
05:44 skamath kadoban, Thanks!
05:45 kadoban 'welcome
05:48 ochorocho__ joined #git
05:53 subhojit777 joined #git
05:54 watabou joined #git
05:54 ome joined #git
05:57 alansaul joined #git
05:58 sebboh joined #git
05:59 tHEMtZ joined #git
06:03 stonerfish joined #git
06:04 mingrammer joined #git
06:06 lindenle joined #git
06:12 alansaul joined #git
06:13 ochorocho__ joined #git
06:16 phaleth joined #git
06:21 circ-user-pwm5l joined #git
06:23 shams joined #git
06:30 subhojit777 joined #git
06:42 Derperperd joined #git
06:43 t0by joined #git
06:45 xaa joined #git
06:57 Gabs joined #git
07:00 dreiss joined #git
07:02 sanketdg joined #git
07:12 rubie joined #git
07:14 superman` joined #git
07:18 mariuscc joined #git
07:21 leeN joined #git
07:23 emPi joined #git
07:24 a_thakur joined #git
07:28 KnightsOfNi joined #git
07:29 vuoto joined #git
07:31 bcalud joined #git
07:33 vuoto joined #git
07:38 mingrammer joined #git
07:46 a_thakur_ joined #git
07:47 netj joined #git
07:47 LucaTM joined #git
07:48 ochorocho__ joined #git
07:50 Manuel15 joined #git
07:50 Manuel15 joined #git
07:53 stuh84 joined #git
07:54 t0by joined #git
07:55 t0by joined #git
07:56 a_thakur joined #git
08:01 raven-au_ joined #git
08:06 creeep joined #git
08:06 dsdeiz joined #git
08:06 dsdeiz joined #git
08:10 Derperperd joined #git
08:14 krs93 joined #git
08:15 Derperperd joined #git
08:15 iskander joined #git
08:15 toogley joined #git
08:25 luxflow joined #git
08:27 toogley joined #git
08:28 aidalgol joined #git
08:28 noufal joined #git
08:30 luxflow left #git
08:31 noufal left #git
08:31 blackwind_123 joined #git
08:32 mingrammer joined #git
08:36 cdown joined #git
08:46 sagittarian joined #git
08:47 dodobrain joined #git
08:48 Balliad joined #git
08:49 dodobrain joined #git
08:49 circ-user-pwm5l joined #git
08:50 toogley joined #git
08:50 IamTrying joined #git
08:53 IamTrying I have 5 dell R310 machines in my Garage "like retired doing nothing but want to do something". Can i make them a git server? where i can put all my Python, C, Java, Go, PureBasic, BASH, C#, Zend Framework, plSQL projects code there?
08:55 geoid joined #git
08:56 bremner umm. sure. install your favourite linux distro, and off you go.
08:57 IamTrying bremner: i have CentOS 7 there. But i wonder how can i make them git server never done it before always used Github.com only
08:57 toogley joined #git
08:57 bremner IamTrying: !github-cheap
08:57 IamTrying bremner: i want to make the git server like Linus use for kernel maintain.
08:57 IamTrying OK
08:57 bremner err. that was supposed to give some info
08:57 bremner !github-cheap
08:57 bremner sigh
08:57 IamTrying :)
08:58 bremner IamTrying: a "git server" is very different from github. You just need ssh access to the machine.
08:58 bremner if you want a fancy web thing, then there is e.g. gitlab
08:59 bremner I think linus is mainly working by mail, so probably not what you want at all.
08:59 IamTrying bremner: i am a bit confused, i do not like those new web interface managements. But what i want to do is make a repositories of all my languages (maintain them using my BASH ncurses gui)
09:00 IamTrying OK
09:00 leeN joined #git
09:00 shinnya joined #git
09:07 circ-user-pwm5l joined #git
09:10 mariuscc joined #git
09:12 IamTrying bremner: assume. 1) Dell R310 server 1 has lan: 172.0.0.2 and its behind NAT where wan is: 8.8.8.8 2) i am driving from remote location i need to $ git pull or git push 3) which ports 8.8.8.8 will translate to 172.0.0.2 ? where 172.0.0.3 is another server already using port 22
09:14 klean joined #git
09:15 ahmedelgabri joined #git
09:17 catsup joined #git
09:23 moei joined #git
09:23 piling joined #git
09:25 robotroll joined #git
09:26 mingrammer joined #git
09:27 a_thakur joined #git
09:28 a_thakur joined #git
09:31 irco joined #git
09:31 gusnan joined #git
09:32 muhaha03__ joined #git
09:34 IamTrying left #git
09:35 Akimb joined #git
09:36 ikmaak joined #git
09:38 Balliad joined #git
09:44 javajoe joined #git
09:44 knobo joined #git
09:45 mariuscc joined #git
09:45 knobo How can I just pull certain hunks from remote?
09:47 ome joined #git
09:48 ochorocho__ joined #git
09:49 saedelaere joined #git
09:51 kmap joined #git
09:51 mohabaks joined #git
09:58 ochorocho__ joined #git
09:59 cbreak knobo: not at all
10:03 paws_ joined #git
10:05 ahmadassaf joined #git
10:05 piling joined #git
10:05 javajoe joined #git
10:06 shinnya joined #git
10:13 liuzhen joined #git
10:15 raffish joined #git
10:17 sagittarian joined #git
10:18 vuoto joined #git
10:19 mehola joined #git
10:24 ochorocho__ joined #git
10:24 rahtgaz joined #git
10:26 fuchstronaut joined #git
10:29 Balliad joined #git
10:29 shinnya joined #git
10:31 mariuscc joined #git
10:34 subhojit777 joined #git
10:35 sleepee joined #git
10:38 subhojit_ joined #git
10:39 c0ded joined #git
10:40 c0ded joined #git
10:40 piling joined #git
10:40 Rodya_ joined #git
10:41 sdothum joined #git
10:41 aca20031 joined #git
10:42 subhojit__ joined #git
10:43 felixjet joined #git
10:55 stamina joined #git
10:55 mk_ joined #git
11:00 mingrammer joined #git
11:05 ochorocho__ joined #git
11:08 Gurgur joined #git
11:13 a_thakur joined #git
11:14 M-shine joined #git
11:17 resident joined #git
11:18 a_thakur_ joined #git
11:19 ojdo joined #git
11:19 cyan__ joined #git
11:23 nebg ok let'sa say i messed all the things up with the new commit... how can deete a commit and go back to the previous commit ?
11:25 mk_ left #git
11:26 HanClinto_ joined #git
11:26 resident https://stackoverflow.com/questions/4114095/how​-to-revert-git-repository-to-a-previous-commit
11:28 fuchstronaut joined #git
11:29 lindenle joined #git
11:29 aard_ joined #git
11:32 a_thakur joined #git
11:35 a_thakur joined #git
11:36 alansaul joined #git
11:48 resident where would you find contributors?
11:50 eivarv joined #git
11:52 alansaul joined #git
11:53 felixjet joined #git
11:56 tomog999_ joined #git
12:00 bremner contributors to what?
12:02 xaa joined #git
12:02 resident to any project i come up with
12:02 resident as in, where would i introduce my project
12:02 resident to an audience
12:03 bremner in the mailing list / irc channel of a related project? blog about it?
12:04 cuicui joined #git
12:04 bremner note that git is not a "related project" just because you use git.
12:05 resident lol
12:06 Manuel15 joined #git
12:06 Manuel15 joined #git
12:07 javajoe joined #git
12:08 The_Phoenix joined #git
12:09 Kicer86 joined #git
12:10 fahadash joined #git
12:11 raijin joined #git
12:12 Endarked joined #git
12:13 a_thakur joined #git
12:15 m0viefreak joined #git
12:17 Endarked joined #git
12:18 Endarked joined #git
12:19 Endarked joined #git
12:21 Endarked joined #git
12:22 Remram[m] joined #git
12:22 Ineentho[m] joined #git
12:22 M-mistake joined #git
12:22 M-meznak joined #git
12:25 Derperperd joined #git
12:26 Derperperd joined #git
12:28 fuchstronaut joined #git
12:29 Derperperd joined #git
12:31 mgoodwin joined #git
12:34 utrack joined #git
12:34 fees joined #git
12:34 mgoodwin Hi gents, need some rebase help - https://i.imgur.com/5v903EY.png If you look at where "origin/travis_ci" is in relation to "origin/travis_ci-lxc and travis_ci-lxc" - then note that I rebased "travis_ci" from "ansible_2.1" - how do I bring "travis_ci-lxc" back to where it was previously? (I.e. both travis_ci and travis_ci-lxc look like they're branched from commit "test" )
12:35 mgoodwin I've tried various combinations of --onto and other options and I just can't seem to get the right combination
12:36 Derperperd joined #git
12:40 merpnderp joined #git
12:40 Derperperd joined #git
12:42 merpnderp joined #git
12:42 ochorocho__ joined #git
12:42 Derperperd joined #git
12:45 subhojit777 joined #git
12:46 _ikke_ mgoodwin: hey
12:46 mgoodwin hi
12:47 _ikke_ So what do you want the end result to be?
12:48 noctux joined #git
12:50 mgoodwin _ikke_: this is very close: https://i.imgur.com/aepkYHV.png and that was accomplished by: `git rebase ff50b3a `
12:50 mgoodwin but I'm not sure why there's a duplicate commit
12:50 mgoodwin It exists three times now :/
12:51 mgoodwin 5e01f8d, cabd123, and a9778f3
12:51 _ikke_ different branches still pointing to the original history
12:51 _ikke_ note that rebase only rebases one branch at a time
12:52 tanimislam joined #git
12:53 SteffanW joined #git
12:53 fuchstronaut joined #git
12:53 fuchstronaut joined #git
12:55 _ikke_ It's hard to say how it happened without seeing what you have done
12:55 mgoodwin It got rid of the extra commit by using `rebase -i HEAD^^` and deleting it
12:55 mgoodwin Since I checked with log -p and I didn't want those changes anyway
12:55 nidr0x joined #git
12:56 mgoodwin I just don't understand why rebase added it agian
12:56 ahmedelgabri joined #git
12:56 robotroll joined #git
12:57 _ikke_ I would only imagine that to happen when that commit is sligtly different from the one already being present
12:58 FunkyAss joined #git
13:06 netj joined #git
13:08 dreamyspell_ joined #git
13:09 inflames joined #git
13:12 Balliad joined #git
13:15 nitin joined #git
13:15 vuoto joined #git
13:17 vuoto joined #git
13:19 Derperperd joined #git
13:20 Akimb joined #git
13:23 jerrcs joined #git
13:24 wrouesnel joined #git
13:24 preyalone joined #git
13:24 ochorocho__ joined #git
13:25 Derperperd joined #git
13:26 mingrammer joined #git
13:27 Endarked joined #git
13:28 Endarked joined #git
13:30 jjardon joined #git
13:31 javajoe joined #git
13:31 jjardon Hi, any idea how can I get the oldest line of code of a specific repo?
13:31 _ADN_ joined #git
13:31 _ikke_ In the current tree
13:31 _ikke_ ?
13:32 jjardon I mean, Id like to get a list of lines from the oldest to the newest
13:33 _ikke_ git blame shows the date per line
13:33 _ikke_ per file
13:33 _ikke_ So you have to iterate over all files
13:34 hzut joined #git
13:34 Derperperd joined #git
13:34 _Trident joined #git
13:34 airdisa joined #git
13:35 Derperperd joined #git
13:36 Endarked joined #git
13:37 Elv1313 joined #git
13:38 monoprotic joined #git
13:38 monoprotic joined #git
13:39 geoid joined #git
13:44 geoid joined #git
13:44 _ikke_ jjardon: Something like this: for file in $(git ls-files -z); do git blame -et $file; done | sort -k3
13:45 Bizkit joined #git
13:46 zacts joined #git
13:47 jjardon _ikke_: nice! thanks; I have to use git blame -t <file> | sort -b -k 4 here though
13:47 mgoodwin How do I rebase without having to do double work on the other branch that should have the same segment of commits?
13:47 _ikke_ jjardon: I used -e to be sure that extra spaces in author names did not break the sorting
13:48 mgoodwin a-b-c-d-1-2-3-b1 ; a-b-c-d-4-5-6-b2 ... how do I edit b and keep both branches in sync?
13:48 javajoe joined #git
13:49 _ikke_ That's afaik something you have to fix yourself
13:49 mingrammer joined #git
13:49 mgoodwin Right now if I edit b I get something like a-c-d-b'-4-5-6-b2 if I rebase on b1
13:50 vuoto joined #git
13:52 alansaul joined #git
13:53 bremner joined #git
13:53 bremner joined #git
13:54 The_Phoenix1 joined #git
13:56 Luke081515_ joined #git
13:56 _ikke_ You have to manually rebase b1 --onto it's old base
13:56 Luke081515_ left #git
13:56 _ikke_ onto the new b' I mean
13:57 TheFox joined #git
13:57 daynaskully joined #git
13:59 Rodya_ joined #git
13:59 Groscheri joined #git
13:59 Derperperd joined #git
13:59 iskander joined #git
14:01 chipp joined #git
14:01 SwiftMatt joined #git
14:02 iskander joined #git
14:05 iskander joined #git
14:05 jjardon _ikke_: yeah, thanks. A bit more readable: git blame -e <file> --date=iso-strict | sort -b -k4
14:06 spudowiar joined #git
14:06 _ikke_ is iso strict converting it to UTC?
14:08 ochorocho__ joined #git
14:12 gravitron joined #git
14:13 bremner joined #git
14:13 bremner joined #git
14:16 hzut left #git
14:16 leeN joined #git
14:17 subhojit_ joined #git
14:19 anuxivm joined #git
14:24 vuoto joined #git
14:28 v3nOm is there's anybody know where i can find the iostream source code definition file?
14:29 zacts joined #git
14:29 _ikke_ v3nOm: context?
14:30 v3nOm ?
14:31 _ikke_ Is this related to git?
14:31 v3nOm oh...
14:31 v3nOm i think it's related
14:32 v3nOm wasn't it git is programming group?
14:32 _ikke_ ok, can you explain a little more what you are looking for?
14:32 _ikke_ git is a source control system
14:32 v3nOm this is github chan, right?
14:32 _ikke_ No
14:32 _ikke_ there is #github
14:32 v3nOm ow...
14:33 v3nOm sorry
14:33 v3nOm so what's this group main topic?
14:33 v3nOm i mean
14:33 _ikke_ Help with using git
14:34 _ikke_ a tool to manage source history
14:34 v3nOm ok
14:34 v3nOm manage source history?
14:34 geoid_ joined #git
14:34 v3nOm what kinda source history?
14:35 _ikke_ Mostly software projects
14:35 _ikke_ but also other things
14:38 v3nOm btw
14:38 v3nOm can you be more spesific?
14:39 _ikke_ perhaps read !parable to get a bit of a background
14:39 gitinfo 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2​009/05/19/the-git-parable.html
14:44 _ADN_ joined #git
14:45 fuchstronaut joined #git
14:47 cqi joined #git
14:49 cqi joined #git
14:50 snowkidind joined #git
14:51 cqi joined #git
14:52 cqi joined #git
14:53 mingrammer joined #git
14:53 subhojit777 joined #git
14:53 subhojit777 joined #git
14:55 mrlowskill joined #git
14:57 ochorocho__ joined #git
14:58 cdown joined #git
15:00 mrlowskill hi, i have problems getting diff- and mergetools running. i tried to install diffmerge and diffuse. i change the global settings, but none of the tools opens when i type "git difftool ... ". some help?
15:01 EricPoe joined #git
15:01 _ikke_ Did you setup any difftool / mergetool settings?
15:01 Endarked joined #git
15:02 mrlowskill yes, i followed the tutorial on the website of diffmerge. if i run the config, it says i have configured diffmerge
15:02 l4v2 joined #git
15:04 Gitzilla joined #git
15:04 _ikke_ what does git config diff.tool return?
15:05 Endarked joined #git
15:07 ochorocho__ joined #git
15:08 skamath left #git
15:12 JJjack joined #git
15:12 JJjack hi I am trying to merge to repos and for some reason in the git status I get my whole dircetory as new file??
15:12 mrlowskill diff.tool=diffmerge
15:12 mrlowskill difftool.diffmerge.cmd=/usr/bin/diffmerge "$LOCAL" "$REMOTE"
15:12 mrlowskill merge.tool=diffmerge
15:12 mrlowskill mergetool.diffmerge.trustexitcode=true
15:12 mrlowskill mergetool.diffmerge.cmd=/usr/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
15:15 netj joined #git
15:16 _ikke_ mrlowskill: and what does git difftool <files> do?
15:16 meLon joined #git
15:17 Endarked joined #git
15:18 mrlowskill it shows the differences in the terminal
15:18 Endarked joined #git
15:18 ochorocho__ joined #git
15:18 _ikke_ and git difftool -t diffmerge
15:18 _ikke_ ?
15:19 raijin joined #git
15:20 osse mrlowskill: are you currently in a merge conflict?
15:20 SwiftMatt joined #git
15:21 mrlowskill exactly the same
15:22 Endarked joined #git
15:23 JJjack joined #git
15:23 JJjack I had only 3 conflicts
15:23 javajoe joined #git
15:23 dmitrij joined #git
15:23 JJjack but why is the rest of the directory now considered new files?
15:25 _ikke_ Was that directory recently added?
15:25 meLon joined #git
15:28 eivarv joined #git
15:29 HoierM joined #git
15:30 mrlowskill joined #git
15:31 mrlowskill osse, yes a have a merge conflict
15:31 _ikke_ try git mergetool
15:31 osse mrlowskill: then difftool doesn't work
15:32 harish joined #git
15:32 JJjack joined #git
15:32 emPi joined #git
15:34 Endarked joined #git
15:35 mrlowskill it works. i think, i forgot the "sudo" before mergetool ... sry im using linux sincen a week. thank you anyway :)
15:35 RustyShackleford joined #git
15:35 Goplat joined #git
15:35 Endarked joined #git
15:36 bremner sudo is almost always wrong when working with git
15:36 Endarked joined #git
15:37 iskander joined #git
15:38 javajoe joined #git
15:38 Mixologic_ joined #git
15:39 morfin joined #git
15:39 morfin hello
15:39 morfin git could be compiled statically?
15:40 _ikke_ good question
15:40 _ikke_ I would not know
15:40 bremner not really, some if it is perl and sh
15:40 morfin hm m
15:41 _ikke_ bremner: good point
15:41 d0nn1e joined #git
15:41 morfin no Perl on Android :(
15:44 Jellyg00se joined #git
15:44 khmarbaise joined #git
15:47 mingrammer joined #git
15:48 rubie joined #git
15:51 rgrinberg joined #git
15:52 iskander joined #git
15:54 jaafar joined #git
15:54 _ADN_ joined #git
15:55 yoan joined #git
15:55 _ADN_ joined #git
15:57 dreiss joined #git
15:57 fuchstronaut joined #git
15:58 madewokherd joined #git
16:00 javajoe joined #git
16:01 LordSticky joined #git
16:03 Guest77375 joined #git
16:04 raijin joined #git
16:05 stux|RC joined #git
16:06 stux|away left #git
16:07 Akimb joined #git
16:08 Endarked_ joined #git
16:09 f0rblaze joined #git
16:13 diogenese joined #git
16:14 p4trix joined #git
16:15 _ADN_ joined #git
16:16 thiago joined #git
16:17 Endarked joined #git
16:18 _ADN_ joined #git
16:20 javajoe joined #git
16:20 subhojit_ joined #git
16:21 Manuel15 joined #git
16:21 Manuel15 joined #git
16:22 kyan joined #git
16:22 catsup joined #git
16:22 a_ joined #git
16:25 mohabaks joined #git
16:27 subhojit__ joined #git
16:27 Balliad joined #git
16:28 kadoban joined #git
16:28 toogley joined #git
16:34 zacts joined #git
16:35 ochorocho__1 joined #git
16:37 robotroll joined #git
16:38 raijin joined #git
16:38 _ADN_ joined #git
16:41 _ADN_ joined #git
16:42 Bizkit joined #git
16:44 billy_ joined #git
16:44 _ADN_ joined #git
16:45 _ADN_ joined #git
16:46 FilipNortic joined #git
16:49 Dyonisos_ joined #git
16:49 javajoe joined #git
16:50 EricPoe joined #git
16:52 edaught joined #git
16:54 edaught joined #git
16:54 BadApe joined #git
16:54 javajoe joined #git
16:55 BadApe does anyone use git-lfs?
16:56 vuoto joined #git
16:57 _ikke_ I don't
16:59 dsantiago joined #git
16:59 jost__ joined #git
17:00 BadApe i really want to try gitblit's support for git-lfs
17:07 diego1 joined #git
17:11 Seveas morfin: the perl parts of git can easily be done without
17:12 Seveas it's the cvs/svn/arch/mediawiki integration, git send-email, git difftool and git add --interactive
17:14 _ikke_ git add --interactive is important imo :P
17:14 vuoto joined #git
17:17 subhojit_ joined #git
17:18 subhojit_ joined #git
17:20 user083 joined #git
17:20 mariuscc joined #git
17:21 ahmadassaf joined #git
17:22 mrlowskill joined #git
17:23 vuoto joined #git
17:24 Seveas I used to think that too, but these days just use -p
17:24 _ikke_ ah
17:24 _ikke_ I was confusing the too
17:24 _ikke_ Then yes, it's not that important :P
17:24 _ikke_ the two*
17:26 mingrammer joined #git
17:27 vdv joined #git
17:30 clemf joined #git
17:31 Shakeel_ joined #git
17:32 Gamecubic joined #git
17:34 Akimbas joined #git
17:35 Seveas I once looked at porting add --interactive to C, but it's 1600 lines of perl and I'm not that interested in it :)
17:36 Smirnov joined #git
17:36 Smirnov joined #git
17:37 EricPoe joined #git
17:37 lolmac joined #git
17:38 ochorocho__ joined #git
17:39 bauruine_ joined #git
17:39 subhojit__ joined #git
17:41 ghostlight joined #git
17:41 _ikke_ hehe
17:41 ghostlight joined #git
17:42 ghostlight joined #git
17:42 ghostlight joined #git
17:43 ghostlight joined #git
17:43 ghostlight joined #git
17:44 ghostlight joined #git
17:44 ghostlight joined #git
17:45 ghostlight joined #git
17:45 ghostlight joined #git
17:46 ghostlight joined #git
17:46 ghostlight joined #git
17:46 ahmedelgabri joined #git
17:47 ghostlight joined #git
17:47 dreiss joined #git
17:48 ghostlight joined #git
17:48 Lunatrius joined #git
17:48 subhojit_ joined #git
17:51 SwiftMatt joined #git
17:57 vassagus joined #git
17:57 EricPoe joined #git
17:57 Rodya_ joined #git
17:58 fuchstronaut joined #git
17:58 fuchstronaut joined #git
17:59 same_ol_geez joined #git
18:01 subhojit__ joined #git
18:01 EricPoe joined #git
18:01 noteness joined #git
18:02 preaction joined #git
18:03 XVar joined #git
18:03 CalimeroTeknik joined #git
18:03 dsdeiz joined #git
18:07 Limes_ joined #git
18:11 clemf joined #git
18:11 ASOLAr joined #git
18:11 felher joined #git
18:12 stuh84 joined #git
18:12 pkiller joined #git
18:13 fahadash joined #git
18:14 archer121_ joined #git
18:18 diogenese joined #git
18:18 Rodya_ joined #git
18:18 archer121_ hi, I have several branches in my local repository, I see only my master branch in github. What am I missing?
18:20 mingrammer joined #git
18:21 phroa you'll need to push your other branches, if you haven't already
18:25 thiago archer121_: how did you push those branches?
18:28 archer121_ I see, until now I was located at master and used to simple 'git push'. I need to 'git push origin branch-name' for all my branch-names?
18:28 archer121_ Can I push everything at once?
18:28 Impaloo archer121_: git push --all
18:29 archer121_ Thanks! RTFM!
18:34 beyertech joined #git
18:35 beyertech joined #git
18:36 kfunk joined #git
18:36 nsh joined #git
18:36 nsh PROTIP: check which files at > allowed maxfile size before compressing and attempting to upload and then barfing at the last minute with nothing productive done
18:36 nsh ty for revisiting this logic flow
18:37 nsh you have 10 (ten) free pizzas available on collection
18:37 satifant joined #git
18:38 fuchstronaut joined #git
18:40 ytl joined #git
18:40 _ADN_ joined #git
18:47 diogenese joined #git
18:48 fuchstronaut joined #git
18:48 alansaul joined #git
18:50 tabrez joined #git
18:59 kbs joined #git
19:00 mohabaks joined #git
19:02 ahmedelgabri joined #git
19:02 vassagus joined #git
19:03 moneylotion joined #git
19:06 Endarked joined #git
19:07 EricPoe joined #git
19:08 jstein_ joined #git
19:11 felher joined #git
19:11 bmahe joined #git
19:12 vdv joined #git
19:18 mariuscc joined #git
19:19 alexsystemf__ joined #git
19:21 alansaul joined #git
19:22 freimatz joined #git
19:22 EricPoe joined #git
19:25 spudowiar joined #git
19:26 kyan joined #git
19:26 Shakeel_ joined #git
19:27 jstein Hi, usually I have all files of my project together in one git repository, but this time I have a 100 large binary files (10 GB in sum). I will never change these, but want to keep track of the file names and store these outside my repo.
19:29 _xor joined #git
19:29 jstein is there a good tool or a trick to make this handy? If I would have to invent it, I would try to make SHA512 sums of the files and store these in a file, while the binaries are on a ftp server.
19:29 jstein but perhaps there is a nice solution that integrates in git?
19:31 avar look up git-annex and git-lfs
19:35 ASOLAr joined #git
19:36 _ikke_ !media
19:36 gitinfo [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
19:46 KevinMGranger joined #git
19:49 JJjack joined #git
19:58 mikecmpbll joined #git
20:04 mehola joined #git
20:06 kulelu88 joined #git
20:07 kuldeep joined #git
20:07 Kicer86 joined #git
20:08 kuldeep_ joined #git
20:08 vassagus joined #git
20:08 mingrammer joined #git
20:09 mohabaks joined #git
20:12 ahmadassaf joined #git
20:14 M-shine joined #git
20:14 EricPoe joined #git
20:17 eivarv joined #git
20:22 multi_io joined #git
20:22 multi_io why does the git debian package draw in libx11-6 libx11-data ?
20:22 multi_io i.e. the xlibs?
20:22 _ADN_ joined #git
20:22 multi_io gitk is a separate package...
20:23 kadoban Maybe for gitk? Dunno
20:24 denimsoft joined #git
20:25 DJ_Spies joined #git
20:28 Xizor joined #git
20:31 cosmicfires left #git
20:31 Seveas multi_io: it doesn't.
20:31 Seveas Depends: libc6 (>= 2.16), libcurl3-gnutls (>= 7.16.2), libexpat1 (>= 2.0.1), libpcre3, zlib1g (>= 1:1.2.0), perl-modules, liberror-perl, git-man (>> 1:2.7.4), git-man (<< 1:2.7.4-.)
20:32 mohabaks joined #git
20:34 Peng multi_io: It Suggests installing gitk; is your package manager configured to automatically install suggested packages?
20:34 Manuel15 joined #git
20:34 Manuel15 joined #git
20:39 fahadash joined #git
20:42 Gsham joined #git
20:42 nwkj86 joined #git
20:42 m0viefreak joined #git
20:42 cagedwisdom joined #git
20:43 cagedwisdom left #git
20:44 _ADN_ joined #git
20:45 _ADN_ joined #git
20:46 jeffreylevesque joined #git
20:49 Darcidride joined #git
20:52 multi_io it comes in via Recommends: ssh-client
20:53 multi_io which depends on xauth which depends on libx11-6
20:53 multi_io apparently the #debian channel has a nice bot to find out such things
20:54 Peng D'oh
20:55 Peng openssh-client should *recommend* xauth, not depend on it. Turn off automatically installing recommended packages and you won't pull everything in.
20:55 EmeraldExplorer joined #git
20:57 bremner it does recommend it
20:58 EmeraldExplorer Anyone know if there is a way to always go with the side of the origin when merging into a local repo?
20:58 * EmeraldExplorer cries at probably horrible vocabulary
20:58 _ikke_ EmeraldExplorer: Unconditionally?
20:59 EmeraldExplorer _ikke_: yes. This is because I am trying to make it so people can have their own "playground" and change files and stuff, but if I change a file in origin/master I always want it to change in the forks/children/whateverTheNameIs
21:00 vdv joined #git
21:01 Sonderblade joined #git
21:03 mingrammer joined #git
21:03 _ikke_ You can look into merge strategies
21:04 aidalgol joined #git
21:07 mathu do any of you have opinions on pygit2/libgit2 vs GitPython?
21:07 mathu gitpython apparently requires that the `git` executable be in path, which makes me think it's working pretty inelegantly but from a couple comments i've seen comparing them online it is a more complete API
21:09 raijin joined #git
21:12 fuchstronaut joined #git
21:13 vassagus joined #git
21:14 foist joined #git
21:15 LordSticky joined #git
21:17 nivag joined #git
21:19 EduardoMartins joined #git
21:21 diogenese joined #git
21:21 dodobrain joined #git
21:21 Lyqyd joined #git
21:23 Remram[m] joined #git
21:23 Ineentho[m] joined #git
21:23 M-meznak joined #git
21:23 M-mistake joined #git
21:24 spudowiar joined #git
21:26 rahtgaz joined #git
21:26 atomicb0mb joined #git
21:29 ahr3n joined #git
21:30 Gsham joined #git
21:31 chid joined #git
21:32 ertes joined #git
21:33 mattcen joined #git
21:35 dzho mathu: the only thing in this area I've even barely touched on has been dulwich
21:35 ertes hi everybody, git newbie here…  i have a skeleton repo from which i start all projects; when i update my skeleton (say to update copyright years), i pull the changes to a skeleton branch in real projects…  to get those changes into another branch (e.g. master), should i merge or cherry-pick?
21:35 ertes the skeleton changes rarely
21:37 SoulOfTheInterne joined #git
21:38 cd-rum joined #git
21:40 denimsoft joined #git
21:43 kadoban ertes: Whichever you like really.
21:48 ertes hmm…  git seems to handle cherry-pick-then-merge properly, so i'll go with cherry-pick
21:48 ertes thanks
21:52 cd-rum joined #git
21:55 javajoe joined #git
21:56 jnewt joined #git
21:57 _ADN_ joined #git
21:57 jnewt what does the core.worktree property do?  i try to do a git status, but i get fatal: Could not switch to , and it's the path in the worktree property in .git/config
21:58 _ADN_ joined #git
21:58 osse man git-config
21:58 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
21:59 nebg hello everyone... if  i messed up all the things... how can i reswet everything going to the last commit  ?
21:59 KnownSyntax joined #git
22:05 mehola joined #git
22:07 bittin joined #git
22:13 fuchstronaut joined #git
22:13 fuchstronaut joined #git
22:17 vassagus joined #git
22:19 filcab joined #git
22:20 ToBeCloud joined #git
22:20 KnownSyntax joined #git
22:20 KnownSyntax joined #git
22:23 jnewt nebg
22:23 jnewt gti checkout .
22:23 jnewt git checkout .
22:24 Derperperd joined #git
22:26 lindenle joined #git
22:29 alansaul joined #git
22:36 nebg jnewt, thanks a lot
22:36 nebg jnewt, what if i want to get things back to a certain commit ?
22:37 nebg and delete all commits which are ahead ?
22:37 phroa man git reset - you'll want $ git reset --hard thecommit
22:37 gitinfo the git-reset manpage is available at http://jk.gs/git-reset.html
22:38 phroa (it won't delete them, you can still go back.  they just won't be part of your current history)
22:38 LeBlaaanc joined #git
22:40 nebg phroa, how can i go back ?
22:40 nebg if they won't be part of the current history  ?
22:40 phroa you can reset "forward" if you know where you want to go.
22:42 cyan__ joined #git
22:43 carpelucem joined #git
22:43 ldlework joined #git
22:43 nebg phroa, how ?
22:44 ldlework joined #git
22:44 phroa $ git reset thecommitgoeshere, same as resetting to a prior commit
22:44 phroa commits are still kept track of locally for some time (man git gc) even if they aren't part of your history, just in case you need to go back to them. (man git reflog)
22:44 gitinfo the git-gc manpage is available at http://jk.gs/git-gc.html
22:44 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
22:45 lindenle joined #git
22:45 LeBlaaanc joined #git
22:46 sgen joined #git
22:46 red__ joined #git
22:47 ldleworker joined #git
22:48 Fabricio20 joined #git
22:49 Fabricio20 joined #git
22:50 jenca joined #git
22:50 Fabricio20 joined #git
22:51 mingrammer joined #git
22:51 Fabricio20 joined #git
22:52 alansaul joined #git
22:53 Lipp joined #git
22:54 lindenle joined #git
22:57 jenca left #git
22:58 romerocesar joined #git
22:59 daniel_rose joined #git
23:02 [Brain] joined #git
23:03 lindenle joined #git
23:05 dreiss joined #git
23:09 rbern joined #git
23:12 lindenle joined #git
23:13 p4trix joined #git
23:14 knobo left #git
23:17 BSAlb joined #git
23:18 gruetzkopf joined #git
23:21 Oog joined #git
23:21 lindenle joined #git
23:22 nluther left #git
23:23 vassagus joined #git
23:24 zerox2a joined #git
23:24 HanClinto_ joined #git
23:25 mattcen joined #git
23:27 jmibanez joined #git
23:29 Derperperd joined #git
23:30 Rodya_ joined #git
23:30 marcm joined #git
23:31 lindenle joined #git
23:31 dinomons joined #git
23:32 raven-au joined #git
23:36 dilfridge joined #git
23:40 lindenle joined #git
23:40 Noldorin joined #git
23:41 Gitzilla joined #git
23:43 cqi joined #git
23:45 fk joined #git
23:45 mingrammer joined #git
23:49 lolmac joined #git
23:49 lindenle joined #git
23:53 inflames joined #git
23:58 lindenle joined #git

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