Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-18

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

All times shown according to UTC.

Time Nick Message
00:00 hahuang65 joined #git
00:00 cagmz joined #git
00:01 mingrammer joined #git
00:02 ochorocho__ joined #git
00:04 fstd joined #git
00:07 romerocesar_ joined #git
00:11 nevyn joined #git
00:15 PioneerAxon joined #git
00:17 d4rklit3 joined #git
00:18 shgysk8zer0 joined #git
00:19 d4rklit3 joined #git
00:20 shgysk8zer0 joined #git
00:23 ajf- joined #git
00:25 hahuang65 joined #git
00:28 xall joined #git
00:30 joki joined #git
00:32 white_gecko left #git
00:33 geko joined #git
00:33 romerocesar joined #git
00:35 cagmz joined #git
00:38 clemf joined #git
00:39 M-shine joined #git
00:40 Limes_ joined #git
00:42 mmlb joined #git
00:43 baxx joined #git
00:43 baxx why does bitbucket just drop out?
00:44 baxx and what am I meant ot do  ? it messed up half way through a commit
00:44 raijin joined #git
00:44 madewokherd joined #git
00:45 baxx http://vpaste.net/NVQzR
00:45 clemf_ joined #git
00:45 baxx can i un commit and start again or something?
00:45 baxx ah i'm too tired, no worrie
00:49 romerocesar joined #git
00:49 romerocesar joined #git
00:50 clemf joined #git
00:52 ag4ve_ joined #git
00:53 _unreal_ joined #git
00:53 _unreal_ hello
00:53 gitinfo _unreal_: 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.
00:54 _unreal_ I'm trying to build from the instructions on this page https://wiki.debian.org/InstallingDebianOn/CuBox
00:54 l4v2 joined #git
00:54 _unreal_ I'm getting stuck on a command giving me errors: git co v4.5
00:54 clemf joined #git
00:54 _unreal_ says co is not a valid command
00:54 osse _unreal_: use git checkout v4.5
00:55 osse _unreal_: co is a common but not default alias for checkout
00:55 osse _unreal_: run  git config --global alias.co checkout to add it yourself
00:55 mingrammer joined #git
00:56 _unreal_ thanks, cool its working
00:56 _unreal_ is that like a CRC check?
00:57 osse what is?
00:57 _unreal_ the checkout string
00:57 osse no, it just puts version 4.5 into the working directory
00:57 ekinmur joined #git
00:57 osse instead of whatever is on the master branch'
00:57 _unreal_ ahh
00:58 osse there's a bunch of checksumming on the way though
00:58 _unreal_ ok https://wiki.debian.org/InstallingDebianOn/CuBox   also from that site, the guy is made a .config file I'm not sure where or when to use it
00:58 ahr3n joined #git
00:58 osse _unreal_: that's a ##linux question. But the answer is: download it and put it in the top-level directory
00:59 osse ie. directly inside the linux clone
00:59 _unreal_ ahh ok
00:59 _unreal_ I was thinking it needed to be part of a command
00:59 _unreal_ wget it is
01:00 jstein__ joined #git
01:00 _unreal_ seems to be happy so far thanks a lot
01:01 ome joined #git
01:02 M-mistake joined #git
01:02 M-meznak joined #git
01:02 romerocesar_ joined #git
01:04 ochorocho__ joined #git
01:06 tlolczyk joined #git
01:07 blackwind_123 joined #git
01:09 pks joined #git
01:11 dsdeiz joined #git
01:12 tlolczyk I've cloned a github project. I want to make a project that uses much of the code, but is used for a different purpose.  I want to rename the project, make a branch. I want the old project to be moved to a branch different from master call it say old_project. I want my branch to become master. Is that possible?
01:12 danimal2 joined #git
01:12 preaction sure, go ahead
01:13 tlolczyk Sorry. I forgot the biggest question. How?
01:14 preaction create a new branch that starts at master: git branch old_project master
01:14 preaction then just commit to master
01:15 mellernoia joined #git
01:15 watabou joined #git
01:15 xall_ joined #git
01:20 mellernoia-work joined #git
01:21 romerocesar joined #git
01:22 cqi joined #git
01:23 Codfection joined #git
01:24 NeverDie_ joined #git
01:24 stantonk joined #git
01:24 bronson joined #git
01:27 clemf_ joined #git
01:30 ResidentBiscuit joined #git
01:33 PresidentBiscuit joined #git
01:35 ResidentBiscuit joined #git
01:35 watabou joined #git
01:42 arescorpio joined #git
01:46 harish joined #git
01:46 mablae joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and surveys | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | rerere: the git that keeps on giving
01:50 mingrammer joined #git
01:50 hahuang65 joined #git
01:52 CEnnis91 joined #git
01:53 MattMaker joined #git
01:54 cagmz joined #git
01:54 clemf joined #git
01:54 eizua joined #git
01:54 cagmz_ joined #git
01:56 Berry joined #git
01:56 berndj what is [svn.authorsfile] relative to? i set it in .git/config to point to an empty (or, at worst, nonexistent) file but svn fetch isn't bailing out on unknown authors
01:56 anuxivm left #git
01:57 ahr3n joined #git
01:59 cqi joined #git
02:00 PioneerAxon joined #git
02:00 clemf joined #git
02:03 sangy joined #git
02:03 nevodka joined #git
02:04 drbean joined #git
02:04 david007 joined #git
02:05 pioiytr_ joined #git
02:05 ochorocho__ joined #git
02:08 clemf joined #git
02:09 drbean joined #git
02:10 pneuma joined #git
02:12 hexagoxel joined #git
02:15 texinwien joined #git
02:16 watabou joined #git
02:18 sctskw joined #git
02:19 ahr3n joined #git
02:29 l4v2 joined #git
02:30 mozzarel1 joined #git
02:33 xall_ joined #git
02:34 Dougie187 left #git
02:35 zacts joined #git
02:35 clemf joined #git
02:35 chachasmooth joined #git
02:43 xall_ joined #git
02:48 clemf joined #git
02:50 raijin joined #git
02:55 ascarter joined #git
02:56 rgrinberg joined #git
02:58 stevenbenner joined #git
03:01 drbean joined #git
03:03 durham joined #git
03:05 cyan__ joined #git
03:06 ochorocho__ joined #git
03:06 clemf joined #git
03:08 boombatower joined #git
03:08 vdv joined #git
03:09 sctskw joined #git
03:09 clemf_ joined #git
03:11 justanot1eruser joined #git
03:12 armyriad joined #git
03:16 netj joined #git
03:19 _August_ joined #git
03:20 k3rn31 joined #git
03:24 treaki_ joined #git
03:29 jeus2 joined #git
03:30 sagerdearia joined #git
03:31 xall_ joined #git
03:33 romerocesar joined #git
03:37 d4rklit3 joined #git
03:38 mingrammer joined #git
03:41 l4v2 joined #git
03:41 PioneerAxon joined #git
03:43 romerocesar joined #git
03:45 a_thakur joined #git
03:46 stantonk joined #git
03:46 robotroll joined #git
03:47 zacts joined #git
03:49 hendry left #git
03:51 d4rklit3 joined #git
03:52 ag4ve_ joined #git
03:56 pioiytr_ joined #git
04:02 romerocesar joined #git
04:03 watabou joined #git
04:06 nobso joined #git
04:07 ochorocho__ joined #git
04:08 catsup joined #git
04:13 cuebix-wk joined #git
04:13 clemf joined #git
04:15 xall_ joined #git
04:19 howdoi joined #git
04:20 xentrax joined #git
04:20 ljc joined #git
04:21 cagedwisdom joined #git
04:21 Dazzyp joined #git
04:23 skyfaller joined #git
04:24 clemf joined #git
04:27 JanC_ joined #git
04:28 netj joined #git
04:28 tlolczyk joined #git
04:29 johnmilton joined #git
04:32 mingrammer joined #git
04:35 k3rn31 joined #git
04:36 Cabanossi joined #git
04:39 clemf joined #git
04:39 dunpeal joined #git
04:40 romerocesar joined #git
04:42 snowkidind joined #git
04:45 bayman joined #git
04:46 bayman hi
04:47 Codfection joined #git
04:49 muthu joined #git
04:49 ljc hey bayman
04:49 gitinfo ljc: 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.
04:51 Orion3k joined #git
04:54 subhojit777 joined #git
04:58 freimatz joined #git
04:59 EvilPenguin joined #git
05:00 romerocesar joined #git
05:02 emPi joined #git
05:04 johnmilton joined #git
05:05 clemf_ joined #git
05:05 romerocesar joined #git
05:06 tristanp joined #git
05:07 rscata joined #git
05:08 clemf_ joined #git
05:08 ochorocho__ joined #git
05:09 diogenese joined #git
05:09 LeMike joined #git
05:11 commontem joined #git
05:15 ahr3n joined #git
05:15 MattMaker joined #git
05:16 vuoto joined #git
05:17 armyriad joined #git
05:19 theskillwithin joined #git
05:23 subhojit777 joined #git
05:24 romerocesar joined #git
05:25 commonte1 joined #git
05:26 bronson joined #git
05:26 Silenced joined #git
05:27 mingrammer joined #git
05:27 Silenced joined #git
05:42 shinnya joined #git
05:48 Alienpruts joined #git
05:49 t-mart joined #git
05:51 dopesong joined #git
05:53 zeroed joined #git
05:53 romerocesar_ joined #git
05:53 zeroed joined #git
05:55 testChinese joined #git
05:57 eizua joined #git
06:01 lordjancso joined #git
06:02 hahuang65 joined #git
06:02 cdown_ joined #git
06:03 meZee joined #git
06:04 qt-x joined #git
06:06 TheMoonMaster joined #git
06:07 markelite joined #git
06:07 nilg joined #git
06:08 ag4ve_ joined #git
06:09 ochorocho__ joined #git
06:09 zytr0n joined #git
06:10 dopesong joined #git
06:14 TheMoonMaster joined #git
06:15 harish joined #git
06:18 phanimahesh joined #git
06:19 MrMojito joined #git
06:20 romerocesar joined #git
06:25 ribasushi joined #git
06:25 PioneerAxon joined #git
06:26 PCatinean joined #git
06:26 makinen how do I prevent a new file being committed?
06:27 Macaveli joined #git
06:27 preaction makinen: git reset can unstage the file. then use gitignore to ensure it doesn't get added again
06:28 Caelum joined #git
06:28 makinen I accidentally added it but didn't commit
06:30 makinen thx
06:30 makinen can I use gitignore with a wildcard? for example for all the .swp files
06:31 preaction yes. but best to put editor files like that in a personal gitignore, not a project gitignore
06:32 romerocesar_ joined #git
06:33 mingrammer joined #git
06:33 MattMaker joined #git
06:38 ljc joined #git
06:39 romerocesar joined #git
06:39 makinen pffft
06:39 preaction then you only have to do it once, and not dozens of times
06:39 makinen I merged a two branches how can I undo it? :D
06:40 preaction reset the branch to before the merge
06:40 preaction !revert
06:40 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
06:40 preaction hmm... how about !unmerge
06:40 preaction nope
06:40 Alienpruts joined #git
06:41 ljc joined #git
06:42 texinwien joined #git
06:42 mariuscc joined #git
06:42 makinen hmm maybe git reset --hard feature/asd
06:43 MattMaker joined #git
06:43 d4rklit3 joined #git
06:46 akiva joined #git
06:48 GavinMagnus joined #git
06:49 cqi joined #git
06:50 sojd joined #git
06:53 jceb joined #git
06:53 Furai Hey, I need to create hook that will check after push what branches it was pushed to and basing on that trigger some actions.
06:53 Furai What is the best one to do it in?
06:53 Furai Action should be run once per branch.
06:53 Furai Is that update hook
06:53 Furai ?
06:53 Furai Or post-receive?
06:54 Jordan_U joined #git
06:54 Furai Actually, I've just read the git hooks from git page. And it seems that update would fit my needs but I'm not sure yet. I wanted to use post-receive and go over all commits in the hunk.
06:57 ufk joined #git
06:58 ufk hi! :) I'm kinda confused with subtree or submodule... in general I want my project, to include a specific directory of another project. do I need submodule or subtree for that ?
06:59 selckin module probably
06:59 kadoban ufk: You'd need subtree to split out the specific directory you want to include into a repo all its own, and then either one to include it in another repo.
06:59 kadoban Or something more exotic/manual to do both at once.
07:00 selckin in short it can't be done
07:00 selckin unless you don't want to stay in sync with the other project
07:00 ufk so I need to create a 3rd repo that has the shared resources, and from both of them to add it as submodule ?
07:01 kadoban ufk: If it's something that should be shared, yeah likely it should be its own repo.
07:01 ufk ok thanks
07:01 kadoban Err, it can be done, just not in one simple step. Two steps isn't too bad really.
07:06 JeroenT joined #git
07:07 romerocesar joined #git
07:08 MattMaker joined #git
07:08 Furai To err is human.
07:10 ufk kadoban, i prefer not to separate it to another git repository. so if it can be done in several times i'd like to know what are they
07:10 ochorocho__ joined #git
07:11 JeroenT joined #git
07:12 kadoban Well, the simplest conceptually is where one of the steps is making it separate. If you don't want to do that, you're down to pretty funky stuff like fetching one from the other, using filter-branch in subdirectory filter mode and then merging it in (it's not going to be fun to get updates back and forth, by the way)
07:13 ufk ah. ok thanks :)
07:13 vtq joined #git
07:13 DieguezZ joined #git
07:13 vtq Hi, a question. Why is it that when I do a cherry-pick it pulls in other commits besides the one I wanted?
07:14 kadoban vtq: Are you cherry-picking a merge commit perhaps?
07:14 rchavik joined #git
07:15 vtq kadoban: I don't think so...
07:15 vtq how do I check?
07:15 selckin what cmd do you run, and how did you determine it pulls in other commits
07:16 vtq selckin: git cherry-pick hash. And visually. The change it tries to make has unrelated functionality, and git show of the same commit indeed lacks the extra stuff
07:18 xentrax joined #git
07:18 xall_ joined #git
07:20 JeroenT joined #git
07:20 Macaveli joined #git
07:20 govg joined #git
07:21 zeroed joined #git
07:25 Hounddog joined #git
07:27 dsdeiz joined #git
07:27 dsdeiz joined #git
07:27 Balliad joined #git
07:29 LiohAu joined #git
07:29 elastix joined #git
07:30 s1mplicity joined #git
07:30 Meteorhead joined #git
07:31 piling_ joined #git
07:31 anu0 joined #git
07:31 apotry joined #git
07:32 jeus2 joined #git
07:32 Softeisbieger joined #git
07:35 Balliad joined #git
07:37 MattMaker joined #git
07:38 nevyn win 8
07:38 djb-irc joined #git
07:38 romerocesar joined #git
07:39 piling joined #git
07:43 zlens left #git
07:45 ahmedelgabri joined #git
07:45 mingrammer joined #git
07:46 DevAntoine joined #git
07:46 a_thakur_ joined #git
07:47 bobdobbs joined #git
07:47 stantonk joined #git
07:48 bobdobbs I accidently included a directory into my git repo. I'd like to remove it from the repo but keep it in the filesystem. How do I do this?
07:48 grawity git rm -r --cached
07:49 WayToDoor joined #git
07:49 nuc joined #git
07:49 bobdobbs thanks
07:50 piling_ joined #git
07:51 multi_io joined #git
07:51 p4trix joined #git
07:51 nnyk joined #git
07:53 baxx joined #git
07:53 hegge joined #git
07:54 WayToDoor joined #git
07:55 lugzer joined #git
07:57 texinwien_ joined #git
07:58 romerocesar joined #git
08:00 PioneerAxon joined #git
08:01 MattMaker joined #git
08:04 dadada joined #git
08:04 dadada hi
08:05 dadada I'm currently resolving conflicts between branches with tools such as kdiff3
08:05 dadada it's showing me three views of the file, base / local / remote
08:05 dadada remote: is the file of the branch I'm trying to merge
08:06 dadada local: is the file as it is on the disk including merge conflicts?
08:06 dadada base: is the file as it was before merging?
08:06 slappymcfry joined #git
08:06 dadada is that correct?
08:07 bobdobbs what should I do first? uglify or concatenate?
08:07 bongjovi joined #git
08:08 dadada bobdobbs: is that related to my question?
08:09 poisond left #git
08:10 aidalgol joined #git
08:11 ochorocho__ joined #git
08:12 jgjorgji joined #git
08:12 bobdobbs whoops. sorry. I was supposed to ask that on a js related channel.
08:13 jgjorgji when i run  git submodule update --init --recursive how do i make it so i don't end up with detached HEAD ?
08:13 a_thakur joined #git
08:15 rominronin joined #git
08:16 mehola joined #git
08:16 MattMaker joined #git
08:17 nights joined #git
08:18 thekrynn_ joined #git
08:18 xall_ joined #git
08:18 thekrynn_ hi all, im trying to clone a branch using -b master --single-branch, but want to specify a specific commit. Any idea how i do that?
08:19 tvw joined #git
08:21 King_Hual joined #git
08:21 King_Hual joined #git
08:23 romerocesar_ joined #git
08:23 Slush-_ joined #git
08:25 mingrammer joined #git
08:27 clmsy joined #git
08:29 Anticom joined #git
08:31 romerocesar joined #git
08:31 tjone270 joined #git
08:33 JeroenT joined #git
08:33 xall_ joined #git
08:34 solf1re joined #git
08:35 djb-irc joined #git
08:38 notebox joined #git
08:39 yuhlw_ joined #git
08:39 notebox joined #git
08:40 MattMaker joined #git
08:41 acetakwas joined #git
08:41 kurkale6ka joined #git
08:42 romerocesar_ joined #git
08:52 romerocesar joined #git
08:53 texinwien_ joined #git
08:55 Silenced joined #git
08:55 kedare joined #git
08:55 Silenced joined #git
08:56 apotry joined #git
08:59 MattMaker joined #git
08:59 osse thekrynn_: you can't. do a git checkout afterwards
09:01 eijk joined #git
09:01 txm joined #git
09:02 eijk_ joined #git
09:02 txm Hi.  I have a fork of someones git repo.  How can I keep my fork up to date?  Usually I delete my fork and start again ;( “This branch is 1 commit ahead, 15 commits behind adazzle:master.”  I have to keep my fork up to date in order to pass a PR to adazzle. https://github.com/txm/react-data-grid
09:03 sonOfRa txm: are you doing your work on your master branch?
09:04 txm sonOfRa: yes
09:04 sonOfRa That is something you should avoid, because it makes it hard to keep it up to date with origin
09:04 txm These are just tiny little PR’s, a couple of lines of JS or CSS.
09:04 txm oh
09:04 BlackPanx joined #git
09:04 txm That’d explain it then :)
09:04 sonOfRa Work on a different branch, and then you can just pull from their master to yours locally, and push that to your github repository
09:05 txm thanks (y)
09:05 sonOfRa You can always !rebase on their master, but that gets messy if the branches are diverged
09:05 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
09:05 piqo joined #git
09:11 mischat joined #git
09:12 ochorocho__ joined #git
09:13 Oog joined #git
09:15 piqo joined #git
09:16 mischat joined #git
09:16 Berry joined #git
09:16 siamect joined #git
09:17 CheckDavid joined #git
09:17 piqo joined #git
09:20 TomyWork joined #git
09:25 dsdeiz joined #git
09:25 dsdeiz joined #git
09:26 ThomasLocke joined #git
09:27 MattMaker joined #git
09:27 romerocesar_ joined #git
09:28 bronson joined #git
09:29 charles` joined #git
09:29 Furai joined #git
09:30 mischat_ joined #git
09:30 Rish joined #git
09:32 DieguezZ joined #git
09:32 mischat_ joined #git
09:35 a_thakur joined #git
09:35 pioiytr_ joined #git
09:35 charles` hey guys, I created a fork of a third party repo and accidentally did work within one of their release branches.  I have several layers of my changes mixed with fetches and merges from their release branch
09:36 charles` how can I restore that branch to being pristine and in sync with the remote?
09:37 charles` (I don't have too many changes, so I can manually move my stuff to my own branch)
09:37 romerocesar joined #git
09:43 GT4066 joined #git
09:44 texinwien_ joined #git
09:44 dopesong joined #git
09:47 sdothum joined #git
09:48 notebox joined #git
09:48 nnyk joined #git
09:51 grawity you could try to `git rebase` your own changes on top of a fresh copy of origin/whatever-1.0
09:52 grawity as for moving stuff, just directly rename that release branch to "charles-changes"
09:52 grawity hmm, actually
09:53 grawity when you say 'created a fork', you mean you 1) forked it on github, and 2) cloned the fork to your computer, yes?
09:55 piqo joined #git
10:02 MattMaker joined #git
10:02 ag4ve_ joined #git
10:03 jas4711 joined #git
10:06 toogley1 joined #git
10:09 stantonk joined #git
10:11 mdw joined #git
10:11 harish_ joined #git
10:13 ochorocho__ joined #git
10:16 MattMaker joined #git
10:17 _August_ joined #git
10:18 pikajude joined #git
10:18 pikajude joined #git
10:18 Grievre joined #git
10:22 kab joined #git
10:23 _August_ joined #git
10:24 geoid joined #git
10:25 armyriad joined #git
10:25 ache joined #git
10:25 mdw joined #git
10:26 clemf joined #git
10:31 Codfection joined #git
10:32 MattMaker joined #git
10:34 DieguezZ joined #git
10:38 romerocesar_ joined #git
10:39 nnyk joined #git
10:40 ache joined #git
10:41 settermjd joined #git
10:42 ache11 joined #git
10:45 MaximusColourum joined #git
10:46 MattMaker joined #git
10:47 JeroenT joined #git
10:47 texinwien_ joined #git
10:48 ache1 joined #git
10:50 JeroenT joined #git
10:51 msayi joined #git
10:52 settermjd joined #git
10:52 mingrammer joined #git
10:55 dopesong joined #git
10:56 crameth joined #git
10:58 nilg joined #git
10:59 jikz joined #git
11:01 MattMaker joined #git
11:04 z8z joined #git
11:04 Somelauw joined #git
11:04 shinnya joined #git
11:05 Somelauw I want to initialize a git repo, so i do 'git init' like usual. I get fatal: Not a git repository (or any of the parent directories): .git
11:05 Somelauw Couldn't get a file descriptor referring to the console
11:05 johnmilton joined #git
11:05 Somelauw of course there is no .git, I'm running this for the first time
11:06 grawity run a `find -ls` just to check what *is* in there
11:07 armyriad joined #git
11:07 Somelauw grawity: just my files, no '.git' directory or anything
11:07 Somelauw does it hate folder names that start with .?
11:08 nnyk joined #git
11:08 Somelauw grawity: i get the same error when doing cd /tmp; mkdir newrepo; cd newrepo; git init
11:09 osse Somelauw: what does 'type git' say ?
11:09 McNozes joined #git
11:10 joki joined #git
11:10 Somelauw hmm, i think i know, i recently installed scm-breeze. I think it broke my git.
11:10 Somelauw osse: it says it's a shell function
11:10 osse aha
11:10 osse try /usr/bin/git init
11:10 Somelauw yep, disabling that one worked
11:11 Somelauw It's that project here: https://github.com/ndbroadbent/scm_breeze. I think i'll remove it.
11:12 txm joined #git
11:13 settermjd joined #git
11:14 ochorocho__ joined #git
11:14 ache1 joined #git
11:14 osse maybe that's the only thing that's wrong wiht it
11:16 ojdo joined #git
11:19 ache1 joined #git
11:20 jost joined #git
11:21 mingrammer joined #git
11:26 geoid joined #git
11:30 _28_ria joined #git
11:30 Somelauw it also stops my shell from autocompleting
11:31 rnsanchez joined #git
11:33 nnyk joined #git
11:34 Lomex joined #git
11:37 sJD joined #git
11:38 romerocesar joined #git
11:39 fmcgeough joined #git
11:40 sJD Hi. I'm trying to achieve something I don't know if is possible: I have let's say a "bare" repo locally. Can I read programatically read it's content (the files from a specific branch) without clonning properly (without grabbing all content locally)?
11:40 geoid_ joined #git
11:41 grawity sure
11:41 grawity it *is* already a full local clone, after all
11:41 grawity (exactly the same kind that non-bare repos have in .git/)
11:42 NeonSynth joined #git
11:42 grawity so for reading the raw contents there's GitPython, `git show/cat-file/ls-tree`, etc.
11:43 Manuel15 grawity: GitPython?
11:44 MattMaker joined #git
11:46 nnyk_ joined #git
11:46 skyfaller joined #git
11:47 constantinexvi joined #git
11:52 Silenced joined #git
11:52 Silenced joined #git
11:52 nnyk joined #git
11:52 sJD grawity: so I have to use "git show" command right?
11:53 rgrinberg joined #git
11:53 Foad_NH joined #git
11:53 sJD or there is need of some third party lib for this?
11:54 Foad_NH When I create a branch, do some commits, merge back and delete the branch, in git log --graph, it show me only one branch with all commits on it. How can I save track of branches in git log?
11:55 grawity sJD: go and try it yourself
11:55 grawity Foad_NH: you can't, other than the "Merged branch x from y" messages that is
11:55 grawity Foad_NH: unlike hg, commits don't remember which branch they were on
11:56 deadnull joined #git
11:57 txm joined #git
11:58 Foad_NH grawity, So how can I have this type of things: http://i.stack.imgur.com/2NS8w.png
11:58 grawity git merge --no-ff
11:58 romerocesar_ joined #git
11:59 freimatz joined #git
11:59 Foad_NH grawity, oh, thanks.
12:01 LiohAu joined #git
12:01 anu1 joined #git
12:02 tomog999 joined #git
12:03 ache1 joined #git
12:04 MaximusColourum joined #git
12:05 mdw joined #git
12:05 JeroenT joined #git
12:06 Lor_ joined #git
12:08 brontosaurusrex joined #git
12:08 brontosaurusrex Any reasons why "checkout" is used when one needs to login/checkin to another branch?
12:09 grawity any reasons why you used the term "login" for checking out another branch?
12:10 Lor__ joined #git
12:10 Arban joined #git
12:11 _August_ joined #git
12:11 grawity I guess it doesn't match what other VCSes use (hg update, svn update, etc.) but it's still closer to what it actually does (i.e. the opposite of commit/"checkin")
12:12 rwb joined #git
12:12 mmlb joined #git
12:13 anu0 joined #git
12:14 maxb For svn, the term would be "svn switch" (as a 'svn update' can only move temporally along the current branch)
12:14 grawity can "svn switch" move along the current branch, then?
12:15 grawity git's is a mix of both
12:15 ochorocho__ joined #git
12:15 freimatz3 joined #git
12:15 maxb "svn switch" could move along the current branch, if you re-specified the name of the current branch on the command line
12:16 Lomex joined #git
12:16 perlpilot joined #git
12:16 NwS joined #git
12:17 MattMaker joined #git
12:18 mingrammer joined #git
12:18 romerocesar joined #git
12:20 mrkake joined #git
12:20 jeffreylevesque joined #git
12:20 TooLmaN joined #git
12:22 Repox joined #git
12:22 brontosaurusrex Ok, so it is not entirely logical to native speakers as well?
12:27 bremner it's more logical than checkin/login to this native speakers.
12:27 bremner heh. alleged native speaker.
12:27 sylario joined #git
12:27 cdg joined #git
12:28 bremner checkin sounds exactly wrong, and login sounds completely offtopic
12:28 deadnull joined #git
12:30 freimatz joined #git
12:31 baxx joined #git
12:31 fahadash joined #git
12:33 MaximusColourum joined #git
12:36 King_Hual joined #git
12:36 King_Hual joined #git
12:36 lordjancso joined #git
12:38 MattMaker joined #git
12:38 brontosaurusrex ok :)
12:40 ribasushi joined #git
12:41 nnyk joined #git
12:41 sanketdg joined #git
12:42 MrMojito joined #git
12:43 MrMojito joined #git
12:46 Ma5ter joined #git
12:46 playfullyExist joined #git
12:46 Ediz joined #git
12:48 Ma5ter joined #git
12:48 armyriad joined #git
12:49 MattMaker joined #git
12:50 cuebix-wk joined #git
12:50 Ma5ter joined #git
12:52 cuebix-wk joined #git
12:54 notebox joined #git
12:54 romerocesar_ joined #git
12:54 mdw joined #git
12:55 _August_ joined #git
12:55 netj joined #git
12:56 ochorocho__ joined #git
12:56 mdw_ joined #git
12:57 ache1 joined #git
12:57 MattMaker joined #git
13:00 Guest9355 joined #git
13:00 a_thakur joined #git
13:02 Rooxo joined #git
13:02 Lomex joined #git
13:05 daniel_rose joined #git
13:06 lmat joined #git
13:06 bsanford joined #git
13:07 MattMaker joined #git
13:09 tinanoo joined #git
13:09 zivester joined #git
13:09 [gmi] joined #git
13:10 ache1 joined #git
13:11 kitsu joined #git
13:11 xall_ joined #git
13:12 zeroed joined #git
13:12 zeroed joined #git
13:12 kitsu Hey! May I add some patches to some commit? E.g A->B->C->D and I want to add fixes to B and don't change the linear structure of commits. So this fixes also should be included in in C & D
13:13 cdown joined #git
13:13 kitsu I guess it should be done with git-rebase or something like that but actually I'm pretty scared about destroying everything
13:15 ExoUNX joined #git
13:17 MattMaker joined #git
13:17 andlabs joined #git
13:17 diegoviola joined #git
13:18 ekinmur joined #git
13:19 unbalancedparen joined #git
13:19 themill joined #git
13:19 jimi_ joined #git
13:19 andlabs Hi. How do I pull a remote branch into the local branch? I am trying to pull origin/thing-thing-api into local thing-thing-api, but if I 'git checkout thing-thing-api ; git pull ; git checkout master' the commits from origin/thing-thing-api were merged into master!
13:19 andlabs *into the equivalent local branch
13:19 Silenced_v2 joined #git
13:19 Silenced_v2 joined #git
13:20 chachasmooth joined #git
13:21 heftig andlabs: how do you determine that happened?
13:22 khelkun joined #git
13:22 bongjovi joined #git
13:23 andlabs heftig: git log
13:24 ache1 joined #git
13:27 rnsanchez_ joined #git
13:27 ribasushi joined #git
13:27 Asiajey joined #git
13:28 al-damiri joined #git
13:28 cdg joined #git
13:29 Repox joined #git
13:29 bronson joined #git
13:31 antranigv joined #git
13:31 MattMaker joined #git
13:32 ache1 joined #git
13:33 l4v2 joined #git
13:34 GodGinrai joined #git
13:35 Softeisbieger joined #git
13:36 andlabs so how do I properly clone this remote branch into a local branch
13:36 notebox joined #git
13:37 perlpilot andlabs: you clone repos, not branches (the branches come with cloning the repo though)
13:38 romerocesar joined #git
13:39 * perlpilot reads scrollback and realizes there's a bit more context
13:39 andlabs yeah
13:40 andlabs I need to merge my coworker's branch with master, but I want to audit his changes locally first
13:40 7YUABMHUY joined #git
13:40 andlabs but every time I try to check out the branch, it gets merged into my master, which is not what I want
13:41 andlabs *with origin/master
13:43 freimatz joined #git
13:44 sangy joined #git
13:46 ochorocho__ joined #git
13:47 xpk joined #git
13:49 weckl joined #git
13:49 ash_workz joined #git
13:52 a_thakur joined #git
13:52 kpease joined #git
13:52 LiohAu joined #git
13:59 ilbot3 joined #git
13:59 Topic for #git is now Welcome to #git, the place for git help and surveys | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | rerere: the git that keeps on giving
14:00 AaronMT joined #git
14:02 ache1 joined #git
14:02 rcollier joined #git
14:02 rcollier hello
14:02 gitinfo rcollier: 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.
14:04 andlabs brb
14:05 andlabs joined #git
14:05 Arban joined #git
14:05 andlabs back
14:05 rcollier What would be the best way for me to 'rollback' 2 commits?. I have already pushed them to my remote I am the sole dev on this repo, so no issues with anybody having commited / merged anything else
14:05 harish__ joined #git
14:06 Macaveli joined #git
14:07 Dougie187 joined #git
14:08 romerocesar joined #git
14:09 rahtgaz joined #git
14:10 Somelauw rcollier: git reset HEAD~2
14:10 mkoskar joined #git
14:10 stantonk joined #git
14:11 crose joined #git
14:11 lugzer ..which is covered here: https://git-scm.com/docs/git-reset :)
14:12 floatingpoint joined #git
14:12 rcollier ta chaps
14:13 nnyk joined #git
14:14 LionsMane joined #git
14:14 lugzer so if you read that chapter carefully, "--hard" would permanently remove those commits from the tree
14:15 compeman joined #git
14:15 gagahaha joined #git
14:15 jaafar joined #git
14:16 compeman joined #git
14:18 grill joined #git
14:19 _August_ can someone help me out? I am trying to push some changes to my branch but i am getting an error saying its not possible because of unmerged files
14:19 cdg joined #git
14:20 freimatz pull?
14:20 _August_ cant pull either
14:20 freimatz why?
14:20 _August_ Pull is not possible because you have unmerged files.
14:20 D-Boy joined #git
14:20 osse read git status
14:21 _August_ i see a few files but i dont understand how to fix it sitll
14:22 freimatz commit or stash
14:22 osse _August_: what does it say? what did you do?
14:22 _August_ ive tried commiting but it wont let me
14:22 osse it didn't happen  just suddenly. you must have pulled or merged or rebased or something
14:23 _August_ http://pastebin.com/Edut7TGN
14:23 _August_ someone merged to another branch
14:23 _August_ i made changes and didnt pull apparently
14:23 _August_ so now im stuck
14:24 osse you can't remember?
14:24 osse scroll up in the shell history then
14:24 osse you can probably do git merge --abort to blow it all away
14:24 pothepanda joined #git
14:24 _August_ this was days ago
14:24 _August_ what will --abort do?
14:25 osse it will abort the current merge process
14:25 osse restore stuff to how it was before
14:25 ShekharReddy joined #git
14:25 _August_ will it make the person have to remerge things again?
14:25 osse it only affects your local repo
14:25 MattMaker joined #git
14:25 osse you're the one who must have started a merge somehow
14:25 _August_ and will it revert my changes to the previous state?
14:25 osse yes
14:26 osse like it is in HEAD of the 'development' branch
14:26 _August_ so all the changes ive done will go bye bye
14:26 phaleth joined #git
14:27 osse it will in some cases be able to keep them
14:27 _August_ how can i push my changes to the branch without losing them
14:27 kab what do you mean without loosing?
14:28 _August_ i dont want my changes to revert back to the changes that are on the branch
14:28 kab you can push committed changes.  if they are committed - you won't loose them
14:28 osse _August_: alternatively you can complete the merge. the only thing you have to decide is whether to keep modules/reports/hours/local.var.php or delete it
14:28 ResidentBiscuit joined #git
14:28 UncleCJ joined #git
14:28 kab stash them
14:28 Lunatrius` joined #git
14:28 _August_ ‎can delete that
14:28 _August_ i
14:28 osse then do what it says on line 32
14:29 osse then git commit
14:29 _August_ it says deleted by us:
14:29 osse indeed
14:29 osse oh shit
14:29 osse i mean line 30
14:30 _August_ so git rm modules/reports/hours/local.var.php ?
14:31 osse yes
14:33 stantonk joined #git
14:33 _August_ it says it needs to merge...
14:33 floatingpoint joined #git
14:34 osse be specific
14:34 _August_ nvm
14:35 _August_ looks like its gone
14:35 _August_ i checked git status and its not there now
14:35 espindola joined #git
14:36 _August_ going to try to push now
14:36 _August_ wish me luck
14:36 D[4]ni joined #git
14:36 osse did you commit?
14:36 _August_ from the looks of it
14:36 _August_ the files are commited
14:38 _August_ Updates were rejected because the tip of your current branch is behind
14:38 _August_ thats the error now
14:38 romerocesar_ joined #git
14:38 eivarv joined #git
14:39 osse pull
14:39 subhojit777 joined #git
14:40 _August_ Your local changes to the following files would be overwritten by merge:
14:40 _August_ Please, commit your changes or stash them before you can merge.
14:40 osse I suggest you commit your changes or stash them.
14:41 snowkidind joined #git
14:44 _August_ updates rejected because current branch is behind
14:44 _August_ i tried pulling again too
14:44 osse and?
14:44 _August_ it told me to commit them again after i already commited them
14:44 andlabs so now I have a fresh clone of the repo; how do I check out branch origin/xxxx as local xxxx ?
14:44 osse _August_: then you didn't commit them properly
14:45 grawity andlabs: git checkout xxxx
14:45 _August_ im looking at the commit
14:45 osse look at git status
14:45 _August_ 20 files committed
14:45 grawity git checkout -b xxxx origin/xxxx, if that doesn't work
14:45 devxom joined #git
14:46 _August_ Your branch and 'origin/development' have diverged,
14:46 _August_ Changes to be committed:
14:46 _August_ and it list all the files in lime green
14:46 deitarion joined #git
14:46 osse then you didn't actually commit
14:47 deitarion I just started something within an existing project but realized it should be its own project. Given that it's only half a dozen commits out of a larger project, is there a better alternative to filter-branch for this use case?
14:48 _August_ im using phpstorm to commit the files and then i look at the version control i see it there
14:48 ochorocho__ joined #git
14:48 andlabs grawity: thanks
14:48 ache1 joined #git
14:49 osse _August_: then find out who to make phpstorm do the equivalent of this command:  git commit
14:49 kab <_August_> in changes tab (number 9 i guess)  you select all files or just some of them?
14:49 osse _August_: if they're listed in git status under "to be committed" then they aren't committed yet
14:50 stantonk_ joined #git
14:50 _August_ kab, all of them
14:50 kab if you want to commit all,  select name of changelist,  default i guess
14:50 ache1 joined #git
14:50 kab and pay attention to checkboxes in commit window
14:50 cdown joined #git
14:51 btree joined #git
14:51 _August_ do you use commit and push or just commit?
14:51 kab me?
14:51 _August_ yeah
14:51 btree left #git
14:51 kab if i want to push after commit, of course i use commit and push
14:51 _August_ i guess it doesnt make a difference
14:52 kab it's independent processes
14:52 kab it can commit but fails to push
14:52 kab if you want to push to origin,  use commit and push,
14:52 kab it depends of what you want
14:53 osse he needs to pull before pushing anyway
14:53 kab so do git pull --rebase,  but you need to commit or shats uncommited changes
14:54 kab or stash*
14:54 romerocesar joined #git
14:54 Somelauw left #git
14:54 _August_ ok so failed to commit and push
14:54 MattMaker joined #git
14:55 kab failed to push or commit too?
14:55 _August_ both
14:55 kab what tracelog writes?
14:55 _August_ you said to pull rebase?
14:55 kab it's in tab Version control
14:56 kab if you can't commit - there are some other troubles
14:56 kab read why git can't commit
14:56 _August_ no its not in there
14:56 freimatz paste
14:56 _August_ 0 files committed, 17 files failed to commit: Changed Naslt chart. Created user hours capacity report. Remove Work Group , Created Gam report, Added total projects to all reports and bug fixes for reports On branch development Your branch and 'origin/development' have diverged, and have 3 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Changes not staged for commit: modified: plugins/daos/Proj
14:56 _August_ Untracked files: .idea/ modules/reports/capacity-analysis/ no changes added to commit
14:56 cdown joined #git
14:58 kab did you commit with phpstorm well before this issue?
14:59 _August_ yeah
14:59 freimatz no
14:59 romerocesar joined #git
14:59 _August_ everything was going well until he merged the branch
15:00 kab do you really want to commit idea project files ? .idea/
15:00 _August_ no
15:00 zivester joined #git
15:00 kab do you have red colored files in changes in phpstorm?
15:01 stantonk joined #git
15:01 _August_ only in unversioned files but there has always been some there
15:02 cdown joined #git
15:02 kab in unversioned there are brown color yeah?
15:02 kab type git status in console
15:02 kab and print output
15:02 _August_ they are red for me
15:02 floatingpoint joined #git
15:03 _August_ http://pastebin.com/Pr09HVCp
15:05 _August_ i have a noob thought
15:05 _August_ is it possible that the merge is still open and has to be closed? if that makes any sense
15:05 madewokherd joined #git
15:05 MattMaker joined #git
15:05 kab git status tell you everything
15:06 reactormonk joined #git
15:06 kab i can't open pastebin.  job politics
15:06 _August_ should i reset the head?
15:06 _August_ what about pastie?
15:06 kab wait
15:06 kab try it
15:06 kab pastie
15:06 _August_ http://pastie.org/private/vhufmupobi60f0ze0afcq
15:07 kab if you reset head  you ' ll loose changes
15:07 kab modified are green in git status, yeah?
15:07 _August_ yup
15:07 _August_ lime colored
15:08 cortexman left #git
15:08 kab type git commit -m 'my commit name'
15:09 kab what did you do before this issue appeared?  why do you have 3 different commits in your branches?
15:09 _August_ error: pathspec 'commit' did not match any file(s) known to git.
15:09 _August_ error: pathspec 'name'' did not match any file(s) known to git.
15:09 grawity use "..." if you're writing this in windows' cmd.exe or powershell
15:10 mehola joined #git
15:10 kab yeah,  which OS do you use?
15:10 kab windows?
15:10 _August_ ok
15:10 kab stop,  how did you get git status then? lol
15:10 _August_ they commited
15:11 _August_ yeah windows
15:11 kab git status now
15:11 _August_ ok the modified files are now gone
15:12 kab i don't know what do you need to do next ) because i don't know your main targets,  do you need to push right now?
15:13 _August_ yeah
15:13 kab you have all 4 commit diverged
15:13 clemf joined #git
15:13 kab have you changed all of them?
15:14 kab do you need to pull changes from origin? or just push everything you have locally
15:14 _August_ http://pastie.org/private/0o28cbnmxqqzkjvqionoq
15:14 dmto joined #git
15:14 _August_ Maybe i should try to pull first
15:14 kab nope, it's question to you, not to git  )))
15:15 kab do you understand what 'diverged' means?
15:15 _August_ no
15:15 kab write git log
15:15 kab git log -5
15:16 le_melomane joined #git
15:17 _August_ ok
15:17 thiago joined #git
15:17 _August_ its showing the history
15:17 kab i want to see
15:18 _August_ http://pastie.org/private/6hgdodrs9wt8b85ybp6ew
15:18 MattMaker joined #git
15:18 kab oh, you didn't change commit name )
15:19 _August_ not worried about it
15:19 _August_ ill amend it later
15:19 kab so now you need to understand that you have diverge between origin and your local branch in 3 and 4 commits
15:19 kab which 3 commits are correct before you last commit,  origin  or local?
15:20 _August_ i would say local
15:21 achadwick joined #git
15:21 kab you can push with force  or you can rebase
15:21 kab in first case origin will be overwritten
15:22 tyreld joined #git
15:22 _August_ and rebase will do what?
15:22 kab rebase will append 4 your last commits after origin last commit
15:23 kab after you resolve conflicts, if they'll be
15:23 kab realize, how did you get 4 and 3 different commits
15:24 _August_ ok
15:24 _August_ going to force push then
15:24 kab beware,  you will loose origin commits
15:24 kab origin branch will be like your local
15:24 _August_ sigh
15:25 _August_ ok lets rebase then
15:25 _August_ ill just copy the code over if anything needs to be changed
15:25 kab just admit what changes are right, thats all
15:25 _August_ Changed Naslt chart. Created user hours capacity report. Remove Work Group , Created Gam report, Added total projects to all reports and bug fixes for reports
15:26 _August_ that one is the most accurate one
15:26 CheckDavid joined #git
15:26 playfullyExist joined #git
15:26 kab did you use amend before?
15:27 kab git commit amend or something like that?
15:27 lugzer joined #git
15:27 xpk joined #git
15:27 _August_ yeah
15:27 kab checkbox amend in phpstorm
15:27 romerocesar joined #git
15:27 kab thats why your branches are diverged
15:27 lugzer joined #git
15:28 kab if your commit is already at origin,  don't amend it,  make new commit
15:28 kab because it'll be diverged
15:28 kab and you need to rebase or merge
15:29 kab you used amend for all 4 commits in a row?
15:29 eroussel joined #git
15:29 _August_ i dont think i have
15:29 kab what?
15:29 jyjon joined #git
15:29 _August_ i dont ever remember see the option when i made the commits
15:29 NeverDie joined #git
15:29 kab option amend?
15:29 _August_ the only time i use amend is in terminal
15:30 kab it's in right top corner in commit window in phpstorm
15:30 dhollinger joined #git
15:30 _August_ it wasnt checked
15:30 daniel_rose joined #git
15:30 cdg joined #git
15:30 usm4n joined #git
15:31 kab did you use git reset HEAD ?
15:31 _August_ not yet, no
15:32 kab so.  if you push with force now,  all your teammates should make additional moves to update their development branches
15:32 kab do you understand why?
15:32 _August_ sort of, yes
15:33 MattMaker joined #git
15:33 kab maybe it'll be better to add to origin just 1 commit with all changes you made in 4 last commits?
15:33 _August_ ok
15:34 kab so, you need do merge 4 commits in one and rebase it to origin.
15:34 kab first - do  git rebase -i HEAD~4
15:34 DieguezZ joined #git
15:34 kab there will be four pick commits lines
15:35 _August_ yes i see them
15:35 romerocesar_ joined #git
15:35 circ-user-pIZEP joined #git
15:35 kab you need left pick to the earlier commit and change al other to f
15:35 kab write f instead if pick
15:36 kab it should be like
15:36 kab pick
15:36 kab f
15:36 kab f
15:36 kab f
15:36 mangolisk joined #git
15:36 le_melomane joined #git
15:37 kab is it ok?
15:37 Goplat joined #git
15:38 jeffreylevesque joined #git
15:38 _August_ -_- client crashed
15:38 kab which client ?
15:38 kab notepad?
15:38 kab )))
15:38 _August_ phpstorm
15:39 _August_ trying again
15:39 a_thakur joined #git
15:39 le_melomane joined #git
15:39 kab i thought you use console for rebase
15:40 _August_ im using it now
15:40 kab pay attention that you are already in repase
15:40 _August_ should i abort?
15:40 kab check the status
15:40 kab sure you can abort and do it again
15:40 _August_ git rebase about?
15:40 _August_ git rebase abort?
15:41 kab --abort
15:42 a_thakur_ joined #git
15:42 Limes__ joined #git
15:42 chachasmooth_ joined #git
15:42 jyjon joined #git
15:42 Alienpruts joined #git
15:43 _August_ im deleting the word pick
15:44 _August_ but nothing is changing
15:44 freimatz3 joined #git
15:44 ache1 joined #git
15:44 kab nope, you need to change like that
15:44 kab pick
15:44 kab pick
15:44 kab pick
15:44 kab pick
15:44 kab to
15:44 kab pick
15:44 kab f
15:44 kab f
15:44 kab f
15:44 stonerfish joined #git
15:45 kab it means that last 3 commits will mend with previous one
15:45 kab melds
15:46 kab it explains all in commends, read explanation of f
15:46 IWishIKnew joined #git
15:46 _August_ i got it
15:46 kab done?
15:47 kab git status now
15:48 _August_ how the hell do i exit...
15:48 _August_ i pressed cmd c
15:48 kab save and close
15:48 _August_ and :quit
15:48 _August_ and im still stuck in there
15:49 kab oh, i gues it's vim shell
15:49 kab i don't remember :D
15:49 _August_ lol fml
15:49 osse :wq <Enter>
15:49 kab lel, thanx
15:50 miklcct joined #git
15:50 kab as for me - i use nano for that purpose
15:50 ahmedelgabri joined #git
15:50 cdown joined #git
15:50 _August_ ok
15:50 kab status
15:50 _August_ it says
15:51 catag87 joined #git
15:51 _August_ http://pastie.org/private/hml3ckoqhven0bpz7lg9q
15:52 _August_ when i exited i saw Cannot 'fixup' without a previous commit
15:52 kab git rebase --edit-todo
15:52 kab you failed some todo list
15:53 romerocesar joined #git
15:53 _August_ ok im back in there
15:54 kab yea,  print stdout
15:54 Guest55 joined #git
15:54 kab to us
15:54 _August_ http://pastie.org/private/yb9dyjp6bgwwokhwptbxha
15:55 kab you can not fixup top commit because it should be fixed up to someone
15:55 kab top commit canonly be picked
15:55 kab you now have
15:55 kab f
15:55 kab f
15:55 kab p
15:55 kab f
15:55 kab and it should be
15:55 kab p
15:56 kab f
15:56 kab f
15:56 kab f
15:56 kab if you need to change signature - do it after
15:56 ochorocho__ joined #git
15:56 _August_ so the top one is going to be one the commited?
15:57 kab and all other will meld into it
15:57 _August_ ok
15:57 cdg joined #git
15:58 Masterphi joined #git
15:58 Limes_ joined #git
15:58 _August_ ok
15:58 _August_ bunch od stuff happened
15:59 _August_ rebased success
15:59 kab git status
15:59 kab now the hardest thing
15:59 bongjovi joined #git
15:59 kab left
15:59 romerocesar_ joined #git
16:00 kab 1 and 3 different commits ,  right?
16:00 _August_ http://pastie.org/private/4rylhy7akafjw6qywjseew
16:00 _August_ yup
16:00 _August_ they are all together
16:01 kab so you need to rebase your local branch to the origin and resolve conflicts if they appear in phpstorm
16:02 kab after that your branch should be ahead of origin on 1 commit
16:02 _August_ ok how do i go about doing that?
16:02 _August_ yeah
16:02 _August_ it is
16:02 _August_ i see it
16:02 kab git rebase origin/development
16:04 _August_ http://pastie.org/private/3isydytk9yda5rewil6cq
16:04 kab if you are newbie in rebasing - i recommend you to make a backup of your local branch
16:04 CalimeroTeknik joined #git
16:05 kab yep, there are conflicts
16:05 kab in phpstorm - VCS - git - resolve conflicts
16:05 mdw joined #git
16:05 kab and resolve them pressing merge
16:06 _August_ done
16:06 kab O_O
16:06 kab you're fast dude
16:06 harish__ joined #git
16:07 kab did you resolve all of them in list?
16:07 _August_ there was only one
16:07 kab ok. now read console,  git says what to do next ^_^
16:08 kab in case git says everything you need )
16:08 devxom joined #git
16:08 _August_ says im still rebasing the branch
16:08 dopesong joined #git
16:09 kab When you have resolved this problem, run "git rebase --continue".
16:09 kab If you prefer to skip this patch, run "git rebase --skip" instead.
16:09 kab To check out the original branch and stop rebasing, run "git rebase --abort".
16:09 kab you need first case
16:09 _August_ ok
16:09 kab done?
16:09 stantonk joined #git
16:10 zeroed joined #git
16:10 dopesong joined #git
16:10 _August_ yup
16:10 kab git status
16:11 BrianBlaze420 joined #git
16:11 kab if it's ahead for 1 commit, dont use pastie
16:11 _August_ http://pastie.org/private/xxyggeqqpgn7jrgd37w
16:11 _August_ it is
16:11 kab lel
16:11 Electrometro joined #git
16:11 kab we're done for now
16:11 kab you can push
16:11 blackwind_123 joined #git
16:11 * _August_ crosses fingers
16:12 Darren_ joined #git
16:12 kab you better to cross them  while rebasing :D
16:13 _August_ IT WORKED!!
16:13 dmto joined #git
16:13 kab omfg,  crazy  yep?
16:13 kab :)
16:13 _August_ holy crap that was so stressful
16:13 MattMaker joined #git
16:13 _August_ thank you so much man
16:14 kab it's because you're new it that stuff
16:14 f3r70rr35f joined #git
16:14 kab in*
16:14 _August_ yeah all i knew how to do was push and pull
16:14 _August_ lol
16:14 kab we all was crossing that way earlier )
16:15 _August_ yeah
16:15 kab if you write git log -5
16:15 kab you can see results
16:15 usm4n joined #git
16:15 kab of our job done
16:15 lugzer joined #git
16:15 daniel_rose joined #git
16:16 _August_ yup i see it
16:16 _August_ thank you thank you thank
16:16 _August_ you
16:16 kab O_o
16:16 eivarv joined #git
16:16 kab no problem
16:16 usm4n joined #git
16:17 Masterphi joined #git
16:17 kab add .idea/ go git ignore file
16:17 kab to*
16:18 _August_ did it
16:18 stantonk joined #git
16:19 deitario1 joined #git
16:20 drbean_ joined #git
16:20 mdw joined #git
16:21 kab also, use tab 'log' in phpstorm changes tab
16:21 kab there are local and log
16:21 Masterphi joined #git
16:21 kab log will show you a lot of things and you can do a lot of things from it
16:22 jimi_ joined #git
16:22 drbean joined #git
16:23 aapaaal joined #git
16:23 _August_ yeah half the stuff under it i dont understand
16:24 kab шеэы ащк тщц нщг вщтэе Ж)
16:24 kab it's for now you don't
16:24 armyriad joined #git
16:25 quetz joined #git
16:25 drbean- joined #git
16:26 romerocesar joined #git
16:26 d4rklit3 joined #git
16:26 durham joined #git
16:28 EvilPenguin joined #git
16:29 drbean joined #git
16:32 stantonk joined #git
16:32 drbean_ joined #git
16:33 zacts joined #git
16:33 st0opkid joined #git
16:33 t-mart_ joined #git
16:33 Silenced_v2 joined #git
16:33 realz_ joined #git
16:35 Silenced_v2 joined #git
16:37 EvilPenguin joined #git
16:37 baxx i was trying to push some stuff last night and it failed, i think that there's a limit to how much you can push up on bitbucket... can i remove that commit and restart in pieces?
16:38 kab bitbucket has it's own manual how to clean it
16:38 kab you reached size limit or what?
16:39 morenoh149 joined #git
16:39 baxx no just it won't work if i try to commit a lot at once
16:39 drbean joined #git
16:39 baxx i had this ages ago before, no idea why
16:39 morenoh149 how can I merge only some commit(s) from one branch into another?
16:40 kab <baxx>  it should write some shit
16:40 kab <morenoh149>  rebase or cherry pick them
16:40 baxx kab: what does that mean
16:41 baxx http://vpaste.net/NVQzR < that was the output of it
16:41 mmlb joined #git
16:42 kab baxx dunno, try to google error with prefix 'bitbucket'
16:42 HoierM joined #git
16:42 baxx yeah i didn't have much luck last time, so just wanted to sack what was left over from that off and do it again in pieces
16:43 daniel_rose joined #git
16:43 kab split commit to smaller ones and just push with force
16:43 kab if you work a;lone in branch
16:44 baxx i dunno how to do that - just wanted to wipe what was done and redo
16:44 danslo joined #git
16:44 kab git reset HEAD~1
16:44 kab it resets one commit in current branch
16:44 kab to unstaged changes
16:44 baxx i don't want to lose my work tho - just whatever was half commited
16:45 kab you won't
16:45 kab it resets only commit, not changes
16:45 baxx ok - i'll try that command now, thanks
16:46 SteffanW joined #git
16:46 baxx git status says that i'm up to date with master - so does this mean that nothing was fouled by the last thing?
16:47 dunpeal joined #git
16:47 kab нуз
16:47 kab yep, it is
16:47 baxx was that to me?
16:47 kab make git fetch and try again
16:47 drbean_ joined #git
16:47 arooni_ joined #git
16:47 Electrom_ joined #git
16:49 arooni_ joined #git
16:49 preyalone joined #git
16:50 UrsoBranco joined #git
16:50 MattMaker joined #git
16:50 LiohAu joined #git
16:51 drbean joined #git
16:52 arooni joined #git
16:52 courrier joined #git
16:53 drbean_ joined #git
16:54 romerocesar joined #git
16:54 emPi joined #git
16:56 paul424 joined #git
16:57 drbean- joined #git
16:57 TinkerTyper joined #git
16:58 TSS_ joined #git
16:59 Dazzyo joined #git
17:00 boombatower joined #git
17:00 rcollier joined #git
17:00 durham_ joined #git
17:01 zytr0n joined #git
17:01 drbean joined #git
17:03 AaronMT joined #git
17:04 D[4]ni joined #git
17:04 durham__ joined #git
17:04 morenoh149 joined #git
17:04 [cust] joined #git
17:04 M-ou-se joined #git
17:05 Michaela joined #git
17:05 EvilPenguin joined #git
17:05 Bigcheese_ joined #git
17:05 frogonwheels_ joined #git
17:05 systmkor_ joined #git
17:06 OnBrokenWings joined #git
17:07 Anoia joined #git
17:07 ilmari joined #git
17:07 wcpan joined #git
17:07 thiago joined #git
17:07 doppo joined #git
17:07 sysanthrope joined #git
17:08 sneep joined #git
17:08 jleclanche joined #git
17:08 nyuszika7h joined #git
17:08 sarbs joined #git
17:08 preyalone joined #git
17:08 eroussel joined #git
17:08 davidstrauss joined #git
17:09 drbean joined #git
17:09 MLM joined #git
17:09 unforgiven512 joined #git
17:09 romerocesar joined #git
17:09 sfan786 joined #git
17:09 iamdevnul joined #git
17:09 ec joined #git
17:09 usm4n joined #git
17:09 boxrick1 joined #git
17:09 elijah joined #git
17:10 LionsMane joined #git
17:10 diego joined #git
17:10 Silenced- joined #git
17:10 Silenced- joined #git
17:10 lugzer joined #git
17:10 vdv joined #git
17:10 iota_pi joined #git
17:10 scalability-junk joined #git
17:10 Guest74885 joined #git
17:10 uidzer0 joined #git
17:10 hexagoxel joined #git
17:10 HedgeMage joined #git
17:10 daxroc joined #git
17:10 martinklepsch joined #git
17:10 Hedgework joined #git
17:11 bronson joined #git
17:11 ec joined #git
17:11 Neico joined #git
17:11 mehola joined #git
17:11 pikajude joined #git
17:11 pikajude joined #git
17:11 bcardarella joined #git
17:11 ToeSnacks joined #git
17:11 MatthewAllan93 joined #git
17:11 dopesong joined #git
17:11 FritzLakritz joined #git
17:11 wizonesolutions joined #git
17:11 fcrick joined #git
17:11 orcus joined #git
17:12 kwmiebach joined #git
17:12 worstadmin joined #git
17:12 ionelmc joined #git
17:12 cebor joined #git
17:12 devhost joined #git
17:13 paperziggurat joined #git
17:13 sigjuice joined #git
17:13 zeller joined #git
17:13 jgornick joined #git
17:13 daniel_rose joined #git
17:14 sadmac joined #git
17:14 fhackdroid joined #git
17:14 mostlybadfly joined #git
17:14 eggoez joined #git
17:14 durham joined #git
17:14 cloudcell__ joined #git
17:15 duarteper joined #git
17:15 nwkj86 joined #git
17:15 t-mart_ joined #git
17:15 twisted` joined #git
17:15 playfullyExist joined #git
17:16 slide joined #git
17:17 gravitron joined #git
17:17 jhass joined #git
17:17 tomboy64 joined #git
17:18 hahuang65 joined #git
17:18 WakiMiko joined #git
17:18 Guest46365 joined #git
17:18 angiebadillo joined #git
17:18 asd5a joined #git
17:18 McKraken_zzzzz joined #git
17:18 de-vri-es joined #git
17:19 tanuki joined #git
17:19 XDS2010 joined #git
17:19 pizzaops joined #git
17:19 deitarion joined #git
17:19 autofly joined #git
17:19 alcohol joined #git
17:19 chrysa joined #git
17:19 MacGyver joined #git
17:20 _flow_ joined #git
17:20 forrestv joined #git
17:20 stantonk joined #git
17:21 romerocesar joined #git
17:21 bastelfreak joined #git
17:21 gravitron joined #git
17:21 MatthewAllan93 joined #git
17:21 WillMoogle joined #git
17:22 MattMaker joined #git
17:22 al-damiri joined #git
17:22 ac_slater left #git
17:23 gitinfo joined #git
17:24 usm4n joined #git
17:24 acetakwas joined #git
17:26 Lomex joined #git
17:26 matthiaskrgr joined #git
17:27 Guest80655 joined #git
17:27 Guest80655 joined #git
17:27 [gmi] joined #git
17:29 ariver joined #git
17:30 durham joined #git
17:31 msonntag joined #git
17:31 vuoto joined #git
17:32 GenZai joined #git
17:33 theskillwithin joined #git
17:34 drbean_ joined #git
17:35 MattMaker joined #git
17:35 zivester joined #git
17:35 stantonk joined #git
17:36 dmto joined #git
17:36 mischat joined #git
17:37 GavinMagnus left #git
17:37 drbean joined #git
17:38 weckl joined #git
17:39 nate_c joined #git
17:39 fhackdroid joined #git
17:40 drbean- joined #git
17:40 Electrometro joined #git
17:40 LeBlaaanc joined #git
17:41 liri_ joined #git
17:42 tek81 joined #git
17:42 nnyk joined #git
17:45 xall_ joined #git
17:46 dsantiago joined #git
17:46 romerocesar joined #git
17:46 mingrammer joined #git
17:48 tek81 Trying to setup some files to be exclude from merges using a custom merge driver.  Created a driver using `git config --global merge.ours.driver true`, and then in .gitattributes added 'App_Data/Sitefinity/Configuration/*.config merge=ours'.  It doesn't seem to be taking (*.config files in that path are still being merged).  Anything obvious I'm missing?
17:48 drbean joined #git
17:49 vuoto joined #git
17:49 Sasazuka joined #git
17:50 vuoto joined #git
17:53 drbean_ joined #git
17:55 drbean joined #git
17:55 xall_ joined #git
17:57 MattMaker joined #git
17:58 govg joined #git
17:59 ochorocho__ joined #git
17:59 usm4n joined #git
17:59 dhollinger joined #git
17:59 sarbs joined #git
18:00 rcollier joined #git
18:00 Limes_ joined #git
18:00 durham_ joined #git
18:00 vuoto joined #git
18:01 dopesong joined #git
18:02 optraz_ joined #git
18:02 vuoto joined #git
18:02 AaronMT joined #git
18:03 usm4n_ joined #git
18:04 lugzer joined #git
18:05 ahmedelgabri joined #git
18:06 stantonk joined #git
18:06 romerocesar joined #git
18:07 vuoto joined #git
18:07 usm4n joined #git
18:07 drbean_ joined #git
18:08 AaronMT_ joined #git
18:08 satifant joined #git
18:09 MattMaker joined #git
18:09 mwhooker joined #git
18:10 texinwien_ joined #git
18:11 kadoban joined #git
18:13 dhanush joined #git
18:15 thiefg joined #git
18:15 texinwien joined #git
18:15 vdv joined #git
18:16 cdown joined #git
18:16 aca20031 joined #git
18:17 romerocesar joined #git
18:20 davisonio joined #git
18:21 Guest63627 joined #git
18:21 g105b joined #git
18:23 drbean joined #git
18:24 MattMaker joined #git
18:29 feignix joined #git
18:30 usm4n joined #git
18:30 drbean joined #git
18:30 DieguezZ joined #git
18:32 Kicer86 joined #git
18:33 nnyk joined #git
18:33 lugzer joined #git
18:34 vuoto joined #git
18:34 AaronMT joined #git
18:34 cyan__ joined #git
18:34 Darren_ joined #git
18:35 usm4n joined #git
18:38 MattMaker joined #git
18:38 m0viefreak joined #git
18:40 stantonk joined #git
18:41 mingrammer joined #git
18:42 cdesai joined #git
18:43 dhanush joined #git
18:43 xall_ joined #git
18:43 Cabanossi joined #git
18:44 drbean joined #git
18:44 Darcidride joined #git
18:45 vuoto joined #git
18:45 skyfaller joined #git
18:45 skyfaller joined #git
18:46 cdesai joined #git
18:47 davisonio joined #git
18:47 aguimaraes1986 joined #git
18:47 cyek joined #git
18:47 MattMaker joined #git
18:48 Tratos joined #git
18:49 King_Hual joined #git
18:49 trobotham joined #git
18:51 thiefg Hi, how would you get new members of an frc team to learn git?
18:51 elastix joined #git
18:51 drbean_ joined #git
18:52 karstensrage_ joined #git
18:53 drbean- joined #git
18:53 Nugget joined #git
18:57 drbean joined #git
18:57 dopesong joined #git
18:58 perlpilot thiefg: As opposed to nothing or some other revision control system?
18:58 ThiefMaster just tell them to read the docs and start using it. the basics are not hard
18:58 MattMaker joined #git
18:59 slobo joined #git
18:59 perlpilot thiefg: If you've already got an established team that's using git, you tell the newbies to just start using it and give them pointers to things like !progit
18:59 gitinfo thiefg: [!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
18:59 thiefg ThiefMaster, I thought so, but many people end up quiting
18:59 editshare-ericf joined #git
18:59 bluj joined #git
19:00 perlpilot thiefg: they quit because of git?  Or just that you have lots of turn-over?
19:01 TinkerTyper joined #git
19:01 davisonio joined #git
19:01 eijk_ joined #git
19:01 thiefg perlpilot: both, some people never contribute because they can never figure out how to do it/don't want to learn, others because they can't program
19:02 TinkerTyper joined #git
19:02 durham joined #git
19:03 thiefg perlpilot: so the question is really how to make people want to learn git
19:04 pokergod joined #git
19:04 pokergod ran git add . and added a boatload of files i didn't intend.   How can I remove everything that i've added?
19:04 occupant joined #git
19:05 p1k hey
19:06 perlpilot thiefg: Show them "git for ages 4 and up" ?
19:06 p1k so for some reason git ls-remote is not working on github private repos
19:06 perlpilot thiefg: have one-on-one sessions showing them how to use git
19:06 p1k does git ls-remote not check ~/.ssh/config for the correct key or what ?
19:08 kadoban It must, otherwise it wouldn't be working in the slightest for me. What behavior are you seeing?
19:08 thiefg perlpilot: thanks, I just looked that up
19:08 mwhooker joined #git
19:09 drbean_ joined #git
19:09 kadoban p1k: Also, what exact command are you running?
19:09 p1k kadoban: git ls-remote git://github.com/user/a_private_repo
19:10 kadoban p1k: What's in your .ssh/config ? Usually you specify which keypair to use in an alias, which you're not using an alias there so it wouldn't be using it.
19:11 MZAWeb joined #git
19:11 perlpilot thiefg: isn't part of the idea of FRC that these are future engineers and such?  Surely you could talk to them about professional responsibility and stuff like that.
19:11 perlpilot thiefg: also, knowledge of git looks good on a resume  ;)
19:11 p1k kadoban: it's just the standard Host github.com entry with identity key
19:11 p1k kadoban: I only use one login so that shouldn't be it at all
19:12 ThiefMaster what's FRC btw? first result on google is some pro-life bullshit
19:12 Darren_ joined #git
19:12 mehola joined #git
19:12 p1k kadoban: git push / pull work fine it's specifically git ls-remote which doesn't seem to use the key
19:13 kadoban p1k: Do 'git ls-remote github.com:user/private_repo' ?
19:13 dsdeiz joined #git
19:13 kadoban git:// is a different protocol I believe, not SSH
19:14 thiago joined #git
19:14 daniel_rose joined #git
19:15 perlpilot ThiefMaster: I'm assuming FRC == FIRST Robotics Competition.
19:15 eijk_ joined #git
19:15 perlpilot (at least that's the only thing that matches "frc team" to "using git" in my head)
19:16 reisio joined #git
19:16 codezomb joined #git
19:17 p1k kadoban: which uses SSH keys ?
19:17 kadoban p1k: I don't understand the question
19:20 eijk_ joined #git
19:21 reisio mmm, is -r in the man pages somewhere?
19:21 p1k kadoban: I didn't realize it was git:// not git@ the former seems tobe bower specific ?
19:21 p1k doens't look like it's git though, nvm
19:22 grawity git:// is Git protocol over raw TCP; ssh:// or user@server: is Git protocol over SSH
19:22 kadoban git:// is not a protocol that gets used a lot, I'm not sure when you'd actually use it. SSH gets used *way* more. Yeah it's a tad confusing.
19:22 grawity well no, git:// is *quite* common
19:22 kadoban Really? I don't think I've ever used it in my life.
19:22 grawity only github helped make https:// more popular, once the "smart HTTP" transport was invented
19:23 grawity outside the github world, git-daemon remains the simplest way to host a read-only repo
19:23 Hedgework I've used git:// quite a lot when doing quick, anonymous clones of things I don't have credentials to push to anyway.
19:23 kadoban Oh I just use gitolite or a HTTP server, so I guess that's why I'm not using it.
19:24 Hedgework gitolite <3
19:24 drbean joined #git
19:25 drbean- joined #git
19:27 romerocesar joined #git
19:27 GavinMagnus joined #git
19:27 reisio hrmm, don't have the git-svn man page for some reason is why!
19:28 IWishIKnew joined #git
19:28 cdown joined #git
19:28 Darren_ joined #git
19:29 lugzer joined #git
19:29 stantonk joined #git
19:30 bronson joined #git
19:30 joki joined #git
19:30 Darren_ joined #git
19:30 circ-user-pIZEP joined #git
19:32 thiefg perlpilot: explaining why it works and that it is a useful skill convinces some, but there are still a few that would rather use flash drives/google drive to share code
19:32 thiefg I guess you can't win them all
19:32 cdg joined #git
19:33 Guest54783 joined #git
19:35 mingrammer joined #git
19:36 sigma__ joined #git
19:36 drbean joined #git
19:36 sigma__ Is there any mechanism by which a stash is created without anyone explicitly executing the git stash command?
19:37 sigma__ My projects tend to accumulate stashes that I am almost certain I'm not creating myself, and no one else is working on these projects in particular.
19:37 reisio is there a big reason someone would use git svn clone over svn directly, besides a preference for git?
19:37 kadoban sigma__: You could have aliases or hooks or something that might be doing it. I don't think they ever create themselves otherwise.
19:38 sigma__ Thanks kadoban
19:38 stantonk joined #git
19:38 sigma__ left #git
19:39 jungsubk joined #git
19:39 WaReZ joined #git
19:39 GodGinra1 joined #git
19:39 drbean_ joined #git
19:40 troulouliou_dev joined #git
19:41 ache1 joined #git
19:43 RedShift joined #git
19:44 jungsubk joined #git
19:47 romerocesar joined #git
19:47 kbs joined #git
19:49 mdw joined #git
19:49 spudowiar joined #git
19:50 bronson joined #git
19:50 paul424 joined #git
19:50 mdw joined #git
19:51 bronson joined #git
19:53 GodGinra1 joined #git
20:00 ochorocho__ joined #git
20:01 anu1 joined #git
20:02 rcollier joined #git
20:04 LeBlaaanc joined #git
20:11 guardian hello, what's the rationale behind commit notes not being fetched and pushed by default?
20:12 cdown joined #git
20:13 drbean joined #git
20:14 spudowiar They.. aren't?
20:14 spudowiar Wait
20:14 BernhardPosselt joined #git
20:14 spudowiar What's a commit note? :P
20:14 spudowiar Ah, git-notes
20:14 BernhardPosselt ive created a file that is listed as ignored in my .gitignore and git makes it show up as modified
20:14 BernhardPosselt why does this happen?
20:15 osse BernhardPosselt: !ignore_tracked
20:15 gitinfo BernhardPosselt: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
20:15 BernhardPosselt oh, wtf
20:15 BernhardPosselt it is checked in
20:15 Doginal joined #git
20:16 zacts joined #git
20:17 osse that's why it's says modifified instead of untracked
20:18 romerocesar joined #git
20:18 BernhardPosselt yeah, thought that i delted taht
20:18 drewo joined #git
20:19 osse deleleting won't help. then it'll only show up as deleted instead of modified
20:19 BernhardPosselt right
20:19 BernhardPosselt deleted the file
20:19 BernhardPosselt pulled
20:19 BernhardPosselt and added it back
20:20 go1111111 joined #git
20:20 ncx joined #git
20:20 ncx hi
20:20 gitinfo ncx: 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.
20:22 aidalgol joined #git
20:22 kbs guardian: not a git expert, so not sure - but (to my eye at least) notes seem to be essentially parallel to commits, and only somewhat tangentially "connected" with them (the porcelain prints them together if they happen to point to the same parent and tree.)
20:22 sangy ahhh, such a welcoming bot
20:24 lugzer joined #git
20:25 bremner joined #git
20:25 bremner joined #git
20:25 drbean_ joined #git
20:26 kbs guardian: but from a usability PoV, it does make sense, so I'm a bit curious too. It sorta seems like a bit of a hack tbo - because it's only so loosely coupled with the commit, I'm guessing that merging etc will turn quite unfriendly
20:28 mmlb !backup
20:28 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
20:28 eroussel joined #git
20:28 mmlb good bo-y-t
20:31 mingrammer joined #git
20:31 herr_barium joined #git
20:32 danslo_ joined #git
20:32 MattMaker joined #git
20:32 mwhooker joined #git
20:34 txm joined #git
20:35 Dyonisos joined #git
20:38 MattMaker joined #git
20:41 drbean joined #git
20:44 zeroed joined #git
20:47 l4v2 joined #git
20:48 romerocesar joined #git
20:49 LionsMane joined #git
20:50 joki joined #git
20:52 cdown_ joined #git
20:56 cdown joined #git
20:56 ahr3n joined #git
20:59 reisio left #git
21:00 MattMaker joined #git
21:00 ochorocho__ joined #git
21:01 usm4n joined #git
21:01 LeBlaaanc joined #git
21:03 stantonk joined #git
21:03 stantonk joined #git
21:05 MZAWeb joined #git
21:06 DieguezZ joined #git
21:06 eijk_ joined #git
21:07 go1111111 joined #git
21:09 shinnya joined #git
21:10 usm4n joined #git
21:11 NeonSynth_ joined #git
21:11 usm4n joined #git
21:12 usm4n left #git
21:12 azbarcea joined #git
21:12 mdw joined #git
21:12 mehola joined #git
21:13 spudowiar joined #git
21:13 nnyk joined #git
21:14 cyphase joined #git
21:14 g105b joined #git
21:15 xall_ joined #git
21:16 mdw joined #git
21:17 usm4n joined #git
21:18 lugzer joined #git
21:18 romerocesar joined #git
21:18 mdw joined #git
21:19 Gitzilla joined #git
21:19 EvilPeng1 joined #git
21:19 kitsu joined #git
21:22 usm4n_ joined #git
21:24 kg6hum joined #git
21:26 boombatower joined #git
21:26 gusnan joined #git
21:27 hahuang65 joined #git
21:27 tvw joined #git
21:28 usm4n joined #git
21:29 herr_barium joined #git
21:30 ochorocho__ joined #git
21:30 mdw joined #git
21:33 preyalone joined #git
21:33 mwhooker joined #git
21:34 _28_ria joined #git
21:34 githogori joined #git
21:35 kab joined #git
21:35 ahmedelgabri joined #git
21:36 livingstn joined #git
21:36 joki joined #git
21:38 kab joined #git
21:38 romerocesar joined #git
21:39 drbean_ joined #git
21:40 MacWinner joined #git
21:40 stantonk joined #git
21:43 jaafar joined #git
21:46 anuxivm joined #git
21:48 Dougie187 left #git
21:50 mwhooker joined #git
21:51 cd-rum joined #git
21:53 kugel left #git
21:54 t0by joined #git
21:56 t0by joined #git
21:56 xall_ joined #git
22:00 cyphase joined #git
22:02 rcollier joined #git
22:04 xall_ joined #git
22:05 blackwind_123 joined #git
22:06 dunpeal joined #git
22:09 andlabs joined #git
22:09 romerocesar joined #git
22:10 joki joined #git
22:11 nettoweb joined #git
22:11 f3r70rr35f joined #git
22:13 lugzer joined #git
22:14 k3rn31 joined #git
22:15 wp joined #git
22:15 Goplat joined #git
22:17 stantonk joined #git
22:19 Noldorin joined #git
22:19 mingrammer joined #git
22:19 romerocesar joined #git
22:19 apotry joined #git
22:20 jstein_ joined #git
22:21 jaguarmagenta joined #git
22:23 SourTrout joined #git
22:23 wodim I pushed a new branch to a remote, now I'm doing "git pull" from another machine but the new branch does not appear... how do I make it appear???
22:23 eijk joined #git
22:24 wodim ah found out, sorry
22:24 rpd wodim: git fetch
22:25 mdw joined #git
22:25 dudbx joined #git
22:25 invisbl joined #git
22:27 HoierM joined #git
22:28 go1111111 joined #git
22:28 inflames joined #git
22:29 ceaucari joined #git
22:30 ramsub07 joined #git
22:33 danslo_ joined #git
22:35 krstf joined #git
22:37 dstarh joined #git
22:38 netcarver joined #git
22:39 drbean joined #git
22:41 joki joined #git
22:41 ochorocho__ joined #git
22:41 drbean- joined #git
22:44 Faylite joined #git
22:46 netj joined #git
22:47 azbarcea joined #git
22:48 aca20031 Any chance I found a bug in git? I'm on 2.9.2.windows.1 and pushing to a repo hosted on a windows file share. It works, but every time it hangs on Total X (delta Y), reused Z (delta Z2)
22:48 aca20031 If i ctrl+c after waiting "long enough" it's fine, but it never returns on its own
22:49 romerocesar joined #git
22:51 joki joined #git
22:52 f3r70rr35f joined #git
22:55 drbean joined #git
22:55 stantonk joined #git
22:57 jyjon joined #git
23:05 akiva joined #git
23:06 jaguarmagenta joined #git
23:08 andypea joined #git
23:08 lugzer joined #git
23:09 jaguarmagenta joined #git
23:11 cd-rum_ joined #git
23:13 mehola joined #git
23:13 mingrammer joined #git
23:15 drbean joined #git
23:17 jaguarmagenta joined #git
23:19 Lynxium joined #git
23:20 lugzer joined #git
23:22 FuzzySockets joined #git
23:22 jaguarmagenta joined #git
23:22 cyphase joined #git
23:23 GavinMagnus left #git
23:25 nettoweb hey guys, the GPG signing is required to get commits signed? or Im asking to do this because Im missing some git config?
23:26 drbean_ joined #git
23:26 osse nettoweb: GPG signing is the only kind of signing possible
23:26 osse Unless you mean adding the 'Signed-off-by:' line at the end
23:27 nettoweb osse hmm, ok. so its something new? cause I start to see this alert this week
23:27 osse what alert?
23:28 nettoweb osse in fact was an error, preventing me from push, and so I generate my gpg
23:29 Lynxium[] joined #git
23:31 tjone270_ joined #git
23:32 nettoweb osse anyway, this is really something I should do, right? I mean, upload my gpg to my github account
23:32 Lynxium joined #git
23:32 osse you don't have to sign commits if you don't want to
23:34 sangy joined #git
23:35 srcerer joined #git
23:37 Aiille joined #git
23:38 drbean joined #git
23:38 nettoweb osse ok, but it's good to verify, right?
23:39 nettoweb anyway, thnks
23:39 kbs nettoweb: is your remote repo on github? (but surprised/curious if github offers a way to prevent unsigned commits, as iirc it doesn't support server side hooks)
23:40 nettoweb kbs github accept unsigned commit, in fact event the github for desktop (mac) doesnt support gpg yet
23:40 kbs right
23:41 Aiille left #git
23:41 drbean- joined #git
23:42 Lynxium joined #git
23:42 kbs fwiw, no harm signing each commit, some people prefer to just use signed tags and forget about github's strictly cosmetic idea of linking user profiles to (basically zero-provenance) usernames in commits.
23:43 * kbs has sort of gone back and forth on this, and come to the conclusion that it's least complicated to just use github as a public git repo and ignore the UI
23:44 mwhooker joined #git
23:44 nettoweb kbs thanks
23:44 RustyShackleford joined #git
23:44 RustyShackleford I am failing at git lol
23:45 RustyShackleford so I was working on another computer, pushed my changes to remote
23:45 RustyShackleford now on this computer I have a clean directory (no pending changes). Why does a git pull require me to merge?
23:46 mellernoia joined #git
23:46 RustyShackleford oh I just remembered. I did a git push --force
23:46 MZAWeb joined #git
23:49 Lynxium joined #git
23:49 SourTrout joined #git
23:49 RustyShackleford so I figured it out. Anyway, there seems to be some debate with git push --force. Do you think its a bad practice to do on your feature branch?
23:50 drewo joined #git
23:50 MattMaker joined #git
23:50 Noldorin joined #git
23:51 kbs to the extent that everyone who's been commit'ing off that branch will need to merge/etc the same way you just did, I guess
23:53 rpd RustyShackleford: on a feature branch, probably not. But maybe that's because I like to cherry-pick everything to master from a feature branch and brutally murder off feature branches very often
23:53 pioiytr__ joined #git
23:54 rpd Also, can't you avoid the merge (even with  --force) if you use git pull --rebase?
23:54 RustyShackleford maybe. I'll have to try
23:54 tachoknight__ joined #git
23:55 RustyShackleford I used git reset origin/featurebranch --hard
23:55 RustyShackleford well first git fetch
23:55 stantonk joined #git
23:55 rpd I mean, sounds like you manually rebased anyways, I guess
23:56 drbean joined #git
23:56 RustyShackleford i'm confused. I did a rebase of master and force pushed earlier
23:56 RustyShackleford then the git reset just now
23:56 RustyShackleford I've used git for like 4 years. Only now am I using it in a team environment and I feel like a noob lol
23:57 jyjon joined #git
23:58 pioiytr__ joined #git
23:59 kbs desirability of messing with a remote ref proportional to (# in team using that ref)*(average comfort level with git) :)
23:59 RustyShackleford everyone is new to git

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