Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-12

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

All times shown according to UTC.

Time Nick Message
00:00 vassagus joined #git
00:02 dsantiago joined #git
00:04 fairuz joined #git
00:04 mablae joined #git
00:04 zivester joined #git
00:05 HappyLoa- joined #git
00:05 lugzer joined #git
00:09 romerocesar joined #git
00:12 tristanp joined #git
00:12 progrock left #git
00:14 cdg joined #git
00:16 vassagus joined #git
00:18 Sasazuka joined #git
00:19 EvilPeng1 joined #git
00:21 constant joined #git
00:22 bq_ joined #git
00:22 malide joined #git
00:26 troulouliou_div2 joined #git
00:32 nicksloan joined #git
00:36 vassagus_ joined #git
00:36 hahuang61 joined #git
00:37 dhollinger joined #git
00:40 thiago_ joined #git
00:40 red_ joined #git
00:41 mikecmpbll joined #git
00:46 clemf joined #git
00:46 Raed|Laptop joined #git
00:47 veilig2000 joined #git
00:48 stuartrexking joined #git
00:49 chachasmooth joined #git
00:49 fuchstronaut joined #git
00:51 livingstn joined #git
00:51 HanClinto joined #git
00:53 axisys joined #git
00:53 axisys joined #git
00:54 vassagus joined #git
00:54 Lyqyd joined #git
00:55 le_melomane joined #git
00:57 harwood joined #git
01:00 lugzer joined #git
01:01 pi__ joined #git
01:05 EvilPeng1 joined #git
01:08 Derperperd joined #git
01:09 sangy joined #git
01:09 harwood joined #git
01:12 constant joined #git
01:12 harwood joined #git
01:12 constant joined #git
01:12 alansaul joined #git
01:14 vassagus joined #git
01:16 MattMaker joined #git
01:19 d^sh joined #git
01:21 pks joined #git
01:21 ytl joined #git
01:24 tristanp joined #git
01:24 Manuel15 joined #git
01:24 Manuel15 joined #git
01:28 veilig2000 joined #git
01:29 Munt joined #git
01:31 bernardio joined #git
01:31 Pursuit joined #git
01:35 MattMaker joined #git
01:36 al-damiri joined #git
01:36 johnny56 joined #git
01:39 mingrammer joined #git
01:41 safe joined #git
01:46 safe joined #git
01:46 romerocesar joined #git
01:46 safe joined #git
01:46 Dougie187 joined #git
01:46 linuxmint joined #git
01:50 fuchstronaut joined #git
01:54 lugzer joined #git
01:58 veilig2000 joined #git
01:59 MattMaker joined #git
02:09 Goplat joined #git
02:09 MattMaker joined #git
02:10 stuartrexking joined #git
02:13 zumba_ad_ joined #git
02:15 cqi joined #git
02:19 MattMaker joined #git
02:23 malide joined #git
02:26 romerocesar joined #git
02:28 kbs joined #git
02:28 harish_ joined #git
02:31 moei joined #git
02:32 dreiss joined #git
02:35 rkazak joined #git
02:35 chachasmooth joined #git
02:35 netj joined #git
02:37 Dreamer3 joined #git
02:37 hahuang61 joined #git
02:37 MattMaker joined #git
02:40 howdoi joined #git
02:42 hexagoxel joined #git
02:42 rik316 joined #git
02:42 lagothri1 joined #git
02:44 joseph joined #git
02:45 netj joined #git
02:48 jhass joined #git
02:49 malide joined #git
02:49 lugzer joined #git
02:54 beyertech joined #git
02:55 ShekharReddy joined #git
02:58 jaequery joined #git
02:59 aavrug joined #git
03:00 p4trix joined #git
03:00 aavrug joined #git
03:01 martin_g joined #git
03:01 devhost joined #git
03:01 cagomez joined #git
03:01 paperziggurat joined #git
03:01 Lowell joined #git
03:03 pizzaops joined #git
03:03 ulkesh joined #git
03:03 cloudcell__ joined #git
03:03 frobnic joined #git
03:03 dreiss joined #git
03:06 MattMaker joined #git
03:07 netj joined #git
03:10 Limes_ joined #git
03:11 milki_ left #git
03:11 milki joined #git
03:12 mehola joined #git
03:14 fstd_ joined #git
03:15 omata joined #git
03:25 rossome joined #git
03:26 omata left #git
03:27 mingrammer joined #git
03:27 danslo joined #git
03:33 beyertech joined #git
03:34 stuartrexking joined #git
03:35 Sasazuka joined #git
03:40 Rodya_ joined #git
03:42 arescorpio joined #git
03:42 Dougie187 left #git
03:42 clemf joined #git
03:44 sagerdearia joined #git
03:46 ytl joined #git
03:46 lugzer joined #git
03:51 fuchstronaut joined #git
04:02 thecomedian joined #git
04:12 zmachine joined #git
04:13 phanimahesh joined #git
04:16 hahuang61 joined #git
04:20 Derperperd joined #git
04:22 mingrammer joined #git
04:22 beyertech joined #git
04:22 romerocesar joined #git
04:24 dolliars joined #git
04:26 Rodya_ joined #git
04:26 hahuang61 joined #git
04:28 Cabanossi joined #git
04:28 rkazak joined #git
04:32 GandalfTheWizard joined #git
04:34 a_thakur joined #git
04:35 Hink joined #git
04:38 dreiss joined #git
04:38 a_thakur joined #git
04:39 danimal2 joined #git
04:43 eight58 joined #git
04:45 Raging_Hog joined #git
04:45 jaequery joined #git
04:47 dolliars left #git
04:49 tureba joined #git
04:49 synchronous joined #git
04:52 nilg joined #git
04:52 fuchstronaut joined #git
04:52 Brain joined #git
04:55 HappyLoa- joined #git
04:56 drbean joined #git
04:57 Munt joined #git
05:05 subhojit777 joined #git
05:09 mar77i joined #git
05:09 Corosus joined #git
05:11 GT4066 joined #git
05:13 Corosus joined #git
05:14 dreiss joined #git
05:22 subhojit777 joined #git
05:24 scarabx joined #git
05:25 scarabx left #git
05:28 DJ_Spies joined #git
05:28 danslo joined #git
05:29 Munt joined #git
05:33 Corosus joined #git
05:34 HeWhois joined #git
05:36 snowinferno joined #git
05:37 ahmedelgabri joined #git
05:39 Sasazuka I've cloned a repo from github locally (prezto), made some changes to it and now I'd like to copy it into my own github to commit those changes, what should I do?
05:40 grawity Sasazuka: 'fork' it on github, then set up the fork as a new remote (git remote add)
05:40 grawity push your changes there
05:40 Sasazuka ah ok
05:40 grawity though, also
05:40 grawity 'commit' probably doesn't mean what you think it means
05:40 grawity committing is always done to the repo you're working on
05:41 grawity this isn't SVN or CVS
05:42 Sasazuka er yes, I mean pushing my changes
05:42 Sasazuka I started out with SVN so I still use those terms from time to time
05:42 Sasazuka if I want to update my fork, I'd use "git merge upstream/master" right?
05:44 grawity `git fetch` to actually update upstream/master (it always refers to the locally cached copy – it doesn't download anything from the remote *unless* you git fetch)
05:44 grawity then `git merge upstream/master`, yes
05:45 grawity `git pull` to do it in one step
05:45 grawity well, that's assuming the upstream remote is actually named 'upstream'
05:45 grawity if you cloned the upstream repo first, it's currently named 'origin'; you can rename it
05:45 grawity but you get the general idea, it seems
05:46 Sasazuka alright, thanks!
05:48 snowinferno_ joined #git
05:48 dreiss joined #git
05:51 mingrammer joined #git
05:51 mariuscc joined #git
05:52 heysin joined #git
05:52 mihaicris joined #git
05:53 fuchstronaut joined #git
05:58 snowinferno joined #git
05:58 dreiss joined #git
05:59 MattMaker joined #git
06:00 konrados joined #git
06:00 Munt joined #git
06:03 Repox joined #git
06:03 rscata joined #git
06:03 sdothum joined #git
06:06 dreiss joined #git
06:08 MattMaker joined #git
06:09 mibr0 joined #git
06:15 snowinferno joined #git
06:16 satya4ever joined #git
06:17 red_ joined #git
06:19 roelmonnens joined #git
06:19 jceb joined #git
06:21 romerocesar joined #git
06:22 mar77i joined #git
06:23 MrWoohoo joined #git
06:23 bocaneri joined #git
06:24 beyertech joined #git
06:26 tvw joined #git
06:26 vrishab joined #git
06:28 hahuang61 joined #git
06:28 MattMaker joined #git
06:30 jagob joined #git
06:30 Mir4g3 joined #git
06:34 Munt joined #git
06:35 vrishab joined #git
06:38 MattMaker joined #git
06:41 konrados Morning :)
06:41 konrados git-newbie here
06:41 thiago we've all been newbies once
06:42 konrados :)
06:43 nikivi joined #git
06:43 konrados I need to change a commit message, I found this: http://stackoverflow.com/questions/179123​/edit-an-incorrect-commit-message-in-git but, I need to change not the *last* commit message but a message of a few commits before the last one. How to do that?
06:43 thiago do other people have that commit already?
06:43 MattMaker joined #git
06:45 konrados No, I'm using git-svn and our hooks didn't accept the first commit (because we have some rules regarding the commit message). I then committed again with the right message, but a cooworker says it won't work because of this first wrong commit message.
06:46 cqi joined #git
06:46 konrados So, I believe I have it only locally, thiago.
06:46 vrishab joined #git
06:46 thiago ok, make sure
06:46 thiago everyone needs to delete their clones
06:46 Sceorem joined #git
06:47 konrados sec...
06:47 thiago git-svn creates a history without merges. Can you confirm? git log --merges thatcommit~.. (including the two dots)
06:47 thiago does it print anything?
06:49 danslo joined #git
06:49 thiago yes or no?
06:50 settermjd joined #git
06:50 cd-rum joined #git
06:51 konrados I'm now sure other ppl don't have it, thiago. I'm not sure what to enter into "thatcommit" I entered something what looks like a hash when I'm doing the usual "git log". It showed nothing.
06:51 ShadeS joined #git
06:51 ShadeS hello
06:52 ShadeS i was working on a machine, then on another machine and the other machine has the best changes, which i upladoed. How do I pull those down onto the first machine, git pull origin dev
06:52 ShadeS and then?
06:53 thiago konrados: the SHA-1 of the commit you want to change
06:53 thiago ShadeS: then you don't do the pull
06:53 ShadeS urgh
06:53 konrados Yes, so, it returned nothing, thiago
06:53 nikivi joined #git
06:53 MattMaker joined #git
06:53 ShadeS how do i undo that then? what do i wnat to do?
06:53 thiago Kronuz: then do git rebase -i thatcommit~
06:53 shaggycat joined #git
06:53 thiago er
06:53 fuchstronaut joined #git
06:54 thiago konrados: ^^^
06:54 a_thakur joined #git
06:54 thiago konrados: that will open your editor with instructions. Read them.
06:54 konrados sec...
06:54 thiago ShadeS: explain what you mean by best changes. Is it two versions of the same change?
06:54 konrados thiago, that "~" is required or it's a typo?
06:54 PCatinean joined #git
06:54 ShadeS on the first machine, I want to over write EVERYTHING
06:54 ShadeS with what is on the repo
06:55 thiago konrados: it's required
06:55 konrados OK, thanks, sec...
06:55 thiago ShadeS: ok
06:55 thiago ShadeS: does anyone already have the changes that yuo have on that machine, the changes that will be overwritten?
06:55 Rish joined #git
06:55 cd-rum joined #git
06:56 ShadeS what?
06:56 romerocesar joined #git
06:56 thiago ShadeS: have you shared those changes with other people?
06:56 ShadeS i have two laptops, one has the good code, this one doesn't. I'd like to just pull the latest from the repo over writing anything i have
06:56 ShadeS thiago: no i dont' want to share the stuff on this machine it's broen and doesn't work
06:56 ShadeS i somehow fixed it and i jut want to propogate the working verison to this machine
06:57 thiago ShadeS: ok
06:57 thiago ShadeS: git fetch origin && git reset --hard origin/master. This will blow away all the changes, including uncommitted changes.
06:57 thiago be sure that's what you want to do
06:58 ShadeS thiago: i've only been committing to origin/dev
06:58 ShadeS should i use --hard origin/dev or or do i use origin/master?
06:58 thiago well, git fetch origin, then git log the branches it downloaded.
06:58 Rish joined #git
06:58 thiago find the commit you want your local repository to be at
06:59 thiago git reset --hard <thatcommit>
06:59 ShadeS it's a lot of branches here
06:59 TomyWork joined #git
07:00 ShadeS so git reset --hard 4a54ca0f1280f1cf570200600d52e02cda5edc39 for exmaple?
07:00 lordjancso joined #git
07:01 submitnine joined #git
07:01 thiago ShadeS: yes
07:02 ShadeS sexcellent
07:02 thiago ShadeS: you should remember the branch that you pushed the correct changes to
07:03 Darcidride joined #git
07:04 bq_ joined #git
07:05 ShadeS I do
07:05 ShadeS i said it's the dev branch
07:05 ShadeS not the master
07:05 thiago there you go
07:06 ShadeS youm ean i could have just --hard origin/dev ?
07:07 ctcrnitv joined #git
07:08 Munt joined #git
07:08 Synthead joined #git
07:09 konrados thiago: https://gist.github.com/konrados/​77da64eae4ae23aefe8a6191c5da145a
07:09 xaa joined #git
07:09 cqi joined #git
07:10 konrados And nothing more...
07:10 shiriru joined #git
07:10 thiago git show that commit. Does it work?
07:11 thiago konrados: did you mention it's the first commit?
07:12 MattMaker joined #git
07:13 konrados I don't understand the question :( Here is my git log: https://gist.github.com/konrados/​ae21fade657686ef333715c03e8f009c the de075814a1793daa2ff181082515ebfd8efa992a commit (the first one, chronologically) is the problem. It's missing "rt#" thing.
07:14 thiago git rebase -i --root
07:14 thiago I've never done this
07:15 konrados thiago - where does git store all the information about all the commits etc... Will deleting the project and then cloning it from svn help?
07:16 thiago konrados: everything is stored in .git
07:16 thiago if you delete and re-clone from svn you should get exactly what you got before
07:16 thiago why would it do something different now?
07:16 jguillen joined #git
07:17 konrados Because I didn't make any important changes, I only started playing with git yesterday. So, will it help? Will I really get what I had before playing with git?
07:17 thiago I don't know what you've done, so I don't know if it will help
07:18 thiago if you re-clone, you should get exactly what you had the last time you cloned
07:18 konrados thiago - Thank you!
07:19 beyertech joined #git
07:19 bernardio joined #git
07:20 Synthead joined #git
07:22 abyx joined #git
07:22 ahmedelgabri joined #git
07:24 nuc joined #git
07:25 netj joined #git
07:26 MattMaker joined #git
07:28 rkazak joined #git
07:30 star_prone joined #git
07:32 ItSANgo joined #git
07:34 bq_ joined #git
07:35 star_prone joined #git
07:36 bq_ joined #git
07:37 mralex joined #git
07:39 jaequery joined #git
07:39 LiohAu joined #git
07:40 Munt joined #git
07:41 HanClinto joined #git
07:42 konrados thiago, someone suggested "git rebase -i HEAD~3" (3 because it was 3 before the last one). Plus I learned how to edit the text which appears later - that I need to replace "pick" with a command, the instructions weren't clear for me. So your way would also work probably, if I knew how to edit the text (I thought I have enter one of those characters, like "e", "r" etc at the end of the text :) Thank you again very much for your patience.
07:42 nikivi joined #git
07:42 t0by joined #git
07:44 cyan__ joined #git
07:44 Lomex joined #git
07:45 mralex left #git
07:47 nikivii joined #git
07:47 cdesai joined #git
07:48 boombatower joined #git
07:48 nikivi joined #git
07:50 MattMaker joined #git
07:52 asdofindia joined #git
07:54 dhanush joined #git
07:54 fuchstronaut joined #git
07:55 jackweb joined #git
07:55 Balliad joined #git
07:57 dreiss joined #git
07:58 alansaul joined #git
08:00 gravitation joined #git
08:01 encod3 joined #git
08:02 marcogmonteiro joined #git
08:03 DistantStar joined #git
08:05 staafl joined #git
08:08 ctcrnitv joined #git
08:08 alcohol joined #git
08:09 p4trix joined #git
08:10 ki0 joined #git
08:11 MattMaker joined #git
08:11 ki0 joined #git
08:13 tomog999_ joined #git
08:13 mikecmpbll joined #git
08:14 Munt joined #git
08:14 Balliad joined #git
08:15 radsy joined #git
08:15 lugzer joined #git
08:16 lugzer_ joined #git
08:16 alansaul joined #git
08:16 chll_ joined #git
08:18 bernardio joined #git
08:20 shaggycat joined #git
08:24 eka joined #git
08:24 ethanol joined #git
08:29 alcohol joined #git
08:29 hahuang61 joined #git
08:31 sfan786_ joined #git
08:32 a3Dman joined #git
08:34 a_thakur joined #git
08:35 Gloomy joined #git
08:35 lugzer_ left #git
08:35 jceb joined #git
08:36 mohabaks joined #git
08:38 radsy joined #git
08:38 radsy joined #git
08:39 radsy joined #git
08:39 Pursuit joined #git
08:40 beyertech joined #git
08:40 MattMaker joined #git
08:42 johnny56_ joined #git
08:42 beyertech joined #git
08:43 ifra201 joined #git
08:46 azwieg103 joined #git
08:46 MattMaker joined #git
08:46 settermjd joined #git
08:48 Munt joined #git
08:49 GavinMagnus joined #git
08:51 garethdaine joined #git
08:54 ws2k3 joined #git
08:55 a_thakur joined #git
08:55 nuc joined #git
08:55 fuchstronaut joined #git
08:57 star_prone joined #git
08:58 mkoskar joined #git
08:58 MattMaker joined #git
08:59 Synthead joined #git
08:59 jceb joined #git
09:00 romerocesar joined #git
09:01 a_thakur joined #git
09:05 marcogmonteiro joined #git
09:06 zumba_ad_ joined #git
09:07 alansaul joined #git
09:08 wrouesnel1 joined #git
09:09 MattMaker joined #git
09:09 satifant joined #git
09:10 azwieg103 joined #git
09:11 spudowiar joined #git
09:11 nuc joined #git
09:11 BlaXpirit I have 3 commits that I'm interested in, they are not consecutive. is there any way to view all the changes they introduce, in one diff?
09:16 BlaXpirit rebase would work i guess but it's so much trouble on master branch
09:16 Simon_ joined #git
09:19 Munt joined #git
09:19 albel727 joined #git
09:19 MattMaker joined #git
09:20 sanketdg joined #git
09:23 ahmedelgabri joined #git
09:27 Synthead joined #git
09:28 MattMaker joined #git
09:28 nuc joined #git
09:30 boombatower joined #git
09:30 star_prone joined #git
09:32 notebox joined #git
09:33 GavinMagnus left #git
09:34 delboy1978uk joined #git
09:34 delboy1978uk any advice? trying to merge. warning: you may want to set your merge.renamelimit variable to at least 4769 and retry the command.
09:34 GavinMagnus joined #git
09:38 tobiasvl delboy1978uk: did you set your merge.renamelimit to at least 4769 and retry the merge?
09:42 MattMaker joined #git
09:43 delboy1978uk yeah i have now, panic over lol, thanks tobiasvl
09:43 delboy1978uk so why do we have that limit?
09:43 pR0Ps joined #git
09:44 nuc joined #git
09:45 _ikke_ delboy1978uk: Performance reasons I guess
09:45 Manuel15 joined #git
09:45 Manuel15 joined #git
09:49 delboy1978uk _ikke_: yeah i guess so too
09:49 kedare joined #git
09:51 Munt joined #git
09:51 jceb joined #git
09:52 ki0_ joined #git
09:53 wget Hello guys, I'm trying to rewrite my history to open source my latex class files, but I've issues with shell expansions
09:53 wget git filter-branch --tree-filter 'find . -type f -not -name \'*fig_*\' -not -name \'configuration.tex\' -delete' HEAD
09:53 wget the shell complains and add on the next line ">", as if the expression  was not terminated
09:53 a_thakur joined #git
09:54 wget When I double the quotes '' (two simple quotes) instead of \', the expression is not properly parsed, bu the shell does not complain any moe
09:54 wget *more
09:54 MattMaker joined #git
09:55 a_thakur joined #git
09:55 TRUMP-PENCE joined #git
09:56 fuchstronaut joined #git
09:59 star_prone joined #git
10:02 wget damn... http://stackoverflow.com/a/1250279/3514658
10:03 fuchstronaut joined #git
10:04 ahmedelgabri joined #git
10:05 delboy1978uk wget: yuk lol
10:06 wget delboy1978uk: yep that was epic :D
10:06 spudowiar joined #git
10:07 MattMaker joined #git
10:07 delboy1978uk left #git
10:07 fahadash joined #git
10:07 nuc joined #git
10:14 Synthead joined #git
10:14 stamina joined #git
10:15 sylario joined #git
10:17 leeN joined #git
10:20 bittin joined #git
10:23 t0by joined #git
10:25 rob_w joined #git
10:25 rob_w when i apply a patch via git am  , why is its comnit id changed ?
10:26 _ikke_ Different comitted, different comitter date
10:26 _ikke_ comitter
10:26 grawity rob_w: compare `git log/show --format=fuller`
10:26 _ikke_ different parent
10:26 rob_w ah ok
10:27 rob_w is this the same mechanic if someone sends a patch to the linux kernel lists and the maintainer applyies them ?
10:27 MattMaker joined #git
10:27 _ikke_ yes
10:27 rob_w ok thx
10:28 nuc joined #git
10:30 hahuang61 joined #git
10:33 NeonSynth joined #git
10:37 tvw joined #git
10:41 MattMaker joined #git
10:43 Pulp joined #git
10:43 heftig can i keep multiple git-svn remotes in a single repo?
10:44 bongjovi joined #git
10:49 nuc joined #git
10:49 JanC joined #git
10:50 a_thakur joined #git
10:51 vuoto joined #git
10:52 ki0 joined #git
10:52 JanC joined #git
10:56 MattMaker joined #git
10:56 sonOfRa joined #git
10:57 jimi_ joined #git
10:59 Mowgli joined #git
11:00 vuoto joined #git
11:01 Kartagis joined #git
11:01 Kartagis ehlo
11:02 paws_ joined #git
11:02 Kartagis how do I find out contents of o secific commit?
11:02 tobiasvl Kartagis: git show
11:05 despoil joined #git
11:06 nuc joined #git
11:07 fuchstronaut joined #git
11:09 docnvk joined #git
11:10 Kartagis thanks
11:10 MattMaker joined #git
11:12 danslo joined #git
11:15 EisNerd hi
11:16 zeroed joined #git
11:16 EisNerd is there a way to stop git rebase --continue from openin the commitmessage for editing?
11:18 ojdo joined #git
11:19 Balliad joined #git
11:19 l4v2 joined #git
11:20 MattMaker joined #git
11:21 bq_ joined #git
11:22 imrel joined #git
11:23 bq_ joined #git
11:23 nuc joined #git
11:24 _ikke_ EisNerd: It means that you have selected an option that requires it
11:24 GavinMagnus joined #git
11:24 _ikke_ either squash or reword
11:25 imrel joined #git
11:25 a_thakur joined #git
11:25 EisNerd no
11:25 EisNerd but I have everytime conflicts, because I moved some static parts into submodules
11:26 EisNerd to cut down the sourcebase
11:26 vrishab joined #git
11:27 EisNerd or would an exec step be applied before it is looked for conflicts?
11:28 j416 joined #git
11:30 achadwick joined #git
11:34 Faylite joined #git
11:34 MattMaker joined #git
11:35 ahmedelgabri joined #git
11:36 Anticom joined #git
11:36 Douhan joined #git
11:36 subhojit777 joined #git
11:36 fuchstronaut joined #git
11:37 rafalcpp how to print version like -DIRTY
11:37 rafalcpp like git describe, but adding -DIRTY if there is not commited work
11:38 rafalcpp aaah --dirty. Nm
11:38 grawity rafalcpp: https://git.kernel.org/cgit/linux/kernel/git/tor​valds/linux.git/tree/scripts/setlocalversion#n74
11:38 grawity oh there's a --dirty now? cool
11:38 rafalcpp yea
11:40 nuc joined #git
11:41 chamunks joined #git
11:41 Eugene joined #git
11:42 d1b joined #git
11:42 msm joined #git
11:42 SegFaultAX joined #git
11:43 konrados After reading this: https://git-scm.com/docs/gitignore and this: http://stackoverflow.com/questions/1470​572/gitignore-ignore-any-bin-directory I'm confused. The first states "If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find a match with a directory. In other words, foo/ will match a directory foo" so it would what I want. The second one says: "The way to ignore all directories called bin
11:43 konrados anywhere below the current level in a directory tree is with a .gitignore file with the pattern: bin/" <- did the guy meant *directly below*? I hope so. Or does it mean that if below current level I have e.g. "SomeDir" and in this dir I have "bin", the "bin" dir will be ignored?
11:44 Sceorem joined #git
11:44 MattMaker joined #git
11:44 imrel left #git
11:45 mehola joined #git
11:45 zeroed joined #git
11:45 zeroed joined #git
11:47 konrados p.s. I know it's a long question, but I promise you, it's very simple :)
11:47 konrados For you.
11:48 _ikke_ grawity: since 1.6.6 :-)
11:48 vuoto_ joined #git
11:50 jon_ross left #git
11:51 johnmilton joined #git
11:52 j416 joined #git
11:52 a_thakur joined #git
11:52 Anticom Hi all. I've got a question about git flow branching model: We are using `git describe` got get version information that will be used to version rpm packages. Now if we tag releases on master branch it's all good. But how will can get a reference to the latest tag in a development branch for dev-builds? Afaik you're not supposed to merge master to develop right?
11:54 gravitation joined #git
11:54 qqz joined #git
11:55 Maple__ joined #git
11:56 CheckDavid joined #git
11:56 srcerer joined #git
11:57 kinetik_ joined #git
11:57 qqz hi; I have just checked out a new kernel version and it said: your local changes would be overwritten by a merge; please commit your changes
11:58 qqz then I had commited what I had appeared to have merged the last time
11:58 nuc joined #git
11:58 qqz but now on git merge origin/master it says: already up to date
11:59 MattMaker joined #git
11:59 qqz no idea why it does not perform the git merge origin/master or what kernel version I am currently on
11:59 qqz it has downloaded a lot but no new git tag marker appeared
12:00 qqz i.e. I have some local changes
12:00 qqz and always did a git merge origin/master which has worked up to now after checking out a new version
12:00 synthroid joined #git
12:00 qqz I am not sure what has gone wrong this time
12:00 konrados thiago, ilmari - can you please look at my question? It's very simple really and you were so helpful. Maybe I'll make it shorter. in .ignore if I put e.g. "bin/" does it mean the one directory being in the same dir as the .ignore file or all let's say I have "someDir" and "bin" directory inside and this "bin" will also be ignored?
12:00 qqz it appears to have nothing cahnged
12:01 jkt joined #git
12:01 raven-au joined #git
12:01 piling_ joined #git
12:02 GavinMagnus joined #git
12:03 kedare_ joined #git
12:03 veilig2000 joined #git
12:03 sdothum joined #git
12:04 ShekharReddy joined #git
12:05 qqz strange: last time I have compiled kernel 4.7 but now that one is not even on the git tag list
12:05 qqz looks like the archive has destroyed itself
12:05 lordjancso joined #git
12:06 qqz by a mere: git pull https://git.kernel.org/pub/scm/linux​/kernel/git/stable/linux-stable.git
12:06 nopf joined #git
12:06 qqz can anyone please help
12:06 qqz I have a little problem with git here
12:07 qqz git seems to have redrawn changes instead of accepting new ones ?!??????
12:07 qqz how can I find out what has happened?
12:08 vuoto_ joined #git
12:09 sonOfRa joined #git
12:09 vuoto joined #git
12:09 MattMaker joined #git
12:09 vuoto joined #git
12:11 a_thakur joined #git
12:11 bruce_lee joined #git
12:11 bruce_lee joined #git
12:11 Zumochi joined #git
12:13 rorro joined #git
12:13 Zumochi Good day, I'm interested to see if it's (easily) doable to remove about half of a branch's history
12:13 Zumochi I work together on a project with a buddy, and we moved from one framework to another
12:14 Zumochi I suggested we start with a fresh history from the first implementation of the new framework, by doing git checkout -b --orphan new-branch
12:14 Zumochi Buttt he messed that up a bit and now we still have the entire history
12:15 Zumochi With that, the .git folder is really, unnecessarily, large (40MB)
12:17 heftig Zumochi: check out the first commit you want to keep into a new branch with --orphan
12:17 heftig Zumochi: rebase the rest of the commits on top of that one
12:17 Faylite joined #git
12:19 Zumochi That actually sounds reasonable, let me try it out
12:20 nuc joined #git
12:22 rwb joined #git
12:24 vuoto joined #git
12:25 vuoto joined #git
12:26 johntramp joined #git
12:26 vuoto joined #git
12:28 algae joined #git
12:28 MattMaker joined #git
12:30 nicksloan joined #git
12:30 vuoto joined #git
12:31 hahuang61 joined #git
12:32 vuoto joined #git
12:33 livingstn joined #git
12:33 daniel_rose joined #git
12:33 vuoto joined #git
12:36 konrados OK, nvm, I'll just try it. But - to ignore a directory/file, I simply create the .ignore file and edit it, is that all?
12:37 Kartagis left #git
12:37 ahmedelgabri joined #git
12:37 nuc joined #git
12:39 zeroed joined #git
12:39 zeroed joined #git
12:39 fuchstronaut after resolving a conflict in a file, do I simply 'git add filename' and then 'git rebase --continue' ?
12:41 Kartagis joined #git
12:41 Kartagis hi
12:42 tobiasvl fuchstronaut: yes
12:42 tobiasvl konrados: yes (and add and commit it)
12:42 fuchstronaut so no need to do anything else like commit or something
12:43 Kartagis I don't remember who recomnnended gşt show, but can I use it to show all of the file at that time?
12:43 konrados Thanks tobiasvl
12:43 tobiasvl fuchstronaut: no, no commit
12:43 fuchstronaut tobiasvl: thank you! Can I add multiple files? like 'git add file1.txt file2.txt' ?
12:43 tobiasvl fuchstronaut: for sure
12:43 konrados tobiasvl fuchstronaut - it is about my .gitignore question?
12:44 fuchstronaut thanks again
12:44 tobiasvl konrados: no.
12:44 konrados OK, thanks
12:46 tobiasvl Kartagis: no, man git cat-file
12:46 gitinfo Kartagis: the git-cat-file manpage is available at http://jk.gs/git-cat-file.html
12:46 mehola joined #git
12:46 tobiasvl Kartagis: or wait, you can: git show SHA:FILE
12:46 tobiasvl forgot about that one
12:47 MattMaker joined #git
12:47 t0by joined #git
12:47 airdisa joined #git
12:48 a_thakur joined #git
12:50 zivester joined #git
12:53 Guest79642 joined #git
12:55 Zumochi heftig: I feel like a potato, I haven't used git for a few months before I started on this project. Anyway, I can't figure out how to do the rebase. I think I'm doing it right with the following (currently on the new, orphaned branch) git rebase --onto new-initial
12:55 Zumochi But I get a message about no tracking info on the current branch
12:55 Zumochi "Please specify which branch you want to rebase against."
12:57 grawity there might be faster ways
12:57 grawity try `git replace --graft <new-initial>`
12:57 nuc joined #git
13:00 Gabs_ joined #git
13:00 GavinMagnus joined #git
13:00 Gabs_ joined #git
13:01 Gabs_ joined #git
13:01 Zumochi grawity: I want to completely remove the previous commits from history though, does graft do this?
13:01 MattMaker joined #git
13:02 grawity once you bake it in with `git filter-branch`
13:03 alansaul joined #git
13:03 nettoweb joined #git
13:03 ddavidd left #git
13:04 lmat It looks like git gc --prune=now --aggressive; (I'm guessing whatever) takes more and more memory as it goes.
13:04 bartosz_ joined #git
13:04 bartosz__ joined #git
13:04 lmat I would expect that it would take enough memory to hold the original object being compressed, and its compressed representation. But in fact, it seems to be holding the whole compressed repository in memory as it adds to it?
13:05 grawity I think it does that in order to quickly find similar objects
13:05 grawity since most of them are delta-compressed against a similar object
13:06 grawity you can configure various limits, see the pack.* settings
13:06 ToBeCloud joined #git
13:06 lmat grawity: excellent. Thanks!
13:07 byteflame joined #git
13:07 lmat grawity: I installed a swap file on my machine, so now it actually runs to completion, but when it's memory bound, all the swapping is pretty slow :-)
13:07 Gabs_ joined #git
13:07 veilig2000 joined #git
13:07 grawity try pack.windowMemory then
13:08 lmat excellent. Does that mean it may miss some delta opportunities? Or it'll just be slower?
13:08 grawity yeah, if it can keep fewer objects in memory, it might not find the best option to delta against
13:11 Oebele joined #git
13:12 MattMaker joined #git
13:13 a_thakur joined #git
13:13 Zumochi grawity: after "baking" it with filter-branch my .git folder size is still ~40 MB
13:14 Zumochi I'm looking to clean that up
13:14 Zumochi It did, however, clean up the previous commits, which was one thing I wanted :)
13:15 grawity well, old commits always stick around after a history rewrite, no matter which method you choose
13:15 grawity try `git gc` or whatever lmat used a few minutes ago
13:16 nuc joined #git
13:17 Zumochi :/ it doesn't improve at all
13:17 Zumochi Size remains exactly the same
13:17 Zumochi hang on let me try something else
13:17 danimal2 joined #git
13:17 grawity git prune
13:18 JanC_ joined #git
13:18 jimi_ joined #git
13:19 Zumochi grawity: no juice. The size is all in one pack file in .git/objects/pack
13:20 Zumochi Let me try an aggressive run :P
13:20 HanClinto joined #git
13:20 Zumochi No difference unfortunately
13:22 HanClinto_ joined #git
13:22 grawity well, that means they're still referenced by something
13:22 grawity try `git show-ref` or `git log --all --graph --oneline --decorate`
13:23 grawity must be the backup refs, actually
13:24 Electrometro joined #git
13:27 cdg joined #git
13:28 konrados In .gitignore How is this: smarty/templates_c/* different from this: smarty/templates_c/ ?
13:28 BlaXpirit konrados, ignore all files inside that folder, or ignore the folder itself.  by themselves I think there is no difference, but in combination there is
13:29 BlaXpirit e.g. you could write   a/*   and   !a/stuff.md   to ignore all files in that folder except one
13:29 BlaXpirit however if you wrote to ignore  a  , it is impossible to unignore anything inside it
13:30 konrados I get it, thank you BlaXpirit!
13:30 cdown joined #git
13:30 notebox joined #git
13:30 ExoUNX joined #git
13:30 MattMaker joined #git
13:31 Mowgli joined #git
13:31 lamont joined #git
13:32 Zumochi grawity: yes, it still shows all the previous commits etc. using your second command. I tried to get rid of them with help from http://stackoverflow.com/a/5985276 but no juice still :/
13:32 gravitation joined #git
13:32 Zumochi Thanks for the assistance anyway :)
13:32 grawity just delete those refs then...
13:32 grawity i.e. with `git update-ref -d`
13:33 rahtgaz joined #git
13:33 zeroed joined #git
13:35 fuchstronaut joined #git
13:36 cdown_ joined #git
13:38 nettoweb joined #git
13:39 Zumochi I can't figure out how to do that exactly :(
13:40 Zumochi I'm sorry for being such a noob :)
13:40 grawity well, what does `git show-ref` list?
13:40 Zumochi Hmm, do I delete the refs/replace/*?
13:41 grawity you can, they're not used for anything anymore
13:41 grawity it's refs/backup/* that is more interesting
13:42 Zumochi grawity: there is no such ref
13:42 grawity what refs *are* there?
13:43 lmat ewwwww   work/db/rice-data/log4j-1.8.3.jar  is matched by   **/rice*.jar  ? :'(
13:43 Zumochi refs/heads/initial, refs/remotes/(some remotes), refs/replace/(some sha, x2)
13:44 grawity *shrug*. well, one of those is holding your commits
13:44 grawity oh, `git for-each-ref --contains <bad_commit>` should do it
13:45 Zumochi There are like 30 commits :D
13:45 grawity so pick one
13:45 grawity they all are going to be in the same ref, anyway
13:46 MattMaker joined #git
13:46 JustAnotherIdiot joined #git
13:46 Zumochi git for-each-ref doesn't have a contains option for me, is that recent?
13:47 lmat How do I only match *files* that match  rice*.jar in any subdirectory? ^_^
13:48 BlaXpirit lmat, specify in the context of what command
13:48 sabgenton joined #git
13:48 rossome joined #git
13:49 nuc joined #git
13:49 lmat BlaXpirit: git rm -rf --cached --ignore-unmatch
13:50 bremner I suspect you need to use find
13:50 jpX joined #git
13:50 lmat bremner: Not a bad idea...
13:51 ams__ joined #git
13:51 lmat git filter-branch --index-filter 'git rm -rf --cached --ignore-unmatched $(find -type f 'rice*.jar')';  should work?
13:51 sabgenton echo /baz export-ignore > .gitattributes   does not seem to ignore baz at the repo's root, am i missing anything?
13:52 grawity is the .gitattributes file itself at the repo's root?
13:52 sabgenton yes
13:52 sabgenton i tried without the slash too
13:53 Gamecubic joined #git
13:53 lmat ah   git filter-branch --index-filter 'git rm -rf $(find . -type f -name '*.properties' -o -name '*.jar')';   should work...
13:54 cyan__ joined #git
13:54 Zumochi Damn, neither my debian machine nor mac have a git version new enough for git for-each-ref --contains
13:55 charlesr joined #git
13:55 sabgenton Zumochi: use homebrew on mac?
13:55 lmat Zumochi: Use archlinux?
13:55 ilmari Zumochi: git from sid installs fine on jessie
13:55 sharpy joined #git
13:55 Zumochi sabgenton: yes, lmat: no
13:55 lmat ;-)
13:56 jpX__ joined #git
13:56 Zumochi Ah! I already had git on my mac, let me install from homebrew
13:56 rossome joined #git
13:57 sabgenton Zumochi: what version you want?  homebrew for me is on 2.8.2
13:57 nebg left #git
13:57 Zumochi I just installed 2.8.3 from homebrew but it's not ended up in my path for some reason
13:58 sabgenton run brew doctor
13:58 dhollinger joined #git
13:59 sabgenton you probably just need to put the PATH  infront in .bash_profile
13:59 Zumochi Or .zshrc :P
13:59 sabgenton :)
13:59 Manuel15 joined #git
13:59 Manuel15 joined #git
14:01 sabgenton grawity: no ideas to why `echo /baz export-ignore > .gitattributes`  fails?
14:03 AaronMT joined #git
14:03 rossome joined #git
14:04 AaronMT joined #git
14:05 MattMaker joined #git
14:05 mohabaks joined #git
14:05 cdown joined #git
14:06 hide joined #git
14:06 LionsMane joined #git
14:06 angular_mike joined #git
14:07 GodGinrai joined #git
14:08 csd_ joined #git
14:09 nuc joined #git
14:11 [Brain] joined #git
14:12 romerocesar joined #git
14:14 robotroll joined #git
14:15 Electrometro joined #git
14:15 catag87 joined #git
14:15 MattMaker joined #git
14:16 catag87 joined #git
14:16 marc_v92 joined #git
14:18 ResidentBiscuit joined #git
14:18 jkt joined #git
14:25 phaleth joined #git
14:25 HaikuUser joined #git
14:26 MattMaker joined #git
14:27 fmcgeough joined #git
14:29 rubyonrailed joined #git
14:29 nuc joined #git
14:30 ash_workz joined #git
14:31 daniel_rose joined #git
14:31 hahuang61 joined #git
14:32 Spacew00t joined #git
14:32 daniel_rose joined #git
14:33 govg joined #git
14:34 fuchstronaut joined #git
14:36 geko joined #git
14:36 bongjovi joined #git
14:37 Prisoner-2460_1 joined #git
14:39 MattMaker joined #git
14:39 AaronMT joined #git
14:40 AaronMT joined #git
14:40 al-damiri joined #git
14:41 cdown joined #git
14:44 Mowgli joined #git
14:46 nuc joined #git
14:47 abyx joined #git
14:48 sim590 joined #git
14:48 cdown joined #git
14:49 mehola joined #git
14:50 marc_v92 joined #git
14:51 TooLmaN joined #git
14:51 l4v2 joined #git
14:53 zeltak left #git
14:53 zivester joined #git
14:54 cdown joined #git
14:54 MattMaker joined #git
14:55 GavinMagnus joined #git
14:55 tjone270__ joined #git
14:57 eivarv joined #git
14:58 jpX joined #git
14:58 makinen left #git
14:59 MattMaker joined #git
14:59 Nex6 joined #git
14:59 jpX__ joined #git
15:00 dreiss joined #git
15:00 zero__ joined #git
15:01 buffal0 joined #git
15:02 zeroed joined #git
15:02 zeroed joined #git
15:02 rkazak joined #git
15:03 daniel_rose joined #git
15:05 cdown_ joined #git
15:05 zacts joined #git
15:05 clemf joined #git
15:05 star_prone joined #git
15:07 buffal0 joined #git
15:08 le_melomane joined #git
15:09 Gsham joined #git
15:09 buffal0 joined #git
15:09 phanimahesh joined #git
15:12 cdown_ joined #git
15:12 abc123 joined #git
15:14 Maple__ joined #git
15:16 zeroed joined #git
15:16 ksolv joined #git
15:16 roelmonnens joined #git
15:18 superchar joined #git
15:19 dmto joined #git
15:20 eivarv joined #git
15:22 Takumo joined #git
15:22 Takumo joined #git
15:24 HappyLoa- joined #git
15:26 fahadash joined #git
15:26 kus joined #git
15:26 romerocesar joined #git
15:28 daniel_rose joined #git
15:28 MattMaker joined #git
15:33 crayon joined #git
15:33 crayon joined #git
15:35 Rodya_ joined #git
15:35 le_melomane joined #git
15:38 marc_v92 joined #git
15:42 MattMaker joined #git
15:43 xpk joined #git
15:43 thiago joined #git
15:44 jaafar joined #git
15:49 subhojit777 joined #git
15:49 mehola joined #git
15:50 crayon joined #git
15:52 kpease joined #git
15:53 danslo joined #git
15:54 MeltedLux joined #git
15:56 InfoTest joined #git
15:58 a_thakur joined #git
15:58 MeltedLux joined #git
15:58 dunpeal joined #git
15:59 dunpeal Hi. Is there a shortcut command to push the current (new) local branch to a new branch of the same name on the remote, and make that new remote branch the upstream for the current local branch?
15:59 mcqr joined #git
16:00 nkouevda joined #git
16:01 canton7 dunpeal, 'git push -u origin HEAD'
16:02 daniel_rose joined #git
16:02 canton7 (or you can use the branch name instead of HEAD if you want: but HEAD saves you from having to type the branch name, or lets you create an alias)
16:02 * canton7 uses git config --global alias.pushup push -u origin HEAD
16:03 dunpeal canton7: thanks!  I'm stealing your pushup alias too
16:03 canton7 :)
16:04 MeltedLux joined #git
16:04 eight58 joined #git
16:05 nikivi joined #git
16:05 daniel_rose joined #git
16:08 dmto joined #git
16:08 * _ikke_ calls the git police
16:09 MattMaker joined #git
16:09 RichiH diiBUU-diiiBUUU-diiBUU
16:09 crelix joined #git
16:09 TomyLobo joined #git
16:10 EvilPeng1 joined #git
16:10 TRUMP-PENCE joined #git
16:11 ytl joined #git
16:13 Kicer86 joined #git
16:14 Brain joined #git
16:14 Seveas git arrest --force dunpeal
16:15 crayon joined #git
16:16 MeltedLux joined #git
16:16 star_prone joined #git
16:17 * osse notes that Seveas violates the non-aggression principle
16:17 Darren_ joined #git
16:17 mingrammer joined #git
16:18 Seveas and you like it when I do that
16:18 notebox joined #git
16:18 roelmonnens joined #git
16:19 madewokherd joined #git
16:20 MattMaker joined #git
16:21 Spacew00t joined #git
16:21 cuicui joined #git
16:21 a_thakur joined #git
16:23 GavinMagnus left #git
16:26 shaggycat joined #git
16:27 FuzzySockets joined #git
16:28 NeckBeardPrince joined #git
16:28 NeckBeardPrince joined #git
16:29 cuicui left #git
16:31 MattMaker joined #git
16:32 LeBlaaanc joined #git
16:32 hahuang61 joined #git
16:35 vrishab joined #git
16:37 nitric joined #git
16:37 dreiss joined #git
16:37 ksolv joined #git
16:40 JrCs joined #git
16:40 rorro joined #git
16:42 jimi_ joined #git
16:42 MattMaker joined #git
16:47 izissise joined #git
16:48 zacts joined #git
16:48 SteffanW joined #git
16:49 joki joined #git
16:50 mehola joined #git
16:52 daynaskully joined #git
16:53 spudowiar joined #git
16:53 ki0 joined #git
16:54 LeBlaaanc joined #git
16:55 ShapeShifter499 joined #git
16:55 marc_v92 joined #git
16:57 PabloR joined #git
16:57 PabloR After 1st commit (and push to github) of all my app files at once, I modified and added the README file to the stage so it was the only one ready to be committed again. However `git commit --amend -m 'Initial commit’` stated that ALL my files changed (it also created a new commit ID). Shouldn’t only the README file have changed and added to the local repo?
16:58 ffio joined #git
16:58 _ikke_ PabloR: It shows you what that commit changed, so the readme was added to those changes
16:58 osse guys
16:58 osse I fell riding my bicycle home from work :/
16:59 osse Rear tire slipped. Rain on stone tiles made it lose traction. I guess you could say it got... untracked
16:59 _ikke_ d'oh
16:59 eivarv joined #git
16:59 _ikke_ I hope only --cached
17:00 MattMaker joined #git
17:00 osse yeah i'm fine
17:01 osse and the wheel is still attached to the bike if that's what you mean
17:02 PabloR _ikke_ I'm not following. I only changed the pre-existing readme. Why is it showing me like all my files changed instead of just the readme?
17:02 _ikke_ PabloR: git commit --amend redoes the commit
17:02 stnutt joined #git
17:03 PabloR Ah, so if I did just git commit without amending would only have changed the readme then?
17:03 stnutt left #git
17:04 jaequery joined #git
17:04 _ikke_ yes
17:04 _ikke_ Note that each commit contains all files
17:04 Cooler216 joined #git
17:05 b1tchcakes joined #git
17:05 [cust] joined #git
17:05 veilig2000 joined #git
17:07 sangy joined #git
17:07 Rodya_ joined #git
17:09 PabloR _ikke_ Thing is if I wanted to rewrite github history with amend to avoid a silly commit (like correcting a word in readme) now I get a new commit ID and shows all files were committed again. Wouldn't this new info screw up whoever cloned the github repo?
17:10 Cooler216 left #git
17:10 _ikke_ PabloR: It would a bit, yes
17:10 joki joined #git
17:11 EvilPeng1 joined #git
17:13 Rodya_ joined #git
17:15 MattMaker joined #git
17:15 jaequery joined #git
17:16 InfoTest1 joined #git
17:16 PabloR _ikke_ I mean somebody familiar with the repo would know the previous commits ID and dates and suddenly all this changes. I guess there is no other way to do it so nothing changes except the corrected word (keeping the commit ID and original dates)? The other option is just commit even for a silly update?
17:17 _ikke_ PabloR: Yes, you have to change history if you don't want to error to be part of the history
17:17 PabloR ok. Thanks
17:17 _ikke_ It's up to you to estimate the impact
17:18 _ikke_ If it's something you just pushed, hardly anyone has that history yet
17:18 star_prone joined #git
17:18 eivarv joined #git
17:18 Repox joined #git
17:19 rubyonrailed joined #git
17:19 PabloR great. thanks
17:19 JrCs joined #git
17:21 ksolv joined #git
17:22 JrCs joined #git
17:24 surfnturf_ joined #git
17:24 abyx joined #git
17:25 Spacew00t joined #git
17:26 mischat joined #git
17:28 robogoat joined #git
17:28 surfnturf_ I'm trying to clone a library from bitbucket but I'm used to github. when I tried: git clone https://tdkwon@bitbucket.org/yaricp/django-bbb-conf It says repository not found...
17:28 surfnturf_ I also tried: git clone https://tdkwon@bitbucket.org/yaricp/django-bbb-conf.git
17:29 rpd uh what's with the https://user@bitbucket syntax
17:29 surfnturf_ thas what it shows in the https link on the page
17:29 _ikke_ rpd: That's normal
17:29 jumpman joined #git
17:29 surfnturf_ If I remove that it says remote not found
17:29 _ikke_ surfnturf_: So you used the link they provided at bitbucket?
17:29 surfnturf_ yes
17:30 surfnturf_ I'm trying to download this: https://bitbucket.org/yaricp/django-bbb-conf
17:30 _ikke_ And you have access with that user to that repository?
17:30 thiago joined #git
17:30 hahuang65 joined #git
17:30 surfnturf_ i believe its public.
17:30 surfnturf_ I can view the src on the web.
17:30 surfnturf_ I also tried to fork it to my repo and download
17:30 kballou joined #git
17:30 jason237 joined #git
17:31 nitric surfnturf_: read carefully, that's a mercurial repo
17:31 _28_ria joined #git
17:31 nitric the clone command is "hg ...."
17:31 surfnturf_ I saw that. But I thought mercurial was just another client for git.
17:31 ojacobson no
17:31 Anoia heh
17:31 ojacobson it's a separate source control system
17:31 surfnturf_ oh ok.
17:31 ki0 joined #git
17:32 ojacobson There are tools for converting between the two, but personally I'd use hg for mercurial repos and git for git repos
17:32 grawity git-remote-hg is best
17:32 surfnturf_ well my entire project is git.
17:33 eivarv joined #git
17:33 Anoia hg can clone and have git sub repos
17:33 cyan__ joined #git
17:33 Anoia I'd hope that git can do similar?
17:34 MattMaker joined #git
17:34 surfnturf_ i've never done that but i believe git can have sub repos
17:34 _ikke_ But not hg subrepositories
17:35 rpd well, I guess a git repo could hold metadata for an hg subrepo, but now you're just putting the peanut butter in the chocolate
17:35 abyx joined #git
17:36 sbeller joined #git
17:36 _ikke_ I would not use subrepositories for this anyway
17:36 surfnturf_ yeah i think i'm just gonna get the code and make my own lib
17:36 reim joined #git
17:38 GodGinrai rpd: I don't think that's a good analogy.  Chocolate and Peanut Butter go great together
17:38 GodGinrai case in point: Reese's
17:39 irco joined #git
17:39 JrCs joined #git
17:40 uranellus joined #git
17:40 uranellus joined #git
17:40 terminal_echo joined #git
17:46 spudowiar joined #git
17:47 netj joined #git
17:47 bittin joined #git
17:48 cebor joined #git
17:48 JrCs joined #git
17:49 MattMaker joined #git
17:49 reda joined #git
17:50 unbalancedparen joined #git
17:50 abyx joined #git
17:50 dreiss joined #git
17:51 mehola joined #git
17:54 dunpeal joined #git
17:55 The_Phoenix joined #git
17:57 Shentino joined #git
17:58 The_Phoenix1 joined #git
17:58 ksolv joined #git
18:03 TRUMP-PENCE joined #git
18:04 LiohAu_ joined #git
18:05 interne7y joined #git
18:05 JrCs joined #git
18:06 A_F_K joined #git
18:07 Derperperd joined #git
18:08 dunpeal Is there a special term for someone who is really, really, ridiculously good at Git?
18:08 _ikke_ a git
18:10 Sasazuka joined #git
18:10 rom1504 it's called gitster
18:10 rom1504 https://github.com/gitster main git contributor :p
18:10 GodGinrai dunpeal: a neckbeard
18:11 BlaXpirit joined #git
18:11 nitric dunpeal: "linux kernel creator"
18:14 rubyonrailed joined #git
18:19 star_prone joined #git
18:20 Anoia Linus?
18:21 ojacobson if anyone ever calls me "a linus" i'm leaving the field forever
18:21 ojacobson i never want to be like that awful man
18:21 MattMaker joined #git
18:22 LeBlaaanc joined #git
18:22 davisonio joined #git
18:22 surfnturf_ he's an awful man? i never heard that
18:22 surfnturf_ although i never heard anything
18:23 frobnic joined #git
18:23 Anoia surfnturf_: i've heard he can be overly aggressive at times
18:23 surfnturf_ ah
18:24 surfnturf_ maybe in his eyes we're all morons?
18:24 nitric statistically, he's right
18:24 rpd that's kind of old school mailing list mentally on pl and kernel groups, but people realize that's not how you build a community
18:24 Seveas he's a dick. A dick who writes pretty decent software, but a dick nonetheless.
18:26 wcpan_ joined #git
18:27 ResidentBiscuit ^
18:27 ResidentBiscuit He has no cares whether he hurts somebody's feelings
18:32 preaction that's not a virtue, to be clear
18:33 hahuang61 joined #git
18:35 endiruna joined #git
18:36 Rodya_ joined #git
18:37 bittin joined #git
18:40 beyertech joined #git
18:45 MattMake_ joined #git
18:46 sargas joined #git
18:47 Darren_ joined #git
18:49 skarm joined #git
18:51 p4trix joined #git
18:51 yoan joined #git
18:52 mehola joined #git
18:52 romerocesar joined #git
18:54 mkoskar joined #git
18:54 Xizor joined #git
18:55 paul424 joined #git
18:56 afuentes joined #git
18:56 FrostCandy joined #git
18:57 d5sx43 joined #git
19:01 davisonio joined #git
19:01 star_prone joined #git
19:01 beyertech joined #git
19:03 johnmilton joined #git
19:03 dan joined #git
19:04 daniel_rose joined #git
19:05 dunpeal I'd say more than "pretty decent software". The guy is chief architect of both Linux and Git.
19:05 dunpeal And wrote the first functional releases of boths.
19:05 catag87 joined #git
19:06 abyx joined #git
19:06 dunpeal (His polarizing behavior notwithstanding)
19:06 offlim joined #git
19:07 codebam I have a remote fetched in a different repo, how can I copy it to the current repo without fetching it again?
19:07 dunpeal IMHO he's an extremely talented engineer, who possibly thinks his talent gives him license to mistreat people around him, promote extreme opinions, and refuse to change them even when confronted by overwhelming contrary evidence.
19:07 NightStrike Is it possible to do the equivalent of "svn up -r" to an earlier commit so that I can modify that commit through a rebase, then reapply all of the subsequent ones?
19:07 grawity codebam: fetch it from that different repo
19:08 dunpeal NightStrike: yes, see rebase -i
19:08 NightStrike that's not what I'm looking for exactly, though
19:08 dunpeal it's basically: git rebase -i commit_you_want_to_change^
19:08 NightStrike oh
19:08 NightStrike I never tried putting a commit after the -i
19:09 dunpeal Yeah, without the -i it will just use a default, which isn't always what you want.
19:09 NightStrike but how do I get the file I'm working with into a state just after the commit I want to modify?
19:10 dunpeal And it's definitely what you want in this case. You don't *need* rebase -i, but it's a combination of multiple tools and logic flows that will otherwise take a precise sequence of 4-5 commands or more.
19:11 dunpeal NightStrike: rebase -i to commit^, then "edit" that commit, and "pick" all following commits.
19:12 codebam it says "fatal: Couldn't find remote ref refs/heads/caf" when I tried fetching from it locally
19:12 codebam I used -t caf
19:13 anonnumberanon Hi for Git configuration it wants me to choose a text editor. I use Sublime and sometimes nano what should I do.
19:13 anonnumberanon ?
19:14 anonnumberanon Does it work well with nano? Not sure if Sublime will work with this.
19:14 dunpeal anonnumberanon: it should respect your $EDITOR
19:14 _ikke_ What do you prefer?
19:14 anonnumberanon I prefer Sublime.
19:14 dunpeal left #git
19:14 _ikke_ anonnumberanon: it has a subl command which you can use for this
19:14 ToxicFrog anonnumberanon: if you want it to use sublime, use 'subl -w'
19:14 GodEater` joined #git
19:14 NightStrike dunpeal: ok, thanks, that worked.  I did a ton of rebasing :)  Does git do any kind of garbage collection on all of these thrown away commits?  Because I can still see them if I do a git show
19:14 ToxicFrog Which will block until you close the file you're editing
19:14 NightStrike even when they don't appear in git log
19:14 codebam vim is a great editor
19:14 anonnumberanon so like this? $  git config --global core.editor 'subl -w'
19:15 anonnumberanon ??
19:15 daniel_rose joined #git
19:15 ToxicFrog Note that this means you won't be able to use e.g. "git commit" without -m  or "git rebase -i" unless you can run subl usefully (in particular, this won't work over ssh)
19:15 ToxicFrog anonnumberanon: yes
19:15 _ikke_ anonnumberanon: Make sure subl is in your $PATH
19:15 _ikke_ anonnumberanon: Or give an absolute path
19:15 ToxicFrog And yes, it also works well with nano (set it to 'nano'), and if you don't bother setting it it'll just use whatever $EDITOR is set to.
19:16 codebam git commits that require editing will not work unless you are in an X session
19:16 codebam s/commits/commands
19:16 anonnumberanon This step is taking too long and detailed I'll just do nano.
19:19 offlim left #git
19:19 anonnumberanon I'll take a note of setting it to several different editors down the line. Is this amoung other things when you get a difference between two files and it opens an editor to deal with that problem or display the differences?
19:19 rorro joined #git
19:21 _ikke_ anonnumberanon: That's called a diff or mergetool
19:21 _ikke_ You set those seperately
19:22 anonnumberanon _ikke_, git does not come with a diff tool by default?
19:22 sangy joined #git
19:23 _ikke_ nope
19:23 _ikke_ Nore does it come with an editor
19:23 _ikke_ or a pager
19:23 _ikke_ Nor*
19:23 anonnumberanon What is a pager?
19:23 nitric anonnumberanon: if you're having trouble finding the "subl" command, you do have to take the extra step of symlinking it into your $PATH: https://www.sublimetext.com/​docs/3/osx_command_line.html
19:23 _ikke_ anonnumberanon: The thing you get when git log has to output more than one screen of output
19:24 evie_hammond joined #git
19:24 rwb joined #git
19:24 bball2music joined #git
19:24 Silox| joined #git
19:24 bball2music left #git
19:25 offlim joined #git
19:26 anonnumberanon nitric, thanks but I'm on linux, this is for osx
19:26 MattMaker joined #git
19:27 peepsalot joined #git
19:28 offlim left #git
19:29 sargas joined #git
19:31 Lipp joined #git
19:34 netj joined #git
19:34 MattMaker joined #git
19:34 BrianJ joined #git
19:35 anonnumberanon IN the official documentation I want to do this but I don't have a my_project object what should I do? All I have is a hidden .git directory? $ git clone --bare my_project my_project.git
19:35 zeemz joined #git
19:35 anonnumberanon (Making a bare copy to paste onto my vps so that the vps can have git too.)
19:37 rorro joined #git
19:40 morenoh149 joined #git
19:40 morenoh149 what's the name of the area that is for unstaged changes?
19:40 morenoh149 is that even inside git really?
19:40 ojacobson work tree
19:40 iskander joined #git
19:41 morenoh149 I'd like to git diff between what's in the filesystem and a commit. But I only see how to diff between head and a commit.
19:41 morenoh149 can I git diff against the work tree?
19:41 nate_c joined #git
19:42 grawity yes
19:43 anonnumberanon omfg
19:43 anonnumberanon do i have to commit every single file I touch all of the time or can I just commit all?
19:43 morenoh149 anonnumberanon: git add .
19:44 morenoh149 but if you're not careful your coworkers will hate you
19:44 anonnumberanon morenoh149, yes assuming I've added everything I wanted to add.
19:44 anonnumberanon Then comes commits.
19:44 anonnumberanon I'm alone right now.
19:44 rpd anonnumberanon: try git add -p
19:45 rpd if you want to separate your additions into logical commits
19:45 MattMaker joined #git
19:45 anonnumberanon I don't know what that means.
19:45 anonnumberanon I have a .c .cpp .txt. I added them. I want to commit all of them, use -p ?
19:45 morenoh149 looks like `git diff <commit> <file>` diffs against the working tree
19:46 anonnumberanon ah nevermind yes the git commit command does what I want
19:46 rpd Well, I was saying before you added them with `git add .`, you could do `git add -p .` and it will show you all the hunks of changes done to those files and allow you to commit those hunks
19:46 Awesomecase joined #git
19:46 ELLIOTTCABLE joined #git
19:47 hdon joined #git
19:48 anonnumberanon Why would I do that? I just push and it will tell me if there are conflicts before I get to push, right?
19:49 alansaul joined #git
19:51 paul424 joined #git
19:56 stamina joined #git
19:58 surfnturf_ left #git
19:58 sargas joined #git
19:58 jstein_ joined #git
19:59 fahadash joined #git
19:59 rossome joined #git
20:00 cdg joined #git
20:01 Guest19 joined #git
20:03 Repox joined #git
20:04 mcqr joined #git
20:05 ToBeCloud joined #git
20:05 MattMaker joined #git
20:10 _ikke_ push would be rejected when someone else had pushed before
20:10 _ikke_ Conflicts you would see when you merge locally
20:11 GenZai joined #git
20:12 CheckDavid joined #git
20:13 GodGinrai anonnumberanon: For future reference: if the files you change are already tracked, then you can just use `git commit -a` to add all of the changed files to the staging area and commit.
20:13 anonnumberanon Okay :)
20:17 Rodya_ joined #git
20:17 _ikke_ Though we usually recommend here to look at what you commit
20:19 anonnumberanon IN the official documentation I want to do this but I don't have a my_project object what should I do? All I have is a hidden .git directory? $ git clone --bare my_project my_project.git
20:19 anonnumberanon https://git-scm.com/book/en/v1/Git-o​n-the-Server-Getting-Git-on-a-Server
20:19 Gianormagantrous joined #git
20:19 _ikke_ Yeah, a bare repository does not have a working tree
20:20 Faylite_ joined #git
20:20 _ikke_ It's purely meant for collaborating with others (pushing to and fetching from)
20:20 anonnumberanon Awesome. what is my_project in that command?
20:21 GodGinrai _ikke_: you can check that w/ git-status, git-diff, etc.
20:21 anonnumberanon Feels like a directory
20:21 nwkj86 joined #git
20:23 netcarver joined #git
20:23 arescorpio joined #git
20:27 MattMaker joined #git
20:28 sangy joined #git
20:28 _ikke_ GodGinrai: Yes, and the next step is to make your commits logical
20:28 _ikke_ Ah, he just left
20:33 endiruna joined #git
20:34 hahuang61 joined #git
20:34 _ikke_ .version
20:34 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
20:36 mcqr joined #git
20:36 nitrospectide joined #git
20:36 offlim joined #git
20:37 moei joined #git
20:38 LeBlaaanc joined #git
20:38 nitrospectide I started with a clean working copy, having committed all of my changes previously, and then I made a bunch of changes. Now I don't like what I did, and want to wipe the changes, and bring my working copy back to what it was right after my last commit. How do I do that?
20:38 _ikke_ safe: git stash
20:38 _ikke_ unsafe: git reset --hard
20:40 nitrospectide _ikke_: Can I blow out that stash later?  I don't want to keep any of this.
20:40 _ikke_ nitrospectide: yes, git stash pop
20:41 nitrospectide _ikke_: so in doing the stash, it will actually checkout the old versions of all the changed files?
20:41 _ikke_ Yes, git stash will store the working tree and index, and then make them both the same to HEAD
20:43 JeremyM joined #git
20:44 nitrospectide _ikke_: It looks like git stash pop will reapply the stashed changes to my working copy
20:44 _ikke_ Oh sorry, I meant drop
20:44 _ikke_ pop = apply + drop
20:45 vuoto joined #git
20:45 JeremyM left #git
20:45 nitrospectide Aha. I see that a little farther down the page. With no arg, it drops the most recent.
20:45 EvilPeng1 joined #git
20:46 nitrospectide _ikke_: Thank you for the help. I appreciate it.
20:46 _ikke_ yes
20:46 _ikke_ But because the objects are stored in the repository, you can still retrieve them untill they are GC'd
20:46 Prisoner-2460_1 if i make a new file and don’t add it, that won’t get stashed. is there a way to stash without adding it?
20:47 _ikke_ Prisoner-2460_1: --include-untracked
20:47 Prisoner-2460_1 and when i pop that it’ll still be untracked?
20:47 _ikke_ should be
20:48 Prisoner-2460_1 sweet
20:48 _ikke_ yup
20:51 toydestroyer joined #git
20:52 afuentes joined #git
20:53 romerocesar joined #git
20:55 t0by joined #git
20:58 nicksloan left #git
21:05 stamina joined #git
21:05 mcqr joined #git
21:08 crayon joined #git
21:09 EvilPeng1 joined #git
21:16 [cust] joined #git
21:16 Derperperd joined #git
21:17 cd-rum joined #git
21:20 jhass joined #git
21:21 mingrammer joined #git
21:23 rubyonrailed joined #git
21:25 Nex6 joined #git
21:27 altendky joined #git
21:28 [cust] joined #git
21:34 cagomez joined #git
21:35 jlebar joined #git
21:41 Finnoloid joined #git
21:44 Derperperd joined #git
21:51 AciD` joined #git
21:51 AciD` hey
21:51 aidalgol joined #git
21:52 AciD` is there a way to prevent git to index a given directory (and its sub-directories) without writing that dir path in the .gitignore file?
21:52 AciD` ie. perhaps using a .gitPleaseIgnoreThisCurrentDir file to put inside that dir?
21:53 dsantiago joined #git
21:53 tang^ that is how... git doesn't care about directories, only files
21:53 _ikke_ AciD`: There is a .git/info/exclude file you can use
21:53 _ikke_ tang^: I suspect that dir contains files
21:54 AciD` tang^ -> perhaps I was not clear enough, I meant a dir with files in it :)
21:54 AciD` yep
21:54 mehola joined #git
21:54 grawity you can put a .gitignore *in* that directory – containing a "*"
21:54 tang^ oh sorry... I flipped the reasoning of that request
21:54 mingrammer joined #git
21:55 AciD` _ikke_ -> so, there is no way to keep that 'config' on that directory level (a bit like when you put a .gitkeep file in a directory that you want git to keep track of)?
21:55 grawity there is
21:55 _ikke_ AciD`: Like grawity said, put a .gitignore file in the dir itself
21:55 AciD` ah sorry, I did not understand that
21:55 AciD` :)
21:55 AciD` of course
21:55 AciD` :x
21:56 RandomNoob joined #git
21:56 tyreld joined #git
21:56 AciD` I had created a .gitignore file, but did not think about putting a * inside :x
21:56 AciD` thank you guys
21:59 evie_hammond joined #git
22:00 red_ joined #git
22:03 israelzuniga joined #git
22:03 RandomNoob Hello guys. I am just starting using Git. I faced with problem. I have already added user.name and user.male but when I am trying to commit getting message http://kopy.io/2X6YU
22:04 RandomNoob *user.name
22:04 Hello71 one, why do you need JS for plain text
22:05 Hello71 two, the fuck is "user.male"
22:05 jaequery joined #git
22:05 tang^ RandomNoob: is that output the actual email address you put in your config?
22:06 RandomNoob tang^:  yeah it is. Should I put there my primary email address for Github? Not private one ?
22:06 tang^ cause it doesn't look like a valid email address format
22:07 tang^ if you're trying to keep your email private on github, you probably want this: https://help.github.com/articles/k​eeping-your-email-address-private/
22:07 airdisa the email should match your github account if you use the service, the name is what will appear in commit messages, so people know who did what
22:08 tang^ it doesn't need to match at all... it just needs to be valid
22:08 airdisa your email address isn't displayed on github to anyone as part of .giconfig
22:09 airdisa keep that private in your directory on your maching
22:09 Chunk2 joined #git
22:09 airdisa use the name field so when you collaborate, people know who did what
22:09 spudowiar joined #git
22:10 docnvk joined #git
22:10 airdisa you can go in and edit the file manually, though the cli has an alias for that too
22:10 nanga joined #git
22:11 abyx joined #git
22:13 RandomNoob Guys I found what was my problem. I just typed user.mail. It should be user.email
22:13 diphtherial joined #git
22:13 jkt joined #git
22:13 airdisa yes
22:13 Derperperd joined #git
22:13 diphtherial i'm using git bash on windows (which is apparently some customized version of mingw?) and i find myself in the position of needing gcc/g++ to build some stuff
22:13 diphtherial is there an easy way to add those to git bash? my apologies if this isn't the right place to ask
22:14 diphtherial (specifically, i'm trying to build the lxml package for python, which has some compiled bits)
22:15 tang^ diphtherial: try this? http://stackoverflow.com/questions/327121​33/package-management-in-git-for-windows
22:17 airdisa the place I'd look for that (I'm not on windows so I have no idea) is to try and figure out what the new windows bash is based from e.g. Linux or BSD and what flavor etc. Then go use the package manager appropriate for that like apt-get for Ubuntu linux, yum for RHEL or make / pkg for BSD.
22:18 airdisa If I had to guess, I would think Microsoft went with Ubuntu. You can try these commands to see $ apt-get
22:18 diphtherial tang^: interesting; this 'git for windows' thing is news to me
22:18 Seveas airdisa: they did go ubuntu.
22:18 The_Phoenix joined #git
22:18 airdisa Seveas: makes sense, I guess
22:19 airdisa then it would be something like apt-get install lxml
22:19 fractalizator joined #git
22:19 Seveas not sure if gcc installed that way will be able to create windows binaries
22:19 diphtherial Seveas: that's a recent thing; previously they were using a fork of mingw called msysgit
22:20 airdisa Saveas: oh man, that would be limiting :-)
22:20 diphtherial frankly i don't even know why i use windows...
22:20 evie_hammond joined #git
22:20 diphtherial booting up an ubuntu vm would probably save me a lot of agony rather than the several projects on which i'm currently depending that promise a gnu environment in windows (cygwin, mingw, and msysgit, specifically)
22:20 Seveas diphtherial: msysgit was the development environment to build git. to reduce the confusion, the renamed that to 'git for windows sdk', while git-the-product on windows is now 'git for windows'
22:20 airdisa diphtherial: I'll refrain from saying I don't know either
22:20 reim joined #git
22:21 diphtherial Seveas: ah, foot in mouth
22:21 Seveas diphtherial: no, common mistake. The naming was terribly confusing :)
22:21 diphtherial ok, i am a saddened and humbled man once again
22:21 Manuel15 joined #git
22:21 Manuel15 joined #git
22:21 diphtherial thanks for the help and advice
22:21 Seveas so, if you install the git for windows sdk, you'll get gcc (as you'll need it to compile git)
22:22 Sample joined #git
22:22 airdisa diphtherial: $5 per mo. gets you a box on Linode or DigitalOcean and you can always run the AWS confusion maze too
22:22 diphtherial i have severa digitalocean VPSs and plenty of AWS instances
22:23 diphtherial i just use windows at home so i can produce music and play games when i'm being a worthless drag on society
22:23 diphtherial (the AWS instances are on the lab account, thankfully)
22:23 Chunk2 joined #git
22:23 diphtherial *several, even
22:23 Seveas so why not compile there?
22:25 diphtherial that's a fair idea
22:25 diphtherial previously i was compiling on the same server that was hosting the website, but my colleague insists on running everything locally, so it didn't occur to me to do it "locally" in a proper GNU environment
22:25 diphtherial i just decided to try to get it to work on windows like a damn fool
22:26 diphtherial (by "locally", i mean on a linux VPS)
22:26 diphtherial he's become involved in this project now, and he's practically helpless so i have to figure out how to do everything for him
22:26 diphtherial e.g. get the project to run both locally and on the remote and check in the changes so he can just pull them and enter a command to run the website
22:27 diphtherial anyway, this is all off-topic chatter
22:27 offlim joined #git
22:27 a3Dman joined #git
22:27 Spacew00t joined #git
22:29 tcurdt joined #git
22:29 jkt joined #git
22:30 Seveas it's quiet in here anyway, a bit of offtopic chatter doesn't hurt.
22:31 diphtherial heh :) well, i appreciate the opportunity to vent
22:31 RandomNoob Guys should I add .gitignore file ? git add .gitignore? git status is giving me untracked file .gitignore :S
22:31 diphtherial yes, you want to add your .gitignore to your repo
22:32 RandomNoob thx
22:32 iio7 joined #git
22:34 iio7 I am working on a local branch on which I have done a lot of commits. I wanted to squash a lot of them into one single commit, so I am using interactive rebasing with "rebase -i --root", however I get stuck with the message "Unmerged path foo", where foo is a submodule.
22:34 iio7 How do I deal with that? I can undo the rebase, but I would like it to proceed.
22:34 up_the_irons joined #git
22:34 hahuang61 joined #git
22:35 gmh joined #git
22:35 Seveas you'll need to solve that merge conflict manually, git add the submodule and git rebae --continue
22:36 Seveas though git rebase --root sounds wrong for work on a local branch
22:36 Seveas that'll rewrite your entire history, not just your commits
22:37 RandomNoob After adding .gitignore to repo with "git add .gitignore". The git status is giving me this message "on branch master nothing to commit, working directory clean". found this about my case http://stackoverflow.com/a/24871697
22:38 Seveas RandomNoob: you'll need to commit it...
22:39 RandomNoob Seveas: I commited it
22:39 Seveas then a clean working tree is expected, isn't it?
22:39 RandomNoob after commit I am getting that clean message
22:39 RandomNoob Aww
22:40 RandomNoob it should be like that ? O:-)
22:41 iio7 Seveas, thanks!
22:43 UTAN_dev joined #git
22:45 iio7 Seveas, without "--root" how would I rewrite my entire history without touching stuff before I checkout the branch?
22:46 Seveas iio7: git rebase -i branch-you-branched-off-of
22:47 Seveas though I usually do a normal rebase first to move the commits to the top, then an interactive rebase to clean up.
22:48 iio7 Seveas, I originally tried that, I branched of master, but when I do "git rebase -i master", I get this "fatal: Needed a single revision. invalid upstream master"
22:48 Seveas that sounds like the master branch was deleted
22:49 mingrammer joined #git
22:49 iio7 When I look in the original repo the master branch is there, I did a clone from that. Shouldn't git clone all branches?
22:50 Seveas it should. Can you do a git for-each-ref and pastebin the output?
22:52 iio7 Seveas, https://pastebin.mozilla.org/8891710
22:52 Duder9999 joined #git
22:52 lindenle joined #git
22:52 iio7 It seems, when I clone, I only get the refactoring branch.
22:53 case39 joined #git
22:56 Seveas I don't see your local branch
22:56 Seveas or did you just work on the refactoring branch?
22:57 iio7 The refactor branch is my local branch, but it was created elsewhere, then cloned from the original box to this one.
22:57 Seveas right
22:57 Seveas git branch -vv
22:57 Seveas and pastebin the output please.
22:57 Seveas Just want to see some more info before I give comfusing and potentially harmful advice :)
22:58 chandu20 joined #git
22:59 iio7 * refactoring 2015623 [origin/refactoring] Removed the hill function
22:59 Seveas cool, that's what I expected
22:59 Seveas the command you want is git rebase -i
22:59 iio7 It is most likely that I am doing something wrong.
22:59 Seveas with no further arguments
23:00 Seveas it'll detect the last commit you and origin/refactoring have in common, and rebase everything newer than that.
23:00 iio7 Seveas, then I only get a "noop"
23:00 iio7 Rebase 2015623..2015623 onto 2015623
23:01 Seveas ah right, you already pushed that
23:01 Seveas you can still rebase, but that would be !rewriting
23:01 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
23:02 iio7 Ah, it's because I did a push!
23:08 RedneckDonut joined #git
23:11 Spec-Chum joined #git
23:12 hdon joined #git
23:13 l4v2 joined #git
23:14 moneylotion how can I fire up the VIM git commit editor, from a bash alias??? it doesn't seem to work
23:16 reim joined #git
23:17 srcerer joined #git
23:18 cdown joined #git
23:19 tanuki joined #git
23:20 EvilPeng1 joined #git
23:21 tanuki joined #git
23:23 rudi_s moneylotion: What exactly are you trying to do? GIT_EDITOR=vim git commit?
23:24 moneylotion i want a bash alias, 'alias gc="git commit";', but the git commit doesn't work that way
23:24 tanuki joined #git
23:25 Seveas git config --global core.editor vim
23:25 xaa joined #git
23:26 moneylotion "git commit" already works as expected, but not through a bash alias
23:26 RandomNoob moneylotion: git config --global alias.gc commit
23:27 RandomNoob but it will change only commit to gc
23:27 RandomNoob git gc
23:27 rudi_s moneylotion: The alias should work just fine, what exactly is the result and the expected result?
23:27 Seveas then your bash alias is wrong. What's the exact output of: type gc
23:27 rudi_s RandomNoob: git gc won't work because gc is an existing command.
23:27 rudi_s You can't alias over existing commands.
23:27 RandomNoob yeah
23:28 RandomNoob just if he removes from .bashrc that alias gc=git commit
23:28 rudi_s RandomNoob: What?
23:28 moneylotion http://pastebin.com/ydFXfpgZ
23:28 moneylotion thats what i get
23:29 slayerjain joined #git
23:29 Seveas moneylotion: What's the exact output of: type gc
23:29 moneylotion gc
23:29 moneylotion ooops
23:29 Seveas moneylotion: and the exact command that produced the output you pastebinned
23:30 moneylotion gc, is a bash alias gc="git commit";, and that what it produces
23:30 rudi_s moneylotion: Please run alias gc and show us the resulting output.
23:30 Seveas that's not what 'type gc' will say.
23:30 Seveas use that command, give us the output.
23:31 moneylotion http://pastebin.com/ydFXfpgZ
23:31 moneylotion that pastebin is the output of the alias
23:32 Seveas that's not what I asked.
23:32 Chunk2 joined #git
23:32 moneylotion you want this alias" git config --global alias.gc commit" ???
23:32 ojacobson run the "type" builtin, and pass "gc" as its only argument
23:32 cdown_ joined #git
23:32 bq_ joined #git
23:32 ojacobson literally, type the string "type gc" into your shell, without quotes, and hit return
23:32 Seveas moneylotion: no, I asked fo the output of: type gc
23:32 moneylotion gc is an alias for git commit -m
23:32 rudi_s moneylotion: Ignore the part about git config, that won't work.
23:32 Seveas there.
23:33 Seveas your alias is wrong
23:33 Seveas fix your alias and it'll work.
23:33 moneylotion sorry i updated it... one sec
23:33 bq_ joined #git
23:33 RandomNoob moneylotion:  alias gc="git commit" try this oe
23:33 RandomNoob one
23:34 tanuki joined #git
23:34 moneylotion alas it worked!
23:35 moneylotion thanks, that was a dumb one
23:36 RandomNoob np
23:41 tanuki joined #git
23:42 Duder9999 joined #git
23:42 ytl joined #git
23:52 Pulp joined #git
23:54 leeN joined #git
23:55 mehola joined #git
23:57 adron joined #git
23:57 nanga joined #git
23:57 nanga joined #git
23:59 adambrenecki joined #git
23:59 thiefg joined #git

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