Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-08

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

All times shown according to UTC.

Time Nick Message
00:00 SmashingX joined #git
00:00 King_Hual` joined #git
00:00 SmashingX I’m trying to clone a repo in gitlab but getting this error: remote: HTTP Basic: Access denied
00:00 SmashingX fatal: Authentication failed for
00:08 sz0 joined #git
00:11 Vampire0 SmashingX, well, yeah, you don't have access
00:11 gopar joined #git
00:11 SmashingX Vampire0: I generated my keys using git bash in windows
00:11 SmashingX I pasted my public key in gitlab
00:12 SmashingX and still the same
00:12 SmashingX does that mean I need to be granted access in gitlab?
00:13 Cabanossi joined #git
00:14 mjuszczak joined #git
00:17 gopar joined #git
00:20 nevodka joined #git
00:20 Vampire0 SmashingX, do you see the repo in GitLab web interface?
00:20 elisa871 joined #git
00:20 elisa871 what does this mean?
00:20 elisa871 locked and limited conversation to collaborators just now
00:20 Vampire0 SmashingX, if not, you probably need to be granted access
00:21 Vampire0 elisa871, for Git nothing
00:21 SmashingX I solved it Vampire0 thansk man
00:21 Vampire0 SmashingX, yw
00:21 SmashingX left #git
00:21 elisa871 I mean github Vampir
00:21 NeXTSUN joined #git
00:22 Vampire0 elisa871, ah, ok !github
00:22 gitinfo elisa871: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
00:22 Whiskey Is there anyway to export files by commits?
00:22 Whiskey git archive HEAD only give me current version of the file right?
00:25 Vampire0 Whiskey, I think so, yes
00:25 Whiskey hehe i mean by sha :D
00:25 Vampire0 Whiskey, sorry?
00:25 Whiskey a command to export the files in some commit
00:25 Whiskey it can be tracked whit sha
00:26 Whiskey but is it a way to just export the files made in a commit
00:26 Vampire0 Whiskey, what do you mean, all files in the project as present in that commit, or the files that were changed in that commit or what?
00:26 Vampire0 Whiskey, what **exactly** do you want to achieve?
00:27 Whiskey yeh only the files that was changed it the commit
00:27 yaiyan joined #git
00:29 BackEndCoder joined #git
00:31 Vampire0 Whiskey, may I ask what you want to use this for?
00:32 Whiskey i just try to get out some of the changes as i use an hook to save them but it don´t seem to work right so i need to btw nevermind :)
00:32 Whiskey i can do it anotherway
00:32 Whiskey anyways the hook has some error in it :D
00:34 Whiskey so it delete files that it not should :D
00:35 Vampire0 Whiskey, actually I'm still not sure what you want to do. Creating a tar with all added and modified files is as easy as
00:36 Vampire0 tar cvf foo.tar $(git diff --diff-filter=AM --name-only foo~ foo)
00:37 Whiskey Vampire0: more like "git diff --name-only fde9f9c232150a91d0edf4decdda3da21b0dff43 | tar -x -C /home/whiskey/www/git/commit/2017-03-08" try to export just the changed files in a commit by sha
00:37 Whiskey but that don´t work
00:38 Vampire0 Whiskey, ah, you mean only the filenames?
00:38 Vampire0 Whiskey, `git diff --name-only fde9f9c232150a91d0edf4decdda3da21b0dff43^!`
00:39 Whiskey yeh
00:39 Noodlewitt joined #git
00:39 duderono_ joined #git
00:39 Darren_ joined #git
00:39 Vampire0 Whiskey, or if you like it more long `git diff --name-only fde9f9c232150a91d0edf4decdda3da21b0dff43~ fde9f9c232150a91d0edf4decdda3da21b0dff43`
00:39 hvn0413 joined #git
00:39 Whiskey :)
00:40 Vampire0 Whiskey, what you did was to compare current state against that commit, not commits parent against commit
00:40 Kaisyu joined #git
00:41 pur3eval joined #git
00:43 th_ joined #git
00:44 watabou joined #git
00:47 Whiskey kk i try it atm i need to find my error in the script
00:48 cdown joined #git
00:50 jimklo joined #git
00:50 j7k6_ joined #git
00:50 Soni joined #git
00:51 Soni so I have some changes on branch A, and I have some other changes on branch B
00:51 zzz joined #git
00:51 Soni and I'm currently on branch B
00:51 Soni how do I merge changes from A into B?
00:51 Soni I don't understand "git merge"
00:51 Soni it has always confused me
00:53 rewt git merge A
00:54 rewt and maybe resolve conflicts
00:54 Vampire0 Soni, what did you not understand exactly?
00:55 Noodlewitt joined #git
00:55 StuartMI joined #git
00:55 Soni ok
00:55 Soni why's it not "git merge A B" or "git merge B A"? .-.
00:55 Soni too stateless?
00:56 rewt it merges the specified branch into the current branch
00:56 Soni yes, that's confusing
00:56 rewt no point in specifying the current branch, because it's already checked out
00:57 rewt and can't merge into another not-checked-out branch, because how are conflicts to be fixed in that case?
00:57 Soni idk
00:57 rewt right
00:57 rewt so the only clear thing to do is to merge some other branch into the current one
00:58 Cabanossi joined #git
00:58 rewt tell git-merge what that other branch is, and that will get merged into the current on
00:58 rewt e
00:58 Soni ok
00:58 Vampire0 Soni, I guess your problem in wrapping your head around why the two branch syntax is not working is, that you don't think about Octopus merges
00:58 Soni probably not gonna get used to that but ok
00:59 cwre joined #git
00:59 Vampire0 Soni, you can merge 5 branches (actually any number) into the current branch with one merge commit
00:59 Soni O_o
01:00 Vampire0 Soni, if you are on branch A and do `git merge B C` both branches B and C will be merged into A with one merge commit that has three parents, A, B and C
01:00 rewt Soni, think of it as: you're always working on what's currently checked out... and merging will affect what's checked out... but how? by merging some other branch that you specify
01:00 GingerGeek joined #git
01:00 GingerGeek joined #git
01:00 c^ joined #git
01:00 Vampire0 Soni, but you can easily make you an alias so that if you call `git merge-to A B` git automatically does `git checkout A $$ git merge B`
01:01 cqi joined #git
01:01 Soni sorry brain's fried
01:01 Soni hmm doesn't help that I'm in a kinda meltdown state
01:01 Soni sorry
01:03 Vampire0 Soni, something like `git config alias.merge-to '!merge_to() { git checkout "$1" && git merge "$2"; }; merge_to'`
01:03 mehola joined #git
01:03 kyan joined #git
01:04 Noodlewitt joined #git
01:05 nickabbey joined #git
01:06 StuartMI joined #git
01:06 jameser joined #git
01:07 TbobbyZ_ joined #git
01:08 kbs joined #git
01:09 skirk joined #git
01:12 Noodlewitt joined #git
01:14 rominronin joined #git
01:17 kristofferR joined #git
01:18 Raed joined #git
01:19 bashcoder joined #git
01:19 bashcoder joined #git
01:21 StuartMI joined #git
01:26 Noodlewitt joined #git
01:27 Whiskey kk i try it atm i need to find my error in the script
01:28 venmx joined #git
01:30 StuartMI joined #git
01:30 raspado joined #git
01:31 Noodlewitt joined #git
01:31 impliednude joined #git
01:32 gugah joined #git
01:32 skirk joined #git
01:33 impliedn joined #git
01:36 StuartMI joined #git
01:37 Sasazuka__ joined #git
01:37 qpdb joined #git
01:41 mjuszczak joined #git
01:43 StuartMI joined #git
01:45 peterbec` joined #git
01:45 peterbecich joined #git
01:46 watabou joined #git
01:48 blr_ joined #git
01:49 Sasazuka__ joined #git
01:49 skirk joined #git
01:49 kyan joined #git
01:50 blr joined #git
01:50 GodEater joined #git
01:50 GodEater joined #git
01:51 clemf joined #git
01:52 StuartMI joined #git
01:55 skirk joined #git
01:56 impliednude joined #git
01:57 foreal joined #git
01:57 foreal joined #git
02:00 geek2nerd joined #git
02:01 StuartMI joined #git
02:02 LeBlaaanc joined #git
02:02 rchavik joined #git
02:02 ayogi joined #git
02:03 raijin joined #git
02:04 metachr0n joined #git
02:08 scoobertron joined #git
02:08 ayogi_ joined #git
02:10 marianina8 joined #git
02:11 marianina8 joined #git
02:12 chigang joined #git
02:12 pur3eval joined #git
02:13 Cabanossi joined #git
02:14 PioneerAxon joined #git
02:15 Guest69206 joined #git
02:24 finalbeta joined #git
02:28 mikecmpbll joined #git
02:31 bitmod joined #git
02:32 pks joined #git
02:32 d^sh joined #git
02:33 bitmod left #git
02:34 madebymarkca joined #git
02:35 aidalgol joined #git
02:40 TbobbyZ joined #git
02:41 stiven joined #git
02:46 BigMacs joined #git
02:46 ncthom91 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 dosequis left #git
02:51 j7k6_ joined #git
02:52 fstd_ joined #git
02:58 Gsham joined #git
02:58 SwiftMatt joined #git
02:58 sunri5e joined #git
03:00 Elronnd joined #git
03:01 Elronnd left #git
03:01 edgimar joined #git
03:02 skelterjohn joined #git
03:04 ojdo joined #git
03:04 Bronze joined #git
03:05 marianina8 joined #git
03:05 edgimar I'm not very well versed in git at this point, and I have the following situation:  I have several commits in my master branch, I add commit X to these.  I later realize I want to do something different, so I "git checkout <rev before X>" and add commit Y.  At this point, how is it possible to get rid of X altogether, and move Y to be where X used to be in the graph of the master branch?
03:06 edgimar I know that the "right thing" to do is to revert X, and rebase Y on top of the reversion.  But, I want to know how to do what I said.
03:07 BronzeiT joined #git
03:07 aavrug joined #git
03:08 aavrug joined #git
03:09 peterbec` joined #git
03:09 aavrug joined #git
03:10 nedbat edgimar: at that point, what is there of X?
03:10 aavrug joined #git
03:11 edgimar I don't know -- I assume it's still present in the master branch (which is different from the "detached from HEAD" branch that I created Y on).  But maybe I'm misunderstanding some fundamental ideas here.
03:12 peterbec` left #git
03:12 edgimar oh, I mean "HEAD detached from ..." branch
03:17 altendky joined #git
03:18 Gsham joined #git
03:19 hhee joined #git
03:23 watabou joined #git
03:23 stiven1 joined #git
03:23 durham_ joined #git
03:25 TheHackax joined #git
03:25 dsantiago joined #git
03:28 Vortex35 joined #git
03:30 gtristan joined #git
03:34 edgimar ok, I think I figured it out -- this helped: http://stackoverflow.com/a/17045215
03:35 bannakaffalatta joined #git
03:36 chachasmooth joined #git
03:38 warthog9 joined #git
03:41 cjohnson in the future, git checkout just takes you to the given commit, but git reset temporarily rewinds history to that commit
03:41 cjohnson once you get to that point you can just commit your new commit and push. unless of course you already pushed that other commit
03:41 cjohnson in which case you are now rewriting history publicly and you'll need to force push
03:42 cjohnson and alert others who may have pulled it
03:42 cjohnson git reset --hard will both rewind time and change your working copy to match, which effectively means that change is totally lost (not exactly, it can still be recovered, but not through the normal means)
03:43 cjohnson So for example if your change was just a little bit wrong and needs some correcting, you would just git reset, modify your changes to be more correct, then commit again
03:46 skered joined #git
03:47 warthog9 joined #git
03:50 impliednude joined #git
03:50 TbobbyZ joined #git
03:51 salamanderrake joined #git
03:55 edgimar cjohnson: ok, that makes sense.  thanks for the explanation, and distinction between reset and checkout.
03:55 edgimar Is it so that a git branch can only ever have one HEAD?
03:57 xall_ joined #git
03:57 Cabanossi joined #git
03:58 pur3eval joined #git
03:58 gopar joined #git
04:00 jungsubk joined #git
04:01 hexagoxel joined #git
04:02 warthog9 joined #git
04:03 nickabbey joined #git
04:05 gtristan joined #git
04:16 warthog9 joined #git
04:16 raijin joined #git
04:16 gelei007 joined #git
04:17 Goplat joined #git
04:18 rominronin joined #git
04:21 jimklo joined #git
04:21 Soni left #git
04:28 venmx joined #git
04:29 rominronin joined #git
04:29 a_thakur joined #git
04:31 Lyqyd joined #git
04:32 lucido-cl joined #git
04:41 rdnt joined #git
04:43 rdnt I added a feature to master a few commits ago that i'd like to separate into its own branch. I created the feature branch, deleted the functionality from master, and am ready to commit but I think I'm doing it backwards
04:44 mjuszczak joined #git
04:46 rdnt I'll just commit the removals and then merge master into the feature branch so they have a common ancestor in the correct state
04:46 nickabbey joined #git
04:47 matt_m joined #git
04:49 svm_invictvs joined #git
04:50 hexagoxel joined #git
04:52 j7k6_ joined #git
04:53 mehola joined #git
04:54 xissburg joined #git
04:56 duderonomy joined #git
04:56 Cabanossi joined #git
04:57 roentgen joined #git
04:57 xissburg_ joined #git
04:59 pur3eval joined #git
05:00 thebird joined #git
05:04 TbobbyZ joined #git
05:04 a_thakur joined #git
05:06 chipotle joined #git
05:09 UnnamedPlayer joined #git
05:11 clemf joined #git
05:11 clemf joined #git
05:12 clemf joined #git
05:13 robattila256 joined #git
05:15 radoslavcap joined #git
05:16 ayogi joined #git
05:22 hexagoxel joined #git
05:22 marianina8 joined #git
05:22 marianina8 joined #git
05:22 amosbird joined #git
05:23 MattMaker joined #git
05:27 MattMaker joined #git
05:27 noteness joined #git
05:29 darkkal joined #git
05:33 Sample joined #git
05:33 annoymouse joined #git
05:35 a_thakur_ joined #git
05:35 clemf joined #git
05:35 clemf joined #git
05:36 clemf joined #git
05:36 YuGiOhJCJ joined #git
05:39 hvn0413 joined #git
05:41 korean joined #git
05:41 thiago joined #git
05:41 xall_ joined #git
05:44 clemf joined #git
05:44 clemf joined #git
05:45 dandaman joined #git
05:46 mischat joined #git
05:46 clemf joined #git
05:48 rominronin joined #git
05:49 svm_invictvs joined #git
05:50 xall joined #git
05:56 justanotheruser joined #git
05:57 Cabanossi joined #git
05:58 arescorpio joined #git
05:58 robotroll joined #git
06:02 jameser_ joined #git
06:03 hue joined #git
06:03 rscata joined #git
06:03 mjuszczak joined #git
06:04 MattMaker joined #git
06:05 acetakwas joined #git
06:12 qt-x joined #git
06:13 xissburg joined #git
06:16 OnBrokenWings joined #git
06:17 TbobbyZ joined #git
06:23 rkazak joined #git
06:25 hexagoxel joined #git
06:26 howdoi joined #git
06:29 sbulage joined #git
06:29 venmx joined #git
06:31 scoobert1on joined #git
06:31 dec0n joined #git
06:34 navidr joined #git
06:34 dtrott joined #git
06:38 PioneerAxon joined #git
06:43 bocaneri joined #git
06:45 dersand joined #git
06:47 netj joined #git
06:47 pur3eval joined #git
06:50 HurricaneHarry joined #git
06:51 brent__ joined #git
06:52 bocaneri joined #git
06:53 j7k6_ joined #git
06:54 t0by joined #git
06:54 menip joined #git
06:56 Glowball joined #git
07:00 a_thakur joined #git
07:01 shgysk8zer0_ joined #git
07:05 menip_ joined #git
07:05 mkoskar joined #git
07:05 noteness joined #git
07:06 freimatz joined #git
07:12 alexandre9099 joined #git
07:12 Silmarilion joined #git
07:12 jagob joined #git
07:14 mda1 joined #git
07:17 eroux joined #git
07:17 JeroenT joined #git
07:18 hurricanehrndz joined #git
07:20 Noodlewitt joined #git
07:20 Karazhan joined #git
07:20 lus joined #git
07:21 rominronin joined #git
07:21 jameser joined #git
07:22 Tobbi joined #git
07:23 pks joined #git
07:24 venmx joined #git
07:24 TbobbyZ joined #git
07:25 imack joined #git
07:27 Karazhan joined #git
07:28 rominronin joined #git
07:30 j7k6_ joined #git
07:32 daynaskully joined #git
07:40 ToxicFrog joined #git
07:40 chele joined #git
07:46 Sceorem joined #git
07:49 GodGinrai joined #git
07:49 bruce_lee joined #git
07:49 bruce_lee joined #git
07:50 ExpiredDev joined #git
07:52 chele joined #git
07:52 Yotta92 joined #git
07:53 Yotta92 left #git
07:53 ExpiredDev joined #git
07:55 MattMaker joined #git
07:55 chele joined #git
07:55 MattMaker joined #git
07:56 MattMaker joined #git
07:56 elect joined #git
07:57 MattMaker joined #git
07:58 MattMaker joined #git
07:59 sgfgdf joined #git
07:59 MattMaker joined #git
07:59 nevodka joined #git
07:59 kristofferR joined #git
07:59 MattMaker joined #git
08:00 chele joined #git
08:00 MattMaker joined #git
08:01 Tobbi joined #git
08:01 MattMaker joined #git
08:01 PCatinean joined #git
08:03 dvaske joined #git
08:05 dvaske_ joined #git
08:09 Silmarilion Hello, I keep getting error: git-svn died of signal 11. When trying to clone a big svn repository. Any suggestions?
08:10 _ikke_ signal 11 is a segfault
08:10 chele joined #git
08:10 masuberu joined #git
08:11 TomyWork joined #git
08:12 xall joined #git
08:13 stduolc joined #git
08:13 EV3RYDAYPR0GRESS joined #git
08:14 DBag joined #git
08:15 stduolc hi all, I have some question about reset, I just reset my HEAD to a older commit and develop from the older commit, can I find the commits info before I reset? I want to graph the all commits that I had commited, include the reset commits.
08:16 stduolc I found if I reset the HEAD, all info after the reset point is gone.
08:18 kadoban stduolc: Check the reflog, 'git reflog' , there's options as well, but it should be in there.
08:18 rchavik git reflog
08:19 chele joined #git
08:19 overlord_tm joined #git
08:20 eroux joined #git
08:21 stduolc kadoban: thx, that is what i want.
08:26 dtrott joined #git
08:29 d0nn1e joined #git
08:29 rapidshot64 joined #git
08:30 stduolc why there is no commit message about the first commit?
08:32 flaviodesousa joined #git
08:34 rdnt joined #git
08:35 stduolc I find the git log -g.
08:36 Darcidride joined #git
08:36 rapidshot64 joined #git
08:36 pur3eval joined #git
08:37 ych joined #git
08:38 chele joined #git
08:41 stduolc I found a useful tool in D3, https://onlywei.github.io/explain-git-with-d3/#clean
08:41 TbobbyZ joined #git
08:42 osse stduolc: git log -g shows the reflog itself. you probably want to take one entry from there and do 'git log {that thing}'
08:42 Balliad joined #git
08:44 marianina8 joined #git
08:44 rapidshot64 joined #git
08:45 Tobbi joined #git
08:46 aard_ joined #git
08:48 akkad joined #git
08:49 murii joined #git
08:49 jnavila joined #git
08:50 govg joined #git
08:52 stduolc_ joined #git
08:54 akosma joined #git
08:56 akosma left #git
08:58 kurkale6ka joined #git
08:58 j416 stduolc_: cool thing
09:00 brendyn left #git
09:01 pks joined #git
09:01 _ADN_ joined #git
09:01 jimklo joined #git
09:02 lesshaste joined #git
09:03 lesshaste on linux what is the most newbie friendly way to deal with Automatic merge failed; fix conflicts and then commit the result.  ?
09:03 _ikke_ lesshaste: probably using a mergetool
09:03 jast !conflict
09:03 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
09:03 jast hmm, that doesn't talk about mergetools
09:04 jast anyway, install something like meld, then 'git config --global merge.tool meld' and run 'git mergetool' to fix conflicts
09:04 xall joined #git
09:04 jast or just get used to the syntax of conflict markers and edit the files
09:05 mikecmpbll joined #git
09:05 lesshaste I am installing meld thx
09:06 zxd joined #git
09:07 lesshaste hmm.. the right hand panel is the remote version, that's clear
09:07 lesshaste what is the difference between the left and middle panels?
09:07 maqr joined #git
09:07 brent__ joined #git
09:07 _ikke_ left is the 'local' version, middle is the common base version
09:07 lesshaste ah ok
09:08 altin joined #git
09:08 altin anyone knows how to add git commands to jailed/chrooted users in a linux system?
09:09 eroux joined #git
09:12 jast altin: normally it's enough to put a git-foo binary in the path
09:13 jast or do you mean making Git itself available? in that case, copy over the Git binary and all libraries it depends on
09:13 jast as well as its shared files like hook templates
09:14 altin I did copy git, git-shell and git-core libs :/
09:14 altin jast
09:14 jast it depends on some external libs, too, like libcurl (if built with HTTP support) and zlib
09:15 MaekSo joined #git
09:15 gtristan joined #git
09:15 zxd hi, I am playing with internal commands, learning git,  I did git update-index --add .emacs   then git write-tree    want to wipe index before adding new file, don't want the new file and .emacs in the new tree
09:15 zxd how to do that?
09:15 zxd delete index file ?
09:16 jast my local git build depends on: libpcre, libz, libresolv, libpthread, libc
09:16 jast zxd: 'git reset'
09:16 qt-x joined #git
09:16 byte512 joined #git
09:17 mknod joined #git
09:17 zxd jast: thanks
09:19 rdnt joined #git
09:19 Glowball joined #git
09:19 govg joined #git
09:20 a_thakur joined #git
09:21 _ADN_ joined #git
09:24 altin jast this is the issue I'm running into:
09:24 altin Cloning into 'testproject2'...
09:24 altin remote: Counting objects: 3, done.
09:24 altin remote: Compressing objects: 100% (2/2), done.
09:24 altin remote: Total 3 (delta 0), reused 0 (delta 0)
09:24 altin Unpacking objects: 100% (3/3), done.
09:24 altin fatal: unable to look up current user in the passwd file: No such file or directory
09:24 altin Unexpected end of command stream
09:24 altin why should it be looking in the passwd file o.O ?
09:24 rdnt joined #git
09:25 stduolc altin: use paste...
09:26 altin stduolc yup sorry, not too many lines though
09:26 Tobbi joined #git
09:26 stduolc altin: https://dpaste.de/
09:26 altin stduolc thnx
09:27 _ikke_ altin: passwd file is what maps uids to names
09:27 marcogmonteiro joined #git
09:27 _ikke_ altin: many programs refer to /etc/passwd\
09:29 Seveas almost no programs do directly though
09:29 Seveas all goes through glibc and libnss
09:29 zxd a commit with more than one parent is always a merge?
09:29 _ikke_ zxd: yes
09:30 Seveas yes, that's the definition of a merge :)
09:30 _ikke_ Seveas: right, but /etc/passwd needs to be available for that to work
09:31 scoobertron joined #git
09:31 Seveas not necessarily. It's perfectly fine (though admittedly not normal) to configure nss not to look at any local files
09:31 altin _ikke_ well I do have /etc/passwd file in place
09:31 _ikke_ altin: in the chroot?
09:32 altin yes _ikke_
09:32 jast and does it have an entry for the current user?
09:32 Seveas altin: and /etc/nsswitch.conf?
09:33 jast actually, never mind, that's not what the error was :)
09:33 altin jast yes it does
09:34 Seveas altin: try upgrading git to 2.6.5 or newer, it handles this situation more gracefully
09:34 Seveas 92bcbb9b338dd27f0fd4245525093c4bce867f3d
09:34 zefferno joined #git
09:34 altin Seveas yes I do have nsswitch.conf too
09:35 Dumblez0r joined #git
09:35 Seveas altin: in the chroot, what does 'id' return?
09:35 _ikke_ git uses getpwuid btw to do this
09:35 altin Seveas uid=1000 gid=1000 groups=1000
09:36 Seveas yeah, so uid 1000 isn't in the passwd file
09:36 altin Seveas it is
09:36 Seveas otherwise it'd have a loginname to go with that
09:37 Seveas got /etc/group in your chroot too?
09:37 pur3eval joined #git
09:37 Seveas and the nss_files library?
09:37 mischat joined #git
09:38 ali1234 joined #git
09:38 ali1234 how do i remove changes to a file with rebase and amend?
09:38 ali1234 like i accidentally ran git commit -a and commited some changes i didn't want to
09:39 ali1234 and i didn't notice until later
09:39 tobiasvl ali1234: you haven't pushed?
09:39 osse ali1234: mark commit 'edit'. make changes. git commit --amend; git rebase --continue
09:39 ali1234 i haven't, no
09:39 zxd how to have git extract the files to my working tree after doing a   git  --read-tree  <tree>
09:39 ali1234 osse: yes, specifically it's the "make changes" part i need help with
09:39 acetakwas joined #git
09:39 Seveas altin: the basic problem with your error is that getpwuid can return ENOENT when a user can't be looked up. But ENOENT usually means 'no such file or directory', which is what git now tells you. But it may be an entirely different issue than a missing file, so if you can make 'id' give you the users loginname, git will stop complaining.
09:40 osse ali1234: that's the only part I can't help you with since I don't know what changes you want to make
09:40 Seveas altin: workarounds would be: upgrade git to 2.6.5 or newer, or set the users name/email in their ~/.gitconfig. Many things really like to see a loginname for a user though, so making 'id' work would be best. 'strace id' might give you a clue as to what's missing in your setup.
09:40 ali1234 osse: i want to remove changes to a file from the commit, and keep the changes in the working directory
09:41 tmg joined #git
09:41 ali1234 the opposite of "git add" i suppose
09:41 marenz_ joined #git
09:42 osse ali1234: i would do git checkout HEAD~ -- file; git commit --amend; git rebase --continue;
09:42 osse then afterwards do git checkout -p $oldhash -- file
09:42 ali1234 that will destroy the changes in the file
09:42 osse corerct
09:43 ali1234 hmm so basically backup the file, revert it, redo commit, and then restore the backup
09:43 ali1234 is that really the only way?
09:43 osse that's my suggestion yes. except making a backup is for noobs. using git checkout to access the old version is for pros
09:44 osse AFAIK rebase doesn't like dirty working directories.  Not sure if it's the only way, but it's a reliable way.
09:44 netj joined #git
09:44 _ikke_ rebase doesn't indeed
09:44 altin Seveas well yes, setting the globals in config, name/email fixed the issue
09:44 _ikke_ but untracked files should not matter
09:44 Noodlewitt joined #git
09:44 marianina8 joined #git
09:44 Seveas altin: no, it worked around the issue.
09:45 ali1234 well, let's look atthe problem another way. iwant to use rebase to split one commit into two commits
09:45 _ikke_ ali1234: You can do that at the same time
09:45 stamina joined #git
09:45 ali1234 at the same time as what?
09:46 osse mark commit edit. when you get there do git reset HEAD~; make two commits; git rebase --continue
09:46 _ikke_ just after you ammended the commit
09:46 _ikke_ you can create a new commit
09:46 ali1234 what's HEAD~?
09:46 leeN joined #git
09:46 Seveas the first parent of HEAD, see man gitrevisions
09:46 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
09:46 mgedmin joined #git
09:47 ali1234 what's HEAD^ then?
09:47 jast first parent of HEAD
09:47 Seveas also the first parent
09:47 grawity the ~ syntax accepts numbers
09:47 ali1234 okay
09:47 grawity e.g. HEAD^^^^^ is HEAD~5
09:47 Seveas ^ too, but means something else
09:47 Pieplay joined #git
09:47 jast HEAD^2 = the second parent, only exists in a merge commit
09:47 jast HEAD~2 = first grandparent
09:47 mgedmin I've this alias 'git up' that does essentially 'git checkout master && git pull'
09:48 mgedmin problem is, if I git up twice in a row, I can no longer use git checkout - to get to the branch I was working on
09:48 Seveas and HEAD*1 is the stepfather of a commit ^_^
09:48 mgedmin because the previous branch is now also master
09:48 mgedmin so I'm thinking maybe I'd update my alias to do the git checkout master only if my current branch is not master
09:48 mgedmin and I'm not sure how to achieve that
09:48 TbobbyZ joined #git
09:49 osse grawity: ^ also accepts numbers ;)
09:49 jast mgedmin: test "$(git symbolic-ref HEAD)" = "refs/heads/master" || { git checkout master && git pull }
09:49 grawity could've done without the ";)"
09:49 mgedmin ah symbolic-ref, thanks!
09:49 Seveas mgedmin: if [ "$(git rev-parse --symbolic-full-name)" != "refs/heads/master" ]; then git checkout master; fi; git pull
09:50 osse goddammit
09:50 seni13 joined #git
09:50 DBag joined #git
09:50 osse for once in my life I use ";)" and I get criticized
09:50 GodGinrai joined #git
09:50 osse :(
09:50 jast actually my version is messed up, it makes the 'pull' conditional, too
09:50 grawity if there's *one* emoticon that makes me want to punch people...
09:51 jast this one, I suppose: { [ "$(git symbolic-ref HEAD)" = "refs/heads/master" ] || git checkout master } && git pull
09:51 Seveas jast: it's more messed up than that
09:51 Seveas symbolic-ref throws errors when HEAD is detached
09:51 osse grawity: I see. Maybe ";)" is to you what writing "just" is to me.
09:51 zxd I did this, echo "test commit with two parent commits" | git commit-tree -p fba99b -p 7cb5b6 5722e53   then copied .git to a new directory and from there, git read-tree -u -m -v <sha1- of the new commit>       I expected all the files from the parent commits to also show up in the working dir
09:51 jast gah, since when
09:51 maloik28 joined #git
09:51 zxd why only the file from 5722e53    showed up
09:51 jast oh well
09:51 Seveas since ever?
09:52 jast third try! { [ "$(git symbolic-ref -q HEAD)" = "refs/heads/master" ] || git checkout master } && git pull
09:52 grawity osse: the "oh, you just need to <five hours of work>" kind of thing?
09:52 osse grawity: E.g.:   noob: "How do I do X? I tried Y?"  pro: "Why not just do Z?" where Z is some super-arcane and/or complicated process that no one in their right mind would expect a noob to know
09:52 jast grawity: why so aggressive ;)
09:52 jast I just can't help it
09:53 maloik28 I reverted a PR merge on GitHub and now want to continue working on the original PR, but it's only giving me the option of reverting the revert which means a single commit which is messy. Is there a way to fix my local branch so that if I push it it does notice the difference between master and that branch, despite all commits having been merged at one point and then reverted?
09:53 Seveas zxd: because you specified 5722e53 as the tree...
09:53 jast maloik28: no
09:53 jast !revert_merge
09:53 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
09:53 whaley joined #git
09:53 _ikke_ maloik28: a revert does not undo the merge, only the changes it brought in. As far as git is concerned, the branch is still merged
09:53 jast you can alter history but then all clones that are up-to-date have to be fixed manually or thrown away
09:54 maloik28 Cherrypicking all commits into a new branch should work, right?
09:54 ali1234 osse: i ended up doing this: rebase, reset, add only the files i want, commit, stash, rebase --continue, stash apply
09:54 osse sounds good to me
09:55 venmx joined #git
09:55 zxd Seveas: so what is having more than one parent good for? how does a merge combine the files from two parents
09:55 mgedmin left #git
09:55 Seveas zxd: but commit-tree doesn't merge anything.
09:56 Seveas zxd: commit-tree is a low-level command that you really shouldn't be using unless you know exactly what it's doing.
09:56 Seveas same for read-tree
09:56 zxd Seveas: i don't know I am playing with the chapter from git internals
09:56 jast zxd: the details are a little more complex, but basically it does a three-way merge between the base version and the tips of the two branches, with some extra magic to hopefully reduce the number of conflicts. of course, only 'git merge' does that, not 'git commit-tree'. if you're working on the low level, you have to do all of it yourself. :)
09:56 zxd Seveas: what lower level commands does a merge do then?
09:57 thebird joined #git
09:57 jast merge has a lot of logic that doesn't have its own low-level command
09:58 thebird joined #git
09:59 newke joined #git
09:59 thebird joined #git
09:59 Snugglebash joined #git
10:00 thebird joined #git
10:01 ahr3n joined #git
10:01 boshhead joined #git
10:01 osse zxd: git commit-tree can create a merge commit by giving two or more -p arguments
10:02 osse so you can think of the final step of a merge as running 'git commit-tree ... -p HEAD -p {argument to git merge command here}'
10:02 thebird joined #git
10:02 aielima joined #git
10:03 _ikke_ zxd: git stores 2 parents btw so that it knows what commits have been merged already. cvs, and for a long time, svn did not store this information, which resulted in very paintful merges (you could not do a 2nd merged of a branch)
10:03 chll_ joined #git
10:03 Guest99537 left #git
10:03 achadwick joined #git
10:03 jimklo joined #git
10:05 chele joined #git
10:06 nutron joined #git
10:06 maloik28 left #git
10:06 eroux joined #git
10:07 metalraiden34 joined #git
10:08 xall joined #git
10:09 Glooomy joined #git
10:10 Dashers joined #git
10:12 P4nther joined #git
10:12 Noodlewitt joined #git
10:13 tang_ joined #git
10:14 hvn0413 joined #git
10:17 ski7777 joined #git
10:19 sbasso joined #git
10:21 Snugglebash joined #git
10:26 Dash- joined #git
10:28 Noodlewitt joined #git
10:28 robattila256 joined #git
10:29 xall joined #git
10:29 King_Hual joined #git
10:31 cyphase joined #git
10:34 ilithium joined #git
10:34 tlaxkit joined #git
10:39 Dashers joined #git
10:40 Dashers Got a strange one here.  File is missing some commits, checked the history and the last patch has the missing data being added, yet it's not viewable in my (or anybody elses) repos when we pull.
10:41 jast have a look at the output of 'git log -p -- <file>' to see changes to the file in recent commits, maybe you'll see something useful. if not, chances are someone accidentally created an "evil merge"
10:42 jast !evil
10:42 gitinfo [!evil_merge] What you describe _can_ be done, but results in an "evil merge": a commit that purports to be a merge, but does not actually take all changes from all sides. This violates the assumptions that tools and humans make about merges, and usually results in confusion and pain down the road.
10:42 jast hmm, that's not the angle I wanted
10:42 jast basically, if someone messes up conflict resolution in a merge, or does even nastier things, that gets "hidden" in the merge commit
10:43 Dashers Ah, that's probably what has happened
10:43 Dashers merging is a pain
10:43 jast not if you do it right ;)
10:43 ilithium Guys, I'm looking to learn what the best methodology is for a 'staging' branch, where I can merge commits to this branch and have this pushed to our staging server. Normally, this is fine, but the question arises: what happens if I want to 'unmerge' a feature branch from staging? Is this possible?
10:44 Dashers haha, indeed, easy to get it wrong though
10:44 jast Dashers: it's a matter of practice
10:44 Dashers Best approach is just to copy and paste the old version over the top?
10:44 jast Dashers: if you're reasonably sure that no actual changes from a merge will get lost that way, sure
10:44 irqq joined #git
10:44 flobin joined #git
10:45 jast ilithium: not really. you can 'revert' a merge, which will essentially create a commit with a reverse patch, but re-merging the same stuff later will then become tricky
10:45 jast !revert_merge
10:45 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
10:46 ferr1 joined #git
10:49 swalladge joined #git
10:49 Dashers :o
10:49 Dashers Yeah, it looks like it got vapourised in a merge
10:49 Dashers So merges don't show changes?
10:50 _ikke_ It shows changes from one side
10:51 flobin hi everyone
10:52 flobin I have an ssh question but I'm not sure there's an ssh-channel, so I thought I'd try here. I'm trying to set up a live repo on a server, but I can't seem to ssh in properly: https://gist.github.com/Flobin/401c359243037c5e893b7ada1b4f6939 any idea why this might happen?
10:54 corentin flobin: it means git doesn't know about the key you're trying to use
10:55 flobin corentin yeah, my question is how do I set it up so that I don't have to specify it?
10:56 corentin flobin: it's more of a ssh issue rather than git. Guess you could try to add your public key in the authorized_keys of the robin user on git server side
10:56 jast Dashers: the default for most tools is to show a "combined diff" for merge commits, which essentially shows only conflicted areas (where there are more than two different versions in the parents/base of the merge). to show a normal diff relative to the first/main branch, use -m. this will show merge commits multiple times, with the diff from different perspectives. the first in the list is *usually* the one that matters.
10:56 flobin corentin thanks!
10:56 flobin will try
10:57 Dashers thanks jast
10:59 marcogmonteiro joined #git
11:00 acetakwas joined #git
11:01 flobin corentin this seems to have worked, except that I forgot the passphrase... d'oh
11:02 Xano joined #git
11:02 flobin luckily I could recover it with keychain
11:03 Xano We're trying to make Git record a file mode change (u-w). core.fileMode is set to true, yet Git does not notice the change. I tried searching, but the results are about Windows or Git own's own --chmod flag. Are we missing anything?
11:04 Xano *Git's own
11:04 PHPanos joined #git
11:05 jimklo joined #git
11:06 mzKas joined #git
11:06 Xano Aaah, core.fileMode is for the executable bit only.
11:07 tvw joined #git
11:08 Xano That helped me narrow down my search, and I now found out why it's impossble :)
11:09 corentin flobin: nobody can help you with that :p
11:09 flobin yeah solved it by now :)
11:10 venmx joined #git
11:13 dsdeiz joined #git
11:13 kristofferR joined #git
11:13 raijin joined #git
11:14 Noodlewitt joined #git
11:15 Tobbi joined #git
11:16 PioneerAxon joined #git
11:19 cdleonard joined #git
11:20 muhannad_______ joined #git
11:20 eroux joined #git
11:23 cousin_luigi left #git
11:25 flobin so I had an error (remote: fatal: This operation must be run in a work tree) that I think I fixed and now I want to re-push, à la "git push live master"
11:25 flobin but when I do that, I get "Everything up-to-date"
11:25 flobin is there a way to push it anyway?
11:26 _ikke_ flobin: It means what you push as nothing that the remote hasn't
11:26 pur3eval joined #git
11:28 cdown joined #git
11:29 Gloomy joined #git
11:34 PHPanos joined #git
11:35 tcorneli joined #git
11:36 nowhere_man joined #git
11:39 kristofferR joined #git
11:39 bvcosta joined #git
11:40 nettoweb joined #git
11:40 jameser joined #git
11:41 avatar_ joined #git
11:44 mkoskar joined #git
11:46 kristofferR joined #git
11:46 marianina8 joined #git
11:46 lesshaste is there some way to receive an email whenever there is a push in a particular repo on github?
11:47 sarri joined #git
11:47 sarri joined #git
11:47 Silenced joined #git
11:47 lesshaste oh I see it is meant to already.. hmmm
11:48 moritz lesshaste: also #github is a better place for such questions
11:48 jimi_ joined #git
11:48 lesshaste oh thanks
11:49 DBag joined #git
11:50 kristoff_ joined #git
11:50 GodGinrai joined #git
11:54 netj joined #git
11:54 nettoweb joined #git
11:56 kristofferR joined #git
11:56 Tobbi joined #git
11:58 jimi_ joined #git
12:00 dviola joined #git
12:02 buzzLightBeer joined #git
12:06 thiago joined #git
12:06 jimklo joined #git
12:07 PHPanos joined #git
12:10 Sonderblade joined #git
12:11 kristofferR joined #git
12:13 valkyr2e joined #git
12:14 Noodlewitt joined #git
12:14 rapidshot64 joined #git
12:15 barteks2x joined #git
12:15 ispn joined #git
12:16 altin what does git use to resolve hosts ?
12:17 altin nslookup ?
12:17 moritz probably gethostbyname
12:17 moritz (the libc routine)
12:18 corentin or getaddrinfo / getnameinfo
12:18 _ikke_ git uses both
12:18 _ikke_ git::master/connect.c
12:18 gitinfo Git web link: https://github.com/git/git/commits/master/connect.c
12:19 Taikibansei joined #git
12:19 altin ahh I see, trying to figure out what should I include in a jail rooted shell
12:19 _ikke_ It does not use a binary
12:20 _ikke_ git::master:connect.c
12:20 gitinfo Git web link: https://github.com/git/git/blob/master/connect.c
12:20 eroux joined #git
12:21 leitao joined #git
12:22 marcogmonteiro joined #git
12:24 tmg_ joined #git
12:30 altin _ikke_ then it's a lib? but which one?
12:31 rapidshot64 joined #git
12:31 Vampire0 altin, libc I think
12:32 YuGiOhJCJ joined #git
12:32 tvw joined #git
12:33 Silenced joined #git
12:33 m_ezhoikam joined #git
12:35 altin Vampire0 I do have that one :P
12:36 Vampire0 good for you
12:37 altin nope nevermind, was mising one of the other libc*
12:37 altin :D
12:38 DDBag joined #git
12:44 absinthe joined #git
12:47 stemid left #git
12:47 a_thakur joined #git
12:48 finalbeta joined #git
12:49 a_thakur joined #git
12:50 zxd In the git book git status shows to unstage this  "Changes to be committed:   (use "git reset HEAD <file>..." to unstage)" but with the git version I have I get " Changes to be committed:   (use "git rm --cached <file>..." to unstage)
12:50 zxd what's the difference ?
12:51 osse zxd: the difference is that in the example it's a modified file, whereas in your case it's a new file
12:51 tobiasvl yeah, the first one resets the state of the file to the one in HEAD, the other one removes the file from the staging area
12:52 masuberu joined #git
12:52 dviola joined #git
12:53 mehola joined #git
12:53 xaviergmail joined #git
12:55 _ADN_ joined #git
12:56 DolphinDream joined #git
12:56 dcpc007 left #git
12:59 kpease_ joined #git
13:00 thebird joined #git
13:01 Sound joined #git
13:01 boombatower joined #git
13:01 zxd what's the command to print on screen  blobs with no commit/tree ref
13:01 zxd dangling
13:02 zxd osse: tobiasvl thanks
13:03 tobiasvl zxd: git fsck --unreachable --no-reflogs
13:04 zxd thanks
13:05 zxd git is cool
13:05 MattMaker joined #git
13:07 cdown joined #git
13:07 burzum joined #git
13:07 jost joined #git
13:08 burzum hello
13:08 osse hail satan
13:08 burzum a workmate committed a ton of binary data that should not go into the repository, is there a way to remove these commits from the repository? they're in a branch.
13:08 jimklo joined #git
13:09 Hink joined #git
13:09 osse burzum: pretend the data is sensitive and follow !sensitive
13:09 gitinfo burzum: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
13:09 osse also !bfg
13:09 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
13:09 burzum thank you!
13:10 venmx joined #git
13:13 netj joined #git
13:14 cdown joined #git
13:14 pur3eval joined #git
13:15 a_thakur joined #git
13:15 kristofferR joined #git
13:17 eroux joined #git
13:17 Tobbi joined #git
13:19 oskarkv joined #git
13:19 impliednude joined #git
13:21 ilithium left #git
13:24 brent__ joined #git
13:24 jameser joined #git
13:25 plos joined #git
13:27 cdown_ joined #git
13:28 chipotle joined #git
13:28 thebird joined #git
13:28 edgimar joined #git
13:30 mischat_ joined #git
13:32 seni13 joined #git
13:32 amrits joined #git
13:33 Cavallari joined #git
13:33 nettoweb joined #git
13:34 burzum osse after reading a little about bfg, can I simply do this? bfg --delete-files img/subfolder/ my-repo.git and bfg will take care of everything and push the changed repo back to the server?
13:34 _ikke_ bfg will not push anything
13:35 osse burzum: i haven't used bfg myself but I would expect it not to pus
13:35 osse h
13:35 burzum hmm ok... i would like to burn my workmate for pushing this binary crap :/
13:36 bremner we can't help with actual assasinations
13:37 osse speak for yourself
13:37 sonOfRa burzum: burning is only for churches, axes are for people!
13:37 burzum lol
13:38 burzum i'll gift him a copy of the album aske
13:39 Vinnie_win joined #git
13:39 bket joined #git
13:42 wooy joined #git
13:43 wooy hi, when i delete remote branch, is there any check that would prevent me from deleting changes that may have been pushed seconds before i issue the delete command?
13:44 a_thakur joined #git
13:44 thiago joined #git
13:44 _ikke_ I don't think there is for deleting refs
13:46 wooy yeah I've setup local bare repo and tested it, but maybe there is some option i could turn on? On some level this problem is very similar to --force-push-with-lease (or something like that)
13:46 edgimar joined #git
13:46 Guest4561 joined #git
13:46 Guest4561 left #git
13:46 alexandre9099 joined #git
13:47 GodGinrai joined #git
13:47 marianina8 joined #git
13:49 Bizkit joined #git
13:50 tty04 joined #git
13:50 tty04 Hi all! How can i use a git hook to checkout the latest tag of a submodule???
13:51 tty04 Anyone can help? :(
13:51 brent__ joined #git
13:52 livingstn joined #git
13:52 WeiJunLi joined #git
13:52 WeiJunLi i did git clone of some google sources but when i enter on the dir, it is empty
13:52 WeiJunLi however the .git dir is there
13:53 WeiJunLi any idea?
13:53 osse WeiJunLi: what exact command did you run ?
13:53 Snugglebash joined #git
13:54 Teny joined #git
13:54 WeiJunLi osse: git clone https://android.googlesource.com/kernel/mediatek
13:54 osse WeiJunLi: the master branch is empty. there are other branches
13:55 whaley joined #git
13:55 osse e.g. git checkout android-3.18
13:55 Tobbi joined #git
13:56 mischat joined #git
13:58 porsche944 joined #git
13:58 DarkPsydeLord joined #git
13:59 polyrob_ joined #git
14:00 bannakaffalatta joined #git
14:00 ocelotsloth joined #git
14:03 Derperperd joined #git
14:06 MattMaker joined #git
14:06 WeiJunLi osse: is that the most recent one?
14:08 Derperperd joined #git
14:09 Karazhan joined #git
14:09 ayogi joined #git
14:09 cdown joined #git
14:10 jeffreylevesque joined #git
14:10 jimklo joined #git
14:11 Glooomy joined #git
14:11 osse WeiJunLi: no clue
14:11 Silenced joined #git
14:12 osse I just read what I saw in the link you gave
14:13 pluszak joined #git
14:14 pluszak Does it matter what version of git was the local repository created with? I mean, if I copy files to a server that has much older git client will bad things happen?
14:14 mischat joined #git
14:14 osse pluszak: It will be fine
14:16 Hobbyboy joined #git
14:17 Karazhan joined #git
14:18 ankit01ojha joined #git
14:18 pulec I wanna be a rebel and force git to everyone in work, are there any ideal books I could learn from or stories about implementing git?
14:19 perlpilot pulec: you might want to recommend !progit to your work mates
14:19 gitinfo pulec: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
14:20 darkbit joined #git
14:20 perlpilot pulec: As far as running your own git server, I just use !gitolite
14:20 gitinfo pulec: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/overview.html#basic-use-case
14:20 jeffreylevesque_ joined #git
14:21 Snugglebash joined #git
14:22 jimi_ joined #git
14:22 barteks2x joined #git
14:23 Tobbi joined #git
14:23 aard_ joined #git
14:24 pulec perlpilot, great, gitolite has nice home page
14:24 pulec but I mean that was one of the most important answers I was looking for
14:25 pulec all those frickin processes and meh
14:25 dendazen joined #git
14:25 pulec then the education and implementation
14:29 publio joined #git
14:29 Gsham joined #git
14:30 jeffreylevesque joined #git
14:30 ExoUNX joined #git
14:32 renatosilva joined #git
14:35 MaekSo left #git
14:35 puff Good morning.
14:36 jast hi
14:36 Vampire0 jast, there, one for the hi trigger :-)
14:37 jast ENOTUITS
14:37 dviola joined #git
14:37 gitinfo puff: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
14:37 chigang joined #git
14:40 jeffreylevesque_ joined #git
14:41 CptHaddock joined #git
14:48 diego3 joined #git
14:48 cdg joined #git
14:49 _ADN_ joined #git
14:50 basiclaser joined #git
14:50 nickabbey joined #git
14:50 bashcode1 joined #git
14:50 bashcode1 joined #git
14:51 Uio joined #git
14:51 crose joined #git
14:51 jeffreylevesque joined #git
14:52 nettoweb joined #git
14:54 BackEndCoder joined #git
14:54 mehola joined #git
14:54 Es0teric joined #git
14:55 stemid joined #git
14:55 tvw joined #git
14:56 Gsham joined #git
14:57 masuberu joined #git
14:58 scottjl joined #git
14:59 rominronin joined #git
15:00 arooni joined #git
15:01 Tobbi joined #git
15:01 jeffreylevesque_ joined #git
15:02 matt_m joined #git
15:03 pur3eval joined #git
15:06 lmatteis joined #git
15:07 MattMaker joined #git
15:08 Murii joined #git
15:08 renatosilva left #git
15:09 cdown joined #git
15:11 venmx joined #git
15:11 Random832 joined #git
15:11 jimklo joined #git
15:11 jeffreylevesque joined #git
15:13 LeBlaaanc joined #git
15:13 cdown joined #git
15:14 Gustavo6046 joined #git
15:15 Tobbi joined #git
15:16 Emperor_Earth joined #git
15:16 shinnya joined #git
15:19 sm_ joined #git
15:20 whaley joined #git
15:21 govg joined #git
15:22 jeffreylevesque_ joined #git
15:23 Hobbyboy joined #git
15:24 barteks2x joined #git
15:24 raspado joined #git
15:25 Exagone313 joined #git
15:25 marianina8 joined #git
15:26 awkwardusername joined #git
15:26 Dougie187 joined #git
15:26 awkwardusername joined #git
15:27 chandu20 joined #git
15:27 ocelotsloth joined #git
15:28 mischat joined #git
15:29 suy_ left #git
15:29 suy joined #git
15:31 gtristan joined #git
15:31 dmc joined #git
15:31 nickabbey joined #git
15:32 dandaman joined #git
15:36 dviola joined #git
15:37 chitopunk joined #git
15:37 marc_v92 joined #git
15:39 suy left #git
15:41 jeffreylevesque joined #git
15:42 cdown joined #git
15:44 math-alpha joined #git
15:44 mischat joined #git
15:45 mischat joined #git
15:46 nd_ joined #git
15:46 buzzLightBeer joined #git
15:46 sborza joined #git
15:49 snyp joined #git
15:49 snyp What does this mean? git add src/rng.cpp
15:49 snyp fatal: Pathspec 'src/rng.cpp' is in submodule 'src'
15:50 jast src/ is not a normal folder in the repo, it's a git submodule. you can't directly add it because it belongs to that submodule, not to the main repo.
15:50 jast man git-submodule for details about submodules
15:50 gitinfo the git-submodule manpage is available at http://jk.gs/git-submodule.html
15:50 snyp uhhh... i don't remember adding src as a submodule...
15:51 jimi_ joined #git
15:53 sonOfRa snyp: did you accidentally "git init" inside src?
15:53 _ikke_ snyp: if src contains a .git folder (with the right contents), and you do git add src, then git adds it as a gitmodule (not a complete submodule)
15:53 whaley_ joined #git
15:53 snits joined #git
15:53 snyp no there's no .git folder in src/
15:53 _ikke_ a .git file?
15:53 snyp no
15:54 _ikke_ snyp: git ls-tree HEAD src
15:54 snyp 160000 commit 388f472e2e0643f92fd5b8c5a2ab5e142c9c8162 src
15:54 snyp anything weird?
15:55 _ikke_ It means either someone else added it as a git module, or it at one point did contain a git repository
15:55 snyp i see
15:55 zxd if I stage a file named foobar with "git add foobar", then modify it,  then again "git add foobar" then "git commit"  will the first version of foobar become a dangling object ?
15:55 snyp i might have done *that* once as a mistake
15:55 snyp i.e git init in src/
15:55 snyp but i removed the .git dir.
15:55 snyp that was a month ago
15:56 _ikke_ zxd: correct
15:56 _ikke_ right
15:56 _ikke_ git rm --cached src should remove that commit link
15:56 snyp i see
15:56 jast after that, re-add your files in src/
15:57 eroux joined #git
15:57 snyp hm. works now. thanks
15:57 NeverDie joined #git
15:58 bongjovi joined #git
15:59 chitopunk joined #git
16:00 geek2nerd joined #git
16:02 TbobbyZ_ joined #git
16:02 durham joined #git
16:03 ssarah joined #git
16:03 ssarah #4chan
16:03 ssarah ups, sorry
16:03 tomg2 joined #git
16:04 jost_ joined #git
16:04 pur3eval joined #git
16:04 marianina8 joined #git
16:05 zivester joined #git
16:05 wrouesnel2 joined #git
16:05 _ADN_ joined #git
16:06 durham joined #git
16:07 shgysk8zer0 joined #git
16:08 cdg joined #git
16:08 MattMaker joined #git
16:09 zxd how to stage files deleted from working tree
16:09 ToxicFrog zxd: 'git rm'
16:12 Tobbi joined #git
16:13 math-alpha joined #git
16:13 noonien joined #git
16:13 noonien Hello folks!
16:13 gitinfo noonien: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
16:15 noonien For some reason I screwed up some commits using fixup and rebase. Is there any way of moving some changes from an old commit to another one, after it?
16:16 Darren_ joined #git
16:16 _ikke_ noonien: interactive rebase + stash I guess
16:16 noonien Can I rebase to that commit, remove what I need, and create a new commit? Then continue the rebase?
16:17 _ikke_ yes
16:17 clemf joined #git
16:17 mischat_ joined #git
16:17 wagle joined #git
16:19 noonien Hmm, when I rebase to a commit
16:19 noonien Should I not have the changes of that commit staged?
16:19 _ikke_ No
16:19 Learath2 are you talking about squashing?
16:19 donutttt__ joined #git
16:20 _ikke_ noonien: You need to manually reset that commit to get that
16:20 Learath2 oh nvm i missed the actual question in the mess of join/quit messaged
16:21 fees joined #git
16:21 noonien Hmm, how would I go on about doing that?
16:21 _ikke_ git reset --soft HEAD~1 wil undo the commit, but keep the changes taged
16:21 dfas joined #git
16:21 noonien rebase, mark the commit with "edit" then reset the commit?
16:21 noonien ah, cool, thank you!
16:22 _ikke_ noonien: correct
16:22 fees .ignore plugin found some files that are tracked with Git which are also listed in .gitignore file. => how can i solve this? I get this message everytime i add a file to the staging
16:22 _ikke_ What is giving that message?
16:22 Gsham joined #git
16:23 fees _ikke_: webstorm
16:23 fees when i do git status I dont see these files
16:24 _ikke_ sure
16:25 _ikke_ It should be not a problem
16:25 fees its not a problem but i want to get rid of that message
16:26 jimklo joined #git
16:31 brent__ joined #git
16:32 NeverDie joined #git
16:32 thiago joined #git
16:32 asdkjashdkajs joined #git
16:33 donutttt joined #git
16:33 HardlySeen joined #git
16:33 kurkale6ka joined #git
16:35 mmlb joined #git
16:35 donutttt if you had to associate something from the sea with git... what would it be?
16:36 tchan joined #git
16:37 jeffreylevesque_ joined #git
16:38 zxd git status   shows renamed:    foobar -> x   , how does it know I renamed the file , does it look in refs/objects  for a hash of the file I added and if it already exists but with different name it thinks it's a rename?
16:40 nickabbey joined #git
16:41 cbreak zxd: it compares how much changed
16:41 cbreak zxd: git never tracks renames
16:41 cbreak it always tracks state snapshots
16:42 zxd what does state snapshots mean
16:42 tchan joined #git
16:43 cbreak when you commit, git stores a snapshot of the state in the staging area
16:43 cbreak it stores how it is right now
16:43 cbreak not what you changed, not what you will change, just as it is
16:44 zxd cbreak: yes but how does it compare the snapshots
16:44 cbreak different algorithms
16:45 cbreak you can tune it with -C and -M
16:45 muhannad_______ joined #git
16:45 mischat joined #git
16:45 zxd cbreak: btw, git never walks down parent commits when creating the working tree correct? it only walks down tree objects ?
16:46 cbreak it doesn't need to know commits at all
16:46 zxd commits is just for the user? to show it a nice graph with  git log ?
16:47 jeffreylevesque joined #git
16:47 cbreak no
16:48 cbreak they are for having history
16:48 zxd each commit has has a bunch of trees, but why link the  commits together
16:48 zxd by saying this is my parent etc
16:48 P4nther joined #git
16:48 cbreak trees only describe the snapshot of state at a commit
16:48 cbreak without a commit that a tree is in, you can't know anything about history
16:50 msonntag joined #git
16:51 overlord_tm joined #git
16:54 awkwardusername joined #git
16:56 nickabbey joined #git
16:57 tlaxkit joined #git
16:57 GodGinrai joined #git
16:57 jeffreylevesque_ joined #git
16:58 tvw joined #git
16:58 mischat_ joined #git
17:03 root____8 joined #git
17:04 madewokherd joined #git
17:05 pur3eval joined #git
17:05 nowhere_man joined #git
17:05 NeverDie joined #git
17:05 Darren__ joined #git
17:06 troulouliou_div2 joined #git
17:06 cdg_ joined #git
17:08 Glooomy joined #git
17:08 orbyt_ joined #git
17:08 MattMaker joined #git
17:10 chardan joined #git
17:11 venmx joined #git
17:13 sebal joined #git
17:13 multi_io joined #git
17:15 tang^ joined #git
17:16 chardan joined #git
17:17 sargas joined #git
17:17 jagob joined #git
17:18 jimi_ joined #git
17:18 troulouliou_div2 joined #git
17:18 paws_ joined #git
17:19 _ADN_ joined #git
17:19 rkazak_ joined #git
17:27 xaviergmail joined #git
17:28 nickabbey joined #git
17:29 flobin joined #git
17:32 ocelotsloth joined #git
17:33 rominronin joined #git
17:34 ashokrajar joined #git
17:38 svm_invictvs joined #git
17:38 WeiJunLi joined #git
17:41 re1 joined #git
17:43 dglambert joined #git
17:43 dglambert yo
17:43 whaley_ joined #git
17:44 re1 joined #git
17:44 dglambert Does git record a record of when I make a pull from my remote?
17:45 dglambert trying to figure out what commits were made before and after I pulled
17:45 re1 joined #git
17:45 moritz dglambert: if it actually fetched some new changes (and merged or fast-forwarded them), there's a reflog entry for that
17:45 moritz git reflog or git log -g
17:46 re1 joined #git
17:46 moritz git log -g say then say "Reflog message: pull: Fast-forward"
17:46 Sample joined #git
17:46 dglambert I think it was an actual pull, not a fetch
17:46 dglambert my git knowlege is really rust, I haven't used it in a few years
17:47 re1 joined #git
17:48 dglambert -g just puts it in descending order?
17:49 dviola joined #git
17:49 Sushi joined #git
17:49 Sushi Hi
17:49 gitinfo Sushi: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
17:50 Sushi I'd like to make a contribution to git, I currently have a small patch but I'm unsure on how to contribute it
17:50 moritz send it to the mailing list, I think
17:50 ExoUNX joined #git
17:50 Sushi git@vger.kernel.org ?
17:50 moritz !list
17:50 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
17:50 moritz yes :-)
17:51 Sushi thanks :)
17:51 Some_Person joined #git
17:52 hahuang65 joined #git
17:53 Some_Person I have a repo where I'm working off a branch. I made a commit. I want to move this commit to a new branch and push it. What should I do?
17:53 jeffreylevesque joined #git
17:53 fees joined #git
17:53 mknod joined #git
17:53 thiago Some_Person: are there commits in the history that you don't want in that new branch?
17:53 Some_Person Nope
17:54 ertesx joined #git
17:54 thiago ok, git branch new_name
17:54 moritz Some_Person: when you're on the branch, git checkout -b new_name
17:54 thiago that will create a branch with the nae "new_name"
17:54 moritz git push origin new_name
17:55 fees how can I remove some tracked files from git, I tried a bunch of things but it didnt work, they keep showing up and my editor keeps nagging about:  plugin found some files that are tracked with Git which are also listed in .gitignore file.
17:55 eroux joined #git
17:55 thebird joined #git
17:56 Some_Person moritz: Thanks, that seems to have worked. Anything else I need to do, or can I just keep working off my new branch now?
17:57 oleksiyp joined #git
17:57 nickabbey joined #git
17:58 lucido-cl joined #git
17:59 notebox joined #git
17:59 annoymouse joined #git
18:00 dave0x6d joined #git
18:02 bvcosta joined #git
18:02 dtrott joined #git
18:03 oleksiyp joined #git
18:06 MattMaker joined #git
18:07 math-alpha joined #git
18:10 jungsubk joined #git
18:12 matsaman joined #git
18:12 pandeiro joined #git
18:14 rapidshot64 joined #git
18:15 kpease joined #git
18:19 al-damiri joined #git
18:20 PHPanos joined #git
18:21 scoobertron joined #git
18:24 Sample joined #git
18:25 aboccia joined #git
18:26 rkazak_ joined #git
18:27 dtrott joined #git
18:30 NeverDie joined #git
18:32 Raging_Hog joined #git
18:33 notebox joined #git
18:34 rominronin joined #git
18:35 xall joined #git
18:36 Ldip joined #git
18:37 _ADN_ joined #git
18:39 ToxicFrog fees: git rm --cached
18:39 ToxicFrog Will remove them from git but keep them in the working tree
18:39 ToxicFrog Or just 'git rm' to remove them from both.
18:40 ertes joined #git
18:41 ertes joined #git
18:42 root____8 left #git
18:42 sonOfRa joined #git
18:45 akkad joined #git
18:47 raynold joined #git
18:48 fees thx
18:49 Guma joined #git
18:50 duderonomy joined #git
18:50 pur3eval joined #git
18:51 darkbit joined #git
18:51 Hink joined #git
18:54 synthroid joined #git
18:54 tjbp joined #git
18:56 dvaske joined #git
18:56 mehola joined #git
18:56 hahuang65 joined #git
18:56 jnewt_ joined #git
18:57 aard_ joined #git
18:59 dtrott joined #git
19:00 dreiss joined #git
19:01 buck1 left #git
19:01 grumble joined #git
19:03 xall joined #git
19:03 TikityTik joined #git
19:03 mikecmpbll joined #git
19:03 thiago joined #git
19:05 Noldorin joined #git
19:05 Endarked joined #git
19:07 n1ce joined #git
19:07 a3Dman joined #git
19:11 jimi_ joined #git
19:12 aboccia joined #git
19:12 venmx joined #git
19:12 Sasazuka joined #git
19:12 dandaman joined #git
19:14 Cabanossi joined #git
19:16 cdown joined #git
19:18 Guest42583 joined #git
19:18 Jellyg00se joined #git
19:18 d0nn1e joined #git
19:19 fatalhalt joined #git
19:20 moritz Some_Person: you might delete the commit from the branch where you didn't want it
19:21 rapidshot64 joined #git
19:22 Cabanossi joined #git
19:25 LEI joined #git
19:26 nickabbey joined #git
19:27 LEI Hello, does someone know why I would get a 'fatal: protocol error: bad line length character:' everytime I git pull/push with TERM=screen-256color (instead of xterm)?
19:29 math-alpha joined #git
19:31 jwmann joined #git
19:31 irqq joined #git
19:32 jnavila joined #git
19:33 xall joined #git
19:35 t0by joined #git
19:36 gugah joined #git
19:38 sbasso joined #git
19:40 molgrum joined #git
19:41 rdz joined #git
19:41 rishi joined #git
19:42 sbasso_ joined #git
19:42 MineCoins joined #git
19:42 molgrum with git merge i would like to keep local modifications (ours) which i think is done with "git pull -s recursive -X ours". but how do i display a diff of what would have been inserted after the pull is done?
19:46 _ikke_ add --no-commit
19:48 peeps[lappy] add -i is incomprehensible.  each action has a number and a letter?  how do i just tell it to add a subset of files without typing every full path name
19:48 P4nther joined #git
19:49 jeffreylevesque_ joined #git
19:49 nickabbey joined #git
19:50 byte512 joined #git
19:51 GodGinrai joined #git
19:51 kadoban peeps[lappy]: Well, you certainly don't need full path names, git understands relative paths to add and such, globs, etc. Your shell probably does too, though the combination can be a bit wonky sometimes.
19:51 GodGinrai peeps[lappy]: how else would you refer to the files?
19:51 pur3eval joined #git
19:51 nickabbey joined #git
19:52 peeps[lappy] GodGinrai, by order they appear in git status
19:52 GodGinrai peeps[lappy]: git commit -a
19:52 GodGinrai that will add all the files that are modified
19:52 GodGinrai and commit
19:52 sargas joined #git
19:53 aboccia joined #git
19:53 peeps[lappy] i don't want all the files
19:53 GodGinrai peeps[lappy]: then what *do* you want?
19:53 nickabbe_ joined #git
19:53 courrier joined #git
19:53 peeps[lappy] a subset of all the files, like i originally said
19:53 Vampire0 peeps[lappy], maybe you might like `git add -p`. You will be able to add each individual hunk, but you can also use `d` and `a` to fully exclude or include the remaining changes in the current file
19:54 P4nther joined #git
19:54 chitopunk joined #git
19:54 tjbp joined #git
19:55 GodGinrai peeps[lappy]: well, you could always send git-status through awk and include or exclude the necessary files you want or don't want
19:57 GodGinrai ex: `git status | awk '/modified/ { if ($2 !~ /fileIdontwant.txt/) { print "git add " $2; } }' | bash
19:57 tjbp joined #git
19:57 thebird joined #git
19:58 diogenese joined #git
19:58 Vampire0 GodGinrai, well, in that case probably better with `git diff --name-only`
19:58 Vampire0 :-)
19:59 GodGinrai Vampire0: combined with grep -v?  Maybe.  It depends on how complex his logic is
19:59 russsaidwords joined #git
20:00 Vampire0 Anyway your suggested line only works as long as you don't have any spaces in filenames (dumb anyway I know, but there are ones out there)
20:01 GodGinrai Vampire0: yes, but it can still be modified to support that
20:01 GodGinrai I will say this, tho'.  I hope to never work on a project that has spaces in filenames in their repo
20:01 kadoban peeps[lappy]: There's a few practical ways to stage a subset of files, but you're not really giving enough information to lead you to any of them.
20:01 GodGinrai spaces in folder names, maybe, but certainly not filenames
20:04 zrts_ joined #git
20:05 cdg joined #git
20:05 rominronin joined #git
20:05 zrts_ when there are unmerged files as "both modified", there is usually a HEAD chunk and another one identified with a hash. what does that hash represent? it doesnt seem to be from commits
20:06 noteness joined #git
20:06 absinthe joined #git
20:07 Ihjx joined #git
20:10 Zireael07 joined #git
20:10 kadoban zrts_: Are you sure it's not? I always thought it was the commit hash
20:10 kadoban Maybe a blob hash? *uncertain look*
20:11 venmx joined #git
20:11 cdg joined #git
20:11 Zireael07 I have a bit of a problem. I have a remote repo named name-of-my-game that I'd like to rename to name-of-my-game-old and then use name-of-my-game for a new repo that's currently local-only
20:11 Zireael07 is that possible? if it matters, the repo is on GitHub
20:12 cdg joined #git
20:12 kadoban Zireael07: 'git remote rename' IIRC and then you can create the new one the usual way
20:13 jimi_ joined #git
20:13 cdg_ joined #git
20:13 Zireael07 yes, but will the new one work? I seem to recall reading in GitHub help that once I rename the repo, the old name becomes a redirect pointing to the new one... but I want to use the old name for something else!
20:14 cdg_ joined #git
20:14 whaley joined #git
20:14 Zireael07 (actually it's the same project, just in a new incarnation plus I want to set up a page for it, hence the desire to have a simple name instead of name-of-my-game-random-suffix-lol...
20:14 eroux joined #git
20:15 Ryanar joined #git
20:16 zrts_ kadoban: ill recheck
20:17 cdg joined #git
20:17 kadoban Zireael07: Are you talking about the remote names in git, or the repo names on github, or?
20:17 Zireael07 both, I guess
20:17 kadoban The later I have no idea, never tried to change the name of a repo on github.
20:17 cdg_ joined #git
20:17 dtrott joined #git
20:19 ahr3n joined #git
20:20 _ADN_ joined #git
20:20 SevTest joined #git
20:22 Vampire0_ joined #git
20:23 dglambert Hey, I asked earlier but got pulled away
20:23 planigan joined #git
20:23 dglambert I'm using git log -g to pull up history, trying to figure out when a coworker setup an environment by pulling from branch
20:23 dglambert I am getting time of commit that was pulled, so authored time, but not when the pull happened
20:24 tjbp joined #git
20:24 moritz that's what git log -g shows you
20:25 grawity ...it is?
20:25 dglambert the authored time
20:25 grawity hmm I was sure it also showed the reflog time
20:25 grawity oh well, check .git/logs/HEAD directly
20:25 tjbp joined #git
20:26 moritz grawity: well, "git show <sha1>" shows me exactly the same timestamp as git log -g for the same commit
20:26 dglambert oh wow
20:26 courrier joined #git
20:26 dglambert I'm guessing one of those numbers is time
20:27 Tobbi joined #git
20:27 dglambert But still is it only the committed time
20:27 tjbp joined #git
20:27 dglambert when talking about pulling and cloaning
20:27 grawity no, it's the reflog time
20:27 YuGiOhJCJ joined #git
20:27 dglambert so that would be different than git log -g?
20:28 grawity yes
20:28 notebox joined #git
20:28 inflames joined #git
20:29 TbobbyZ joined #git
20:30 dglambert Am I using reflog to peek at a specific commit?
20:30 dglambert rather than list them like log
20:31 grawity well, you got a list from `git log -g`, didn't you?
20:31 sargas joined #git
20:31 sunnny joined #git
20:32 dglambert yeah my question is reflog for taking one from that list and inspecting it further, or is it another list tool
20:32 dglambert git reflog returns a list aswell
20:34 grawity same thing, just different --format
20:34 grawity "git reflog show is an alias for git log -g --abbrev-commit --pretty=oneline"
20:34 grawity still walks the entries in .git/logs/
20:35 dglambert I saw that
20:35 PHPanos joined #git
20:36 StuartMI joined #git
20:37 strugee joined #git
20:38 raijin joined #git
20:39 ratdeptrai joined #git
20:40 TomyLobo joined #git
20:41 dglambert Yeah, I'm not getting any time stamps via reflog
20:42 dglambert I also tried using --pretty:fuller as it is a log argument, no dice
20:44 Emperor_Earth_ joined #git
20:46 shgysk8zer0 joined #git
20:47 dglambert what would reset: moving to HEAD mean
20:53 sunnny left #git
20:54 Cabanossi joined #git
20:55 TbobbyZ joined #git
20:55 IntruderSRB joined #git
20:57 Thorn joined #git
20:58 Thorn left #git
20:59 molgrum when i do "git pull -s recursive -X ours --no-commit" to keep the local files on conflict but want to view the changes that would be made i get an error saying my local changes would be overwritten by merge. no merge is done
20:59 _ikke_ molgrum: So you have something locally that is not comitted
21:01 timetrex joined #git
21:01 leitao joined #git
21:02 timetrex left #git
21:04 cdg joined #git
21:06 whaley joined #git
21:08 chipotle joined #git
21:10 sbasso joined #git
21:12 dreiss joined #git
21:14 cdg_ joined #git
21:19 Derperperd joined #git
21:19 peterbecich joined #git
21:20 dsdeiz joined #git
21:21 peterbecich joined #git
21:23 Vrqee joined #git
21:27 Some_Person Is there a way to 'git rm' all 'unmerged paths'?
21:27 uhmgawa^3 joined #git
21:27 Some_Person got a crapton of binaries in that list
21:27 joeyDB joined #git
21:27 joeyDB hi everyone.
21:30 darckense joined #git
21:30 tmg joined #git
21:32 Ldip left #git
21:36 Atm0spher1c joined #git
21:37 rominronin joined #git
21:37 JanC_ joined #git
21:38 BlaXpirit Some_Person, i'd do git status,  copy paste to text editor,  clean it up  and paste into terminal  xD
21:39 zahrobsk joined #git
21:40 pur3eval joined #git
21:40 jeffreylevesque joined #git
21:43 eh3 joined #git
21:44 sbasso joined #git
21:44 ocelotsloth joined #git
21:45 raijin joined #git
21:47 nowhere_man joined #git
21:50 m0viefreak joined #git
21:50 osse Some_Person: git ls-files --unmerged | awk -F$'\t' '{print $3}' | git rm
21:51 osse Some_Person: I think it wasn't 3 at least
21:51 atomi joined #git
21:52 Some_Person BlaXpirit: I ended up just doing that. Pretty easy to clean up in Notepad++
21:53 Some_Person thanks
21:54 marianina8 joined #git
21:54 Rodya_ joined #git
21:56 chipotle joined #git
21:57 thiago joined #git
22:00 nowhere_man joined #git
22:02 peterbecich joined #git
22:03 jnavila joined #git
22:10 Sasazuka_ joined #git
22:13 ISmithers joined #git
22:15 jedahan joined #git
22:16 snits` joined #git
22:17 ash_workz joined #git
22:19 thiago joined #git
22:20 olav_ joined #git
22:24 Jellyg00se joined #git
22:24 xaviergmail joined #git
22:25 ahrs joined #git
22:25 arunc joined #git
22:25 peterbecich joined #git
22:25 arunc left #git
22:28 snowalpaca joined #git
22:31 olav_ joined #git
22:32 vtols joined #git
22:32 peterbecich joined #git
22:32 atomi joined #git
22:33 bgerber joined #git
22:33 ldleworker left #git
22:34 math-alpha joined #git
22:40 olav_ joined #git
22:41 pur3eval joined #git
22:42 snowalpaca joined #git
22:43 Noodlewitt joined #git
22:43 Sasazuka joined #git
22:46 Sound joined #git
22:49 awkwardusername joined #git
22:49 hvn0413 joined #git
22:49 venmx joined #git
22:50 Dougie187 left #git
22:52 akkad joined #git
22:54 Cabanossi joined #git
22:54 gugah joined #git
22:58 mehola joined #git
22:59 vtols Is there a handy way to send patch from another person in new patch series? See https://public-inbox.org/git/CAGZ79kbnpUtrKdjQdQ-r6rRuVvnawooLFk1bO8jOSgxNkx2Dbg@mail.gmail.com/
23:00 askb joined #git
23:01 EV3RYDAYPR0GRESS joined #git
23:03 math-alpha left #git
23:07 cqi joined #git
23:07 salamanderrake joined #git
23:08 rominronin joined #git
23:11 tekniq joined #git
23:14 chardan joined #git
23:16 venmx joined #git
23:17 tmsmith joined #git
23:20 NeverDie joined #git
23:24 clemf_ joined #git
23:25 Glowball joined #git
23:25 anuxivm joined #git
23:28 dsdeiz joined #git
23:28 dsdeiz joined #git
23:30 flobin joined #git
23:30 ExeciN joined #git
23:33 marianina8 joined #git
23:34 Mobutils joined #git
23:35 anuxivm joined #git
23:40 rkazak_ joined #git
23:40 venmx joined #git
23:46 Pulp joined #git
23:46 Anja joined #git
23:52 Kaisyu joined #git
23:53 TheHackax joined #git
23:54 Cabanossi joined #git
23:55 bannakaffalatta joined #git
23:55 Groovin joined #git
23:56 DolphinDream joined #git
23:58 clemf joined #git
23:59 Ekho joined #git

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