Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-19

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

All times shown according to UTC.

Time Nick Message
00:00 cagedwisdom joined #git
00:01 ColdKeyboard joined #git
00:01 dsdeiz joined #git
00:02 floatingman joined #git
00:03 Siegfried joined #git
00:04 jstimm joined #git
00:05 ramsub07 joined #git
00:06 thebope joined #git
00:07 Starky joined #git
00:08 CubiK joined #git
00:08 dermoth_ joined #git
00:10 mattp_ joined #git
00:14 pasadinhas joined #git
00:16 crayon joined #git
00:21 MaximusColourum joined #git
00:21 romerocesar joined #git
00:25 barteks2x I started a merge and now I don't remember if I had any local changes or not before I started it, way way to check it? (is it even possible to have local uncommited changes and do successful merge?)
00:27 Anja_ joined #git
00:28 Orbitrix joined #git
00:28 barteks2x wait, I couldn't have uncommited changes... because I did it right after checkout
00:29 Orbitrix joined #git
00:29 mischat joined #git
00:30 azerus joined #git
00:30 Starky joined #git
00:32 shampine joined #git
00:32 shampine joined #git
00:33 Ryanar joined #git
00:33 railssmith joined #git
00:33 doppo joined #git
00:33 pks joined #git
00:38 nwkj86 joined #git
00:39 jccn joined #git
00:47 nettoweb joined #git
00:49 mikecmpbll joined #git
00:51 crayon joined #git
00:53 SwiftMatt joined #git
00:59 b3kN joined #git
01:00 cdown joined #git
01:01 MaximusColourum joined #git
01:03 crayon joined #git
01:06 madewokherd joined #git
01:09 thebope joined #git
01:11 SwiftMatt joined #git
01:20 sdelic joined #git
01:20 polyrob joined #git
01:21 hahuang65 joined #git
01:22 ashokrajar joined #git
01:22 jstimm joined #git
01:22 jaafar joined #git
01:24 jnewt_ how do i show multi-line commit messages with git log -graph (instead of wrapping at the console boundary)?
01:25 User458764 joined #git
01:27 leb joined #git
01:29 Rickmasta joined #git
01:30 mischat joined #git
01:32 Starky joined #git
01:34 nonconvergent joined #git
01:34 nonconvergent left #git
01:35 nonconvergent joined #git
01:35 nonconvergent Is there way to see what branch I created a branch from? I cut a feature branch from a potentially dirty develop and realized I might have done it more than once.
01:38 watabou joined #git
01:39 sdelic joined #git
01:40 rewt nonconvergent, a gui (eg: gitk) can show that quite clearly
01:40 qpdb joined #git
01:41 derk0pf joined #git
01:42 catbeard joined #git
01:46 svm_invictvs joined #git
01:48 pwnz0r joined #git
01:51 cdown joined #git
01:55 done joined #git
01:56 slayerjain joined #git
01:58 Guest55 joined #git
02:01 Shentino joined #git
02:02 UniFreak joined #git
02:03 durham joined #git
02:04 Starky joined #git
02:06 Siegfried joined #git
02:06 BenderRodriguez joined #git
02:09 thebope joined #git
02:11 neanderslob joined #git
02:11 montyboy joined #git
02:12 d^sh joined #git
02:14 clemf joined #git
02:21 clemf_ joined #git
02:24 hahuang65 joined #git
02:25 aFeijo joined #git
02:26 aFeijo hi friends. Is it safe to recreate the master branch? It is too conflicted, I dont need any file in it.
02:26 mizu_no_oto joined #git
02:26 thiago have you shared that repository with others?
02:26 aFeijo I want to drop the master, create it again, and merge from stage branch
02:27 aFeijo thiago, me? yes, but he doesnt use master
02:28 thiago he'll still have to delete his clone and clone again
02:28 aFeijo hmmm, how to force master to match stage branch? any other way?
02:28 aFeijo maybe copy all stage files over it, and commit
02:28 thiago same problem: everyone will have to delete their clones and clone again
02:29 thiago you can create a new commit without rewriting history though
02:29 thiago git checkout stage .
02:29 thiago including the dot at the end
02:31 mischat joined #git
02:32 aFeijo ok I will try, thanks thiago
02:32 aFeijo thiago, sinto cheiro de brasileiro?
02:34 finalbeta joined #git
02:36 akurniawan joined #git
02:39 wrouesnel2 joined #git
02:41 plankws joined #git
02:41 Gadgetsu joined #git
02:42 pks joined #git
02:46 Gadgetsu left #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:57 Shentino joined #git
03:10 thebope joined #git
03:12 sunri5e joined #git
03:19 GT4066 joined #git
03:24 venmx joined #git
03:26 Celelibi joined #git
03:27 jnewt joined #git
03:27 jnewt i have a conflict on merge.  i want to overwrite my local with whatever came down that caused the conflict.  how do i do that?
03:28 hexagoxel joined #git
03:28 jnewt i meant pull, not merge
03:29 chachasmooth joined #git
03:30 rewt pull is just fetch+merge, so merge was the right term there
03:30 Rickmasta joined #git
03:31 rewt you can do `git reset --hard origin/<branch>` to reset your working tree to match the latest commit in the branch from the remote repo
03:31 rewt that will wipe out all changes made locally
03:32 mischat joined #git
03:38 bluezone joined #git
03:40 Nilesh_ joined #git
03:41 Goplat joined #git
03:45 malber joined #git
03:50 pfg_ left #git
03:51 pfg joined #git
03:59 Celelibi Hi there.
04:00 Celelibi I like to have clean commits that looks like I never write bugs publicly.
04:00 Anupkumar joined #git
04:00 Celelibi So I often rebase to fixup older commits.
04:01 Celelibi Would it be possible that every time I commit, if the message starts with "fixup <commitid>:" it does the rebase automatically?
04:03 Celelibi Even better if it does that out of the working directory.
04:04 russ_za_ joined #git
04:06 clemf joined #git
04:06 phroa Celelibi: sounds exactly like rebase --autosquash : man git-rebase
04:06 gitinfo Celelibi: the git-rebase manpage is available at http://jk.gs/git-rebase.html
04:11 acetakwas joined #git
04:11 Celelibi Ok, so it takes the whole title after "fixup! " actually. That's nice.
04:11 jstimm joined #git
04:11 thebope joined #git
04:12 jnewt_ how can i modify a commit message (buried)?
04:12 Celelibi And --autostash is nice too, I should enable that by default.
04:12 jnewt_ i tried checkout and then git commit --amend, but it created a new commit as opposed to modifying the old one
04:13 Celelibi jnewt_: you will always have new commits. However, you can make git reapply the whole list of changes that came afterwards and make them the new branch.
04:14 jnewt_ Celelibi, you're talking about rebasing all subsequent branches post commit-in-question onto the new commit?
04:14 Vortex35 joined #git
04:14 Celelibi Yes.
04:14 jnewt_ yuck
04:15 Celelibi Well, no, not exactly.
04:15 Celelibi If you use rebase -i you can tell which commit you want to reword.
04:15 Celelibi git will reapply all your changes, one by one, when you said "reword", it will stop and let you edit the message, and when you're done, it continues.
04:16 Celelibi But in the end, you have a whole new branch of commits.
04:16 Celelibi And there is no way around that, the commit message is part of the sha1 commit id.
04:16 jnewt_ yeah, i can do that.
04:16 Celelibi And subsequent commits refer to the previous one by its hash.
04:18 leb joined #git
04:18 barteks2x is it possible to git add only specifi parts of a file?
04:18 barteks2x Halfway through creating next change I realized I need to change smething in previous commit
04:19 jnewt_ one more question.  i have a point where i had a branch with 1 commit that i merged back into master, and it didn't ff. i want to squash the split, but rebase gives an conflict.  i don't know how to resolve it so that it just ends up with the result of the merge.
04:19 Celelibi barteks2x: you can git add -p
04:19 Celelibi It will prompt you for the diff to add to the index.
04:20 Rickmasta joined #git
04:20 barteks2x nice, if I knew about it so many things would be easier
04:21 Celelibi barteks2x: if you need to fix the last commit when you started editing your files, you can stash your changes, ammend the commit, and pop the stash.
04:21 barteks2x Except that these chnges are already done (formatting...)
04:21 barteks2x so adding specific parts of a file is easier than dealing with merge conflict when applying stash
04:22 Celelibi jnewt_: I don't see what your commit DAG looks like or what you want it to be.
04:23 romerocesar joined #git
04:24 xall joined #git
04:26 pwnz0r joined #git
04:26 jnewt_ Celelibi, http://pasted.co/ca46dcf6
04:27 jnewt_ or even leave the merge commit results in there would be better
04:28 jnewt_ i trie rebase -i <SHA of A>, but as soon as it hits the commits int the "split", it conflicts
04:31 Celelibi I have no idea how rebase behave when there are several ancestors to a commit.
04:31 xall joined #git
04:31 Celelibi Probably not very well.
04:32 Celelibi jnewt_: well, I'd probably do it by hand.
04:32 Celelibi Like, create a new temporary branch on commit A.
04:33 Celelibi Checkout the *files* from D (don't checkout the commit itself).
04:33 Celelibi And create a new commit from these new files.
04:34 Celelibi You can import the commit message from D with the -c or -C option of git commit.
04:34 romerocesar joined #git
04:35 umpc joined #git
04:37 watabou joined #git
04:44 phanimahesh joined #git
04:45 pks joined #git
04:46 gfixler joined #git
04:46 lordjancso joined #git
04:47 Celelibi How can I uncommit? I would like HEAD and the current branch to return to HEAD~ but with all the commit diff in the index (or at least in the working directory).
04:48 barteks2x git reset HEAD^ I think
04:49 Celelibi Oh, yes, it was that simple.
04:50 robattila256 joined #git
04:54 Celelibi I'm not sure how rebase --autosquash recognize the commits.
04:56 leb joined #git
04:58 Aboba joined #git
04:58 fstd_ joined #git
05:06 watabou_ joined #git
05:11 xall joined #git
05:13 ismithers joined #git
05:14 tjone270 joined #git
05:15 shashin_ joined #git
05:15 shashin joined #git
05:15 b3kN joined #git
05:15 b3kN joined #git
05:18 Cabanossi joined #git
05:18 thebope joined #git
05:19 phanimahesh joined #git
05:24 venmx joined #git
05:25 pwnz0r joined #git
05:25 jnewt_ when using git log with --format=format:''  how do i use %s (the commit message), but allow it to wrap as typed instead of getting smashed into one long line?
05:27 jnewt_ nm, %B does it
05:28 acetakwas joined #git
05:29 durham joined #git
05:30 shashin joined #git
05:30 inflames joined #git
05:32 aidalgol joined #git
05:33 mischat joined #git
05:35 pks joined #git
05:40 lightstalker joined #git
05:50 OnBrokenWings joined #git
05:54 L4B Can git projects have some sort of project configuration file that specifies the project name, version, etc.? And can those be used as macros that expand inside files?
05:54 bannakaffalatta joined #git
05:57 sdothum joined #git
05:57 daey joined #git
05:59 User458764 joined #git
06:05 leb joined #git
06:05 Mobutils joined #git
06:05 Muzer joined #git
06:08 moritz L4B: no. If you need that, you should use a build system that supports that
06:11 InfoTest joined #git
06:14 lovingrainbow joined #git
06:14 User458764 joined #git
06:26 MrWoohoo joined #git
06:26 darkbit joined #git
06:32 L4B moritz: Ironic, because this is actually *for* my build system, which I plan to have in a separate repo and import it as a submodule in all other projects. :)
06:33 mischat joined #git
06:34 L4B I probably shouldn't mention this but SCCS has something of the sort.
06:34 xall joined #git
06:36 pijiu3 joined #git
06:42 shubhnik joined #git
06:43 LucaTM joined #git
06:50 romerocesar joined #git
06:50 NeverTired joined #git
06:51 Ozymandy joined #git
06:51 minifu joined #git
06:51 pks joined #git
06:52 minifu hello
06:52 gitinfo minifu: 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.
06:54 jfr joined #git
06:54 minifu I want to install Git on MacOS El Capitan from source. Turns out I need to install OpenSSL to do that. Which I'd also like to install from source. More than that, I'd like to understand what I'm doing and why I'm doing it as I'm installing from source. I've done some building from source, but very limited and I darn sure didn't know what I was doing. I do not want to use MacPorts, Fink or Homebrew. Whenever I've touched those loathsome
06:54 minifu beasts in the past, they have made me rue the day I ever heard of them and the person who said, "No, trust me. This will be so much easier." Bite me. I don't believe you. Those dogs have bitten me every single time I've played with them. I don't expect to learn everything tonight. But if you were me, a beginner comfy with the command line, but still a beginner, wanted to accomplish what I described, where would you start in your
06:54 minifu learning process?
06:55 akurniawan joined #git
06:57 User458764 joined #git
06:57 User458764 joined #git
07:00 dermoth joined #git
07:03 vuoto joined #git
07:04 johnny56 joined #git
07:08 howdoi joined #git
07:11 vuoto joined #git
07:11 dsantiago joined #git
07:13 bocaneri joined #git
07:16 vuoto joined #git
07:18 vuoto left #git
07:20 vuoto joined #git
07:22 derk0pf joined #git
07:24 venmx joined #git
07:34 tjone270 joined #git
07:34 a_thakur joined #git
07:34 mischat joined #git
07:37 xall joined #git
07:37 User458764 joined #git
07:39 lindenle joined #git
07:46 jstimm joined #git
07:49 dreiss joined #git
07:50 ochorocho__ joined #git
07:51 pks joined #git
07:51 meauses joined #git
07:52 SteffanW joined #git
07:53 cagedwisdom joined #git
07:59 _ikke_ minifu: I guess just start trying, and googling problems you run into
07:59 _ikke_ That's most of my process
08:02 clemf joined #git
08:02 _UniFreak joined #git
08:03 _UniFreak joined #git
08:05 minifu I try to avoid that, especially with Mac's. They have one version of some of these things (Git, OpenSSL, etc) and sometimes when you start experimenting like that (or when I've experimented in the past), the clean up was brutal. Usually along the lines of re-installing the system.
08:05 minifu Now I like to go in prepared with notes.
08:06 minifu I remember one time when I tried to update Perl.
08:06 minifu That was a nightmare.
08:06 tvw joined #git
08:06 nd joined #git
08:12 awq joined #git
08:15 jozwior joined #git
08:16 Qria joined #git
08:18 Macaveli joined #git
08:21 flavius joined #git
08:24 flavius_ joined #git
08:32 jknetl joined #git
08:33 ahmedelgabri joined #git
08:33 polyzen joined #git
08:34 cosmos joined #git
08:34 Karazhan joined #git
08:35 timetocode joined #git
08:35 mischat joined #git
08:37 timetocode how do I "read a desired tree" into this command? checkout-index --prefix=blah/ -a
08:40 timetocode is that gonna be something like   git SETSOMETHING https://timetocode@bitbucket.org/timetocode/example.git
08:44 cyan__ joined #git
08:45 pks joined #git
08:47 pwnz0r joined #git
08:49 edaught joined #git
08:51 ochorocho__ joined #git
08:51 mindriot101 joined #git
08:53 Anja_ joined #git
08:54 jozwior joined #git
08:58 ochorocho__ joined #git
09:01 Gloomy joined #git
09:02 albel727 joined #git
09:04 blackwind_123 joined #git
09:10 pks joined #git
09:18 ilbot3 joined #git
09:18 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
09:25 venmx joined #git
09:28 puff joined #git
09:30 LiohAu joined #git
09:33 venmx joined #git
09:36 mischat joined #git
09:40 puff joined #git
09:41 mehola joined #git
09:41 mindriot101 joined #git
09:45 mischat joined #git
09:49 pwnz0r joined #git
09:50 moop joined #git
09:54 zonric joined #git
09:55 dpower joined #git
09:55 JyZyXEL joined #git
09:56 L4B joined #git
09:56 JyZyXEL joined #git
09:58 King_Hual joined #git
09:58 JyZyXEL joined #git
09:58 pwnz0r joined #git
09:59 bluezone joined #git
10:02 dan2k3k4 joined #git
10:02 JyZyXEL joined #git
10:03 JyZyXEL joined #git
10:04 qws-user-1229 joined #git
10:04 JyZyXEL joined #git
10:05 govg joined #git
10:07 jstein joined #git
10:14 Karazhan joined #git
10:15 sawk joined #git
10:18 a_thakur joined #git
10:19 jozwior joined #git
10:19 disi joined #git
10:21 mablae joined #git
10:24 InfoTest1 joined #git
10:24 WoodLeg joined #git
10:24 xall joined #git
10:27 sawk joined #git
10:28 Murii joined #git
10:28 sawk joined #git
10:29 vuoto joined #git
10:31 overlord_tm joined #git
10:31 moritz joined #git
10:38 diogenese joined #git
10:43 seishun joined #git
10:43 PCatinean joined #git
10:44 cyan__ joined #git
10:48 inflames joined #git
10:49 a3Dman joined #git
10:49 WifiBrain joined #git
10:52 meauses joined #git
10:54 leehambley joined #git
10:54 nettoweb joined #git
10:55 mikecmpbll joined #git
11:02 dodobrain joined #git
11:07 reverse_light joined #git
11:07 z8z joined #git
11:08 nettoweb joined #git
11:08 _UniFreak joined #git
11:10 _UniFreak joined #git
11:10 WoodLeg_ joined #git
11:11 _UniFreak joined #git
11:12 eivarv joined #git
11:13 _UniFreak joined #git
11:15 _UniFreak joined #git
11:17 _UniFreak joined #git
11:19 _UniFreak joined #git
11:20 tmh1999 joined #git
11:20 a3Dman joined #git
11:20 _UniFreak joined #git
11:21 ochorocho__ joined #git
11:21 jozwior joined #git
11:22 _UniFreak joined #git
11:23 Darcidride joined #git
11:24 Karazhan joined #git
11:24 robotroll joined #git
11:25 _UniFreak joined #git
11:26 sq-one joined #git
11:26 vuoto_ joined #git
11:27 vuoto_ joined #git
11:27 _UniFreak joined #git
11:29 shinnya joined #git
11:29 _UniFreak joined #git
11:30 fuchsi joined #git
11:31 _UniFreak joined #git
11:36 cosmos joined #git
11:39 tens0r joined #git
11:39 a3Dman joined #git
11:39 sawk joined #git
11:40 p0wn3d joined #git
11:40 Mobutils joined #git
11:43 Exagone313 joined #git
11:45 leeN joined #git
11:49 jimi_ joined #git
11:49 ieee joined #git
11:50 Karazhan joined #git
11:52 cdg joined #git
11:53 xocket joined #git
11:54 HoierM joined #git
11:54 sawk joined #git
11:55 cdown joined #git
11:55 shashin joined #git
11:56 WoodLeg joined #git
11:56 ahmedelgabri joined #git
11:58 a3Dman joined #git
11:59 vrld joined #git
11:59 dikiaap joined #git
12:00 jknetl joined #git
12:00 pwnz0r joined #git
12:03 dikiaap joined #git
12:06 _UniFreak joined #git
12:08 _UniFreak joined #git
12:08 leeN joined #git
12:09 mindriot101 joined #git
12:13 xock_stream joined #git
12:16 cdown joined #git
12:17 Ozymandy joined #git
12:21 ambrazur joined #git
12:22 ambrazur left #git
12:22 oskarkv joined #git
12:22 ambrazur joined #git
12:23 ericP left #git
12:23 eivarv joined #git
12:24 satifant joined #git
12:24 cdown_ joined #git
12:27 Hello71 joined #git
12:28 aavrug joined #git
12:29 sawk joined #git
12:29 xall joined #git
12:30 subhojit777 joined #git
12:30 thierryp joined #git
12:31 thierryp joined #git
12:32 hahuang65 joined #git
12:33 jstimm joined #git
12:33 ToxicFrog joined #git
12:33 ToxicFrog !deploy
12:33 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
12:34 davimore joined #git
12:35 Cassiopaya joined #git
12:36 ramsub07 joined #git
12:37 IlNominePatre joined #git
12:37 xall joined #git
12:40 finalbeta joined #git
12:41 iLembus joined #git
12:45 subhojit777 joined #git
12:45 fahadash joined #git
12:46 LaptopBrain joined #git
12:50 qws-user-1228 joined #git
12:53 sq-one joined #git
12:57 Ardethian joined #git
12:58 meauses joined #git
13:00 sdothum joined #git
13:01 nikivi joined #git
13:03 sdothum joined #git
13:03 WoodLeg joined #git
13:04 sq-one joined #git
13:07 Learath2 joined #git
13:09 eivarv joined #git
13:11 Rickmasta joined #git
13:15 mizu_no_oto joined #git
13:18 romerocesar joined #git
13:19 User458764 joined #git
13:19 Raging_Hog joined #git
13:22 rodyhaddad joined #git
13:23 ramsub08 joined #git
13:27 tmh1999 joined #git
13:28 toydestroyer_ joined #git
13:33 dhollinger joined #git
13:33 WoodLeg joined #git
13:33 lvns joined #git
13:34 leehambley joined #git
13:35 mindriot101 joined #git
13:47 anonymuse joined #git
13:48 thebope joined #git
13:50 ambrazur left #git
13:53 dviola joined #git
13:56 Puffball joined #git
13:56 lena joined #git
13:56 mob1le joined #git
13:57 dikiaap joined #git
13:58 Puffball_ joined #git
14:01 marianna joined #git
14:01 pwnz0r joined #git
14:03 acetakwas joined #git
14:07 maret joined #git
14:13 fuchsi joined #git
14:16 Puffball joined #git
14:18 moop joined #git
14:20 tmh1999_ joined #git
14:20 iota_pi joined #git
14:24 Zamerick joined #git
14:30 fuchsi joined #git
14:30 CheckDavid joined #git
14:34 j416 joined #git
14:34 hahuang65 joined #git
14:36 raspado joined #git
14:37 mindriot101 joined #git
14:39 fuchsi joined #git
14:39 Vampire0 joined #git
14:41 fmcgeough joined #git
14:42 b3kN joined #git
14:42 b3kN joined #git
14:43 lindenle joined #git
14:44 albel727 joined #git
14:47 jknetl joined #git
14:49 anuxivm joined #git
14:49 blackwind_123 joined #git
14:50 elastix joined #git
14:50 jstein___ joined #git
14:51 m___ joined #git
14:51 alansaul joined #git
14:52 Derperperd joined #git
14:53 subhojit_ joined #git
14:54 fuchsi joined #git
14:56 GT4066 joined #git
14:57 ieee joined #git
14:57 Noldorin joined #git
15:03 snowkidind joined #git
15:04 eivarv joined #git
15:06 meauses joined #git
15:08 nikivi joined #git
15:13 russ_za joined #git
15:17 garethdaine joined #git
15:19 PCatinean joined #git
15:19 rmbeer joined #git
15:19 rmbeer hello
15:21 rmbeer i have problem with 'git push' where i create a new repo for use like a remote local repo: http://pasteall.org/121105   i need any other command?
15:22 shashin joined #git
15:22 russ_za joined #git
15:22 moritz rmbeer: the error message tells you what to do
15:22 moritz rmbeer: read it!
15:23 finalbeta joined #git
15:24 rmbeer moritz, ah! sorry, i unknown that this is for only 1 try...
15:25 xall joined #git
15:27 rmbeer moritz, ok, thank... and you must hope for my next silly question. :)
15:29 rmbeer left #git
15:30 edaught joined #git
15:30 joki- joined #git
15:30 sawk joined #git
15:36 kulelu88 joined #git
15:37 mizu_no_oto joined #git
15:38 Macaveli joined #git
15:38 mindriot101 joined #git
15:40 aavrug joined #git
15:40 styler2go joined #git
15:40 hubertus_quack joined #git
15:41 SwiftMatt joined #git
15:42 davimore_ joined #git
15:42 garethdaine joined #git
15:43 davimore__ joined #git
15:43 LaptopBrain joined #git
15:45 Derperperd joined #git
15:46 Learath2 joined #git
15:47 cagnotto joined #git
15:47 cdown joined #git
15:49 cagnotto left #git
15:49 thebope joined #git
15:50 govg joined #git
15:52 johnny56 joined #git
15:53 cdown joined #git
15:54 VladGh joined #git
15:56 heroux joined #git
15:58 NeverDie joined #git
16:00 ramsub07 joined #git
16:02 User458764 joined #git
16:04 davimore_ joined #git
16:05 sangy joined #git
16:10 SwiftMatt joined #git
16:11 ojdo joined #git
16:18 cdown joined #git
16:18 chris2 joined #git
16:19 InfoTest joined #git
16:19 derk0pf joined #git
16:22 salamanderrake joined #git
16:22 Karazhan joined #git
16:22 User458764 joined #git
16:23 montyboy joined #git
16:24 Karazhan joined #git
16:25 barteks2x is it possible to do interactive rebase starting before a merge commit and preserve the merge commit?
16:25 dreiss joined #git
16:26 zeroed joined #git
16:30 _ikke_ yes, but with limitations
16:30 _ikke_ man git rebase, look for --preserve-merges
16:30 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
16:30 Macaveli joined #git
16:32 barteks2x "Merge conflict resolutions or manual amendments to merge commits are not preserved." no...
16:32 barteks2x I had a few bad merge conflicts here
16:32 sq-one joined #git
16:32 Karazhan joined #git
16:33 barteks2x any way around that?
16:33 barteks2x This is the first time I hit a git limitation
16:35 finalbeta joined #git
16:35 blackwind_123 joined #git
16:36 Karazhan joined #git
16:39 mindriot101 joined #git
16:39 Karazhan joined #git
16:40 Karazhan joined #git
16:41 cdown joined #git
16:41 tvw joined #git
16:41 stux|RC-only joined #git
16:42 Karazhan joined #git
16:42 sweatsuit joined #git
16:42 derk0pf joined #git
16:44 clemf joined #git
16:44 leehambley joined #git
16:45 cdown joined #git
16:46 ColdKeyboard joined #git
16:46 eivarv joined #git
16:48 justanotheruser joined #git
16:48 cagmz joined #git
16:49 subhojit__ joined #git
16:50 thebope joined #git
16:50 bytefire joined #git
16:50 bytefire hi
16:52 bytefire i want to undo last three commits but keep all the changes as staged. is it possible?
16:52 _ikke_ git reset --soft HEAD~3
16:52 moritz bytefire: git reset --soft HEAD~3
16:52 * moritz too slow
16:52 bytefire aha
16:52 bytefire nice one guys thanks
16:52 anuxivm joined #git
16:56 rominron_ joined #git
16:56 Karazhan joined #git
16:57 romerocesar joined #git
16:58 Karazhan joined #git
16:58 Guest94366 joined #git
16:59 subhojit_ joined #git
17:00 joki- joined #git
17:00 meauses joined #git
17:03 vuoto joined #git
17:04 brokenrecord joined #git
17:04 brillenfux joined #git
17:04 leb joined #git
17:06 vrishab joined #git
17:06 davimore__ joined #git
17:09 Electrometro joined #git
17:09 markelite joined #git
17:11 romerocesar joined #git
17:11 Celelibi Can I push a commit that's not the tip of a branch?
17:11 JanC_ joined #git
17:15 woodruffw joined #git
17:15 sgtbigman joined #git
17:16 tlaxkit joined #git
17:16 thebope joined #git
17:16 tobiasvl Celelibi: sure, but you need to push it to a remote branch (or tag, or something). but why? !xy
17:16 gitinfo Celelibi: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
17:17 Celelibi Because I like to have a few commits unpushed to rebase them.
17:18 tobiasvl why don't you use branches for that?
17:18 Celelibi It doesn't fit the need.
17:18 moritz you can generally push older commits with  git push <remote> <commit>:<remotebranch>
17:19 moritz so soemthing like  git push origin master~3:master
17:19 Celelibi Thanks.
17:19 raijin joined #git
17:22 inflames joined #git
17:22 inflames joined #git
17:23 davimore joined #git
17:24 sea-gull joined #git
17:25 govg joined #git
17:25 syg_ joined #git
17:25 CubiK joined #git
17:26 jimi_ joined #git
17:27 madewokherd joined #git
17:27 Siegfried joined #git
17:31 watabou_ joined #git
17:31 barteks2x Is there actually any way to do interactive rebase before a merge and preserve the merge eve if it had conflicts without re-resolving them again?
17:31 fmcgeough joined #git
17:35 howdoi joined #git
17:36 jstimm joined #git
17:36 vrlx joined #git
17:38 fuchsi joined #git
17:39 mindriot101 joined #git
17:41 Goplat joined #git
17:43 nikivi joined #git
17:46 eizua joined #git
17:46 brillenfux joined #git
17:47 phos1 joined #git
17:48 subhojit777 joined #git
17:48 phos1 For some reason when I do “Git status” it’s showing 100’s of files changed. I only changed like 10. I did have to adjust permissons on everything (owership etc), could that cause it?
17:48 thebope joined #git
17:50 bernardio joined #git
17:52 wcpan joined #git
17:57 whitby joined #git
17:58 Karazhan joined #git
17:59 sgtbigman phos1: yes
18:00 phos1 Ah, that explains so much..
18:00 nessundorma joined #git
18:03 Ryanar joined #git
18:03 SwiftMatt joined #git
18:03 btree joined #git
18:04 rivarun joined #git
18:04 seishun joined #git
18:05 rivarun joined #git
18:06 Random832 AIUI not all permissions changes affect git, it's mainly if you changed whether something was executable
18:06 abec0 joined #git
18:06 phos1 I think I changed from 755 to 775
18:07 moritz !perm
18:07 gitinfo [!permissions] Git does not store full UNIX permissions, even if it makes it look like it does. In fact, the only mode-related info Git stores is whether a given file is executable. Anything else is taken care of by your umask and the core.sharedRepository setting. See also !configfiles
18:07 Random832 that shouldn't have affected it
18:08 qws-user-1229 joined #git
18:09 Random832 phos1, git diff will show you
18:09 phos1 when i commit it shows “mode change 100644 “
18:09 rivarun joined #git
18:09 Random832 but in general it doesn't track ownership or any modes other than "is executable" - the mode field is always 100644 or 100755
18:10 eivarv joined #git
18:11 diogenese joined #git
18:11 M-nated joined #git
18:13 zeroed joined #git
18:14 btree left #git
18:15 davimore__ joined #git
18:16 Seveas Random832: or 120000 (symlink) 160000 (submodule)
18:16 User458764 joined #git
18:18 davimore joined #git
18:18 raijin joined #git
18:19 Derperperd joined #git
18:20 mrkake joined #git
18:20 thebope joined #git
18:21 Siegfried joined #git
18:22 mizu_no_oto joined #git
18:22 davimore_ joined #git
18:23 robotroll joined #git
18:24 shashin joined #git
18:24 brendyn joined #git
18:25 davimore__ joined #git
18:26 g_zen---- joined #git
18:26 variousartist joined #git
18:27 davimore joined #git
18:30 romerocesar joined #git
18:30 Random832 i meant for regular files but yeah (or 40000 for directories)
18:31 mizu_no_oto joined #git
18:32 ochorocho__ joined #git
18:32 watabou_ joined #git
18:34 govg joined #git
18:37 Discovery joined #git
18:37 hahuang65 joined #git
18:38 nonconve1gent joined #git
18:38 sdelic joined #git
18:40 IlNominePatre joined #git
18:40 mindriot101 joined #git
18:41 mrkake joined #git
18:41 phos1 left #git
18:42 ochorocho__ joined #git
18:43 montchr joined #git
18:43 montchr left #git
18:45 vuoto joined #git
18:45 HoierM joined #git
18:48 krawchyk joined #git
18:52 isysd joined #git
18:55 fmcgeough joined #git
18:58 Mikerhinos joined #git
18:58 davimore_ joined #git
19:02 nikivi joined #git
19:06 govg joined #git
19:07 JZA joined #git
19:07 JZA hi how can I get submodules on git?
19:07 JZA I checkout a project that has a 'remote' folder
19:11 irco joined #git
19:13 minh joined #git
19:13 ciechomke joined #git
19:14 seishun joined #git
19:14 kyan joined #git
19:14 alansaul_ joined #git
19:15 Endarked joined #git
19:17 NeverDie joined #git
19:17 vuoto joined #git
19:18 russ_za_ joined #git
19:20 wget joined #git
19:20 wget joined #git
19:20 seishun joined #git
19:20 davimore joined #git
19:22 nikivi joined #git
19:23 wget joined #git
19:24 nidr0x joined #git
19:27 cdown joined #git
19:28 leehambley joined #git
19:29 salamanderrake joined #git
19:30 thebope joined #git
19:30 barteks2x if I'm in interactive rebase, how to see all changes including those in commit I modified?
19:30 barteks2x I only found a way to see changes I made in the rebase
19:32 JZA hi how can I get submodules on git?
19:32 JZA I checkout a project that has a 'remote' folder
19:32 tobiasvl JZA: what do you mean?
19:32 JZA well I clone a repo and has a soft-link folder that I guess I need to compile but the pull show the empty folder
19:32 JZA I guess thats a submodule
19:33 tobiasvl ah, right. yes
19:33 tobiasvl you could have cloned with git clone --recursive
19:33 barteks2x I'm tryig to eliminate unnecessary changes so I would like to see the diff
19:33 GavinMagnus joined #git
19:33 tobiasvl JZA: but now that you have cloned you can do this: git submodule update --init --recursive
19:33 tobiasvl barteks2x: the diff between what?
19:34 eivarv joined #git
19:34 barteks2x I'm in interactive rebas eand I just did git commit --amend, how do I see all changes added by the commit including changed from te amend?
19:35 grawity git show
19:36 barteks2x I would never expext it to be so obvious...
19:36 JZA thanks
19:36 tgies joined #git
19:37 JZA left #git
19:40 jmpp_ joined #git
19:40 jmpp_ joined #git
19:41 mindriot101 joined #git
19:44 mindriot101 joined #git
19:45 ghostlight joined #git
19:46 Learath2 joined #git
19:46 eivarv joined #git
19:48 subhojit_ joined #git
19:54 cagedwisdom joined #git
19:55 WoodLeg joined #git
19:55 aavrug joined #git
19:56 nikivi joined #git
19:56 fahadash joined #git
19:56 ecx86 joined #git
20:00 GavinMagnus left #git
20:02 WayToDoor joined #git
20:10 ecx86 hi, anyone here?
20:11 ramsub07 joined #git
20:13 eivarv joined #git
20:15 grawity only when someone asks something interesting
20:15 Mixologic joined #git
20:16 davimore_ joined #git
20:16 re1_ joined #git
20:16 raspado joined #git
20:16 leb joined #git
20:16 lindenle joined #git
20:17 todd_dsm joined #git
20:18 lindenle joined #git
20:18 Starky joined #git
20:18 Starky joined #git
20:19 ecx86 ok
20:19 ecx86 i have a repository
20:20 ecx86 sometime ago all of the files got moved to another repository without preserving history
20:20 ecx86 how can i reconciliate these two repositories and merge the histories
20:20 tlaxkit joined #git
20:20 grawity that'll need some history rewriting I think
20:20 grawity are the files at least at roughly the same paths?
20:21 mindriot101 joined #git
20:21 thebope joined #git
20:23 ecx86 yeah
20:24 davimore joined #git
20:26 ecx86 http://stackoverflow.com/questions/1220557/how-do-i-prepend-history-to-a-git-repo
20:27 EricPoe joined #git
20:30 Starky joined #git
20:31 grawity pretty much what I'd have suggested
20:31 grawity except the last part can be shortened down to `git replace --edit $TAIL`
20:31 ecx86 what's that do?
20:32 grawity the same thing, only automated
20:32 pietilson joined #git
20:32 ecx86 ok
20:33 grawity (i.e. automates the cat-file/hash-object/replace)
20:34 Starky joined #git
20:35 SwiftMatt joined #git
20:35 ecx86 is it necessary that the repository contents be identical before I begin?
20:39 hahuang65 joined #git
20:42 nessundorma_ joined #git
20:42 pietilson left #git
20:42 Lyqyd joined #git
20:43 venmx joined #git
20:45 steven_a_s joined #git
20:47 johnny56 joined #git
20:48 pwnz0r joined #git
20:50 mindriot101 joined #git
20:52 Fissure joined #git
20:52 ecx86 ok
20:52 ecx86 git replace --edit worked
20:52 ecx86 Thanks, grawity
20:56 subhojit__ joined #git
21:00 EricPoe joined #git
21:01 grayjoc joined #git
21:01 Starky joined #git
21:01 holgersson joined #git
21:03 meauses joined #git
21:08 WoodLeg joined #git
21:10 beastd joined #git
21:13 ramsub08 joined #git
21:13 mindriot101 joined #git
21:14 _Patrick_ joined #git
21:15 cdg joined #git
21:17 cdg joined #git
21:22 ecx86 Hi
21:23 ecx86 Now that i have replaced the commit's parent, how do i include all of the parent commits into the repository history proper?
21:23 grawity you just did
21:23 nicoulaj joined #git
21:23 ecx86 I pushed to remote and there the commit log does not have the old commits.
21:23 ecx86 But when I do git log locally it is there
21:23 grawity bake in the replace with `git filter-branch` etc.
21:23 ecx86 How should I do that
21:24 fmcgeough joined #git
21:25 mindriot101 joined #git
21:25 spento joined #git
21:28 Starky joined #git
21:29 EricPoe joined #git
21:29 acetakwas joined #git
21:32 ecx86 Ah ok, figured it out.
21:32 ecx86 Thanks.
21:34 EricPoe joined #git
21:34 grayjoc joined #git
21:38 EricPoe joined #git
21:43 Khisanth joined #git
21:44 hsk3 joined #git
21:46 leb joined #git
21:46 hsk3 I create a new branch from master and create a few commits. No changes are made to master.
21:46 hsk3 How can I merge my changes to master such that it looks like a real branch? (As opposed to just moving master forward)
21:46 hsk3 sort of like pull requests, but doing it within git only
21:48 thebope joined #git
21:50 irco joined #git
21:53 aidalgol joined #git
21:54 Siegfried joined #git
21:54 ecx86 left #git
21:54 Seveas hsk3: git merge --no-ff
21:54 hsk3 thanks!
21:57 krobzaur joined #git
21:57 EricPoe joined #git
21:58 SwiftMatt joined #git
21:58 krobzaur Alright, I am confused about something. Disclaimer: I'm still a bit of a Git newbie. Anyhow, I have a personal project with a "master" and "develop" branch. I've merge all changes from develop into master, but for some reason running git diff on the same file in the two branches shows differences.
21:58 krobzaur What gives?
21:58 Cabanossi joined #git
21:58 cdown joined #git
21:59 Seveas could be changes local to master, a mismerge, or using git-diff wrong
22:01 krobzaur Seveas: I think the first option is probably the reason, as sometimes I get sloppy and make small changes on my master branch.
22:01 Seveas why do you even have a develop branch?
22:01 krobzaur Seveas: Let me investigate a bit, and I'll probably have more questions
22:02 krobzaur Seveas: Because its code for running simulations and when I get things in a functional state I merge into master. When I want to try something new I use my develop branch
22:02 krobzaur This way I'll also have functional code in my master branch if I need to run sims or something while I'm in the middle of adding a new feature
22:03 Seveas ok, that actually makes sense :)
22:03 krobzaur You seems surprised :)
22:04 cdg joined #git
22:04 nikivi joined #git
22:06 krobzaur Seveas: Yeah you were right they are changes local to master. I'll just have to merge those into develop then and hopefully everything will be back to normal
22:09 EricPoe joined #git
22:09 pbrewczynski joined #git
22:10 bluezone joined #git
22:10 p3lim joined #git
22:11 p3lim Is the plumbing for guessing the dir name during cloning available?
22:11 pothepanda joined #git
22:11 umpc joined #git
22:14 leb joined #git
22:16 grayjoc joined #git
22:29 Seveas p3lim: no, but the logic is easy to copy
22:29 Seveas https://github.com/git/git/blob/master/builtin/clone.c#L178
22:29 p3lim Seveas: I know, just wondering if I can cut corners :D
22:33 leehambley joined #git
22:33 CubiK joined #git
22:38 kuppi joined #git
22:41 hahuang65 joined #git
22:44 venmx joined #git
22:45 nonconvergent joined #git
22:47 acetakwas joined #git
22:49 courrier joined #git
22:54 Siegfried joined #git
22:56 grayjoc joined #git
22:59 sammyo joined #git
22:59 stemid joined #git
23:00 stemid started using submodule just a few weeks ago, something I've been wondering; if I'm making changes to both parent and submodule repos, is it best to have an actual repo as submodule or is it possible to work with just a .git file in the submodule repo and still be able to make commits to it?
23:01 stemid the only way I've found possible is to have an actual .git/repo in the submodule dir.
23:03 leb joined #git
23:03 pwnz0r joined #git
23:05 cdg joined #git
23:05 quackgyver joined #git
23:07 PCatinean joined #git
23:09 jave joined #git
23:10 arduinoToy joined #git
23:12 jaggz joined #git
23:13 jaggz why's my git blame saying "fatal: bad revision: foo.cpp"?
23:17 zacts joined #git
23:18 tlaxkit joined #git
23:20 ahf joined #git
23:21 thiago jaggz: because you type something wrong
23:21 jaggz "git blame foo.cpp"
23:22 jaggz no wait.. git blame *.cpp
23:22 jaggz thanks thiago  :)
23:28 canton7 jaggz, you give 'blame' one file. Any other arguments are interpreted as revisions, see man git-blame
23:28 gitinfo jaggz: the git-blame manpage is available at http://jk.gs/git-blame.html
23:28 canton7 jaggz, your shell expands '*.cpp' to all .cpp files, and git thinks the first few are supposed to be revisions
23:30 nunchuck joined #git
23:37 GavinMagnus joined #git
23:43 User458764 joined #git
23:47 howdoi joined #git
23:47 mustmodify joined #git
23:48 mustmodify I want to use git to create a document-based store. This is tue Ruby git tool I found: https://github.com/schacon/ruby-git
23:48 watabou_ joined #git
23:49 thebope joined #git
23:50 mustmodify First task is just to persist a document. So if it has a class like Animal, I guess I'll create an /animal directory and store each record in a file. The value I need is (a) a commit message with user info to show why a change was made and by whom (b) ability to diff these files and (c) branches as we commit groups of changes, which should be merged later.
23:51 mustmodify So my question is what kind of file convention I should use for the files under /animal ... like /animal/guid.json or more like /animal/integer.json or some other thing.
23:51 mustmodify I guess or some hash of the data
23:52 mustmodify I guess any of those is an option. Just trying to think if there is anything about git or my domain that will make one preferable.
23:53 mustmodify so integers are out because we are likely to create files in two branches and need to merge.

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