Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-11

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:00 NeverDie ojacobson: I mean, I want to make a commit with a commit message title and to add to the body as well to describe the changes in more detail.
00:00 hahuang65 joined #git
00:01 ojacobson Add --edit to the command
00:01 NeverDie ojacobson: So in other words, just git commit?
00:02 ojacobson `git commit` on its own will use the default generated message, or whatever the prepare-commit-msg hook spits out, and generally presents an editor
00:02 ojacobson `git commit [-m message|-C commitish|-F path] --edit` will use whatever commit message comes from the options, and present an editor.
00:03 romerocesar joined #git
00:03 Vasistha NeverDie: I didn't realize there was a difference between the commit message "title" and "body"
00:03 ojacobson There isn't, except by convention :)
00:03 ojacobson The commit message is a freeform blob; treating the portion before the first newline as a summary is a widespread convention but not actually enforced by git in any way
00:04 ojacobson you could even use a JPEG as your commit message, if you hate your colleagues. (Git won't render it, but you can get the blob back out and render it yourself)
00:04 Vasistha NeverDie: maybe you just want to use -m with a multiline message?
00:04 NeverDie Vasistha: No, I'm just OCD and want to be very meticulous with my git commits.
00:05 NeverDie So I can describe my changes in proper detail.
00:05 void187 left #git
00:05 Vasistha NeverDie: so ... multiline message after -m ? Are you aware that you can do that by opening a quote and not closing it before pressing enter ? Of course I don't know what shell you're using
00:06 NeverDie Vasistha: Bash.
00:06 ojacobson You can enter multi-line strings in bash.
00:06 ojacobson 'Foo
00:06 ojacobson bar'
00:06 Vasistha yeah, you can do that. git commit -m 'hello
00:06 ojacobson has a newline in it, for example.
00:06 Vasistha world'
00:06 ojacobson Another approach that works well for me is to prepare a message using my editor, as .git/next-commit (not a name reserved by git)
00:06 ojacobson then to commit with -F
00:07 Vasistha that's a nice solution ojacobson
00:07 ojacobson I stole it from … I want to say monotone?
00:07 ojacobson Anyways, some other SCM system
00:10 xaa joined #git
00:10 davimore_ joined #git
00:10 Vinnie_win joined #git
00:11 jeffreylevesque joined #git
00:11 Vasistha com ur
00:11 jwmann joined #git
00:11 nwkj86 joined #git
00:11 Vasistha sorry, wrong window
00:12 hahuang65 joined #git
00:12 flupke joined #git
00:12 cttttt joined #git
00:12 worstadmin joined #git
00:12 davisonio joined #git
00:12 t-richards joined #git
00:13 wget joined #git
00:13 wget joined #git
00:13 milki joined #git
00:13 ikelso joined #git
00:13 pcarrier joined #git
00:13 pcarrier joined #git
00:13 Infamous joined #git
00:13 Narwhaal joined #git
00:14 Mogget joined #git
00:14 Mekkis joined #git
00:14 catsup joined #git
00:14 l2y joined #git
00:14 VladGh joined #git
00:14 boxrick1 joined #git
00:14 ggherdov joined #git
00:14 madduck joined #git
00:14 madduck joined #git
00:14 XDS2010 joined #git
00:14 doppo joined #git
00:14 timwis joined #git
00:14 zmachine joined #git
00:16 ELLIOTTCABLE joined #git
00:17 howitdo joined #git
00:17 kfc joined #git
00:17 jokajak joined #git
00:17 ojacobson joined #git
00:17 ahammond joined #git
00:17 bcc joined #git
00:17 bcc joined #git
00:18 BrAsS_mOnKeY joined #git
00:18 ahf joined #git
00:18 canton7 joined #git
00:18 caliculk joined #git
00:18 jor joined #git
00:19 Lea2 joined #git
00:19 Xethron joined #git
00:19 Awesomecase joined #git
00:19 HelloShitty joined #git
00:19 SJr joined #git
00:20 demize joined #git
00:20 lohfu joined #git
00:20 Gianormagantrous joined #git
00:21 LordRyan joined #git
00:21 aendrew joined #git
00:22 DolpheenDream joined #git
00:22 busta joined #git
00:22 adambrenecki joined #git
00:23 reiser__ joined #git
00:24 Timvde| joined #git
00:25 ThunderChicken joined #git
00:25 ThunderChicken joined #git
00:25 aendrew joined #git
00:25 adambrenecki joined #git
00:25 BrAsS_mO- joined #git
00:25 tribly joined #git
00:25 jason237 joined #git
00:26 fmeerkoetter joined #git
00:26 selckin joined #git
00:26 robogoat joined #git
00:26 pasky joined #git
00:28 nettoweb joined #git
00:34 Dev0n joined #git
00:38 zzz joined #git
00:41 dhollinger joined #git
00:44 PettanShouta-Kun joined #git
00:44 PettanShouta-Kun is there a way to pull one relative commit behind origin/branch?
00:44 PettanShouta-Kun I thought there was like a git pull origin/branch HEAD~1 but I guess there isn't
00:46 kadoban PettanShouta-Kun: git fetch && git merge origin/branch~1
00:47 cqi joined #git
00:49 nettoweb1 joined #git
00:54 PettanShouta-Kun thank you! I think I wanted git checkout origin/branch~1 but I wasn't clear at describing my problem
00:54 PettanShouta-Kun you helped me just the same!
00:57 arescorpio joined #git
00:59 drbean joined #git
01:07 qpdb joined #git
01:08 rkazak joined #git
01:09 UnnamedPlayer joined #git
01:12 jorj joined #git
01:13 joelkraehemann joined #git
01:13 joelkraehemann hi all
01:13 gitinfo joelkraehemann: 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.
01:14 joelkraehemann how can I provide local history changes?
01:14 joelkraehemann I did `git fetch && git replace --graft`
01:16 joelkraehemann local the history seems to be complete
01:16 joelkraehemann but remote did get the changes
01:16 joelkraehemann ^^ not
01:18 ikelso joined #git
01:20 joelkraehemann http://git.savannah.gnu.org/cgit/gsequencer.git
01:20 joelkraehemann I have imported old history of a different repo
01:21 ^7heo when "the" is too long to type...
01:23 joelkraehemann basically I did this https://developer.atlassian.com/blog/2015/08/grafting-earlier-history-with-git/
01:26 joelkraehemann git push origin 'refs/replace/*'
01:26 joelkraehemann Everything up-to-date
01:26 thiago joined #git
01:26 bonks left #git
01:32 luhem joined #git
01:33 ResidentBiscuit joined #git
01:33 Nilesh_ joined #git
01:35 zacts joined #git
01:38 done joined #git
01:39 elsevero joined #git
01:39 Noldorin joined #git
01:41 SantaClauze joined #git
01:41 Derperperd joined #git
01:42 enckse joined #git
01:43 storrgie joined #git
01:46 joelkraehemann Is it possible that origin doesn't allow change history?
01:49 rchavik joined #git
01:51 Derperpe1 joined #git
01:51 mischat joined #git
01:54 dzho joined #git
01:55 SwiftMatt joined #git
01:55 GavinMagnus joined #git
01:56 Winter_ joined #git
01:56 Winter_ Ok, I just finished that awesome tutorial learngitbranching.js.org
01:56 Winter_ And I'm now ready to use branches
01:57 Winter_ Should my distant branches match my local branches ?
01:57 Winter_ I want a branch for what I'm working on
01:57 madewokherd joined #git
01:57 Winter_ Let's say "server"
01:57 Winter_ Should I make a server branch on distant and local ?
01:57 Winter_ How only distant and push my master to server ?
01:57 dzho joined #git
01:57 Winter_ Or *
01:59 ^7heo Winter_: s/distant/remote/
01:59 brent__ joined #git
01:59 Winter_ as you wish
01:59 ^7heo no
01:59 ^7heo as everyone speaks for years
01:59 ^7heo not my personal wish
02:00 ^7heo it's not even distantly correct otherwise
02:01 GavinMagnus left #git
02:01 joelkraehemann savannah doesn't allow non-fast-forward
02:02 ^7heo for your own good.
02:02 ^7heo Winter_: also by the look of your questions, you followed a crappy course.
02:02 Winter_ Thank you that's really kind
02:02 Winter_ Having a good day ?
02:02 ^7heo oh it's a "tutorial"
02:02 dzho joined #git
02:03 ^7heo tutorials are to teaching what photos are to cooking
02:03 cagmz_ joined #git
02:03 ^7heo they look good and make you do the same, but it stops there
02:04 ^7heo and fine Winter_, be defensive, learn nothing. that's not my time you'll be wasting.
02:04 Winter_ I'm not defensive
02:04 Winter_ What did you taught me ?
02:04 ^7heo oh you're french...
02:05 ^7heo that explains it :)
02:05 ^7heo laters tho.
02:05 ^7heo I'm annoyed enough as it is
02:05 _ADN_ joined #git
02:05 Winter_ Nice way to avoid the question
02:06 ^7heo I have no obligation to answer. let alone a compelling reason.
02:06 ^7heo the question does not make sense.
02:06 Winter_ You also have no obligation to trash talk on anything
02:06 Winter_ or anyone
02:06 Winter_ And if you do you will face the consequences
02:07 ^7heo Which I am not doing.
02:07 Winter_ Yes you are being so constructive
02:07 ^7heo dude.
02:07 Winter_ How did I missed out that with my over defensive view ?
02:07 Winter_ that out *
02:07 ^7heo I told you goodbye 2 times.
02:07 Winter_ I don't give a shit
02:07 ^7heo you keep taunting me.
02:07 ^7heo now, goodbye.
02:07 Winter_ You stay here because you are being emotional
02:07 ^7heo troll alone
02:08 Winter_ And you confirm my point
02:08 Winter_ How elitist is that channel omg
02:09 [0xAA] joined #git
02:09 finalbeta joined #git
02:09 romerocesar joined #git
02:13 converge joined #git
02:14 joelkraehemann what's up?
02:15 jameser joined #git
02:15 joelkraehemann Since you didn't answer we see us in hell ;)
02:15 joelkraehemann welcome
02:16 joelkraehemann BlessJah: I know why u r h3r3!
02:18 joelkraehemann you are awesome
02:20 Wulf4 joined #git
02:24 joelkraehemann left #git
02:26 tchan joined #git
02:27 rchavik joined #git
02:28 aarobc joined #git
02:29 netj joined #git
02:32 nowhere_man joined #git
02:34 donught joined #git
02:37 Vampire0_ joined #git
02:37 anuxivm left #git
02:40 dreiss joined #git
02:41 snowkidind joined #git
02:46 a_thakur joined #git
02:46 Doginal joined #git
02:46 aw1 joined #git
02:46 d^sh joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:50 rchavik joined #git
02:51 webdev007 joined #git
02:52 nidr0x joined #git
02:52 mischat joined #git
02:54 pks joined #git
02:54 NeverDie joined #git
02:56 nowhere_man joined #git
02:59 aavrug joined #git
03:00 aavrug joined #git
03:06 ResidentBiscuit joined #git
03:11 rchavik joined #git
03:14 a_thakur joined #git
03:14 dodobrain joined #git
03:18 dreiss joined #git
03:20 axisys joined #git
03:21 elbarto_ joined #git
03:23 adino joined #git
03:24 hexagoxel joined #git
03:27 thiago joined #git
03:28 justanotheruser joined #git
03:28 rivarun joined #git
03:29 adino joined #git
03:30 Vortex34 joined #git
03:31 webdev007 joined #git
03:31 mizu_no_oto joined #git
03:32 a_thakur_ joined #git
03:32 SpeakerToMeat joined #git
03:34 howdoi joined #git
03:36 sunri5e joined #git
03:36 chosafine joined #git
03:37 dave0x6d joined #git
03:38 matsaman joined #git
03:38 durham_ joined #git
03:39 chosafin_ joined #git
03:41 chosafin_ left #git
03:42 chosafine joined #git
03:42 WakiMiko joined #git
03:45 Goplat joined #git
03:45 rvsjoen_ joined #git
03:46 ajpiano_ joined #git
03:46 rt joined #git
03:49 rchavik joined #git
03:52 duderonomy joined #git
03:53 chachasmooth joined #git
03:53 PioneerAxon joined #git
03:54 fstd_ joined #git
03:55 Dougie187 joined #git
03:56 Dougie187 left #git
03:57 kyan joined #git
03:57 watabou joined #git
03:58 ki0 joined #git
03:58 axisys joined #git
04:01 Guest26 joined #git
04:01 d1z joined #git
04:02 d1z I developed an application. Then I created a branch to enable ipv6 support for it. Now I'm at the branch, but I'd like to make this branch the new master branch
04:03 matsaman d1z: ordinarily you'd merge it into master
04:03 d1z should I do a merge? If so, I already tried `git merge ipv6 master` and it didn't work, it said `Already up-to-date`
04:03 matsaman git checkout master; git merge ipv6
04:03 matsaman or
04:03 matsaman git checkout master; git merge --squash -X theirs ipv6
04:04 durham joined #git
04:04 matsaman or, more clearly: git add ...; git commit ...; git checkout master; git merge --squash -X theirs ipv6; git add ...; git commit ...
04:04 matsaman --squash -X theirs is nice for your own stuff
04:05 matsaman 'cause you usually know ahead of time you don't care about conflicts
04:05 matsaman otherwise you'd just want an ordinary git merge ipv6
04:09 SwiftMatt joined #git
04:12 e joined #git
04:14 SantaClauze Got issue here: I was changing files in a project and then stashed them before pulling on git. HOWEVER! some one else changed the whole project so i have to resolve merges in the whole file and I am unable to git stash apply until I merge all the files. Is there anyway that I can cancel the last pull in order to apply my git stash and find another solution?
04:14 _ikke_ SantaClauze: git merge --abort
04:15 hahuang65 joined #git
04:21 SantaClauze this will not cancel out my git stash?
04:21 SwiftMatt joined #git
04:21 SantaClauze ikke, this will not cancel ou my git stash?
04:21 _ikke_ it does not touch stashes
04:22 SantaClauze nice let me try before i cry :)
04:27 SwiftMatt joined #git
04:29 gfixler joined #git
04:29 durham joined #git
04:30 elsevero joined #git
04:31 mehola joined #git
04:31 SantaClauze ikke, working thanks bro
04:34 jimi_ joined #git
04:39 arussel joined #git
04:39 arussel I have *.jar in my gitignore_global, how can I ignore that in a project ?
04:40 _ikke_ arussel: What is your gitignore_global
04:40 _ikke_ ?
04:40 _ikke_ Where is it located?
04:40 arussel ~
04:41 _ikke_ You have to set git config --global core.excludefile gitignore_global
04:42 arussel no, my gitignore_global is properly set up and I like it as it is. But, for one of the project I work on, I do need to push jar files, so I want, for this project, to ignore the rule of the gitignore globla.
04:43 _ikke_ arussel: Ah, your question confused me :P
04:43 _ikke_ you want to ignore that the file is being ignored
04:43 arussel it is not easy to google either :-)
04:43 _ikke_ hehe
04:43 _ikke_ what about adding !*.jar in a local .gitignore ?
04:44 adino joined #git
04:44 arussel I'll give it a shot, thanks
04:46 _ikke_ (you can also add it to .git/info/exclude, because it's probably just for you
04:46 Guest26 joined #git
04:47 kadoban If it's a limited number (that will never/rarely grow) you can also simply force add them (after which any ignore facility has absolutely no effect)
04:48 arussel .git/info/exclude seems pretty good, I had no idea it existed
04:49 kadoban Ya, that one can be quite handy now and again
04:49 arussel the version number is appended to the name, so it does change fairly often
04:50 kadoban Seems like a good choice then. Note that tracking build products (like .jar files) is usually a pretty bad idea. Though once in a while you have to anyway.
04:50 arussel especially for freelancer :-)
04:51 kadoban Heh, ya if they tell you you have to I guess. So ick though ;)
04:51 rchavik joined #git
04:53 mrpackethead joined #git
04:53 arussel kadoban: pushing the jar file to a third party builder/runner for our docker images, they need the jars.
04:54 mutiny joined #git
04:54 kadoban Ya, using git for deployment is fugly :-/
04:54 _ikke_ BlessJah: ^^ :P
04:54 mutiny hello, trying to get my own git server set up, but during the test project push it does nothing
04:54 dreiss joined #git
04:54 mutiny kind of just hangs, anyone would be able to help me out?
04:54 _ikke_ mutiny: What did you set up?
04:55 mutiny _ikke_: i mostly followed this: https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server
04:55 mutiny the only thing i changed was git user home location as well as git data/base location
04:55 _ikke_ you can ssh to the server as the user you set up?
04:56 mutiny hmm i never actually tried to ssh into the git user before i changed its shell to git-shell, but i do have a local account with the same pub key on that machine
04:56 mutiny which i can ssh into fine
04:56 mutiny i just used the same authorized_keys file into git .ssh/
04:57 mutiny when i do git push origin master, it seems like it completes (it says writing objects: done) but prompt never returns to user, kind of just hangs
04:57 mutiny and files dont appear on server side it seems
04:57 _ikke_ Never seen that
04:58 adino joined #git
04:58 mutiny ya im not sure what to search or anything since im not really getting any error...
04:58 sbulage joined #git
04:58 bmahe joined #git
05:02 svm_invictvs joined #git
05:02 luhem joined #git
05:04 acetakwas joined #git
05:07 elsevero_ joined #git
05:11 subhojit777 joined #git
05:11 cqi joined #git
05:11 tirej joined #git
05:12 askb joined #git
05:13 acr4 joined #git
05:14 lindenle joined #git
05:16 hahuang65 joined #git
05:17 snthsnth joined #git
05:17 romerocesar joined #git
05:17 Guest26 joined #git
05:20 romerocesar joined #git
05:20 thiago joined #git
05:21 safe joined #git
05:22 arussel left #git
05:23 ignarps joined #git
05:24 rchavik joined #git
05:25 mrpackethead joined #git
05:28 ayogi joined #git
05:28 dimi1947 joined #git
05:31 mutiny ok i think ive found its just a permission issue..
05:33 done joined #git
05:34 xall joined #git
05:38 _ikke_ mutiny: btw, if you need a bit more flexibility, you might also want to look into gitolite (which uses the same principle as you are using now)
05:38 Aut0maton joined #git
05:38 kadoban gitolite is definitely worth looking into, it's a big upgrade in functionality without a lot of extra work or learning
05:39 mutiny what does gitolite add to what ive set up?
05:40 _ikke_ mutiny: !gitolite
05:40 gitinfo mutiny: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
05:40 mutiny is it just a git alternative?
05:40 _ikke_ No
05:41 grawity it's a git addon
05:41 _ikke_ It's an authorization layer on top of git
05:41 mutiny oh i see, more access control
05:42 FabTG joined #git
05:42 mutiny hmm it seems like i can accomplish what i want with plain git?
05:42 mutiny ssh write access for myself, git read access for any repos i choose to allow?
05:43 _ikke_ Right, if that's all you need, then gitolite is not necessary
05:43 mutiny think i understand now, thanks for letting me know about it in case my needs do change
05:44 sdothum joined #git
05:46 mrpackethead joined #git
05:46 Cabanossi joined #git
05:46 acetakwas joined #git
05:49 cdesai joined #git
05:49 tristanp joined #git
05:49 Noodlewitt joined #git
05:51 pbrewczynski joined #git
05:52 harrymoreno joined #git
05:58 tirej joined #git
05:59 mutiny cool think ive got things working~
05:59 ki0 joined #git
05:59 mutiny if i understand correctly, ill need to locally create new repositories on server side manually?
05:59 mutiny each time
06:00 Guest26 joined #git
06:01 _ikke_ yes
06:03 YuGiOhJCJ joined #git
06:03 shgysk8zer0 joined #git
06:08 xall joined #git
06:09 jameser_ joined #git
06:11 watabou joined #git
06:11 rscata joined #git
06:11 mrpackethead joined #git
06:17 hahuang65 joined #git
06:18 govg joined #git
06:19 Anja joined #git
06:20 xall_ joined #git
06:21 dersand joined #git
06:23 mrpackethead joined #git
06:25 f0rks joined #git
06:27 pandeiro joined #git
06:27 jameser joined #git
06:29 druonysus joined #git
06:37 phanimahesh joined #git
06:40 sbulage joined #git
06:40 drbean_ joined #git
06:42 thierryp joined #git
06:43 drbean- joined #git
06:45 Tom__ joined #git
06:45 diogenese joined #git
06:45 drbean joined #git
06:46 regedit joined #git
06:47 drbean_ joined #git
06:47 ThomasLocke joined #git
06:51 BSAlb joined #git
06:52 mrpackethead joined #git
06:54 tunafizz joined #git
06:54 hhee joined #git
06:57 zeroed joined #git
06:57 zeroed joined #git
06:58 ki0 joined #git
06:58 Raging_Hog joined #git
06:59 drbean joined #git
07:00 tmsmith joined #git
07:04 drbean_ joined #git
07:07 cdown joined #git
07:07 thiago joined #git
07:10 zeroed joined #git
07:10 zeroed joined #git
07:12 brent__ joined #git
07:13 drbean joined #git
07:14 Gloomy joined #git
07:14 dreiss joined #git
07:15 jameser joined #git
07:15 mitzip joined #git
07:15 vdv joined #git
07:16 drbean_ joined #git
07:18 chele joined #git
07:20 drbean joined #git
07:20 spacelord_ joined #git
07:23 theoceaniscool joined #git
07:24 gugah joined #git
07:24 xall_ joined #git
07:26 freimatz joined #git
07:28 finalbeta joined #git
07:31 jarshvor joined #git
07:31 ihradek joined #git
07:32 thierryp joined #git
07:32 drbean_ joined #git
07:33 eduardas_m joined #git
07:35 BlessJah _ikke_: still, the tool does it's job and does it well
07:39 Tobbi joined #git
07:40 jnavila joined #git
07:41 Sceorem joined #git
07:41 qt-x joined #git
07:41 robotroll joined #git
07:43 hwoarang joined #git
07:44 elect joined #git
07:45 zefferno joined #git
07:45 bannakaffalatta joined #git
07:45 drbean joined #git
07:46 JeroenT joined #git
07:48 drbean_ joined #git
07:49 Darren_ joined #git
07:50 JeroenT joined #git
07:50 lindenle joined #git
07:54 xall joined #git
07:54 Disgeae joined #git
07:55 elect_ joined #git
07:57 elect__ joined #git
07:57 cyan__ joined #git
07:58 GavinMagnus joined #git
07:58 mutiny so if i wanted to use something like cgit
07:58 Tobbi joined #git
07:58 mutiny are there ways to make cgit or gitweb honor "git-daemon-export-ok" presence
08:00 elect joined #git
08:01 drbean joined #git
08:03 drbean- joined #git
08:04 creppe joined #git
08:09 Darcidride joined #git
08:09 danslo joined #git
08:10 csk157 joined #git
08:10 djb-irc joined #git
08:11 fragstone joined #git
08:12 Derperperd joined #git
08:12 cdg joined #git
08:13 TomyWork joined #git
08:15 drbean joined #git
08:17 DelphiWorld joined #git
08:17 DelphiWorld hi giters
08:17 DelphiWorld i work with a person on a git repo
08:18 DelphiWorld if i push and he also push after me i lose my works
08:18 DelphiWorld how to avoid that?
08:19 hahuang65 joined #git
08:19 danslo DelphiWorld: you don't lose your work unless this person force pushes. and even in that case you still have your changes in your own repo (a major point in DVCS's).
08:19 xall joined #git
08:21 DelphiWorld__ joined #git
08:21 mgedmin teach the other person to use 'git pull --rebase && git push' instead of 'git push --force' when their original 'git push' fails
08:22 DelphiWorld__ left #git
08:22 DelphiWorld__ joined #git
08:23 tvw joined #git
08:23 durren joined #git
08:23 DelphiWorld__ left #git
08:25 Snugglebash joined #git
08:26 DelphiWorld joined #git
08:26 * DelphiWorld back
08:27 Ruler- isn't 'git pull --rebase' without knowing what you do, potentially dangerous?
08:28 tvw joined #git
08:28 a_thakur joined #git
08:29 JeroenT joined #git
08:29 Alienpruts joined #git
08:30 omegak joined #git
08:30 canton7 no more so than most other commands
08:30 sea-gull joined #git
08:30 nowhere_man joined #git
08:30 canton7 in any typical setup, pull --rebase will only rewrite non-public history
08:30 djb-irc joined #git
08:31 wrouesnel2 joined #git
08:33 nowhere_man joined #git
08:35 drbean joined #git
08:36 jameser joined #git
08:39 aidalgol joined #git
08:42 Balliad joined #git
08:45 cqi joined #git
08:45 thiago joined #git
08:46 sitaram mutiny: the simplest explanation for what gitolite does is at http://gitolite.com/gitolite/overview.html#basic-use-case
08:46 sitaram s/explanation/example
08:47 DelphiWorld left #git
08:47 drbean_ joined #git
08:48 Martian joined #git
08:48 almy joined #git
08:48 jgrasser joined #git
08:49 ki0 joined #git
08:50 snthsnth joined #git
08:55 finalbeta joined #git
08:59 Kaisyu joined #git
09:00 Tobbi joined #git
09:01 alcohol joined #git
09:02 marchelly joined #git
09:03 drbean joined #git
09:03 thierryp_ joined #git
09:04 kurkale6ka joined #git
09:05 Kaisyu7 joined #git
09:07 bongjovi joined #git
09:07 marcogmonteiro joined #git
09:09 JeroenT joined #git
09:10 nettoweb joined #git
09:13 maret joined #git
09:13 mikecmpbll joined #git
09:15 maret joined #git
09:17 dsdeiz joined #git
09:17 dsdeiz joined #git
09:17 PHPanos joined #git
09:18 drbean_ joined #git
09:20 Panacea joined #git
09:21 Macaveli joined #git
09:21 _ADN_ joined #git
09:22 maret joined #git
09:22 clmsy joined #git
09:24 dimi1947 joined #git
09:25 rorro joined #git
09:26 star_prone joined #git
09:28 Tobbi joined #git
09:28 brent__ joined #git
09:34 drbean joined #git
09:37 afuentes joined #git
09:38 Panacea joined #git
09:39 Ekho joined #git
09:40 maret joined #git
09:42 chll_ joined #git
09:46 a_thakur_ joined #git
09:47 drbean_ joined #git
09:48 phanimah1sh joined #git
09:49 luhem joined #git
09:51 romerocesar joined #git
09:52 jfr joined #git
09:54 sdothum joined #git
09:58 finalbeta joined #git
09:58 Tobbi joined #git
10:00 watabou joined #git
10:01 marcogmonteiro joined #git
10:01 evie_hammond joined #git
10:02 Serpent7776 joined #git
10:02 bongjovi joined #git
10:03 King_Hual joined #git
10:05 re1 joined #git
10:05 achadwick joined #git
10:05 g_zen joined #git
10:07 drbean joined #git
10:07 ayogi joined #git
10:09 Guest26 joined #git
10:11 drbean_ joined #git
10:12 byte512 joined #git
10:14 drbean joined #git
10:15 drbean- joined #git
10:16 maret joined #git
10:17 drbean_ joined #git
10:17 marcogmonteiro joined #git
10:18 cbegin joined #git
10:19 overlord_tm joined #git
10:19 hahuang65 joined #git
10:22 maret joined #git
10:23 drbean joined #git
10:23 rominronin joined #git
10:25 ugjka joined #git
10:25 NwS joined #git
10:25 theoceaniscool joined #git
10:25 theoceaniscool joined #git
10:25 drbean_ joined #git
10:26 thiago joined #git
10:27 maret joined #git
10:27 theoceaniscool joined #git
10:28 jozwior__ joined #git
10:28 drbean joined #git
10:30 Tobbi joined #git
10:31 rivarun joined #git
10:33 mehola joined #git
10:34 drbean joined #git
10:38 bongjovi joined #git
10:38 drbean_ joined #git
10:38 Hogofwar joined #git
10:38 dodobrain joined #git
10:40 t0by joined #git
10:40 t0by joined #git
10:42 ferr1 joined #git
10:43 drbean joined #git
10:43 mischat joined #git
10:43 aw1 joined #git
10:44 mischat joined #git
10:44 drbean- joined #git
10:45 Serious8 joined #git
10:46 drbean| joined #git
10:47 drbean_ joined #git
10:50 energizer joined #git
10:50 phanimahesh joined #git
10:50 energizer How can I get git diff to show me all lines even the ones not changd
10:50 energizer ?
10:51 _ikke_ energizer: git diff -U10000
10:51 _ikke_ (increase if you have insanely large files)
10:51 andrew710 joined #git
10:53 aavrug joined #git
10:53 drbean joined #git
10:54 borkr joined #git
10:56 energizer _ikke_: does that work with color-words?
10:58 _ikke_ I would think so
10:58 _ikke_ not sure
11:00 GavinMagnus joined #git
11:01 dimi1947 joined #git
11:01 watabou joined #git
11:02 drbean_ joined #git
11:02 nowhere_man joined #git
11:03 drbean joined #git
11:03 energizer tnx
11:04 cqi joined #git
11:06 GitGatter joined #git
11:06 jknetl joined #git
11:07 GitGatter Hi ! i am bit new to git, is there a way to clone or pull recent changes made by someone else on a brach to my current local clone of the project, pardon my git terminology.
11:08 grawity sounds like a regular `git pull`, tbh
11:08 grawity do you have that branch already?
11:08 GitGatter or should i redownload the new clone after each change by someone
11:08 grawity if not, `git fetch` and checkout
11:11 thierryp joined #git
11:12 GitGatter will give it a try now!
11:13 rivarun joined #git
11:13 theoceaniscool joined #git
11:13 hasc joined #git
11:19 csk157 joined #git
11:19 moop does git-push also do a git-fetch
11:19 moop ?
11:21 pbrewczynski joined #git
11:21 _ikke_ moop: nope
11:21 canton7 it will effectively fetch the branch being pushed to during the course of the push
11:22 mischat_ joined #git
11:23 jknetl joined #git
11:23 moop so i thought, just wasn't sure which repository does the validation, remote or local
11:24 canton7 "validation"?
11:24 moop as in can your commits be pushed to a remote
11:24 tobiasvl the remote decides whether to accept a push or not
11:24 canton7 the remote side's responsible for rejecting non-fast-forward merges
11:25 a_thakur joined #git
11:29 freimatz joined #git
11:29 wendelmineiro joined #git
11:30 ioden joined #git
11:33 mischat joined #git
11:33 GitGatter another question about databases and git, it apparently does not add your databases to git. how would you recommend a bunch of people working with the same database ?
11:34 davimore joined #git
11:34 tobiasvl GitGatter: what do you mean "it" does not add your databases to git?
11:35 tobiasvl GitGatter: usually database systems handle simultaneous access themselves
11:35 nd_ joined #git
11:35 mehola joined #git
11:35 tobiasvl state, atomic transactions, locks, etc
11:35 canton7 GitGatter, are you talking about tracking databases / database schemas / updates to database schemas within source control?
11:35 canton7 GitGatter, if so, the normal approach is to use migrations, and to track the migrations in source control
11:35 YuGiOhJCJ joined #git
11:39 jailbox joined #git
11:43 joki joined #git
11:45 mischat_ joined #git
11:46 GitGatter canton7: yes basically that, for example a couple of people works on the database for example mysql. the schema changes or is updated, and how would you update the database ?
11:46 canton7 GitGatter, by using migrations
11:47 GitGatter alright awesome! thank you! I am starting with a django project now, and i was unsure which direction to follow, especially working with multiple people
11:47 canton7 GitGatter, the basic concept (although I'm sure there are articles on the web which explain this better than I will) is that your database is given a version - 1, 2, 3, etc - which is tracked in a special table. You then write a migration (which is normally a set of SQL statements) which bring the schema from version 0 to version 1, then another migration to bring the database from version 1 to version 2.
11:47 canton7 Old migrations are never edited - if you need to make more changes, you write a new migration
11:47 canton7 Then you have tools which look at the current set of migrations, and the current version of the database, and run the necessary migrations to bring the database from its current version to the latest version (or another version which you specify)
11:48 Macaveli joined #git
11:48 canton7 some tools also allow "down" migrations - which can bring the database from version 2 back to version 1, say. There can be complications, so not all tools support this
11:48 hhee2 joined #git
11:48 canton7 The migrations are source files which are stored in source control
11:48 smaudet joined #git
11:48 tcorneli joined #git
11:49 GitGatter canton7: ahh okay so it is better to just make a new migrations with new changes even after a screw up
11:49 canton7 there's a point - while you're developing the migration it's OK to change it of course. But if you change a migration which other people have run, you'll run into trouble (a bit like editing git commits which other people have fetched)
11:50 canton7 ... if an old migration has a bug which causes data loss, though, it might be acceptable to fix it (the expected outcome of the migration won't change)
11:51 GitGatter so basically the fail fast and learn even faster concept ? Make sure everyone knows their position and what to do before doing anything at all
11:51 ertesx joined #git
11:51 canton7 maybe? Not sure exactly how you think that concept applies
11:52 canton7 but anywhere, there will be resources on the web which will explain migrations better than I have
11:52 canton7 ... but that's the way the industry's settled on tracking changes to databases
11:52 maret joined #git
11:53 Derperperd joined #git
11:54 GitGatter Thank you so much for the help!
11:55 canton7 ... and most languages / frameworks will include migration libraries
11:55 Panacea joined #git
11:55 canton7 searching "Django Migrations" brings up a lot of results
11:56 finalbeta joined #git
11:56 JeroenT joined #git
11:56 dsdeiz joined #git
11:56 dsdeiz joined #git
11:59 emporio joined #git
11:59 PHPanos joined #git
12:00 JeroenT joined #git
12:02 ResidentBiscuit joined #git
12:03 watabou joined #git
12:04 Snugglebash joined #git
12:06 CaptainHeavy joined #git
12:07 Tobbi joined #git
12:08 a_thakur joined #git
12:09 a_thakur_ joined #git
12:09 JeroenT_ joined #git
12:10 thiago joined #git
12:12 JeroenT_ joined #git
12:12 zeroed joined #git
12:12 zeroed joined #git
12:12 romerocesar joined #git
12:13 davimore joined #git
12:14 d1z joined #git
12:14 finalbeta joined #git
12:14 Ryanar joined #git
12:16 ispn joined #git
12:20 hahuang65 joined #git
12:24 [ADN] joined #git
12:25 ismithers joined #git
12:27 Alienpruts joined #git
12:28 energizer Is it possible to git diff ignoring line order
12:28 _ADN_ joined #git
12:29 theoceaniscool joined #git
12:30 PCatinean joined #git
12:30 lpapp joined #git
12:31 lpapp why is it not possible with git to rewrite the commit message in the remote with forced?
12:31 Panacea joined #git
12:31 lpapp I can understand that for code changes as code changes can depend on each other, but fixing silly mistakes in the commit message would sometimes be very welcome, and force is just to scary an operation for colleagues, somewhat rightfully.
12:32 lpapp so what I am probably asking, why is it not as simple as updating tags?
12:32 tobiasvl lpapp: it is possible for git to rewrite the commit message on the remote with --force
12:32 lpapp too scary*
12:32 tobiasvl lpapp: what do tags have to do with this?
12:33 tobiasvl lpapp: if you mean _without_ --force, it's because the commit message is part of the commit, and rewriting any part of a commit changes the hash of the commit
12:33 rivarun joined #git
12:33 lpapp let us give an example: I accidentally put 12345689 as the bug tracking number in the commit message rather than 123456788
12:34 lpapp so now the commit message refers to a completely irrelevant bugreport, which is a shame... but I do not think it is such a dangerous thing to fix.
12:34 _Cyclone_ joined #git
12:35 lpapp while --force is really like the kind of last resort that is almost never done in a bigger team than a couple of engineers.
12:35 tobiasvl it's not a dangerous thing to fix, but rewriting history that has been pushed, in any way, is "dangerous" because it means hashes will change and people will need to rebase and do work
12:35 themill Except of course it might be a dangerous thing to fix.
12:35 tobiasvl and yeah commit messages might be dangerous to fix
12:36 lpapp I guess code review (including commit messages) could help with this to a certain extent even if not completely.
12:36 lpapp but even that is not always possible in projects.
12:36 themill Including giving false or misleading information about what was or was not changed by changing the commit message.
12:37 tobiasvl lpapp: I'm not completely sure what you're asking – are you wondering why the commit SHA is a hash of anything more than the actual diff (and parent commits)?
12:37 todder joined #git
12:37 jameser joined #git
12:38 Tobbi joined #git
12:39 JeroenT joined #git
12:39 mischat joined #git
12:40 al-damiri joined #git
12:41 eblip joined #git
12:44 Derperperd joined #git
12:46 SpeakerToMeat joined #git
12:47 GavinMagnus joined #git
12:51 jameser joined #git
12:51 stamina joined #git
12:54 lindenle joined #git
12:55 luhem joined #git
12:55 overlord_tm joined #git
12:56 luhem joined #git
12:57 luhem joined #git
12:57 ojdo joined #git
12:58 luhem joined #git
13:04 watabou joined #git
13:05 infinite joined #git
13:06 noecc joined #git
13:09 boombatower joined #git
13:17 jameser joined #git
13:18 ExoUNX joined #git
13:18 refried_ joined #git
13:18 finalbeta joined #git
13:18 leeN joined #git
13:21 borkr joined #git
13:23 JeroenT joined #git
13:23 gyre007 joined #git
13:25 PHPanos joined #git
13:25 jagob joined #git
13:26 lpapp left #git
13:28 treia joined #git
13:29 cyan__ joined #git
13:29 jameser joined #git
13:31 shinnya joined #git
13:31 Tobbi joined #git
13:32 rnsanchez joined #git
13:32 elect joined #git
13:33 mischat joined #git
13:35 PioneerAxon joined #git
13:36 mischat joined #git
13:37 Derperperd joined #git
13:38 bongjovi joined #git
13:40 Gloomy joined #git
13:40 govg joined #git
13:42 mgedmin git determines whether different clones of the same repo have the same data by comparing commit hashes
13:43 mgedmin if changing a commit message didn't change the hash, how would you propagate the changed message everywhere?
13:43 nicoulaj joined #git
13:43 bernardio joined #git
13:45 maret joined #git
13:45 rkazak joined #git
13:46 jeffreylevesque joined #git
13:46 maret joined #git
13:47 osse mgedmin: and exception that allowed it if only the message is different :3
13:47 lindenle joined #git
13:50 ikelso joined #git
13:50 SpeakerToMeat joined #git
13:56 maret joined #git
13:57 Ryanar joined #git
13:57 prohobo joined #git
13:58 prohobo hi, im trying to understand branching in git, but this first example already doesn't make any sense to me: https://git-scm.com/book/ch3-2.html
13:58 prohobo say you have two branches, master and foobar, you're 2 commits into foobar when you suddenly need to add something to master
13:59 prohobo in this example, foobar stays WITHOUT the change in master
13:59 prohobo right?
13:59 thiago joined #git
13:59 prohobo so how does foobar reintegrate into master later on?
13:59 theoceaniscool joined #git
13:59 tobiasvl prohobo: yes, a commit added to master will not be added to foobar. to reintegrate, you merge (or rebase)
13:59 osse prohobo: right. you can use git merge to do that
14:00 prohobo what if i need to continue working on foobar, but need the updates from master?
14:00 prohobo like some kind of octopus
14:00 tobiasvl merge or rebase
14:01 prohobo merge removes foobar though right?
14:01 prohobo the branch i mean
14:01 tobiasvl no
14:01 tobiasvl but it will cause foobar and master to be identical
14:01 prohobo so i'd lose my progress in foobar
14:01 tobiasvl no, the progress in foobar would be merged with the progress in master
14:02 tobiasvl you would lose neither
14:02 prohobo oh sorry, yeah
14:02 prohobo hm im trying to keep the branches separate but have master be a "base common code" branch, so i guess im looking for rebase?
14:03 Zamerick joined #git
14:03 ResidentBiscuit joined #git
14:03 tobiasvl well, maybe, but why do you want them to be separate?
14:04 prohobo because say i have (or literally have) a CMS project that would be used for multiple clients but each client would need some specific functionalities
14:05 prohobo i'd have my base CMS, then separate branches for each client
14:05 prohobo i think my idea might be dumb though, better just have a modular CMS that can be configured on deployment
14:05 mgedmin repeated merges might work
14:05 watabou joined #git
14:05 zenmaster joined #git
14:06 mgedmin btw a merge doesn't exactly make the two branches "identical"
14:06 tobiasvl yeah you can merge master into the separate branches when you need to. or rebase, but that'll be tedious and rewrite history all the time
14:06 mgedmin it makes one branch contain all the changes that are in the other branch
14:06 tobiasvl yeah that was a little imprecise
14:06 mgedmin but it leaves the other branch alone
14:06 Tobbi joined #git
14:06 prohobo oh
14:06 prohobo yeah dude that makes sense
14:06 oskarkv joined #git
14:07 harrymoreno joined #git
14:07 prohobo alright thanks for the help :)
14:08 Gsham joined #git
14:08 kpease joined #git
14:09 rnsanchez_ joined #git
14:10 cust joined #git
14:10 jwmann joined #git
14:10 mgedmin (long-lived branches that share code are usually painful)
14:11 mgedmin (modular CMS + configuration sounds like a better plan)
14:12 brent__ joined #git
14:13 prohobo yeah i should just keep it simple
14:14 jimi_ joined #git
14:15 _0xbadc0de joined #git
14:15 _0xbadc0de hi
14:15 _0xbadc0de I have a project with a remote repo
14:16 _0xbadc0de and I want to push it to another repo
14:16 _0xbadc0de but eventually go back pushing where I was before
14:16 _0xbadc0de how can I achieve this?
14:16 tobiasvl add the other repo as a new remote and push to it?
14:17 _0xbadc0de how can I do that?
14:17 tobiasvl man git remote
14:17 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
14:18 tobiasvl git remote add REMOTE_NAME REMOTE_URL; git push REPO_NAME BRANCH
14:18 kexmex joined #git
14:19 tobiasvl s/REPO_NAME/REMOTE_NAME
14:19 Snugglebash joined #git
14:19 phanimah1sh joined #git
14:20 jbitdrop joined #git
14:20 ocbtec joined #git
14:21 noecc joined #git
14:21 hahuang65 joined #git
14:22 acetakwas joined #git
14:23 Snugglebash joined #git
14:23 wootehfoot joined #git
14:24 Snugglebash joined #git
14:24 zeroed joined #git
14:24 zeroed joined #git
14:24 anonymuse joined #git
14:24 Snugglebash joined #git
14:25 Snugglebash joined #git
14:25 JeroenT_ joined #git
14:27 modin joined #git
14:30 cdg joined #git
14:30 mda1 joined #git
14:30 cyan__ joined #git
14:31 ShekharReddy joined #git
14:31 nettoweb joined #git
14:33 Murii joined #git
14:36 maret joined #git
14:36 mehola joined #git
14:38 Derperperd joined #git
14:40 robotroll joined #git
14:45 adbjesus joined #git
14:47 chosafine joined #git
14:47 hhee joined #git
14:48 cyan__ joined #git
14:54 e14 joined #git
14:54 Disgeae joined #git
14:55 JeroenT joined #git
14:55 bannakaf_ joined #git
14:57 Nilesh_ joined #git
14:58 Gsham joined #git
14:59 ash_workz joined #git
15:00 AaronMT joined #git
15:01 glnz joined #git
15:02 a3Dman joined #git
15:02 andrew710 joined #git
15:02 Es0teric joined #git
15:03 ikelso joined #git
15:03 SomeDev1080 joined #git
15:04 sentriz joined #git
15:05 SomeDev1080 Hi. I'm trying to migrate a kitchen-sink SVN repo to Git. In this process I'd like to split all the unrelated modules into single Git repos. Can I use git subtree for this? Just substree split and then push the split to the new repo?
15:07 watabou joined #git
15:07 ResidentBiscuit joined #git
15:08 peeps[lappy] joined #git
15:08 PresidentBiscuit joined #git
15:09 cdg_ joined #git
15:12 a_thakur joined #git
15:12 Es0teric joined #git
15:13 jknetl joined #git
15:15 kadoban SomeDev1080: If you want, sure. Will you be using the kitchen-sink repo anymore? If not, filter-branch might be easier, if you're not familiar with subtree yet.
15:16 diogenese joined #git
15:16 Es0teric joined #git
15:16 Gsham joined #git
15:17 shgysk8zer0 joined #git
15:17 Raging_Hog joined #git
15:18 heroux_ joined #git
15:18 moei joined #git
15:19 cbegin joined #git
15:20 d1z joined #git
15:20 refried_ joined #git
15:20 maret joined #git
15:21 altendky joined #git
15:21 kexmex joined #git
15:21 grilled-cheese joined #git
15:22 JeroenT joined #git
15:22 nickabbey joined #git
15:23 chosafine joined #git
15:24 SomeDev1080 kadoban: No, I won't use it later on. So I should be able to do subtree split, push splits to new repos and forget the old repo all together, right?
15:24 maret joined #git
15:24 kadoban Yes. Personally I'd find that easier to do with filter-branch subdir-filter or whatever it is though, but whichever you prefer will work fine for that
15:26 rorro joined #git
15:26 tuor joined #git
15:27 gajus joined #git
15:27 heroux joined #git
15:28 shashin joined #git
15:28 HardlySeen joined #git
15:29 gaut85 joined #git
15:30 zivester joined #git
15:30 tcorneli joined #git
15:31 Cavallari joined #git
15:31 ronskisika joined #git
15:32 eihabarabia joined #git
15:32 manuelschneid3r joined #git
15:34 yehowyada joined #git
15:34 rivarun joined #git
15:34 cdown joined #git
15:35 [0xAA] joined #git
15:36 snowkidind joined #git
15:39 Derperperd joined #git
15:40 adino joined #git
15:40 gugah joined #git
15:41 Raging_Hog joined #git
15:42 maret joined #git
15:43 acetakwas joined #git
15:44 thiago joined #git
15:46 Tobbi joined #git
15:46 ronny joined #git
15:48 phanimahesh joined #git
15:49 Serious8 joined #git
15:50 SomeDev1080 kadoban: Can I use filter-branch on the kitchen-sink repo after I used subtree split or should I do a fresh checkout? I think subtree split missed some things and would like to check that with filter-branch.
15:50 maret joined #git
15:51 TheMontyChrist joined #git
15:52 Serious8 joined #git
15:52 SomeDev1080 Ah. Some modules were renamed so the prefix doesn't work for older commits. Argh.
15:52 _ADN_ joined #git
15:53 TheMontyChrist joined #git
15:53 TheMontyChrist joined #git
15:53 TheMontyChrist I git clone "git clone REPO1" to REPOS2.  I make a much of changes to REPO1, how do get them into REPO2.  I'm coming from mercurial, I can do this two ways, "pull" from 1 to 2. or from 1, push into 2.
15:53 TheMontyChrist make a much - make a bunch
15:54 maret joined #git
15:55 Snugglebash joined #git
15:55 aarobc joined #git
15:55 Domhack joined #git
15:58 spider_x joined #git
15:59 harrymoreno joined #git
15:59 todd_dsm joined #git
16:00 a_thakur joined #git
16:00 Shashikant86 joined #git
16:03 Guest22896 joined #git
16:04 subhojit777 joined #git
16:06 yehowyada joined #git
16:07 watabou joined #git
16:07 Tobbi joined #git
16:08 phanimah1sh joined #git
16:11 chosafine joined #git
16:13 emporio joined #git
16:13 Gsham joined #git
16:15 erebel55 joined #git
16:19 JeroenT joined #git
16:21 Derperperd joined #git
16:22 hahuang65 joined #git
16:23 kulelu88 joined #git
16:24 brent__ joined #git
16:24 Khisanth joined #git
16:25 dave0x6d joined #git
16:25 harrymoreno left #git
16:25 gugah joined #git
16:26 rominronin joined #git
16:28 sammyo joined #git
16:29 cjohnson TheMontyChrist: when you clone it, it establishes the original repo as the remote for the new one. so yes, pull will pull latest changes
16:31 InfoTest joined #git
16:31 dreiss joined #git
16:32 Darren_ joined #git
16:32 Darcidride joined #git
16:32 jccn joined #git
16:33 e14 joined #git
16:37 manuelschneid3r joined #git
16:38 mehola joined #git
16:38 luhem joined #git
16:38 Milos joined #git
16:42 spider_x Hey guys, I would like to install git on linux, so I did and I set my username and password
16:42 spider_x however I have two way authentication (SMS thingie)
16:42 spider_x and for whatever reason I can't seem to get it to work, any ideas?
16:43 mischat joined #git
16:44 crayon joined #git
16:45 luhem7 joined #git
16:45 e14 joined #git
16:45 PresidentBiscuit Git has two way auth?
16:45 spider_x Well Github*
16:45 Oebele joined #git
16:46 spider_x but when I try to login to git it doesn't seem to work
16:46 luhem7 joined #git
16:46 PresidentBiscuit Not sure what you mean login to git
16:46 PresidentBiscuit When you try to push to github?
16:46 spider_x well when I have to commit and push something
16:46 spider_x yea exactly
16:47 PresidentBiscuit Might read https://github.com/blog/1614-two-factor-authentication
16:47 PresidentBiscuit tl;dr use ssh or the access token
16:47 maret joined #git
16:48 spider_x Yea, I used the access token up to this point
16:48 Derperperd joined #git
16:48 spider_x but never figured out how to store the access token
16:49 PresidentBiscuit Store it? I think you just use it in place of your password
16:50 PresidentBiscuit Or you can setup ssh access and not worry about it
16:50 spider_x Yea, that's what I was doing, using the Token in place of my password but it got tedious as the Token is a long hard to remember String
16:50 spider_x I will check the SSH stuff out
16:51 durham joined #git
16:53 Snugglebash joined #git
16:53 tvw joined #git
16:54 zivester joined #git
16:54 raspado joined #git
16:55 borkr joined #git
16:56 zivester joined #git
16:58 Raging_Hog joined #git
17:00 Bombe joined #git
17:00 tang^ joined #git
17:01 mohabaks joined #git
17:02 jwmann joined #git
17:03 cust joined #git
17:03 dreiss joined #git
17:03 jagob joined #git
17:04 refried_ joined #git
17:07 matsaman joined #git
17:08 watabou joined #git
17:10 nowhere_man joined #git
17:11 armyriad joined #git
17:12 BSab joined #git
17:13 hasc joined #git
17:13 hasc joined #git
17:15 madewokherd joined #git
17:15 andrew710 joined #git
17:19 blackwind_123 joined #git
17:20 cyberz joined #git
17:21 dsdeiz joined #git
17:21 dsdeiz joined #git
17:22 ihradek joined #git
17:22 maret joined #git
17:24 LionsMane joined #git
17:25 Gsham joined #git
17:25 matsaman not seeing a clear consensus as to how one is meant to merge master into another branch
17:25 matsaman git merge master seems to be a clusterfsck, though
17:26 maret joined #git
17:26 darkbit joined #git
17:27 thiago joined #git
17:27 rominronin joined #git
17:28 Es0teric joined #git
17:30 refried_ joined #git
17:30 raedah how come I see  theuser:thebranch  on the PR but  https://github.com/theuser/theproject  does not exist? Is the branch stored somewhere else?
17:32 chardan joined #git
17:34 canton7 raedah, might be private?
17:35 canton7 or the project might have been deleted?
17:35 canton7 raedah, you don't normally see "theuser:thebranch" though - it's "therepo:thebranch"
17:36 ayjay_t joined #git
17:36 anonymuse joined #git
17:37 raedah canton7: https://github.com/decred/dcrwallet/pull/520/commits/754422af0e012e0937db41542e899f05b79298d1
17:37 raedah where is the repo for dajohi:ticketmaxprice ?
17:38 svm_invictvs joined #git
17:38 canton7 raedah, https://github.com/dajohi/btcwallet
17:38 markelite left #git
17:38 canton7 raedah, mouseover the "dajohi:ticketmaxprice" to see the location of the repo.
17:39 canton7 ... the commits in the PR are also available in the decred/dcrwallet repo
17:39 canton7 (https://help.github.com/articles/checking-out-pull-requests-locally/)
17:39 canton7 so you almost never need to go and look at the repo of the person submitting a PR
17:40 durham joined #git
17:40 canton7 (the PR came from this branch specifically: https://github.com/dajohi/btcwallet/tree/ticketmaxprice)
17:41 evie_hammond joined #git
17:41 raedah thats great, thanks
17:41 raedah yeah, that was what I was getting to...needed to pull down the commit locally to test.
17:42 Gsham joined #git
17:42 canton7 yeah, the quick way is 'git fetch origin refs/pull/520/head:pr-520 && git checkout pr-520'
17:44 spacelord_ joined #git
17:48 cbegin joined #git
17:49 aard_ joined #git
17:49 howitdo joined #git
17:49 howitdo joined #git
17:49 ash_workz how can I show all commits which changed a specific file?
17:50 durham joined #git
17:51 mischat joined #git
17:52 leeN joined #git
17:53 moritz ash_workz: git log -- the/file
17:54 moritz ash_workz: with -p added if you want to see the diffs
17:54 ash_workz oh I see
17:54 ash_workz git log -p <file> or git log -p -- <file> ?
17:54 hahuang65 joined #git
17:54 matsaman is there a way to get the list of merge conflict files that 'git status' reports, only entirely unformatted, just one per line, no fluff?
17:54 moritz ash_workz: as long as <file> can't be a branch or tag name, they behave the same
17:55 moritz ash_workz: in case of ambiguity, the -- resolves it
17:55 ash_workz I see
17:56 pbrewczynski joined #git
17:56 moritz matsaman: git ls-files --unmerged
17:57 pikajude left #git
17:57 cyan__ joined #git
17:57 mischat joined #git
17:58 matsaman hrmm, that's better than git diff --name-status --diff-filter=U by far
17:58 matsaman but I still have to process it with | cut -f 2- | sort | uniq
17:59 thiago --name-omly
17:59 erebel55 left #git
17:59 thiago only
18:00 matsaman git diff --name-only | sort | uniq, that's even bettererer
18:00 fatalhalt joined #git
18:00 raspado joined #git
18:01 matsaman but is there really no single ordinary command to do that?
18:01 thiago you can apply --diff-filter to it if you want
18:01 matsaman meh
18:01 mischat joined #git
18:02 matsaman I feel like the simplest way to resolve these conflicts is to check the list of conflict files, quickly see which I want to merge manually, grep -v them out, and checkout --theirs the rest
18:02 jnavila joined #git
18:02 matsaman is there some more git-like strategy than this?
18:03 dviola joined #git
18:03 thiago there's no git-like strategy for resolving conflicts
18:03 matsaman also, is there some nice culty word that people tolerate akin to 'pythonic' for git? =P
18:03 thiago by definition, conflicts are something that Git can't solve and a human needs to step in
18:03 matsaman right, but there's no better human strategy for using git than what I just outlined?
18:03 thiago the best strategy is "manually"
18:03 dviola joined #git
18:04 matsaman okay, well good to know
18:04 thiago git mergetool will iterate over the conflicts for you and launch your merge tool
18:04 matsaman moritz: thiago: thanks =)
18:04 refried_ joined #git
18:04 thiago what problem are you trying to solve?
18:05 ^7heo the eternal question of the meaning of life, the universe, and everything
18:06 thiago ultimate
18:06 tinti joined #git
18:07 r4nd0m-0ne joined #git
18:09 matsaman sorry, distracted
18:09 matsaman like I said, it's just a merge with conflicts
18:09 siddart joined #git
18:09 watabou joined #git
18:09 matsaman and instead of going through them one by one, since I know I will just want all of --theirs or all of --ours for basically all of them, I wanted to loop through a plain list
18:10 matsaman git diff --name-only | sort | uniq is pretty good
18:11 matsaman oh interesting, can't do parallel things with git =)
18:12 markelite joined #git
18:13 thiago what about the files that didn't conflict? Do you want ours or theirs?
18:13 thiago ok
18:13 matsaman aren't ones that didn't conflict identical?
18:14 tvw joined #git
18:14 maret joined #git
18:15 thiago no
18:15 thiago it means the merge was successful
18:15 Iyph joined #git
18:16 matsaman oh of course
18:16 matsaman those don't bother me, should they?
18:16 matsaman I mean of course they might bother someone, but they don't need to necessarily bother me, right?
18:16 Guest86770 left #git
18:17 Derperperd joined #git
18:17 kadoban It's usually weird when you want to treat whatever magically automatically got merged different from what didn't. It suggests ... I don't know, but usually that a merge either isn't what you want, or that you do want a merge, but you think there's a shortcut around the conflicts.
18:18 matsaman so my strategy at this point is: git checkout notmaster; git merge --squash master; git diff --name-only | sort | uniq | egrep -iv 'stuff_to_individually_address' | while IFS='' read -r line; do git checkout --theirs "$line"; git add "$line"; done; git mergetool; ... commit etc.
18:18 maret joined #git
18:19 matsaman the conflicts are all files I haven't been working on in my non-master branch
18:19 matsaman I don't care if they're all treated with --theirs
18:19 matsaman but one day there may well be one or two or plenty of files within those that I _do_ care about, that I have been working on
18:19 matsaman and obviously I will want to merge those manually
18:20 dreiss joined #git
18:20 kadoban So on one side of the merge, there's files you never touched. On the other they got changed, and there's conflicts on those files?
18:20 matsaman yes
18:21 e14 joined #git
18:21 valize joined #git
18:21 matsaman other people have updated files I haven't changed, and I want to merge them in to my branch
18:21 kadoban I don't want to say that's impossible, since some weird stuff happens occasionally and maybe I'm not thinking of something, but ... that doesn't sound right.
18:21 matsaman I want to manually merge in changes to files I _have_ changed if they're there, but not manually for other files
18:21 matsaman yeah well it doesn't sound right to me, either =P
18:22 matsaman as I recall in the past this was not happening
18:22 kadoban What changes is it trying to merge and getting conflicts on? What do these conflicts look like?
18:22 matsaman maybe someone drastically changed some files?
18:22 bannakaffalatta joined #git
18:22 matsaman meh... hang on =)
18:22 duderonomy joined #git
18:22 Ryanar left #git
18:22 kadoban It doesn't really matter if they changed them to PHP in haiku format ... if you didn't change them on your branch, what conflict can there be?
18:23 matsaman we'll see in a moment
18:23 Someguy123 joined #git
18:23 matsaman we use svn for our repo, if that might explain it
18:24 kadoban Hmm. It shouldn't, but I don't really know how git-svn works anymore.
18:24 maret joined #git
18:25 matsaman neither do I =P
18:25 matsaman okay so it's just
18:25 matsaman they're mostly .py python files, and the first one mergetool picks out, one line has changed
18:25 matsaman in a file I've not altered in my branch
18:26 serialoverflow joined #git
18:27 kadoban Is the branch you're merging in like ... has it had history altered or anything?
18:27 matsaman determined by? =)
18:27 matsaman you're saying if git saw a file was unchanged by me, but changed in the branch I was merging in, it would not mark it as having a merge conflict?
18:27 matsaman even if it couldn't figure out how to merge it?
18:28 liberpater joined #git
18:28 kadoban You could look at uhmmm ... I guess it'd be   'git log your_branch ^their_branch' I think, see if that only shows your changes?
18:28 liberpater What's the best way to diff a file between two branches?
18:28 matsaman the first instance is something like old (foo,bar),(baz,qux) to new (foo,bar,),(baz,qux,fred)
18:29 kadoban matsaman: I don't want to be too authoritative, I use git a lot but occasionally other workflows surprise me in their behavior or something, but ... I have no idea what merge conflict can even exist when only one side of a merge has changed something, ever.
18:29 demize joined #git
18:29 matsaman kadoban: only shows mine
18:30 kadoban matsaman: And you're on your branch and doing 'git merge their_branch' ?
18:30 matsaman ooooh, okay, I think I know what's going on
18:30 LionsMane joined #git
18:30 kadoban liberpater: Some variation of 'git diff' certainly. Is one of the branches the one you're on?
18:30 matsaman I must have merged in all the files I wasn't changing, and added them, and committed them
18:30 matsaman when clearly I should only have merged in & added files that I was working on
18:31 matsaman sound right? =P
18:31 kadoban Well, you don't really choose files you're merging, you merge branches (or at least commits)
18:31 matsaman yeah
18:31 matsaman that's what I thought
18:31 kadoban So doesn't sound too right. Still confused.
18:31 matsaman yeah
18:32 matsaman I've been working on this branch for a while, and every now and then I merge in master (other people's stuff) in case I need to address things again / in a different way
18:32 matsaman that's not unreasonable/crazy itself, right?
18:32 maret joined #git
18:32 kadoban That should still be fine, naw yeah that's a normal thing to do really.
18:33 matsaman k
18:34 Gsham joined #git
18:34 matsaman well I'll think on it =)
18:35 matsaman hopefully we'll be finally transitioning away from svn soon, and maybe that'll alleviate many things
18:35 kadoban Hmm, ya good luck. Sorry I wasn't able to provide much clarity.
18:35 matsaman well at least I know some aspects of what I'm doing aren't out of the ordinary, that's useful =)
18:35 chosafine joined #git
18:38 e14 joined #git
18:40 Oebele_ joined #git
18:40 str joined #git
18:40 satifant joined #git
18:40 matsaman kadoban: and is git merge --squash master halfway sane?
18:40 Oebele joined #git
18:40 matsaman I'm going to re-squash all my changes before I ever merge back into master anyway
18:44 Ryanar joined #git
18:44 aw1 joined #git
18:45 chosafine joined #git
18:45 chosafine joined #git
18:45 matsaman ohwell can't be bothered anymore today =P
18:46 jost_ joined #git
18:48 maret joined #git
18:48 Guest1091 joined #git
18:49 malavv joined #git
18:49 emporio joined #git
18:52 maret joined #git
18:55 Es0teric joined #git
18:55 adino joined #git
18:58 rominronin joined #git
18:58 Es0teric joined #git
19:01 tyreld joined #git
19:01 TomyLobo joined #git
19:02 Gsham joined #git
19:05 Sasazuka joined #git
19:08 yosstheboss joined #git
19:08 SteffanW joined #git
19:09 anjen joined #git
19:10 mgoodwin joined #git
19:10 mgoodwin It seems like nearly every time I do an interactive rebase just to reword commits It conflicts over "error: could not apply" and I don't understand why
19:11 watabou joined #git
19:13 thiago joined #git
19:14 thiago joined #git
19:14 Limes_ joined #git
19:15 maret joined #git
19:15 eihabarabia joined #git
19:15 kadoban matsaman: I would probably avoid squashes if it were me. I could possibly see that causing your trouble, though I didn't think about it much.
19:18 yosstheboss hi there, git newbie here. I cloned a repo then sometime later (with _no_ local changes)  did "git pull --depth=1". Why would that cause a merge conflict?
19:18 Derperperd joined #git
19:18 maret joined #git
19:19 mischat joined #git
19:19 nickabbey joined #git
19:21 perlpilot_ yosstheboss: At a guess, because there have been enough commits that the file in question no longer resembles what you have locally and you didn't get enough depth for git to figure out how to go from your local copy to the most recent one
19:27 Tobbi joined #git
19:27 kadoban yosstheboss: As a git newbie, I can't imagine that shallow clone things are a good idea ... they confuse the crap out of me and I should vaguely know what I'm doing.
19:27 overlord_tm joined #git
19:28 yosstheboss perlpilot_: sorry for being thick, but I understood that all I asked git to do is to fetch latest files from the remote branch and merge any changes from there to my local branch. Is the problem that with a shallow pull git cannot know if indeed I have not made local changes?
19:28 emg joined #git
19:29 matsaman kadoban: yeah...
19:29 matsaman kadoban: you think just avoiding squashing master into my branch would suffice? And I could still squash back into master without issue?
19:29 gugah joined #git
19:29 lungaro is there a way to make a local tag that is not visible in git describe ?
19:30 moritz lungaro: if you tag witout -a, git describe will ignore it
19:30 yosstheboss kadoban: in essence you are right but seeing as git cannot resume an aborted clone I had no other choice with my currently flaky connection.
19:30 moritz (at least with default options)
19:30 ojacobson yosstheboss: for the time being, forget that --depth and other shallowness-related options exist, other than `git fetch --unshallow`.
19:30 lungaro moritz, hmm, i am tagging without -a and it still shows it
19:30 ojacobson If you can't clone the repo, consider making a copy with a resumable mechanism like rsync, first - git repos are just files
19:30 perlpilot_ yosstheboss: you asked git to give you a single commit.  --depth is about commits not files.
19:30 star_prone joined #git
19:30 perlpilot_ yosstheboss: and definitely what ojacobson said.
19:31 moritz lungaro: are you calling git describe --tags?
19:31 lungaro Yah
19:31 ojacobson (yes, it sucks that git can't progressively clone or fetch, no, that's not easy to fix, no, shallow is not a good fix. shallow has _complicated_ side effects.)
19:31 moritz lungaro: leave out --tags
19:31 ojacobson (like "you can't push unless" side effects.)
19:31 lungaro mortiz, so.. i mean I use tag as a version, so I want a version tag. But I also want a tag for when I merge/pull into my local branch
19:32 perlpilot_ yosstheboss: Why are you using --depth in the first place?
19:32 moritz lungaro: why?
19:32 kyan joined #git
19:32 Jackneill_ joined #git
19:32 ojacobson You could probably build a reasonable incremental fetch out of shallow fetching and incremental deepening, but you'd have to have a fairly good internal knowledge of how shallow repos work and of what repack does
19:32 lungaro i'm probably just going about it wrong.. I want to keep track of the changes since I last pulled in order to easily see what changes when I merge
19:32 lungaro I can do it a few different ways really, so maybe i'll just change my logic
19:33 lungaro yah, i got bad logic =P
19:33 * lungaro quacks
19:36 yosstheboss thanks guys, I think I got it now but just to make sure: true or false? - with "pull --depth=1",  git does not have enough context to be able to determine that I have not made local changes? as far as it's concerned the latest remote commit is not a descendant of my HEAD?
19:36 nwkj86 joined #git
19:36 ojacobson with --depth=1 git _may or may not_ have enough context to compute the merge.
19:37 ojacobson depending on what's already in your repo, how many commits you actually end up fetching, and other factors.
19:37 ojacobson do you want a highly state-dependent problem? because that's how you get ants.
19:37 danslo joined #git
19:38 yosstheboss but I can do "git reset remote/origin" to get in sync with origin?
19:38 ojacobson with --depth=1 you may end up with a gap in the repo between the newly-fetched commits and their nominal last common ancestor, which means that git won't be able to walk the commit graph to find the merge-base for the merge implied by pull
19:38 jstimm joined #git
19:38 ojacobson you can, yes, if you don't mind discarding local commits
19:38 ojacobson you'd still have a gap in your git history, though
19:39 yosstheboss ... which doesn't bother me at the moment, but will bite me in the future?
19:39 KevinMGranger[M] joined #git
19:40 perlpilot_ gaps in history?  yes!
19:42 druonysus joined #git
19:42 PHPanos joined #git
19:43 govg joined #git
19:43 elsevero joined #git
19:43 yosstheboss what I really need is for some git hacker to somehow enable support for incremental pulling/cloning. Even at the cost of inefficient bandwidth consumption. Perhaps pulling single objects at a time as apposed to a pack file so that an abborted fetch won't leave me with nothing at all.
19:43 ki0 joined #git
19:44 Ryanar joined #git
19:44 yosstheboss This seems to be a very much requested feature.
19:44 malavv joined #git
19:45 yosstheboss Is a partially downloaded pack file really useless? must it just be discarded?
19:47 PresidentBiscuit joined #git
19:47 durham joined #git
19:50 kexmex joined #git
19:51 RTO joined #git
19:51 RTO left #git
19:52 ojacobson Presently, yes, to both
19:54 sargas joined #git
19:54 yosstheboss ...and it's a difficult problem to rectify? or just nobody gotten 'round to it?
19:55 ojacobson A combination of "it's hard" and "other problems are more interesting" and "the best solutions appear to break backwards-compat"
19:56 tdupu joined #git
19:56 yosstheboss got it. thanks guys.
19:56 spriz joined #git
19:56 ojacobson if you invented a practical way to extract a valid pack from the prefix of an invalid pack
19:57 ojacobson (and to rehash that new pack, which is easy)
19:57 ojacobson then you could probably implement incremental fetches
19:57 svm_invictvs joined #git
19:57 ojacobson you could also script it with shallow repos, but the failure modes for that are pretty bad
19:57 ojacobson (and since incremental fetch is about a failure mode in the first place, that's important)
20:00 Es0teric joined #git
20:02 yosstheboss How about fetching unpacked objects but only updating the repository once all needed objects have arrived?
20:02 jimi_ joined #git
20:02 ojacobson Hugely inefficient, but would work
20:02 ojacobson packs are delta-encoded, which means that the total length of the pack is normally significantly less than the sum of the lengths of the packed objects
20:03 ojacobson It needs a smart server, but we already have that (git-upload-pack)
20:03 yosstheboss or fetching (user configurable maximum size) multiple small packs.
20:04 aidalgol joined #git
20:04 yosstheboss efficiency is not a consideration when without a solution a full fetch is virtually impossible (on a bad connection and a big repository)
20:05 maret joined #git
20:05 ojacobson Sure. Correct, then readable, then efficient. :)
20:05 ojacobson I snarked about this conversation on twitter, on the same theme :)
20:05 ojacobson RT @derspiny: There are statistical limits to the size of a remote git repository, imposed by the (probably Pareto) frequency of connection problems.
20:05 ojacobson RT @derspiny: These limits cannot be lifted except by using something else (rsync, for example): git has no way to subdivide network operations.
20:05 ojacobson RT @derspiny: Computing these limits is tricky, but probably worth doing.
20:06 Muzer joined #git
20:09 yosstheboss joined #git
20:09 ki0 joined #git
20:12 watabou joined #git
20:12 xaa joined #git
20:14 durham joined #git
20:16 Balliad joined #git
20:17 dsdeiz joined #git
20:17 dsdeiz joined #git
20:20 kpease_ joined #git
20:20 nwkj86 joined #git
20:22 thierryp joined #git
20:23 Ryanar joined #git
20:25 str joined #git
20:29 rominronin joined #git
20:30 anonymuse joined #git
20:31 Serious8 joined #git
20:33 Mobutils joined #git
20:34 yosstheboss left #git
20:35 karstensrage since 'master' is just a convention, is there a more semantically concrete word to use for the concept?
20:36 kadoban Which concept?
20:36 karstensrage master
20:36 kadoban I know, but ... which part of it? It means different things to different people/projects.
20:36 platzhirsch joined #git
20:37 karstensrage well the context is i have to develop some documentation about how things get into a repo that can be used to deploy stuff to FedRAMP
20:37 Zialus joined #git
20:37 karstensrage so its like how things get into "master"
20:37 karstensrage but i dont want to use the word master since thats just a convention
20:37 karstensrage like blessed
20:37 karstensrage or vetted
20:38 platzhirsch Any idea how to get the stats changed from git log --stats with format? I didn't find any variables in the format= on the man page
20:38 kadoban karstensrage: Maybe could call it like "the production branch"? I'm not sure there is a general term.
20:38 cdown_ joined #git
20:38 kadoban Git provides so little guidance on workflow that I'm not sure there can be a general term for it that applies to all uses of git.
20:38 d1z joined #git
20:39 mehola joined #git
20:39 askb joined #git
20:39 snthsnth joined #git
20:40 PHPanos joined #git
20:40 Ramen joined #git
20:42 YuGiOhJCJ joined #git
20:43 karstensrage kadoban, ok production branch
20:43 karstensrage thats good enough
20:44 dsop joined #git
20:44 Balliad joined #git
20:45 perlpilot_ "master isn't for production, it's for development!"  ;-)
20:45 hasc_ joined #git
20:46 kadoban Heh, it depends a lot :-/ in some it's development, in some it's production ... in particular git flow I think has the default "production" branch be master, "develop" is the development branch.
20:46 kadoban Of course even those are configurable, even if you use the actual tool. If you don't, you can obviously do whatever.
20:46 kadoban I'm kind of leaning towards just not even having a master branch in new projects anymore.
20:46 karstensrage yeah and i hate git flow so we are going to try something else
20:47 Ramen joined #git
20:47 kadoban Ya? I kinda like it. Though it's a bit restrictive for small projects.
20:47 snthsnth joined #git
20:48 karstensrage its too contextless
20:48 karstensrage for our team i think code review is going to work better
20:49 karstensrage for FOSS maybe its ok since the PR's have issues and tons of context around them
20:49 kadoban Well, most of my projects are just me or at most one or two other people
20:50 karstensrage mine too
20:50 kadoban For a real team, something based on reviews is probably a good idea, but I'm not sure that conflicts with git flow necessarily.
20:51 nettoweb joined #git
20:52 judson joined #git
20:52 karstensrage thats probably true
20:52 karstensrage i think i just dont like JUST git flow
20:52 kadoban Which is not to suggest that I'm advocating you use git flow. Right, ya I get that.
20:52 star_prone joined #git
20:53 matsaman joined #git
20:54 stick-shift joined #git
20:54 ki0_ joined #git
20:55 Guest46 joined #git
20:55 Balliad joined #git
20:56 refried_ joined #git
20:56 Fabricio20 joined #git
20:56 hashpuppy joined #git
20:58 rorro joined #git
20:58 sq-one joined #git
20:58 hashpuppy user1/featureA and user2/featureB branched off the same point on upstream/master.  is it possible for me to apply user2/featureB on top of user1/featureA on top of upstream/master, but have all of user1/featureA's commits squashed and user2/featureB's commits squashed so that it's just <last master commit> <featureA> <featureB> in the commit log but featureA
20:58 hashpuppy still shows that user1 committed it
20:58 hashpuppy that was way longer than i had anticipated
20:59 Guest46 joined #git
20:59 Snugglebash joined #git
21:01 thiago joined #git
21:01 nickabbey joined #git
21:01 hasc joined #git
21:02 GT4066 joined #git
21:06 kyan joined #git
21:06 matsaman hashpuppy: also than I had =P
21:07 matsaman hashpuppy: I don't see why an ordinary git merge --squash master from each user in turn wouldn't cover that
21:07 matsaman but I am definitely not a git expert
21:07 blackwind_123 joined #git
21:08 zyrb joined #git
21:09 PHPanos joined #git
21:10 bannakaf_ joined #git
21:10 thiago --squash will discard merging information
21:10 dsdeiz joined #git
21:10 dsdeiz joined #git
21:12 zyrb left #git
21:13 watabou joined #git
21:15 cdg joined #git
21:16 tang^ joined #git
21:17 WayToDoor joined #git
21:17 Limes__ joined #git
21:19 Balliad joined #git
21:19 WaReZ joined #git
21:20 snthsnth joined #git
21:20 dsantiago joined #git
21:21 Atm0spher1c joined #git
21:22 Synthead joined #git
21:23 crose joined #git
21:24 siddart joined #git
21:29 siddart joined #git
21:29 m0viefreak joined #git
21:32 netj joined #git
21:33 vdl joined #git
21:34 phanimahesh joined #git
21:34 gugah joined #git
21:34 dsantiago joined #git
21:35 Gloomy joined #git
21:36 d1z joined #git
21:37 HardlySe1n joined #git
21:42 ddavidd left #git
21:47 HardlySeen joined #git
21:52 HardlySeen joined #git
21:54 robmozart_____ joined #git
21:54 borkr joined #git
21:54 snthsnth joined #git
21:54 siddart_ joined #git
21:59 LeBlaaanc joined #git
22:00 Sasazuka joined #git
22:01 mischat joined #git
22:02 rominronin joined #git
22:04 Serious8 joined #git
22:04 davimore_ joined #git
22:06 Sasazuka joined #git
22:06 _0xbadc0de joined #git
22:06 _0xbadc0de hello
22:06 _0xbadc0de here's the problem
22:07 _0xbadc0de (jumping right to the issue)
22:07 _0xbadc0de I have a project - KerN3l0
22:07 Serious8 joined #git
22:07 _0xbadc0de and instead of doing the obvious thing
22:08 _0xbadc0de which would be creating a branch first adding features and then making a pull request
22:08 hahuang65 joined #git
22:08 _0xbadc0de I simple cloned the repo and locally added the features
22:08 _0xbadc0de now I want to make a new branch and commit these changes to that new branch
22:08 _0xbadc0de what is the best way to do this?
22:09 _0xbadc0de appreciatted
22:09 nettoweb1 joined #git
22:10 rivarun joined #git
22:13 Snugglebash joined #git
22:14 doener joined #git
22:15 watabou joined #git
22:17 thierryp joined #git
22:18 WayToDoor joined #git
22:25 Serious8 joined #git
22:25 d1z joined #git
22:27 netj joined #git
22:28 kadoban joined #git
22:28 mischat joined #git
22:28 anonymuse joined #git
22:28 mischat joined #git
22:33 adino joined #git
22:37 LBV_User joined #git
22:40 Noodlewitt joined #git
22:40 hahuang65 joined #git
22:41 emg joined #git
22:42 tobiasvl _0xbadc0de: just make a branch now? and reset master (or whatever branch you mistakenly added the commits to) to origin/master if you want to
22:43 tobiasvl _0xbadc0de: and if you're using github (just assuming, since you said "pull request") you probably want to make a fork and push the branch there in able to make a PR
22:44 Pursuit joined #git
22:45 thiago joined #git
22:46 LaptopBrain joined #git
22:46 sargas joined #git
22:49 Gsham joined #git
23:01 fmeerkoetter joined #git
23:01 albel727 joined #git
23:01 Serious8 joined #git
23:05 snthsnth joined #git
23:06 jimi_ joined #git
23:07 Serious8 joined #git
23:09 LeBlaaanc joined #git
23:09 Eugene _0xbadc0de - !float
23:09 gitinfo _0xbadc0de: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
23:10 zivester joined #git
23:10 FSadino joined #git
23:12 Sasazuka joined #git
23:12 Serious8 joined #git
23:15 watabou joined #git
23:17 arescorpio joined #git
23:20 sargas joined #git
23:21 Serious8 joined #git
23:24 dsdeiz joined #git
23:24 dsdeiz joined #git
23:29 dsdeiz joined #git
23:29 dsdeiz joined #git
23:33 rominronin joined #git
23:33 rnsanchez joined #git
23:36 SpeakerToMeat joined #git
23:39 Xethron joined #git
23:39 bannakaffalatta joined #git
23:39 gugah joined #git
23:45 hahuang61 joined #git
23:45 Pluppz joined #git
23:46 Pluppz my friend wants to try my program and he get "permission denied (public key).. fatal: could not read from remote repository" when he wants to clone. Does he need a registered user or something? I would like so that anyone can clone
23:46 romerocesar joined #git
23:46 Pluppz (github)
23:50 GavinMagnus joined #git
23:51 shinnya joined #git
23:56 re1_ joined #git
23:57 ikelso joined #git
23:57 rkazak joined #git
23:57 Serious8 joined #git
23:59 moritz Pluppz: if it's a public repo, everone can clone via https:// URLs
23:59 silnp joined #git

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