Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-13

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

All times shown according to UTC.

Time Nick Message
00:00 jokajak joined #git
00:03 rubyonrailed joined #git
00:07 cuebix-wk joined #git
00:11 MattMaker joined #git
00:13 durham joined #git
00:14 fstd_ joined #git
00:15 HoierM_ joined #git
00:15 tristanp joined #git
00:15 Literphor joined #git
00:17 dreamseeker joined #git
00:21 CSWookie joined #git
00:24 cd-rum joined #git
00:27 Kaisyu joined #git
00:28 refried_ joined #git
00:30 MattMaker joined #git
00:30 Literphor joined #git
00:31 mischat_ joined #git
00:32 cd-rum joined #git
00:34 durham joined #git
00:36 rubyonrailed joined #git
00:38 elementalest joined #git
00:39 jstimm_ joined #git
00:39 Vinnie_win_j joined #git
00:46 espindola joined #git
00:47 cqi joined #git
00:49 laxen joined #git
00:50 espindola joined #git
00:54 MattMaker joined #git
00:58 romerocesar joined #git
00:58 justanotheruser joined #git
01:03 rbern joined #git
01:04 thiago joined #git
01:04 dsantiago joined #git
01:05 liuzhen joined #git
01:12 refried_ joined #git
01:13 Literphor joined #git
01:16 glebihan__ joined #git
01:18 texinwien joined #git
01:19 pks joined #git
01:20 BombStrike joined #git
01:22 drodger joined #git
01:25 NeverDie joined #git
01:25 Literphor joined #git
01:26 NeverDie joined #git
01:28 romerocesar joined #git
01:29 Rodya_ joined #git
01:31 AndroidLoverInSF joined #git
01:32 harish joined #git
01:33 Lotlot joined #git
01:38 miesco left #git
01:38 f3r70rr35f joined #git
01:39 BlackPanx joined #git
01:39 l4v2 joined #git
01:45 jakesyl_mobile joined #git
01:45 AndroidLoverInSF joined #git
01:46 tristanp joined #git
01:46 acetakwas joined #git
01:46 paragon joined #git
01:47 durham_ joined #git
01:50 Dougie187 joined #git
01:51 Rodya_ joined #git
01:51 madprocess joined #git
01:53 pejerrey6 joined #git
01:54 david007 joined #git
01:59 Atrumx joined #git
02:01 Sasazuka joined #git
02:02 AndroidLoverInSF joined #git
02:02 Goplat joined #git
02:05 AndroidLoverInSF joined #git
02:06 AndroidLoverInSF joined #git
02:06 djapo joined #git
02:09 tilerendering_ joined #git
02:10 pejerrey6 joined #git
02:10 a_thakur joined #git
02:10 pejerrey6 Uh, I'm not sure if this is the proper way to ask, but can someone give me a hand with an issue I'm having?
02:11 patarr joined #git
02:11 koro I think the proper way to ask is asking...
02:14 pejerrey6 Uh, right. So, basically, I made a repository on Github from my laptop. Then, I went to my PC, cloned it with the HTTPS protocol, commited something and tried to push, but it didn't work.
02:14 pejerrey6 Before even asking for my username and password, the terminal returned "Permission to Pejerrey/repo.git denied to Coronato"
02:14 pejerrey6 So, Pejerrey is my Github user, Coronato is my Gitlab user.
02:15 stonerfish joined #git
02:15 hahuang61 joined #git
02:15 pejerrey6 In the gitconfig my name and email is correct.
02:16 pejerrey6 So where's git getting that I'm "Coronato" when I push? Where's that being stored?
02:17 GT4066 joined #git
02:21 hexagoxel joined #git
02:22 acetakwas joined #git
02:26 Literphor joined #git
02:27 nnyk_ joined #git
02:31 ajf- joined #git
02:34 darkbit joined #git
02:35 sangy joined #git
02:36 nnyk joined #git
02:38 blahdodo joined #git
02:42 ahr3n_ joined #git
02:46 mwleeds joined #git
02:46 stan_man_can joined #git
02:47 stan_man_can so I have 3 branches, master, staging, and dev
02:47 stan_man_can if I do some stuff in dev and commit it, how do I then migrate that code into staging, and then master?
02:48 stan_man_can git checkout staging; git merge dev?
02:50 espindola joined #git
02:50 tgunr joined #git
02:55 cozmo joined #git
02:55 eizua joined #git
02:58 nnyk joined #git
02:58 mwhooker joined #git
02:59 a_thakur joined #git
02:59 Literphor joined #git
02:59 Lotlot joined #git
02:59 chachasmooth joined #git
03:00 Dougie187 left #git
03:00 xall joined #git
03:05 tristanp joined #git
03:05 livingstn joined #git
03:09 zacts joined #git
03:09 sagerdearia joined #git
03:14 drodger joined #git
03:17 hahuang61 joined #git
03:17 treaki__ joined #git
03:18 cozmo left #git
03:18 boombatower joined #git
03:21 Sucks joined #git
03:24 rubyonrailed joined #git
03:25 Literphor joined #git
03:33 diogenese joined #git
03:34 a_thakur joined #git
03:34 Phrohdoh joined #git
03:34 Garen joined #git
03:35 Phrohdoh Is there a non-interactive flag for `commit --amend`? Most of the time when I amend I want the exact same commit message so it is just an extra step to :x out of vim.
03:35 patarr joined #git
03:36 DarkoEyes joined #git
03:36 a_thakur_ joined #git
03:36 a_thakur joined #git
03:36 jokajak joined #git
03:38 Sucks joined #git
03:38 a_thakur_ joined #git
03:39 shgysk8zer0_ joined #git
03:42 Sucks joined #git
03:42 rubyonra_ joined #git
03:43 jokajak joined #git
03:43 zacts joined #git
03:44 phanimahesh joined #git
03:46 Darren_ joined #git
03:47 Sucks joined #git
03:47 jokajak joined #git
03:50 shgysk8zer0_ joined #git
03:50 jeus2 joined #git
03:52 jokajak joined #git
03:55 drodger joined #git
03:56 hk238 joined #git
04:03 zivester joined #git
04:04 jokajak joined #git
04:05 a_thakur joined #git
04:06 espindola joined #git
04:06 tristanp joined #git
04:06 _ikke_ phanimahesh: -CHEAD
04:07 phanimahesh _ikke_: ?
04:08 Phrohdoh Is there a non-interactive flag for `commit --amend`? Most of the time when I amend I want the exact same commit message so it is just an extra step to :x out of vim.
04:09 jab416171 joined #git
04:12 azbarcea joined #git
04:12 MTecknology joined #git
04:14 MTecknology Is it possible to squash multiple commits in a local repo into one? Like, let's say I have commit 1 -> 10 and I want to turn 7-9 into just a single commit
04:14 Phrohdoh rebase
04:14 dsantiago joined #git
04:14 MTecknology a script went a little broken and created a bunch of commits that no longer make sense..
04:15 MTecknology git rebase <commit_I'm_going_back_to>^   correct?
04:16 SwiftMatt joined #git
04:16 shgysk8zer0 joined #git
04:16 t2mkn joined #git
04:16 xall joined #git
04:18 hahuang61 joined #git
04:18 Phrohdoh MTecknology: try it, looks sane to me
04:19 Phrohdoh since you want to rebase onto the parent commit, yeah
04:19 Phrohdoh (you'll want squash or fixup once you're in the rebase)
04:19 Phrohdoh git rebase -i ...
04:19 Phrohdoh (interactive)
04:20 mwhooker joined #git
04:20 watabou joined #git
04:21 mwhooker joined #git
04:21 MTecknology ah, crap... I'm just gonna leave it. This is gonna break other crap (probably)
04:22 Phrohdoh rebase is tricky but it is a great part of git imo
04:22 stantonk joined #git
04:22 MTecknology maybe not that bad... hmmmmm
04:22 MTecknology the problem is I already have a tag up top, so I'd probably be best deleting the tag and adding it when I'm don.
04:23 MTecknology Everything is local so I have the chance to clean it up... but I'm ready to push it public
04:25 Zamerick_ joined #git
04:29 orbitphreak joined #git
04:30 ajf- if I do git checkout -p -- .
04:30 ajf- will that give me a super duper interactive way to trash modifications ?
04:31 MTecknology Phrohdoh: could you help me out? The one I'm going back to, is that the one I want to modify or the one I'm creating a modification on top of?
04:32 MTecknology ex: I'm happy with fdefe77, and a37a141 is the one I want to merge with head;  which do I rebase -i <xyz>^ to?
04:33 _ikke_ phanimahesh: sorry, that was for Phrohdoh
04:34 _ikke_ Phrohdoh: git commit --amend -CHEAD will reuse the commit message of head (and don't spawn an editor)
04:34 Phrohdoh _ikke_: nice, thanks
04:34 Phrohdoh git rebase -i fdefe77
04:34 Phrohdoh rebase onto fdefe77 is what that will do
04:35 Phrohdoh meaning your current commit and fdefe77 will survive (granted you don't squash into dfefe77)
04:35 MTecknology It just launched into a scary todo list
04:35 Sasazuka joined #git
04:35 Phrohdoh that is the interactive part
04:35 MTecknology http://dpaste.com/05HC4WR
04:35 _ikke_ MTecknology: change pick to squash for every commit you want to squash up
04:36 _ikke_ huh, why are some commented out?
04:36 MTecknology ooooh, shiny
04:36 _ikke_ ah
04:36 _ikke_ "# note that empty commits are commented out"
04:37 _ikke_ So those can be dropped anyway
04:38 _ikke_ MTecknology: Do you want to squash the 2nd commit into the first?
04:39 MTecknology nope, I want a5edebb through 9358964 to not exist
04:39 rewt squash them all
04:39 _ikke_ No need to squash them
04:39 _ikke_ They bring no changes
04:39 MTecknology I tried squash and just leaving them commented - http://dpaste.com/2PZQ9BJ
04:40 rewt ah yeah, commented out = removed = lost, so same diff since they're empty
04:40 _ikke_ MTecknology: Just exit would be enough
04:40 MTecknology I did :x
04:40 _ikke_ MTecknology: because they're commented out, those commits would be dropped
04:40 pioiytr joined #git
04:40 MTecknology right, whether I do that OR squash, I get that same error
04:41 rewt the error is on the first one, before it even gets to those
04:41 mehola joined #git
04:41 _ikke_ yes
04:41 _ikke_ which would imply it is being rebased on a different commit
04:41 _ikke_ git rebase --abort
04:41 MTecknology done
04:41 _ikke_ git rebase -i 18a6cbc~
04:42 MTecknology ah, shit... I lost other commits I need - give me a minute to unbreak and then I'll also get a git log to share
04:42 Phrohdoh reflog
04:43 Cabanossi joined #git
04:43 rubyonrailed joined #git
04:44 _ikke_ MTecknology: These commits, are they merges?
04:45 Phrohdoh left #git
04:47 MTecknology nope
04:47 MTecknology a failed import of an upstream tarball
04:47 nilg joined #git
04:50 ahr3n joined #git
04:51 _ikke_ ok
04:54 jokajak joined #git
04:55 ShekharReddy joined #git
04:55 freimatz joined #git
05:00 _ikke_ I would not expect any merge conflicts with a non-moving interactive rebase (and no reordering)
05:00 MTecknology WOOHOO!!!!
05:01 _ikke_ worked?
05:01 MTecknology yup
05:01 MTecknology now... to figure out how I'm going to clobber the existing git repo on debian servers...
05:03 freimatz joined #git
05:03 pwnz0r joined #git
05:04 ncd|leeN joined #git
05:05 xcesariox joined #git
05:09 jeus2 joined #git
05:10 romerocesar joined #git
05:17 MTecknology WOOOOOOHOOOOOO HOOO HOOOOOOOO!!!!!!!
05:18 subhojit777 joined #git
05:18 hahuang61 joined #git
05:18 MTecknology _ikke_: I'd say this looks purty gosh darned swell! :D :D :D   http://anonscm.debian.org/cgit/collab-maint/tdc.git/
05:19 howdoi joined #git
05:20 _ikke_ Glad we could help :-)
05:21 pwnz0r joined #git
05:21 MTecknology Me too!
05:21 MTecknology _ikke_: Any chance you could help me with one other thing?
05:21 _ikke_ If it's quick
05:21 _ikke_ I have to go very soon
05:22 MTecknology I have the old git repo, I waunt to suck that in as its own branch to just kinda dangle there for historical reference
05:22 MTecknology How can I do that?
05:22 _ikke_ MTecknology: !subtree
05:22 gitinfo MTecknology: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
05:22 open_coder joined #git
05:22 Andrew_K joined #git
05:22 _ikke_ If just as a branch
05:23 _ikke_ then it's just a matter of adding it as a remote and fetching from it
05:23 MTecknology git branch historical; git merge ../old-stuff/ ?
05:24 MTecknology err.. no
05:24 _ikke_ git remote add old_stuff ../old-stuff
05:24 _ikke_ git fetch
05:24 _ikke_ git fetch old_stuff
05:24 _ikke_ g2g now
05:25 darkbit joined #git
05:25 MTecknology but the branch names will be the same, won't they?
05:25 MTecknology okay, thanks
05:29 MTecknology _ikke_: The bitch is that I only care about it because I want the git logs and history still attached to this same repo, but it really has no place there
05:32 ThomasLocke joined #git
05:32 mehola joined #git
05:36 OnBrokenWings joined #git
05:38 gabeio joined #git
05:40 maroloccio joined #git
05:42 maroloccio i am in commit id1, detached head. i want to get the files from id7 (ahead of me) and check them out in the current detached head state, to apply them at this point in time (id1) and get a new (id2). i can see the diff with git diff id7 and i know how to use rebase interactive.. but can i do this with a single command? get the stuff from id7 HERE and now?
05:45 maroloccio ah... it's the startpoint arg of checkout. never used it before. that right?
05:45 tristanp joined #git
05:46 romerocesar joined #git
05:48 OnBrokenWings joined #git
05:48 maroloccio no, actually. that's wrong. :( help
05:49 ajf- joined #git
05:53 Alienpruts joined #git
05:54 xall i pushed a commit then needed to do an ammend commit to fix something. whats the best way to fix the remote now?
05:55 Macaveli joined #git
05:55 pioiytr joined #git
05:55 mariuscc joined #git
05:56 maroloccio git push --force if nobody has got that commit
05:56 maroloccio "fix" = overwrite?
05:56 maroloccio if somebody got that commit.. git amend
05:57 maroloccio xall: read https://www.atlassian.com/git/tutorials/rewriting-history/
05:58 qt-x joined #git
05:58 zeroed joined #git
05:58 JanC_ joined #git
05:59 _ikke_ MTecknology: As long as you don't merge anything, they stay separated
06:00 xlegoman joined #git
06:00 ajf- joined #git
06:01 satya4ever joined #git
06:01 gabeio joined #git
06:03 TomyLobo joined #git
06:04 maroloccio _ikke_: do you know from c1 how do i get a patch generated that brings me all the way to c99? git diff shows the patch but i dont seem to be able to save it and git apply it.. :(
06:04 maroloccio specifically.. because a patch, the way i do it, assumes it changes files.. does not create the files if missing?
06:05 usm4n joined #git
06:07 espindola joined #git
06:07 freimatz joined #git
06:08 rscata joined #git
06:08 D[4]ni joined #git
06:10 sobersabre_ joined #git
06:10 romerocesar_ joined #git
06:10 go1111111 joined #git
06:11 cqi joined #git
06:12 Sucks joined #git
06:12 Oebele joined #git
06:13 lindenle joined #git
06:14 stan_man_can left #git
06:15 usm4n_ joined #git
06:16 texinwien joined #git
06:16 vuoto joined #git
06:17 sobersabre_ joined #git
06:18 jatin30 joined #git
06:18 jatin30 why is it that sometimes when I do "git fetch" it returns noting
06:18 jatin30 *nothing
06:18 MrMojito joined #git
06:19 jatin30 when I am doing git fetch after a day and there sure have been changes for which I need to sync my repo
06:19 circ-user-JW25t joined #git
06:19 pioiytr joined #git
06:19 freimatz_ joined #git
06:20 thiago jatin30: because there's nothing to be done
06:20 jatin30 coz yesterday I did "git fetch" and it did nothing
06:20 jatin30 and when I did "git fetch origin" it actually fetched
06:21 maroloccio thiago: do you know how i can generate/apply a patch that brings me from commit1 to commit 99 in one go!
06:21 nilg joined #git
06:22 EvilPeng1 joined #git
06:22 thiago jatin30: still, there was nothing to be done
06:22 thiago the issue being that the remote that it fetched had nothing to be fetched
06:22 thiago but that remote wasn't origin
06:22 lordjancso joined #git
06:22 thiago maroloccio: git format-patch and git am
06:23 maroloccio git am?
06:23 themayor joined #git
06:24 usm4n joined #git
06:24 thiago maroloccio: yes
06:25 maroloccio can you give 2 sample invocations please
06:25 thiago for git am?
06:25 thiago no, just one: git am mailboxfile
06:26 nilg joined #git
06:27 JeroenT joined #git
06:32 aidalgol joined #git
06:36 zacts joined #git
06:37 acetakwas joined #git
06:38 Alienpruts joined #git
06:38 NeverDie joined #git
06:41 Ratler joined #git
06:41 dminca joined #git
06:41 rchavik joined #git
06:42 DieguezZ joined #git
06:43 nilg joined #git
06:45 xall joined #git
06:45 romerocesar joined #git
06:45 digidog joined #git
06:48 saedelaere joined #git
06:49 mwhooker joined #git
06:49 EvilPenguin joined #git
06:52 diprotic joined #git
06:52 diprotic joined #git
06:52 ajf- joined #git
06:55 Dazzyo joined #git
06:56 romerocesar_ joined #git
06:57 texinwien joined #git
07:00 jatin30 any help with this? https://bpaste.net/show/44ebe56769fe I have a local branch "vim_features" for which I want to make a remote tracking branch "origin/vim_features" . Its giving this error . any help?
07:04 sanketdg joined #git
07:05 drodger joined #git
07:05 jknetl joined #git
07:11 peepsalot joined #git
07:14 jokajak joined #git
07:15 romerocesar joined #git
07:18 AndroidLoverInSF joined #git
07:18 tristanp joined #git
07:19 freimatz joined #git
07:20 hahuang61 joined #git
07:21 Repox joined #git
07:22 TomyWork joined #git
07:22 sweatsuit joined #git
07:24 stantonk joined #git
07:24 zeroed joined #git
07:24 AndroidLoverInSF joined #git
07:25 FunkyAss joined #git
07:25 Balliad joined #git
07:27 _ikke_ Manually creating a remote tracking branch does not make sense, why do you want/need that?
07:28 jknetl joined #git
07:29 DevAntoine joined #git
07:29 Softeisbieger joined #git
07:29 jatin30 its alright I pushed my local branch which made the remote tracking branch! Thanks anyways
07:29 DarkoEyes joined #git
07:31 tristanp joined #git
07:31 _ikke_ yes, that's how it's normally done
07:31 OnBrokenWings joined #git
07:32 Hounddog joined #git
07:36 Markus23 joined #git
07:39 texinwien joined #git
07:40 irco joined #git
07:41 raven-au joined #git
07:41 OnBrokenWings joined #git
07:41 darkbit joined #git
07:44 encod3 joined #git
07:45 romerocesar joined #git
07:48 fees joined #git
07:49 davisonio joined #git
07:50 multi_io joined #git
07:51 FunkyAss joined #git
07:53 PCatinean joined #git
07:54 muelli joined #git
07:55 usm4n_ joined #git
07:59 madduck joined #git
07:59 kurkale6ka joined #git
08:01 Repox joined #git
08:01 JeroenT joined #git
08:05 cdown joined #git
08:05 Markus23 Dear FOSS developers! Please fully fill out our survey at http://elektra.limequery.org/625192 and a donation will go to FOSS projects. The survey is carefully crafted and helps research! Thank you! If you have any questions you can ask me.
08:06 clmsy joined #git
08:06 texinwien_ joined #git
08:07 armyriad joined #git
08:07 espindola joined #git
08:11 goTAN joined #git
08:12 zeroed joined #git
08:12 Macaveli joined #git
08:13 GavinMagnus joined #git
08:14 cyan__ joined #git
08:15 bongjovi joined #git
08:16 romerocesar joined #git
08:17 GavinMagnus left #git
08:18 pioiytr_ joined #git
08:21 hahuang61 joined #git
08:23 DevAntoine joined #git
08:24 a_thakur joined #git
08:28 auzty joined #git
08:29 armyriad joined #git
08:30 Beams joined #git
08:30 matleh joined #git
08:30 digidog joined #git
08:32 maroloccio i still dont get it. how can i create a patch to get me from commit1 on branch1 all the way to commit2 on branch2 in one step?
08:34 jknetl joined #git
08:36 mycyber joined #git
08:36 romerocesar joined #git
08:42 patarr joined #git
08:43 DX2 joined #git
08:43 Mo joined #git
08:45 pneuma since both commits are just objects to git, git just does the diff... it doesn't have to crawl up and down the branches
08:45 Mo Hi, I try getting git over the proxy, but it doesn't accept the git port for git://. So how can I tell git to only use http links? I found something like sed -ri 's|(url = )git://|\1http://|'   in the .gitconfig. Does that work like this as a workaround, at least for github that always has a http mirror? But there is the global config located? I only find ~root/.gitconfig
08:46 chll_ joined #git
08:46 auzty can i prevent 1 file on my repository become read only? or just me can edit it ???
08:46 i7c No.
08:46 romerocesar joined #git
08:47 auzty ok thanks, i just had a situation that i need add deploy configuration on root of my repository, and i get that question :D
08:48 hck89 joined #git
08:48 knittl this is weird. I'm trying to merge a branch (git-svn branch) into a normal git branch. A file only changed on the svn side is getting conflicts. how is this possible?
08:48 i7c auzty, there's additional software that can prevent pushs or so, but you cannot protect single files, afaik.
08:49 knittl the only change is the previous merge, maybe that merge is f*** up
08:50 MrWoohoo joined #git
08:50 auzty i think that maybe after i push it, and add it to .gitignore file, so the configuration file didn't get cloned, but the .gitignore file also editable, so it will be useless, btw thanks for the answer i7c :D
08:53 Mo Ok, I found   git config --system url.https://github.com/.insteadOf git://github.com/   Any way to do that for all URLs?
08:54 texinwien_ joined #git
08:54 i7c auzty, it's probably possible to build something with hooks that prevents you from changing a specific file.
08:54 nnyk joined #git
08:56 auzty yes i7c , i try to implement drone.io :D but drone.io need add .drone.yml to root repository to deploy it (if im not wrong) >.<
08:56 mkopriva joined #git
08:57 courrier joined #git
09:01 mycyber joined #git
09:03 Zamerick_ joined #git
09:04 tvw joined #git
09:04 tristanp joined #git
09:05 kedare joined #git
09:08 PinkPonyOfDeath joined #git
09:13 nilg joined #git
09:14 DieguezZ joined #git
09:16 PinkPonyOfDeath hey, i created a git repo and two branches (develpment and testing). i also added a .gitignore, but realized that it does not effect files that are already tracked. so i did "git rm -r --cached ." and "git add .". i did this while i was on the development branch and think this was not the smartest of ideas, since when i try to checkout any other branch git wants to remove the untracked files from the directory ("error: The following untrac
09:16 romerocesar joined #git
09:17 PinkPonyOfDeath how could i fix this?
09:17 muelli joined #git
09:18 GavinMagnus joined #git
09:19 Narwhaal joined #git
09:22 hahuang61 joined #git
09:22 BW^- joined #git
09:22 BW^- is kdiff3 your favourite graphical DIFF tool ever, or do you like any other one even more?
09:24 xcesariox joined #git
09:24 BW^- is kdiff3 your favourite graphical DIFF tool ever, or do you like any other one even more?
09:25 Silenced_v2 joined #git
09:25 Silenced_v2 joined #git
09:25 jantje is there an easy way to exclude a file from git-diff ? (say, I did a git rm $file with some other modifications and then I want a git diff HEAD , but I don't want to include that file (but I do want any other removed files, so can't use --diff-filter)
09:26 mischat joined #git
09:27 moritz jantje: not easy, but you could limit the diff to a list of paths, and generate that list using git diff --name-only | grep -v fileyouwanttoavoid
09:28 jantje that kinda sucks :-)
09:32 nnyk joined #git
09:34 jantje moritz: but thanks any way1
09:34 jantje !
09:35 liamonade joined #git
09:38 mdw joined #git
09:38 sostenuto joined #git
09:39 jeus2 joined #git
09:39 troyt joined #git
09:40 bumpy joined #git
09:40 cdown joined #git
09:41 SimonNa joined #git
09:41 basiclaser joined #git
09:41 acetakwas joined #git
09:42 alexsystemf__ joined #git
09:44 iota_pi joined #git
09:50 jeus2 joined #git
09:57 Lvjasha joined #git
10:01 moriko joined #git
10:04 bouncy joined #git
10:05 aidalgol joined #git
10:05 Silenced_v2 joined #git
10:05 Silenced_v2 joined #git
10:08 espindola joined #git
10:11 Asenar joined #git
10:11 jknetl joined #git
10:12 Quaternion1 joined #git
10:13 Quaternion1 left #git
10:14 Chiko joined #git
10:14 dsdeiz joined #git
10:15 bumpy joined #git
10:18 shiriru joined #git
10:18 katherine joined #git
10:20 Repox joined #git
10:23 _ikke_ jantje: :!path should work
10:23 hahuang61 joined #git
10:23 _ikke_ jantje: see man gitglossary pathspec
10:23 gitinfo jantje: the gitglossary manpage is available at http://jk.gs/gitglossary.html
10:24 JeroenT joined #git
10:25 johnny56 joined #git
10:27 moop joined #git
10:27 moriko joined #git
10:28 a_thakur joined #git
10:30 abs25 joined #git
10:31 abs25 guys, I am doing --no-ff merge, and I get that commit message open in my default editor, the question is: can I skip that message edit, and just have it merge and create a commit with default message?
10:31 abs25 its comapny policy for git to always use --no-ff, and I am scripting my deployment scripts, but this things blocks the script for being fully automatic
10:32 i7c A quick gaze in the manpage would have answered that.
10:33 i7c You can use -m or --no-edit.
10:33 i7c !man git-merge
10:33 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
10:33 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
10:36 ArchNoob joined #git
10:40 tristanp joined #git
10:51 armyriad joined #git
10:54 JeroenT joined #git
10:57 sdothum joined #git
10:58 fuchstronaut joined #git
10:59 pioiytr_ joined #git
11:00 gusnan joined #git
11:04 jantje _ikke_: thanks, that is exactly what I needed !
11:05 bruce_lee joined #git
11:05 bruce_lee joined #git
11:05 abs25 i7c: thanks !
11:07 moriko joined #git
11:08 Darcidride joined #git
11:08 armyriad joined #git
11:09 espindola joined #git
11:13 jbitdrop joined #git
11:14 jbitdrop joined #git
11:14 acetakwas joined #git
11:15 noteness joined #git
11:15 sulky_ joined #git
11:16 ojdo joined #git
11:16 armyriad joined #git
11:17 ariath joined #git
11:17 romerocesar joined #git
11:18 TomyWork git commit -c $commit gives me the message of the commit $commit, which is useful. However, it also sets the commit's author date to the same as the referenced commit. Is there a flag that only takes the message?
11:22 skasturi joined #git
11:26 ariath joined #git
11:27 ariath left #git
11:27 ison__ joined #git
11:27 ison__ Hello. Can I get get with tortoise git here too?
11:28 jhass you can try, if you're lucky it's not actually specific to it or somebody might know
11:29 eijk joined #git
11:30 drodger joined #git
11:31 Vinnie_win joined #git
11:31 ison__ I have 2 problems with tortoise git: 1) Sometimes, when I try to merge a branch tortoise git says that there are conflicts and I should resolve them, but then when I open a file with a conflict, there are no conflicts at all. The worst thing is that if it happens, the commit dialog is a normal commit dialog instead of the merge commit dialog, which means that if I commit changes, its as if it was a normal commit and not a merge. Is it a
11:32 a_thakur joined #git
11:32 ison__ 2) It seems that tortoise git can't handle reverting renaming. I'm getting a "could not find file" errors while trying to revert. Is there any other way to revert?
11:32 bremner use the CLI
11:32 bremner (for 2)
11:33 ison__ bremner: I'm not familiar with the commands. Is it as simple as git revert?
11:33 bremner pretty much
11:33 ison__ So I guess it means that I should read a 100 pages long readme?
11:33 bremner I doubt that man git revert is 100 pages
11:33 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
11:34 bremner you should look at the examples in the man page, and if they don't make sense, ask questions.
11:34 mycyber joined #git
11:35 bremner basically "git revert <commit-specifier>", where the simplest <commit-specifier> is a hash you get from "git log"
11:35 ison__ I'm not sure git revert does the same thing as "revert" in tortoise git. The changes has NOT been commited yet, they are in my working directory.
11:35 ison__ So I don't want to revert a commit.
11:35 * bremner shivers
11:36 ison__ bremner: tried it, but got error: Your local changes would be overwritten by revert. hint: Commit your changes or stash them to proceed. fatal: revert failed
11:36 ToBeCloud joined #git
11:36 armyriad joined #git
11:36 bremner right, because tortoise git is using different terminalogy, just to piss me off.
11:37 bremner !revert
11:37 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]?
11:37 bremner see ^b
11:37 rnsanchez joined #git
11:37 ison__ git reset seems like what I need, but I'm afraid it will delete ignored files (like binaries in my working directory)
11:37 bremner ison__: note that there is no "undo" for git reset --hard
11:38 bremner git reset won't touch untracked files.
11:39 bremner ison__: you probably want to run "git status" before running git reset
11:39 johnmilton joined #git
11:40 ison__ git status are the changes I've made in my working directory?
11:40 bremner yes
11:40 ison__ git reset --hard worked, thank you so much
11:40 bremner welcome.
11:41 PCatinean joined #git
11:48 jimi_ joined #git
11:48 romerocesar joined #git
11:48 ison__ bremner: one more question, I tried to run "git merge myOtherBranch" and got this error: "fatal: git write-tree failed to write a tree", I'm using CLI. What could be wrong?
11:49 cqi joined #git
11:49 bremner hmm. not sure, maybe somebody else knows. The obvious thing to check would be disk space.
11:50 ison__ I have 400 GB free
11:50 bremner or permissions, I guess
11:50 Codfection joined #git
11:51 courrier joined #git
11:53 CheckDavid joined #git
11:57 synthroid joined #git
11:58 romerocesar joined #git
11:58 Alienpruts joined #git
11:59 jakesyl_mobile joined #git
12:01 ome joined #git
12:02 tomog999_ joined #git
12:04 espindola joined #git
12:04 liquidjamm joined #git
12:05 crankharder is there a way to cherry pick the top commit on my branch back to master without checking out master first?
12:05 ome_ joined #git
12:05 cdown joined #git
12:05 tristanp joined #git
12:07 eijk joined #git
12:07 Rodya_ joined #git
12:09 flaguy48 left #git
12:10 ison__ Could anyone explain to me how "merge" works in git? I just merged another branch, and all I got was some changes in my working directory, but "git log" still shows only my commits, and none of the commits I merged. It's as if I made the changes myself instead of merging another branch. What do I do wrong?
12:11 dcpc007 left #git
12:12 ison__ I think it's because my git treats my "git merge branch" and if I wrote "git merge branch --squash"
12:13 unforgiven512 joined #git
12:14 unforgiven512 joined #git
12:14 unforgiven512 joined #git
12:15 ison__ ok, I used --no-comit and it seems to work, finally
12:15 ison__ it's still a black magic to me though
12:15 unforgiven512 joined #git
12:15 JeroenT joined #git
12:16 unforgiven512 joined #git
12:16 unforgiven512 joined #git
12:17 unforgiven512 joined #git
12:17 unforgiven512 joined #git
12:17 azbarcea joined #git
12:18 unforgiven512 joined #git
12:18 romerocesar joined #git
12:19 alcohol ison__: it's hard to comment without knowing more specifics
12:22 UTAN_dev joined #git
12:23 rwb joined #git
12:26 dcpc007 joined #git
12:27 Rynomster joined #git
12:27 Rynomster joined #git
12:28 stantonk joined #git
12:29 tango_ g23
12:29 tango_ g23
12:29 tango_ wut
12:29 tango_ oh
12:33 sangy joined #git
12:35 zivester joined #git
12:35 solars joined #git
12:35 _noblegas joined #git
12:36 solars if I have a branch 'feature' (off 'dev') that contains conflicting changes but is way behind dev, should I use git rebase (then merge) or git merge? I think I once caused all commits to be duplicated when using rebase
12:38 moriko joined #git
12:38 jhass if you only plan to merge and not work further on it before merge, just merge directly
12:38 romerocesar joined #git
12:39 solars jhass, and otherwise? :)
12:39 Silenced_v2 joined #git
12:39 Silenced_v2 joined #git
12:40 eizua joined #git
12:41 jhass well, merging dev back into feature will likely cause less and/or easier to resolve conflicts, otoh many people prefer the "cleaner" history a rebase gives
12:42 jhass ymmv, it's largely personal preference
12:43 solars jhass, I'm just unsure about rebase, I once rebased feature on dev, then had a merge conflict, resolved it - later (as in the normal workflow) merged feature to dev and got duplicated commits
12:43 FunkyAss joined #git
12:44 GavinMagnus joined #git
12:46 liamonade joined #git
12:46 jhass well that can only happen if you choose the wrong rebase base (branch feature onto dev, rebase on new commit on dev, rebase again on dev but on the previous base, for example) or if you rewrote history (a rebase is one form of rewriting history) of dev after you branched feature from it
12:46 fuchstronaut joined #git
12:48 solars I see
12:48 solars I'll try to test that
12:48 solars jhass, thanks
12:50 GavinMagnus left #git
12:51 MadHatter42 joined #git
12:51 maroloccio joined #git
12:52 d1z joined #git
12:55 bumpy joined #git
12:56 JeroenT joined #git
12:56 Silenced_v2 joined #git
12:56 Silenced_v2 joined #git
12:57 circ-user-b0xon joined #git
12:58 romerocesar joined #git
13:02 concerti joined #git
13:04 solars jhass, just one more thing: so I rebased (and merged) feature on dev. feature was already pushed, and now I've got many outgoing changes, but also one incoming change, where does the incoming change come from?
13:05 jhass solars: a rebase is rewriting history
13:05 jhass the local history is now different from the one you pushed
13:06 rgrinberg joined #git
13:06 jhass the "incoming" change is the old commit, the outgoing changes are the new commits from dev _and_ the on top rewritten commit of feature
13:06 solars jhass, ah of course, right
13:06 rgrinberg joined #git
13:07 jhass that's actually another possibility for duplicates there
13:07 jhass you pulling now instead of force pushing
13:07 solars jhass, yeah, if I pull now it'll be a problem
13:07 solars jhass, so if I force push, it'll be okay?
13:07 jhass within the implications that a force push has, yes
13:08 solars you mean that it changes history for otheres
13:08 solars others
13:08 jhass it means others will need to know what they're doing if they have pulled the old version of the branch and maybe even committed on top of it
13:09 PaulCapestany joined #git
13:09 solars yep exactly
13:09 solars alright I understood now, thanks a lot!
13:10 jhass yw
13:12 treaki__ joined #git
13:12 ash_workz joined #git
13:15 DomeMaster joined #git
13:16 treaki__ joined #git
13:17 bsanford joined #git
13:18 johnny56 joined #git
13:18 Viewtiful joined #git
13:18 viewty joined #git
13:19 romerocesar joined #git
13:21 treaki__ joined #git
13:21 Shock- joined #git
13:22 ItSANgo joined #git
13:22 JeroenT joined #git
13:24 ryez joined #git
13:25 treaki__ joined #git
13:26 livingstn joined #git
13:26 rnsanchez_ joined #git
13:27 shinnya joined #git
13:28 go1111111 joined #git
13:29 ses1984 joined #git
13:29 ses1984 hi -- i had a weird idea and was wondering if maybe this was already a thing:
13:30 ses1984 a pattern for embedding more docs in your repo, something resembling a blog
13:30 todd_dsm joined #git
13:30 tristanp joined #git
13:30 notebox joined #git
13:31 ses1984 a piece of documentation that you can stick in your repo, in markdown format, that you could list out in time order, and it works well with web gui browsing
13:32 ses1984 like github has the wiki -- something similar but it's actually checked in to the repo
13:32 _ikke_ You have static blog generators
13:33 grawity git-annex uses the same repo for code and ikiwiki
13:33 grawity it's a bit messy tbh
13:33 ses1984 i can think of a million ways to roll this myself, i was just wondering if this was common enough that there's some people talking about what they did
13:33 grawity (I mean git-annex the code project, not the tool)
13:35 Shock- joined #git
13:35 crose joined #git
13:36 al-damiri joined #git
13:36 uid100101 joined #git
13:38 texinwien_ joined #git
13:39 chachasmooth joined #git
13:40 harish joined #git
13:41 Dougie187 joined #git
13:42 Noldorin joined #git
13:43 l4v2 joined #git
13:43 Lunatrius joined #git
13:44 macivy joined #git
13:44 rubyonrailed joined #git
13:44 happy-dude joined #git
13:46 ash_workz does `git log` show all branches
13:46 ash_workz ?
13:46 GuKKDevel joined #git
13:47 Shock- joined #git
13:48 GuKKDevel left #git
13:48 daniel_rose joined #git
13:49 Lunatrius` joined #git
13:49 ash_workz like, this isn't showing me really accurate information; not sure why exactly
13:50 icedp joined #git
13:50 _ikke_ ash_workz: just `git log` will just show everything reachable from HEAD
13:52 ash_workz I need to resolve when a project started; how do I see commit history on just 1 branch?
13:53 ash_workz _ikke_: ^
13:53 savali joined #git
13:54 _ikke_ Do you know the branch it branched off from?
13:55 RustyShackleford joined #git
13:56 ash_workz yeah
13:56 elsevero joined #git
13:57 ash_workz _ikke_: yeah
13:57 chachasmooth joined #git
13:58 refried_ joined #git
13:59 _ikke_ ash_workz: then git log <base>..<branch>
13:59 romerocesar joined #git
13:59 AaronMT joined #git
13:59 ash_workz ie: `git log master..iss01` ?
14:00 cdg joined #git
14:01 freimatz joined #git
14:01 _ikke_ yes
14:01 ash_workz didn't produce anything
14:02 _ikke_ has iss01 been merged into master?
14:02 ash_workz and branched from it
14:02 ash_workz s/^/yes /
14:03 _ikke_ It looks like all commits from iss01 are reachable from master
14:04 sangy joined #git
14:04 ash_workz I don't know what you're getting at
14:04 madewokherd joined #git
14:06 cdown joined #git
14:07 ash_workz I just don't get these diagrams
14:07 ash_workz I've been pretty good about branching
14:07 _ikke_ What diagrams?
14:07 ash_workz right now I'm looking at gitk
14:07 _ikke_ ok
14:07 ash_workz I was looking at git log --graph earlier
14:07 _ikke_ that would work better with --oneline
14:07 _ikke_ and --decorate
14:08 leeN joined #git
14:08 azbarcea joined #git
14:08 ash_workz _ikke_: I've looked at short, tweaked graphs but the flow doesn't make sense
14:08 ash_workz I just don't understand how this works because I'll just start a project off master and commit to the branch and then when it's ready it gets merged into master
14:09 sanketdg joined #git
14:09 _ikke_ That would look something like this:
14:09 acetakwas joined #git
14:10 toogley joined #git
14:11 _ikke_ .digraph c -> b -> a; f -> e -> d -> a; f -> c; f[xlabel="master"]; e[xlabel="branch"]
14:11 ash_workz I mean, even in gitk I don't understand what branch I'm looking at. it says branches: iss01, iss02, iss03, master, origin/iss01, origin/iss02, origin/iss03, origin/master
14:11 gitinfo .digraph: http://g.jk.gs/xu.png
14:11 BombStrike joined #git
14:12 ash_workz .digraph c -> b -> a; f -> a; f -> c; f[xlabel="master"]; e[xlabel="branch"]
14:12 gitinfo .digraph: http://g.jk.gs/xv.png
14:12 ash_workz more like
14:12 deadnull joined #git
14:12 D-Boy joined #git
14:12 livingstn joined #git
14:13 Viewtifu_ joined #git
14:13 eijk joined #git
14:14 _ikke_ So for git, branches are just labels pointing to commits
14:15 ash_workz yeah
14:16 GodGinrai joined #git
14:17 Tentacled joined #git
14:18 shgysk8zer0 joined #git
14:18 _ikke_ So commits don't 'know' to which branch they belong, they could even belong to (reachable) from multiple branches
14:19 Tentacled Whoa, that's a crowd of you guys here. Hi! So anyway... I have forked a project, made commits, sent a pull request, my changes were modified and included - so I now want to get back in touch with how the master project looks like. So I reverted my changes totally and grabbed the current state of the project. Nice. But now my fork says "4 commits ahead of master". But those commits only make my project 100% identical to its master, how is it ahead??
14:19 i7c "master" probably refers to the remote of your fork?
14:19 lindenle joined #git
14:20 i7c Depends on the upstream.
14:20 david007 joined #git
14:20 GodGinrai Tentacled: because `git-revert` creates commits
14:21 GodGinrai Tentacled: why did you revert your changes in the first place?
14:21 i7c Oh, literally revert with git revert. Didn't think of that. :)
14:21 i7c revert is never unambigious to me.
14:24 drodger joined #git
14:25 osse joined #git
14:25 sdothum joined #git
14:25 ThomasLocke_ joined #git
14:25 SimonNa joined #git
14:26 catag87 joined #git
14:26 Heisenberg1276 joined #git
14:27 phaleth joined #git
14:27 fracting joined #git
14:29 Tentacled GodGinrai: my changes weren't so nicely formatted as the master project needed them, so its owner did some cleaning up when merging the request. Apparently git didn't recognize it as merging my changes, rather as making new ones similar to mine - so I wanted to just acknowledge those and move on.
14:29 notebox joined #git
14:29 tristanp joined #git
14:30 Tentacled Theoretically I could just kill my fork and fork anew, but that seems wasteful.
14:31 GodGinrai Tentacled: well, in that case, a `git-reset` to an old commit, and then a pull would probably have been the cleaner method
14:31 stantonk joined #git
14:31 Tentacled Even though now my files are identical to the HEAD of the master project?
14:31 _ikke_ Tentacled: That's why it's better to make such changes on a branch
14:31 GodGinrai Tentacled: your files are, but your history isn't
14:32 GodGinrai _ikke_: this too
14:32 _ikke_ Tentacled: Once the changes are merged, you can just abandon your branch
14:32 Tentacled _ikke_: that's what I considered wasteful, unless it's normal practice.
14:32 GodGinrai Tentacled: that's normal practice
14:32 _ikke_ Tentacled: It's perfectly normal
14:32 _ikke_ Tentacled: A good way to isolate changes
14:32 xcesariox joined #git
14:32 GodGinrai Tentacled: in a forked project, master is normally a copy of upstream
14:32 GodGinrai Tentacled: and you have branches for changes you would like to make
14:33 Tentacled Ah, therein lies my fault, I was working on master.
14:33 Tentacled my master, that is.
14:33 GodGinrai Yea, in general, you shouldn't ever work on master, even in a non-forked project
14:33 GodGinrai master is where things get merged into
14:34 _ikke_ Basically, upstream 'owns' master
14:34 GodGinrai ^ in a forked scenario, yes.
14:34 Jonv32 joined #git
14:34 _ikke_ Yeah, that was implied :P
14:34 Tentacled So in the future I should be doing what, submitting pull requests from my BRANCH to the upstream project?
14:34 GodGinrai yes
14:34 _ikke_ correct
14:35 GodGinrai Tentacled: branches are cheap in git, so there's no need to worry about using them
14:36 Tentacled Interesting. But, it's for the future. I guess I should just trash my project on GitHub now, seeing as I've made a mess on its master, or..?
14:36 _ikke_ No need to trash it
14:36 _ikke_ Just reset your local master to upstreams, and force push that to your fork
14:37 Tentacled All right, that makes sense, now I'm off to read up on how to go about it. :P
14:37 _ikke_ !fixup
14:37 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
14:37 GodGinrai Tentacled: you can just use git-reset to reset to an old commit before your changes, and then `git pull`
14:39 Bid joined #git
14:40 RustyShackleford joined #git
14:40 jeus2 joined #git
14:41 zivester joined #git
14:45 eivarv joined #git
14:46 eijk joined #git
14:46 ResidentBiscuit joined #git
14:47 RustyShackleford joined #git
14:47 ExoUNX joined #git
14:49 Codfection joined #git
14:49 jeus2 joined #git
14:50 jfran joined #git
14:51 subhojit777 joined #git
14:53 hahuang61 joined #git
14:53 Shock- joined #git
14:53 foist joined #git
14:53 mycyber joined #git
14:57 Macaveli joined #git
14:57 dmto joined #git
14:58 zivester joined #git
15:02 Tim-SEM joined #git
15:04 clemf joined #git
15:09 mikecmpbll joined #git
15:09 Shock- joined #git
15:12 qpdb joined #git
15:12 kaldoran joined #git
15:13 kaldoran joined #git
15:14 mingrammer joined #git
15:14 kaldoran joined #git
15:15 fmcgeough joined #git
15:15 kaldoran joined #git
15:16 Aelius joined #git
15:16 Aelius I created a .gitattributes file and this is it http://sprunge.us/AgBO
15:17 Aelius I keep getting the error "not valid attribute name"
15:19 Ahmed90 joined #git
15:19 canton7 Aelius, did you mean to have two 'clean' lines?
15:19 Aelius canton7: yes
15:20 Aelius I have two lines I want to clean
15:20 emmajane joined #git
15:20 canton7 I can't see anything in man gitattributes which suggests you can have two 'clean' lines
15:20 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
15:20 daniel_rose joined #git
15:20 canton7 also that same man page suggests that you don't need quotes around the command
15:20 mdw joined #git
15:20 InfoTest joined #git
15:21 Gitzilla joined #git
15:22 ejb joined #git
15:22 tyreld joined #git
15:22 NerudaLY joined #git
15:23 GodGinrai yea, the manpage seems to imply there is only one of each the clean and smudge command
15:23 jstimm_ joined #git
15:23 Aelius canton7: OK, I created two filters, one clean per filter. Same error
15:24 Aelius removed the quotes, same error
15:24 canton7 Aelius, can you paste the error in full?
15:24 dabaR joined #git
15:24 Aelius is not a valid attribute name: .gitattributes:4
15:24 Aelius that repeated several times
15:24 canton7 and the full .gitattributes file, since you've modified it, please?
15:25 canton7 (that exact error message is useful, since it gives the line number of the error)
15:25 Aelius http://sprunge.us/DKAU
15:25 Aelius well that error is repeated for lines 4 5 7 and 8
15:25 Aelius so... all of the file
15:25 dabaR Hello. In my branch, I have merged in a few GitHub-backed PRs, and now I want to "revert" their changes, but I will probably want to pull in those changes at some point later. How is it best to do that?
15:26 GodGinrai Aelius: maybe -'s aren't allowed in filter names?
15:26 a_thakur joined #git
15:26 canton7 Aelius, aah, "Then you would define a "filter.indent.clean" and "filter.indent.smudge" configuration in your .git/config"
15:26 canton7 Aelius, so the filtes are defined in your .git/config, not in .gitattributes
15:26 NeXTSUN joined #git
15:26 BrianBlaze420 joined #git
15:27 a_thakur joined #git
15:27 GodGinrai ah yea
15:27 GodGinrai .gitattributes only defines what filters are used
15:27 Aelius then https://wiki.archlinux.org/index.php/Dotfiles#Confidential_information lies to me?
15:27 GodGinrai not the specifics of the filter
15:27 canton7 Aelius, in what way?
15:27 GodGinrai Aelius: no.  It says it clearly in that article
15:27 canton7 Aelius, that says "The filter must be defined in .git/config, e. g.: "
15:27 GodGinrai "The filter must be defined in .git/config, e. g.: "
15:27 Aelius oh I cant read
15:28 canton7 it's a problem we all share :P
15:28 robotroll joined #git
15:29 a_thakur joined #git
15:29 Tim-SEM left #git
15:29 dimi1947 joined #git
15:30 LionsMane joined #git
15:30 romerocesar joined #git
15:30 treaki joined #git
15:31 Aelius hrmm. fatal: bad config line 14 in file .git/config
15:31 Aelius pointing to the clean = sed stuff
15:31 catag87 joined #git
15:31 Shock- joined #git
15:32 GodGinrai "bad config line".  Man, these errors are so descriptive
15:32 rubyonrailed joined #git
15:32 GodGinrai Aelius: did you take out the quotes?
15:32 Aelius Yeah I tried, made no difference
15:33 catag87 joined #git
15:33 thiago_ joined #git
15:33 GodGinrai hrm
15:33 TomyLobo joined #git
15:34 _ikke_ It's best to use git config to change config files
15:34 _ikke_ not manually editing it
15:36 GodGinrai Aelius: it might be the backslash breaking it
15:36 clemf joined #git
15:37 King_DuckZ joined #git
15:37 barteks2x joined #git
15:38 GodGinrai Aelius: try this: sed -e 's#^secret[[:space:]]=.*#secret = #'
15:38 GodGinrai see if that throws the same error
15:39 King_DuckZ hi, I have a c++ project A from which I want to pull out some files into a separate project B, but some header files are needed by both, and possibly by other projects I will write in the future - I don't want to pull out these files into some project C because they are not really related
15:40 King_DuckZ I also don't want to end up with 10 1-file projects, and I'd like to avoid the case where several git submodules will pull in the same project over and over
15:40 Aelius GodGinrai: I escaped the backslash, it's no longer throwing the error. How do I confirm the filter worked before pushing?
15:40 GodGinrai Aelius: that I do not know, but I'm glad to hear escaping the backslash seemed to work :)
15:40 King_DuckZ I'm not sure how to tackle this problem... is there anything in git that can help me?
15:40 _ikke_ Aelius: git show :file
15:41 _ikke_ This should show the filtered content
15:41 NeverDie joined #git
15:41 GodGinrai King_DuckZ: Can you imagine what you want to have?  Because it sounds like you imagined the 2 possible ways to solve your problem and dismissed them both.
15:41 Aelius thanks. one of the filters worked, heh
15:42 King_DuckZ GodGinrai: that's the problem... I don't have a clue :(
15:42 jhass well, do you really need separate repos?
15:42 tristanp joined #git
15:43 GodGinrai King_DuckZ: if you can't imagine some scenario with the perfect tool, then it's not something we can really solve for you.
15:43 jhass it's not unseen for projects that share code to just keep a single repo
15:43 jhass see for example systemd or powerdns
15:44 JeroenT joined #git
15:44 madewokherd joined #git
15:44 Alienpruts joined #git
15:45 EvilPenguin joined #git
15:46 King_DuckZ if you don't mind discussing, here's the real scenario: this is my project https://github.com/KingDuckZ/dindexer and I wrote some generic Redis client lib that should have its own repo, but files like this https://github.com/KingDuckZ/dindexer/blob/dev/include/helpers/compatibility.h are getting in the way
15:46 Gvii joined #git
15:46 Aelius ok, it's only doing one or the other filter
15:47 D[4]ni joined #git
15:47 Aelius both are in the correct syntax and both work, as long as only one is there
15:48 Aelius this is mildly infuriating
15:48 King_DuckZ this one is even worse https://github.com/KingDuckZ/dindexer/blob/dev/include/helpers/lexical_cast.hpp it's still under development so I'll be working on it and I don't want to handle multiple copies of it... but it's pulling in sprout as a submodule, which is quite big, and I don't want some hypotethical project C pulling in that file + sprout twice in my top level project
15:48 orbitphreak joined #git
15:50 cdown_ joined #git
15:50 King_DuckZ I hope it makes sense
15:50 romerocesar joined #git
15:51 fracting joined #git
15:52 JeroenT joined #git
15:56 Rodya_ joined #git
15:57 rgrinberg joined #git
16:03 Aelius left #git
16:06 synthroid joined #git
16:06 refried_ joined #git
16:08 NeverDie joined #git
16:08 devbug joined #git
16:08 PCatinean joined #git
16:09 Darren_ joined #git
16:10 romerocesar joined #git
16:12 chrisshattuck joined #git
16:12 troulouliou_div2 joined #git
16:13 GodGinrai joined #git
16:13 Duder9999 joined #git
16:13 unbalancedparen joined #git
16:14 eijk joined #git
16:16 drodger joined #git
16:17 D-Boy joined #git
16:17 eijk_ joined #git
16:17 qknight joined #git
16:18 xcesariox joined #git
16:18 Aboba joined #git
16:19 qknight hey. i often have problems with 'git rebase master' because it forces me to 'merge' things which _I_ have never touched and i'm not sure why it does so.
16:19 _ikke_ What do you mean with that it forces you to merge things?
16:20 qknight _ikke_: it shows merges of two files i've never changed
16:20 qknight _ikke_: so maybe 'git rebase -p master' is what i want?
16:20 _ikke_ You mean conflicts?
16:20 qknight yes
16:20 qknight conflicts
16:20 Topic for #git is now Welcome to #git, the place for git help and pop music lyrics | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | I kissed a git, and I liked it. I hope my repo don't mind it.
16:21 _ikke_ -p is not going to help against conflicts
16:21 qknight so my question is: "since rebase seems to be the right thing to keep the history clean' how to do it properly
16:21 rubyonrailed joined #git
16:21 qknight _ikke_: i don't have a problem with conflicts in general but only with those which are not caused by my changes
16:21 qknight and which i have to resolve
16:21 Tentacled Thanks a bunch guys, _ikke_, GodGinrai - although I'm in less a pickle than before, it's still a pickle. I am now a 0-change "Merge remote-tracking branch" commit ahead of the upstream. And it's adding stuff that was already added. I think I'm running in circles :/
16:21 eijk joined #git
16:22 kpease joined #git
16:22 dmto joined #git
16:22 chardan joined #git
16:22 croberts_ left #git
16:24 mkopriva_ joined #git
16:24 Tentacled Bah. I just ended up remaking the github repo anew.
16:24 slance joined #git
16:24 croberts joined #git
16:24 _ikke_ :-(
16:24 JanC joined #git
16:24 _ikke_ qknight: Hard to tell without more details
16:26 tristanp joined #git
16:27 blackwind_123 joined #git
16:27 King_DuckZ left #git
16:28 chardan left #git
16:28 freimatz joined #git
16:28 gusnan joined #git
16:28 gusnan joined #git
16:29 usm4n joined #git
16:30 FroMaster joined #git
16:30 eijk_ joined #git
16:31 The_Phoenix joined #git
16:31 Ujeoq joined #git
16:31 xall joined #git
16:33 devbug joined #git
16:34 catag87 joined #git
16:35 GodGinrai joined #git
16:36 freimatz joined #git
16:38 Daiwo joined #git
16:39 thebloggu joined #git
16:40 thebloggu I'm working on a branch (with remote) and I'm one commit ahead and several behind the remote. Although my commit and the remote's do not touch the same files (so there's no conflict) I can't fast forward and have to merge. Why?
16:41 romerocesar joined #git
16:41 _ikke_ You can never fastforward diverged history
16:41 spudowiar joined #git
16:42 qknight _ikke_: ok, when i hit one case again, i'll ask again
16:42 qknight thanks
16:42 PinkPonyOfDeath left #git
16:43 ArchNoob joined #git
16:43 durham joined #git
16:44 thebloggu _ikke_: so to fast forward I can't have a local commit? Hmm ok. So is it possible to reapply my commit only after pulling? And I would guess this is not really a best practice right?
16:45 catag87 joined #git
16:46 _ikke_ thebloggu: git pull --rebase
16:47 _ikke_ That would reapply your local commits after what just has been fetched
16:48 D[4]ni joined #git
16:48 thebloggu _ikke_: thank you very much!
16:49 nettoweb joined #git
16:49 Codfection joined #git
16:51 Daiwo why isn't Git (on windows) creating it's new repo in subfolder instead of the user's root directory by default ?
16:52 _ikke_ Daiwo: How are you creatin this repository
16:52 Daiwo I wish I knew about that before ... now i have leftover everywhere in my user's dir
16:52 Daiwo the very newcomer aka noobishest way
16:52 _ikke_ Daiwo: I just need the command
16:52 Daiwo cloned from cmd prompt
16:52 Daiwo ok
16:52 Daiwo hold on
16:53 LJHSLDJHSDLJH joined #git
16:53 LJHSLDJHSDLJH here comes the impossible to answer question ... what is difference between a repo and a gist?
16:53 LJHSLDJHSDLJH where the word gist come from in the first place
16:53 _ikke_ gist is an english word
16:54 Daiwo git-past ... gist
16:54 _ikke_ http://www.thefreedictionary.com/gist
16:54 InfoTest joined #git
16:54 Daiwo sorry i have to search again, I don't remember those bty heart
16:54 ascarter joined #git
16:54 GodGinrai Daiwo: http://tfd.com/gist
16:54 LJHSLDJHSDLJH _ikke_: sounds very american english
16:55 Daiwo im french
16:55 GodGinrai LJHSLDJHSDLJH: It's anglo-french
16:55 LJHSLDJHSDLJH I'm nazy
16:55 Daiwo I shouldn't even dare to spell a word in english
16:55 Daiwo I know it's horrible
16:55 Daiwo ;p
16:55 _ikke_ LJHSLDJHSDLJH: gist is a tool from github, which automatically creates repositories with pasted content
16:56 rgrinberg joined #git
16:56 LJHSLDJHSDLJH _ikke_: thanks for making the day ... it really puzzled me for a while and no one in github wanted to answer
16:56 Daiwo _ikke_: he knew already.. he was making fun of the question ..
16:56 LJHSLDJHSDLJH Daiwo: No, I'm really new in git like yourself
16:57 Daiwo ohh
16:57 GodGinrai "like yourself"
16:57 Daiwo well gist is really just storing plain text.. unlike repo
16:57 GodGinrai Daiwo: mentioned he was new *before* LJHSLDJHSDLJH joined
16:57 LJHSLDJHSDLJH GodGinrai: yeah I'm in English as well
16:57 _ikke_ Daiwo: In the background, a repository is created
16:57 jhass gists are actually full git repos, you can clone, pull and push to them
16:58 Daiwo _ikke_: for real ?
16:58 _ikke_ Daiwo: for r eal
16:58 LJHSLDJHSDLJH GodGinrai: wow, you're very smart person! I'm impressed of such discovery
16:58 Daiwo thanks
16:58 Daiwo then LJHSLDJHSDLJH's question suddently sound more relevent
16:58 daniel_rose joined #git
16:59 GodGinrai Daiwo: to answer your question, can you give us the exact commands you tried to use, and where?
16:59 Daiwo ikke sorry I'm getting those command I made
16:59 Daiwo yes
16:59 Daiwo sorry on it
16:59 GodGinrai LJHSLDJHSDLJH: I'd appreciate it if you didn't act like an ass
16:59 LJHSLDJHSDLJH _ikke_: so basically it's an application on github server, right?
16:59 Daiwo glad you're here, hold on
16:59 _ikke_ LJHSLDJHSDLJH: yes
16:59 LJHSLDJHSDLJH GodGinrai: I'd appreciate if don't act like a mother fucker
16:59 LJHSLDJHSDLJH left #git
17:00 Eugene was kicked by Eugene: Shut up, all of you.
17:00 Eugene joined #git
17:01 romerocesar joined #git
17:01 Eugene Seriously, it's like watching 12 year olds.
17:01 Eugene Grow up
17:01 _ikke_ heh
17:02 _ikke_ Making a point by kicking yourself
17:02 Eugene And/or shamelessly padding my stats, like a 12-year-old.
17:03 _ikke_ That's implied :P
17:03 stasmakarov joined #git
17:04 catag87 joined #git
17:07 diegoviola joined #git
17:07 phanimahesh joined #git
17:07 mwhooker joined #git
17:09 miesco joined #git
17:09 miesco Hi.  Does the "working directory" include untracked files?
17:09 GodGinrai miesco: Where are you seeing the term "working directory"?
17:10 GodGinrai I assume it would, but that may depend on context
17:10 miesco GodGinrai: Wait, I mean "work tree"
17:10 cdg joined #git
17:11 GodGinrai ah
17:11 GodGinrai I would assume it wouldn't
17:13 miesco GodGinrai: Okay.  Because I am looking at the docs for `git status -s`: "X shows the status of the index, and Y shows the
17:13 miesco status of the work tree."
17:14 GodGinrai hrm
17:14 rudi_s miesco: work tree is the checkout, so yes, all files.
17:15 cuebix-wk joined #git
17:15 GodGinrai rudi_s: then how would you create a new worktree?  Does it create a clean branch with no untracked files?
17:16 hahuang65 joined #git
17:17 rudi_s GodGinrai: I don't think you can. work tree is just the collection of files which are around. You can remove them of cours.e
17:17 nettoweb joined #git
17:17 jungsubk joined #git
17:17 rudi_s It's just the name for "all files next to the .git directory".
17:17 drodger joined #git
17:17 GodGinrai rudi_s: no, there is `git worktree add` https://git-scm.com/docs/git-worktree
17:18 daniel_rose joined #git
17:18 rudi_s GodGinrai: Well yes. But it's still just a work tree.
17:18 rudi_s And git-worktree is just a shortcut for a second checkout.
17:19 GodGinrai rudi_s: Yes, but my question remains: If you add a worktree, is it clean with no untracked files?
17:19 rudi_s GodGinrai: I don't know, check the man page and try it.
17:19 mikecmpbll joined #git
17:19 rudi_s I'd assume it contains the same files and is just a "copy" of the current branch.
17:19 ccolorado joined #git
17:19 GodGinrai I checked the manpage, and that's why I was assuming it was not "all the files"
17:19 GodGinrai because it specifically talks about using the worktree to not clobber things
17:20 GodGinrai like a more powerful stash
17:21 rudi_s GodGinrai: Yes. But it still must "start" somewhere. And the only sane choice is IMHO the current commit.
17:22 GodGinrai rudi_s: of course.  Which is why I think it is only the tracked files
17:22 rudi_s But AFAIK git worktree is very similar to just run git clone twice with two target dirctories.
17:22 rudi_s GodGinrai: Oh, of course.
17:22 rudi_s Sorry for the confusion.
17:22 lindenle joined #git
17:22 GodGinrai np
17:23 rudi_s The problem is that work tree is used in multiple places. And when you talk about work tree in your example, then it copies tracked files. - But when you talk about work tree in general, it's all files next to the .git directory.
17:23 Daiwo being newb indeed makes me look ... newb.. being french does makes me sounds 12-yr old
17:23 Daiwo let it be
17:24 Daiwo @eugene
17:24 sbeller_ joined #git
17:27 drodger joined #git
17:29 GodGinrai Daiwo: still waiting on those commands that you were trying to run
17:30 Daiwo made a git init
17:30 EduardoMartins joined #git
17:30 Daiwo sorry didn't know you were waiting, _ikke_ was on the case in pm
17:30 durham_ joined #git
17:30 Daiwo so basically, it created the repo in my %userprofile% dir
17:31 Daiwo directly
17:31 editshare-ericf joined #git
17:31 GodGinrai when you ran `git init`?
17:31 ccolorado Any recomendation for understanding git-svn ? ( I have an svn project and I am hating
17:31 ccolorado it )
17:31 Lvjasha joined #git
17:31 FuzzySockets joined #git
17:31 GodGinrai ccolorado: Are you trying to convert it into a git project?
17:32 Daiwo GodGinrai: humm when ? first thing
17:32 durham__ joined #git
17:32 Daiwo then git add README.md , all the way to push
17:32 ccolorado GodGinrai: No, I want to conform with the team without having to deal svn.
17:33 ccolorado GodGinrai: is git-svn the wrong tool for that ?
17:35 GodGinrai ccolorado: It can be used for that.  I just haven't seen it used for that often
17:35 pioiytr__ joined #git
17:36 GodGinrai Daiwo: I'm having trouble connecting this to your problem.  You said it was creating the repo in the wrong directory... when did you notice that?
17:37 daniel_rose joined #git
17:37 Daiwo when I browsed my user's root directory.. on a system maintenance ride
17:37 Daiwo (ride was the only word coming to my head that fit)
17:38 GodGinrai and there was a.git directory there?
17:38 Daiwo yes
17:38 Rodya_ joined #git
17:38 Daiwo strangely, there was both a .git and git directory
17:38 mwhooker joined #git
17:39 Daiwo I thought it was from my previous "Git for Windows" install
17:39 narendraj9 joined #git
17:39 Daiwo but its not
17:40 davisonio joined #git
17:40 _ikke_ .git is the repository directory
17:40 _ikke_ git can be anything
17:44 spudowiar joined #git
17:44 oke joined #git
17:45 zivester joined #git
17:46 ajf- joined #git
17:48 mwhooker joined #git
17:48 Daiwo seems like thats where git was installed
17:48 miesco So let me get this straight.  `git status -s` [STAGED][UNSTAGED]?
17:49 D[4]ni joined #git
17:49 Literphor joined #git
17:50 skylite joined #git
17:50 Sasazuka joined #git
17:51 Daiwo it contains all of git's ressources file, readme , and binaries
17:52 kriskropd joined #git
17:53 tristanp joined #git
17:55 thiago joined #git
17:55 zivester joined #git
17:56 deadnull joined #git
17:56 hahuang61 joined #git
17:58 madewokherd joined #git
18:00 durham joined #git
18:01 _ikke_ miesco: What is your question?
18:01 tristanp joined #git
18:01 SimonNa joined #git
18:01 miesco _ikke_: For XY, is X staged, and Y unstaged?
18:01 miesco Like ??, MM, etc
18:02 _ikke_ miesco: From man git status: "For paths that do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree."
18:02 gitinfo miesco: the git-status manpage is available at http://jk.gs/git-status.html
18:03 bongjovi joined #git
18:03 _ikke_ miesco: so, yes
18:04 miesco _ikke_: Okay thanks
18:05 catag87 joined #git
18:06 ejb joined #git
18:09 Literphor joined #git
18:09 nitrospectide joined #git
18:09 durham joined #git
18:11 LionsMane joined #git
18:11 nitrospectide left #git
18:15 mmlb joined #git
18:17 mingle__ joined #git
18:18 Literphor joined #git
18:19 bz_robot joined #git
18:22 EduardoMartins joined #git
18:22 catag87 joined #git
18:22 kfunk joined #git
18:23 qpdb joined #git
18:23 jost__ joined #git
18:26 nwkj86 joined #git
18:27 mmlb joined #git
18:29 bz_robot left #git
18:30 moriko joined #git
18:32 basiclaser joined #git
18:32 catag87 joined #git
18:34 ahmed_elgabri joined #git
18:35 rahtgaz joined #git
18:37 bsanford joined #git
18:40 peroht joined #git
18:42 zacts joined #git
18:42 romerocesar joined #git
18:43 chachasmooth joined #git
18:45 miesco Hey, git does a commit even if you exit the editor without saving?
18:45 GodGinrai nope
18:45 GodGinrai it aborts the commit if you exit the editor without saving
18:46 GodGinrai if the commit is going through, your editor is modifying the file somehow (maybe autosaving?)
18:47 _ikke_ It depends on whether the commit message is empty or not
18:47 _ikke_ git commit --amend for example would commit when you don't save
18:48 jungsubk joined #git
18:48 miesco _ikke_: Yea thats what I did
18:48 miesco _ikke_: Why would it do that?
18:48 daniel_rose joined #git
18:48 _ikke_ miesco: Because there is a valid commit message
18:48 miesco _ikke_: How do you abort?
18:49 _ikke_ vim has :cq, which would quit with an error code
18:49 D[4]ni joined #git
18:50 miesco _ikke_: Ah I see. Thanks.
18:50 Literphor joined #git
18:52 GodGinrai _ikke_: if you exit without saving, the commit message will be empty, tho'
18:52 GodGinrai ah
18:52 GodGinrai the amend example
18:52 GodGinrai I didn't consider that
18:52 bket joined #git
18:54 dsdeiz joined #git
18:55 shinnya joined #git
18:59 m0viefreak joined #git
19:01 SteffanW joined #git
19:02 rubyonrailed joined #git
19:02 romerocesar joined #git
19:02 tristanp joined #git
19:03 Sasazuka joined #git
19:04 Sucks joined #git
19:04 tristanp_ joined #git
19:06 monu joined #git
19:06 rgrinberg joined #git
19:06 usm4n joined #git
19:07 daniel_rose joined #git
19:08 Klipp joined #git
19:08 lindenle joined #git
19:09 madewokherd` joined #git
19:11 quetz joined #git
19:12 durham joined #git
19:13 chachasmooth joined #git
19:15 emPi joined #git
19:16 ArchNoob joined #git
19:16 ejb joined #git
19:20 jamesd joined #git
19:21 ochorocho__ joined #git
19:22 zacts joined #git
19:22 romerocesar joined #git
19:24 cyan__ joined #git
19:25 tvon joined #git
19:26 _ikke_ :-)
19:29 muelli joined #git
19:30 tvw joined #git
19:34 Rooxo joined #git
19:40 usm4n left #git
19:42 Shock- joined #git
19:42 zacts joined #git
19:42 rgrinberg joined #git
19:43 elsevero joined #git
19:45 nilg joined #git
19:45 GodGinrai joined #git
19:48 tristanp joined #git
19:49 flaguy48 joined #git
19:50 rubyonrailed joined #git
19:50 D[4]ni joined #git
19:53 romerocesar joined #git
19:56 tristanp joined #git
19:58 texinwien_ joined #git
19:59 daniel_rose joined #git
20:01 _28_ria joined #git
20:01 freimatz joined #git
20:05 freimatz3 joined #git
20:06 flaguy48 left #git
20:06 weox joined #git
20:06 m1dnight1 joined #git
20:09 apotry joined #git
20:10 Arban joined #git
20:10 PioneerAxon joined #git
20:11 WayToDoor joined #git
20:12 rominron_ joined #git
20:13 Literphor joined #git
20:14 smemsh joined #git
20:15 Silenced_v2 joined #git
20:15 smemsh hello, if, in interactive rebase, i 'drop' a commit that adds a file, is the file supposed to be deleted from the working directory? i had thought it would just leave it there as an untracked file
20:16 clemf joined #git
20:17 zacts_pi joined #git
20:17 raijin joined #git
20:20 Klipp smemsh im not 100% sure, but i assume it would delete the file since the commit that added it was removed
20:20 rudi_s smemsh: It will delete it completely.
20:20 madewokherd joined #git
20:21 rudi_s (Of course you can get the commit back via the reflog, but the file will be gone from the work tree.)
20:21 Klipp if you want it, just make a patch of that commmit before you rebase then save it for later
20:24 Hanumaan joined #git
20:30 rgrinberg joined #git
20:31 Doginal joined #git
20:32 i7c o_O
20:33 aidalgol joined #git
20:33 ccolorado left #git
20:33 i7c You can still get the single file back. git checkout <commit from reflog or the hell from where> -- that/file.asdf
20:33 i7c No need for patches or funny copying around of files to /tmp and back. ;)
20:33 Viewtiful joined #git
20:35 tanuki_ joined #git
20:35 ascarter joined #git
20:38 monsterjamp joined #git
20:38 monsterjamp Hello?
20:38 gitinfo monsterjamp: 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:38 monsterjamp I can't reattach head on a branch
20:38 monsterjamp No matter what I do
20:40 _ikke_ monsterjamp: Can you explain a bit more?
20:40 monsterjamp _ikke_ Commands like 'git reset --hard' or 'git checkout fork/master' won't reattach the head.
20:41 _ikke_ monsterjamp: did you try git checkout branch ?
20:41 smemsh Klipp: it definitely does delete, but i think that's unexpected.  it should just leave it in the working dir as untracked, imo.  it should only manipulate commits; by removing a commit, you remove it to the point before git knew about it, which was untracked (i.e. it would just ignore it)
20:41 monsterjamp _ikke_ Yeah
20:41 monsterjamp I have no local commits I need to save btw
20:42 Klipp smemsh: see, i would disagree, i assumed / expected it to remove it since the code that created it is being removed... just personal assumption though
20:43 monsterjamp It's really frustrating, I can't pull upstream or really do anything because of the HEAD.
20:43 d4rklit3 joined #git
20:44 _ikke_ monsterjamp: !transcript
20:44 gitinfo monsterjamp: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
20:44 IWishIKnew joined #git
20:45 yqt joined #git
20:45 ochorocho__ joined #git
20:46 monsterjamp _ikke_ There's not really much to see: http://pastebin.com/gJ9Bseme
20:46 _ikke_ You keep checking out a remote tracking branch
20:46 _ikke_ which would actually detach HEAD
20:46 _ikke_ You need to create a local branch from the remote tracking branch
20:47 chrisshattuck joined #git
20:47 smemsh Klipp: rebase should bring the *repository* to the point it was at before the commit.  if anything it should need rebase --hard or something to erase working files, just like reset does.  but, apparently i don't think like the git developers in this case :-)
20:47 monsterjamp _ikke_ So make another branch?
20:47 GodGinra1 joined #git
20:47 _ikke_ monsterjamp: To make the destinction clear
20:47 Literphor joined #git
20:48 spudowiar joined #git
20:48 _ikke_ monsterjamp: remote tracking branches start with refs/remotes/, 'branches' start with refs/heads
20:49 monsterjamp _ikke_ So I should never commit to 'fork/master'?
20:49 _ikke_ No
20:49 _ikke_ That's only meant to track the baster branch on the remote fork
20:49 zacts_pi joined #git
20:49 _ikke_ Any time you fetch, that ref is updated
20:49 yitz joined #git
20:51 monsterjamp _ikke_ Well that kinda makes sense but how come I can't sync 'fork/master' with 'origin/master' anymore?
20:51 smemsh pop music lyrics?!?
20:51 D[4]ni joined #git
20:51 _ikke_ monsterjamp: git push origin refs/remotes/fork/master:master
20:52 tristanp joined #git
20:53 yitz How would I best go about getting the timestamp of a commit? Other than parsing git log -n1
20:53 monsterjamp _ikke_ Thanks that helps, although you got it backwards :P I'm pushing to the fork.
20:53 monsterjamp _ikke_ Now everything makes sense :D
20:53 _ikke_ monsterjamp: Same principle counts
20:53 yitz Heh. nvm. git help log got a format section
20:54 _ikke_ yitz: git show <commit> --format "%ad %cd"
20:54 yitz Thanks, _ikke_ :D
20:57 smemsh left #git
20:58 yitz `git show` doesn't work with HEAD. git log -n1 --format %ct  can take HEAD
20:58 monsterjamp left #git
20:59 _ikke_ yitz: Why not?
20:59 hahuang61 joined #git
20:59 _ikke_ git show --format="%ad" HEAD works for me
20:59 yitz It's showing a diff as well
20:59 _ikke_ --no-patch
21:00 yitz Got it. Thank you
21:00 _ikke_ -s
21:00 nwkj86 joined #git
21:01 drewo joined #git
21:02 elastix joined #git
21:05 troulouliou_div2 joined #git
21:05 stantonk joined #git
21:06 chachasmooth joined #git
21:09 tristanp joined #git
21:10 miesco left #git
21:13 romerocesar joined #git
21:14 miesco joined #git
21:15 miesco Okay I have an issue with gpg-agent's pinentry.  I have it set to curses.  I run tmux.  It will load my pinentry program in my irssi tmux window, and a full screen black pinentry prompt, then when I type the password, instead of putting it to the prompt, it goes to irssi's input line.
21:17 nnyk joined #git
21:17 Rodya_ joined #git
21:17 Daiwo I need help, I can't seem to relocate my repo
21:17 Daiwo my local repo (windows 7)
21:18 miesco maybe I should ask in the gpg channel!
21:18 miesco left #git
21:18 _ikke_ Daiwo: What have you tried, and what's not working?
21:18 Daiwo _ikke_: no and im totally pissed
21:19 yitz Hrm. I got one commit that `git show -s --format="%at" $tag` is showing the comment and not just the time
21:19 Daiwo I have tried relocating the repo from my windows user directory, to my root dir ("C:\Dev\Repos")
21:20 Daiwo but for gitbash to detect it , I have to change the "start in" location path from the git-bash.exe shortcut , but when i do so it can't find the repo's .git dir anymore
21:20 Rodya__ joined #git
21:20 _ikke_ Why do you have to do that?
21:20 Daiwo it's like the $home and repo directories can't be seperates
21:21 nwkj86 joined #git
21:21 urda joined #git
21:21 Daiwo well I don't want to put all my different project's repo files in one single place
21:22 Daiwo I'd prefer to have a directory for each, named accordingly... ie: repoproject1 , repoproject2
21:22 Daiwo those would be subfolder of the home directory
21:23 ascarter joined #git
21:23 Daiwo right now, both Repos and Home dir are the same
21:26 tristanp joined #git
21:27 Daiwo what git-related files should be located in the home dir ?
21:28 _ikke_ The only one is the global .gitconfig file
21:28 _ikke_ the repositories can be placed anywhere
21:28 Daiwo I'd like to delete that repo, and perform an init again (with specified subfolder that time)
21:29 Daiwo the only .gitconfig file I have is located in my Home Dir
21:29 Daiwo which is %userprofile%
21:29 _ikke_ Right
21:29 Daiwo aka c:/users/<myuser>
21:30 Daiwo if I move the .git dir from there, my git can't find the repo anymore
21:30 _ikke_ Don't move the .git dir
21:30 _ikke_ You have to move the entire repository
21:31 Daiwo I though the .git dir WAS the repository
21:31 Daiwo what files consist the repository
21:31 Daiwo my home dir contains both ....
21:31 tvon joined #git
21:32 Daiwo all repos files AND $home files
21:32 _ikke_ Right
21:32 cdg joined #git
21:32 _ikke_ You can move that .git dir, to a subdir, but then you have to cd to that subdir before you can do git operations
21:32 Daiwo oh
21:32 Daiwo thats all..
21:32 Daiwo omg
21:33 _ikke_ yes
21:33 Daiwo omg.. trying..
21:33 _ikke_ git will look in the current dir, and all it's parents for a .git directory
21:33 romerocesar joined #git
21:33 Daiwo all it's parent or child ?
21:34 bruce_lee joined #git
21:34 bruce_lee joined #git
21:36 Daiwo finally..
21:36 Dougie187 Parent
21:36 Daiwo that was just it
21:36 Dougie187 If it was children, ~ or / would look like a git repo if you had a single git repo anywhere
21:36 Daiwo thanks ikke !
21:37 _ikke_ yw
21:38 elsevero joined #git
21:39 dhollinger joined #git
21:39 tristanp joined #git
21:42 Daiwo so now I can change the git-bash.exe shortcut to Start in my main repo directory
21:43 cdown joined #git
21:44 nettoweb joined #git
21:49 worstadmin On github I'm seeing "This branch is 2 commits ahead, 743 commits behind mitchellh:master."
21:49 worstadmin How can it be both?
21:50 Darren_ joined #git
21:50 fracting joined #git
21:52 D[4]ni joined #git
21:53 Dougie187 left #git
21:53 Douhan joined #git
21:54 romerocesar joined #git
21:55 tristanp joined #git
21:55 hexagoxel worstadmin: you pushed 2 commits to local master and someone pushed 743 commits to upstream master
21:56 hexagoxel worstadmin: numbers are relative to latest common ancestor.
21:56 worstadmin hexagoxel: Well the numbers refer to different ancestors
21:56 worstadmin I understand now
21:57 nettoweb joined #git
21:57 hexagoxel worstadmin: no, the same ancestor. but different lines from that ancestor :)
21:58 clemf joined #git
21:58 worstadmin hexagoxel: pointless semantics
21:58 zacts joined #git
21:59 raijin joined #git
22:00 hexagoxel worstadmin: it is you not understanding things. should not complain about the precision of my explanation.
22:01 hexagoxel when you are up-to-date, master and upstream point to the _same_ commit. not just two branches that are in synchrony.
22:03 clemf joined #git
22:04 dsantiago joined #git
22:04 Impaloo joined #git
22:05 joki joined #git
22:05 si joined #git
22:09 NwS joined #git
22:11 ochorocho__ joined #git
22:11 tristanp joined #git
22:15 ochorocho__1 joined #git
22:19 clemf joined #git
22:20 nettoweb joined #git
22:22 dhollinger joined #git
22:26 ArchNoob joined #git
22:28 Doginal joined #git
22:30 clemf joined #git
22:32 flaguy48 joined #git
22:32 sagerdearia joined #git
22:32 madewokherd joined #git
22:33 apotry joined #git
22:35 tristanp joined #git
22:36 ahr3n joined #git
22:36 Rodya_ joined #git
22:39 Doginal joined #git
22:41 netj joined #git
22:42 elsevero joined #git
22:42 apotry joined #git
22:42 liquidjamm joined #git
22:43 Orion3k joined #git
22:43 WaReZ joined #git
22:44 Celelibi joined #git
22:44 clemf joined #git
22:47 raijin joined #git
22:48 clemf joined #git
22:50 tristanp joined #git
22:52 D[4]ni joined #git
22:54 texinwien_ joined #git
22:56 jakesyl_mobile joined #git
22:58 johnmilton joined #git
23:01 Literphor joined #git
23:05 sdothum joined #git
23:05 johnmilton joined #git
23:05 xlegoman joined #git
23:05 Doginal joined #git
23:06 tristanp joined #git
23:07 c^ joined #git
23:07 tgunr joined #git
23:07 Korvin joined #git
23:07 Korvin joined #git
23:07 boombatower joined #git
23:07 netj joined #git
23:09 leonarth joined #git
23:13 rubyonrailed joined #git
23:17 variable joined #git
23:18 worstadmin hexagoxel: But one could argue that my local master is a different ancestor that origin/master given that I could track either. Being up to date and pointing to the same commit is actually the definition of two branches being in sync is it not?
23:18 drodger joined #git
23:18 function joined #git
23:18 worstadmin hexagoxel: Getting help doesn't mean accepting what a person says without reply (and precision is important)
23:18 worstadmin ancestor than*
23:19 MattMaker joined #git
23:19 ochorocho__ joined #git
23:21 rubyonrailed joined #git
23:23 Sasazuka I've committed but not pushed but to the wrong branch; I know I can create a patch, back out my commit, and commit to the right branch but is there a better way of doing this?
23:23 tristanp joined #git
23:23 elastix joined #git
23:24 preaction Sasazuka: rebase your commit onto the right branch
23:25 Sasazuka preaction: nice, thanks!
23:27 ahr3n_ joined #git
23:30 mellernoia joined #git
23:34 tristanp joined #git
23:35 JeDa left #git
23:43 elsevero joined #git
23:44 Doginal joined #git
23:48 rubyonrailed joined #git
23:48 MZAWeb joined #git
23:48 NeverDie joined #git
23:49 tristanp joined #git
23:49 DolphinDreamm joined #git
23:50 rubyonrailed joined #git
23:50 NeverDie joined #git
23:51 DolphinDreammm joined #git
23:54 drodger joined #git
23:55 djapo joined #git
23:57 SwiftMatt joined #git
23:59 MZAWeb joined #git
23:59 zacts joined #git

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