Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-09

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

All times shown according to UTC.

Time Nick Message
00:01 JanC_ joined #git
00:01 skyres joined #git
00:02 cqi joined #git
00:02 vucks96 joined #git
00:03 chid joined #git
00:05 snthsnth joined #git
00:06 thiago joined #git
00:07 mablae joined #git
00:07 skyres joined #git
00:08 oxsyn joined #git
00:12 batrick joined #git
00:13 skyres joined #git
00:15 dodobrain joined #git
00:16 _ADNWO_ joined #git
00:16 harushimo joined #git
00:18 cagedwisdom joined #git
00:19 ramsub07 joined #git
00:19 anonymuse joined #git
00:19 skyres joined #git
00:25 madewokherd joined #git
00:25 skyres joined #git
00:25 raijin joined #git
00:27 ISmithers joined #git
00:27 crayon joined #git
00:27 fahadash joined #git
00:28 Oatmeal joined #git
00:28 zumba_addict joined #git
00:30 Motoko joined #git
00:31 diogenese joined #git
00:31 skyres joined #git
00:32 clemf joined #git
00:33 renlo joined #git
00:33 jstimm joined #git
00:35 elsevero joined #git
00:37 skyres joined #git
00:38 Darren_ joined #git
00:43 clemf joined #git
00:44 skyres joined #git
00:47 Learath2 joined #git
00:47 theskillwithin joined #git
00:48 nettoweb joined #git
00:50 skyres joined #git
00:52 clemf joined #git
00:52 renlo joined #git
00:52 e14 joined #git
00:56 n-st joined #git
00:56 skyres joined #git
00:57 clemf joined #git
00:57 ke4nhw joined #git
01:02 skyres joined #git
01:04 nicksloan joined #git
01:05 Lor_ joined #git
01:05 GavinMagnus left #git
01:07 renlo joined #git
01:08 skyres joined #git
01:09 l0v38ug joined #git
01:14 skyres joined #git
01:15 afusion joined #git
01:15 thiago joined #git
01:16 renlo joined #git
01:16 thebope joined #git
01:16 Lyqyd joined #git
01:18 fstd_ joined #git
01:19 e14 joined #git
01:20 skyres joined #git
01:22 anuxivm joined #git
01:23 AnxiousGarlic joined #git
01:24 skelterjohn_ joined #git
01:26 Balthasar|EB840 joined #git
01:26 jimi_ joined #git
01:26 anonymuse joined #git
01:26 skyres joined #git
01:26 mda1 joined #git
01:29 anuxivm joined #git
01:30 e14 joined #git
01:32 skyres joined #git
01:33 pipedreams joined #git
01:33 netj joined #git
01:35 snthsnth joined #git
01:38 rchavik joined #git
01:38 skyres joined #git
01:40 harwiltz joined #git
01:41 jimi_ joined #git
01:42 harwiltz Hello all. I'm using git for a large project with a bunch of people. We have a bunch of branches so different people can work on different features. We also have a branch called Testing that is there to place code that is thought to be good, but needs more actual testing.
01:42 harwiltz The Testers modify this branch by changing a few values (tweaking) in the code. However, we would like to keep Testing up to date with master, so the tester's have access to the right algorithms
01:42 harwiltz What is the best way of doing this? We tried rebasing before, but that was a mess.
01:43 raijin joined #git
01:44 annoymouse25642 joined #git
01:44 phroa depending on the project, you can do a `man git-merge` every few weeks and just eat the cost of manually resolving all the conflicts, or try `man git-cherry-pick` to pick out only the commits you want, slowly diverging further and further away from master
01:44 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
01:44 gitinfo the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
01:44 skyres joined #git
01:45 xall_ joined #git
01:45 jstimm joined #git
01:45 renlo joined #git
01:45 harwiltz phroa: So I would checkout to Testing, and do git merge origin master?
01:45 phroa yeah
01:46 harwiltz phroa: And that doesn't change the master branch in any way, right?
01:46 phroa nope
01:46 e14 joined #git
01:46 harwiltz phroa: Oh, perfect. Awesome. Thanks a lot
01:46 jimi_ joined #git
01:47 phroa another idea is to have testers create branches as needed off of the current master, and apply the patches with the code under test to their own branch.  that would be the most up to date, as long as the patch is also up to date
01:48 liuzhen joined #git
01:48 phroa there's probably endless ways of doing this
01:49 harwiltz phroa: Good point. However, right now the testers are enjoying the single Testing branch, so we'll probably stick with that. For the record, I think your idea of having the testers branch off master is probably the best way
01:49 morenoh149 joined #git
01:50 skyres joined #git
01:52 theskillwithin joined #git
01:55 annoymouse25642 joined #git
01:56 sangy joined #git
01:56 pokalyis joined #git
01:57 skyres joined #git
02:00 jimi_ joined #git
02:01 annoymouse256425 joined #git
02:01 jimi_ joined #git
02:02 dsdeiz joined #git
02:02 dsdeiz joined #git
02:03 skyres joined #git
02:04 jimi_ joined #git
02:09 skyres joined #git
02:09 pks joined #git
02:10 andrew710 joined #git
02:10 micdo_ joined #git
02:10 mikecmpbll joined #git
02:15 skyres joined #git
02:15 pokalyis joined #git
02:16 theskill_ joined #git
02:17 ISmithers joined #git
02:20 mar77i_ joined #git
02:20 cbreak joined #git
02:21 skyres joined #git
02:21 theskillwithin joined #git
02:23 wolfpld joined #git
02:23 ronybeck joined #git
02:24 vmiklos joined #git
02:24 SaraDR joined #git
02:25 jimi_ joined #git
02:25 finalbeta joined #git
02:27 pokalyis joined #git
02:27 skyres joined #git
02:27 pijiu joined #git
02:29 mikecmpbll joined #git
02:29 jimi_sanchez joined #git
02:31 e14 joined #git
02:32 Goplat joined #git
02:33 skyres joined #git
02:36 jstimm joined #git
02:38 alex1a joined #git
02:39 skyres joined #git
02:40 fakenerd joined #git
02:41 renlo joined #git
02:41 d^sh joined #git
02:46 railssmith joined #git
02:46 skyres joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | 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 | git-bisect: No, not like that. Grow up.
02:50 jimi joined #git
02:51 skyres joined #git
02:52 dsdeiz joined #git
02:55 Oatmeal joined #git
02:57 annoymouse256425 joined #git
02:57 skyres joined #git
02:59 xelxebar joined #git
02:59 dreiss joined #git
02:59 fakenerd joined #git
03:00 annoymouse256425 joined #git
03:03 QwertyDragon joined #git
03:03 e14 joined #git
03:03 skyres joined #git
03:03 dsantiago joined #git
03:03 SaraDR left #git
03:06 red82 joined #git
03:07 aavrug joined #git
03:08 aavrug joined #git
03:09 skyres joined #git
03:09 xelxebar joined #git
03:12 gusnan joined #git
03:12 gusnan joined #git
03:12 pokalyis joined #git
03:12 ayjay_t joined #git
03:12 ke4nhw Hi all. After beating myself over the head with svn and realizing it is a pain in the rumpus, I give up. I surrender. I have deleted all the repositories I created, users, groups, configs, the works. Can you give me the link to the git documentation, in particular to me setting up my own git server?
03:14 thiago joined #git
03:16 skyres joined #git
03:18 phroa ke4nhw: !docs !book !host !getting_started
03:18 gitinfo ke4nhw: [!doc] A list of useful documentation of all kinds is here:  http://git-scm.com/documentation -- or try the wiki at  http://git.wiki.kernel.org/.  Also try typing "!book" "!cs" "!bottomup"  "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC.  !book is probably the most helpful.
03:18 gitinfo ke4nhw: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
03:18 gitinfo ke4nhw: [!gitolite] 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/
03:18 phroa !gettingstarted ?
03:18 phroa :(
03:19 phroa 'git server' is one of those things where you have a lot of vendors to choose from depending on your requirements
03:20 Limes joined #git
03:21 pks_ joined #git
03:21 ayjay_t joined #git
03:22 skyres joined #git
03:22 einnjo joined #git
03:24 cyphase joined #git
03:24 Oatmeal joined #git
03:26 pokalyis joined #git
03:26 finalbeta1 joined #git
03:28 skyres joined #git
03:31 mar77i joined #git
03:33 sunri5e joined #git
03:33 allomancer joined #git
03:34 skyres joined #git
03:35 nd_ joined #git
03:35 lagothri1 joined #git
03:36 chachasmooth joined #git
03:38 hexagoxel joined #git
03:38 morenoh149 joined #git
03:39 cagmz joined #git
03:40 skyres joined #git
03:40 Andrew_K joined #git
03:46 skyres joined #git
03:49 fakenerd_ joined #git
03:49 liuzhen joined #git
03:50 bmahe joined #git
03:52 skyres joined #git
03:53 bitri joined #git
03:55 jnewt joined #git
03:56 a_thakur joined #git
03:57 jimi_ joined #git
03:58 skyres joined #git
04:01 jost_ joined #git
04:01 jimi_sanchez joined #git
04:04 skyres joined #git
04:05 circ-user-2Kqbr joined #git
04:10 liuzhen joined #git
04:10 skyres joined #git
04:14 Vortex35 joined #git
04:15 justanotheruser joined #git
04:16 skyres joined #git
04:17 e14 joined #git
04:17 mehola joined #git
04:18 gfixler joined #git
04:22 skyres joined #git
04:22 safe joined #git
04:26 anonymuse joined #git
04:27 anonymus_ joined #git
04:28 skyres joined #git
04:28 snthsnth joined #git
04:29 anonymuse joined #git
04:30 pks joined #git
04:32 harrymoreno joined #git
04:34 skyres joined #git
04:34 anonymuse joined #git
04:34 thiago joined #git
04:35 renlo joined #git
04:36 mrnuke joined #git
04:37 mrnuke hi, I'm trying to use git send-email over gmail smtp. Got all the configs right, except the password. But when I run the command, instead of asking me for a password, it fails
04:37 mrnuke "5.5.1 Authentication Required. Learn more at"
04:37 mrnuke then some link to a google (un)help page
04:37 jimi_ joined #git
04:38 mrnuke anyone know of a fix for this?
04:40 skyres joined #git
04:40 jnewt1 joined #git
04:43 GootRaider joined #git
04:43 e14 joined #git
04:44 GootRaider left #git
04:44 thiago joined #git
04:46 skyres joined #git
04:50 Outsider__ joined #git
04:52 Siegfried joined #git
04:52 skyres joined #git
04:56 govg joined #git
04:56 nilg joined #git
04:56 jaguarmagenta joined #git
04:58 pks joined #git
04:58 skyres joined #git
05:00 pijiu2 joined #git
05:01 afusion joined #git
05:05 skyres joined #git
05:05 subhojit777 joined #git
05:07 mda1 joined #git
05:07 railssmi_ joined #git
05:09 Mixologi- joined #git
05:10 robotroll joined #git
05:11 skyres joined #git
05:11 daey_ joined #git
05:12 renlo joined #git
05:14 lufeng joined #git
05:17 skyres joined #git
05:17 go1111111 joined #git
05:18 satya4ever joined #git
05:21 sarbs joined #git
05:23 skyres joined #git
05:24 renlo joined #git
05:27 morenoh149 joined #git
05:29 Cabanossi joined #git
05:29 skyres joined #git
05:30 elsevero joined #git
05:31 pks joined #git
05:33 Oatmeal joined #git
05:35 skyres joined #git
05:38 jason237 joined #git
05:41 skyres joined #git
05:42 lufeng joined #git
05:43 lufeng joined #git
05:43 ety001 joined #git
05:44 xall joined #git
05:45 thiago joined #git
05:45 ety001 left #git
05:47 jaguarmagenta joined #git
05:47 skyres joined #git
05:50 renlo joined #git
05:53 skyres joined #git
05:56 ybden joined #git
05:59 skyres joined #git
06:00 resurtm joined #git
06:01 liuzhen joined #git
06:06 skyres joined #git
06:06 a_thakur joined #git
06:07 fatalhalt joined #git
06:07 tango_ joined #git
06:08 fakenerd joined #git
06:08 anonymuse joined #git
06:09 crazyadm joined #git
06:09 ayogi joined #git
06:10 ke4nhw One thing I wanted to know about git vs svn (fsfs backend) given the same projects with the same number of revisions, which would require more disk space: git or svn? Which is better at managing (and minimizing the usage of) disk space?
06:11 vuoto joined #git
06:12 skyres joined #git
06:15 fakenerd_ joined #git
06:16 _ikke_ ke4nhw: Depends a bit on what you are goign to store (large binary files or just text)
06:17 b100s joined #git
06:17 _ikke_ But git can be very efficient in storing text
06:17 grawity comparing the source-code repos I had gitified, the Git packfiles are usually between the same and much smaller than packed fsfs
06:18 skyres joined #git
06:19 xall joined #git
06:19 ke4nhw most would be text: source code for Java and Visual Basic programs (if I can get VB 2010 to play with git). I will have one repo with some pdf's and word docs, but no binaries. When it comes time to deploy a project I'll pull it, compile it, and use another avenue to deploy it.
06:21 a_thakur joined #git
06:21 LeBlaaanc joined #git
06:24 skyres joined #git
06:25 _cyril_ joined #git
06:26 raober joined #git
06:27 raober left #git
06:27 raober joined #git
06:30 skyres joined #git
06:36 skyres joined #git
06:36 ngperfex joined #git
06:40 Furai joined #git
06:41 ThomasLocke joined #git
06:41 ThomasLocke joined #git
06:42 skyres joined #git
06:43 k200 joined #git
06:43 k200 hi
06:43 k200 how to recover from crashed git process?
06:43 k200 whateven i do, git add, git checkout it comlains that previous git process crashed? cant lock
06:44 cqi joined #git
06:48 svm_invictvs joined #git
06:48 skyres joined #git
06:49 resurtm joined #git
06:49 meauses joined #git
06:52 kadoban k200: What's the exact message? Might have a hint in it.
06:54 cyan__ joined #git
06:54 LucaTM joined #git
06:54 skyres joined #git
06:55 k200 kadoban: yes. deleted index.lock
06:55 kadoban Cool
06:55 k200 i accidentally did git add -p "my commit message" instead of doing git commit -m . Now git commit says pathspec "my commit message" did not match any files.
06:56 k200 how to correct this?
06:56 fakenerd joined #git
06:56 voidDotClass joined #git
06:57 k200 vm.
06:57 k200 nvm.
06:58 jfr joined #git
07:00 skyres joined #git
07:01 Raging_Hog joined #git
07:03 xall joined #git
07:06 dan2k3k4 joined #git
07:06 zumba_ad_ joined #git
07:06 skyres joined #git
07:09 thiago joined #git
07:11 Mo joined #git
07:11 roelmonnens joined #git
07:12 circ-user-2Kqbr left #git
07:12 rscata joined #git
07:13 skyres joined #git
07:13 clemf joined #git
07:14 PCatinean joined #git
07:16 morenoh149 joined #git
07:17 freimatz joined #git
07:18 zeroed joined #git
07:18 zeroed joined #git
07:18 qt-x joined #git
07:19 skyres joined #git
07:22 guampa joined #git
07:22 ISmithers1 joined #git
07:22 elsevero joined #git
07:24 Oatmeal joined #git
07:24 chele joined #git
07:24 sostenuto joined #git
07:25 JeroenT joined #git
07:25 skyres joined #git
07:25 ljc joined #git
07:25 nidr0x joined #git
07:27 jnewt1 joined #git
07:29 TheWild joined #git
07:31 skyres joined #git
07:32 TheWild hello. I just ended with some problem. I have modified sample.php yet neither commited nor pushed. When git pull, git bothers me that file sample.php would be overriden by merge. However, noone modified this file on repository.
07:32 TheWild How to be able to pull? I don't want to lose my changes.
07:33 jaguarmagenta joined #git
07:34 linduxed joined #git
07:34 TheWild correction: the file isn't modified. The file is new (!) and doesn't exist in repository
07:34 elect joined #git
07:36 adac joined #git
07:37 jnavila joined #git
07:37 skyres joined #git
07:37 milki TheWild: you can git add && git stash the file, then merge. or you can mv the file somewhere else, then merge
07:38 troulouliou_div2 joined #git
07:39 brk_ joined #git
07:39 eivarv joined #git
07:41 sea-gull_ joined #git
07:43 TheWild1 joined #git
07:43 geko joined #git
07:43 skyres joined #git
07:43 TheWild1 milki: thank you, though I resolved it eventually. I looks like I staged this file by accident. git reset helped.
07:44 hahuang65 joined #git
07:45 cqi joined #git
07:45 hs366 joined #git
07:46 dreiss joined #git
07:46 cqi joined #git
07:49 skyres joined #git
07:49 rossome joined #git
07:50 zeroed joined #git
07:51 TomyWork joined #git
07:51 c0ded joined #git
07:53 Darcidride joined #git
07:55 overlord_tm joined #git
07:55 skyres joined #git
07:56 JeroenT_ joined #git
07:58 Sceorem joined #git
07:59 rasto joined #git
07:59 b100s joined #git
08:00 ngrin joined #git
08:00 qpdb joined #git
08:00 jknetl joined #git
08:01 renlo joined #git
08:01 skyres joined #git
08:03 elsevero joined #git
08:03 laumann joined #git
08:03 r3c0d3x joined #git
08:04 geko joined #git
08:06 JeroenT joined #git
08:07 CalimeroTeknik joined #git
08:07 zeroed joined #git
08:08 skyres joined #git
08:08 m1dnight2 joined #git
08:09 clemf joined #git
08:11 tvw joined #git
08:13 ke4nhw joined #git
08:14 skyres joined #git
08:15 danslo joined #git
08:17 MrMojito joined #git
08:17 MrMojito joined #git
08:19 Gloomy joined #git
08:20 skyres joined #git
08:20 bocaneri joined #git
08:21 slappymcfry joined #git
08:22 JeroenT joined #git
08:22 Alienpruts joined #git
08:23 r3c0d3x joined #git
08:24 slappymcfry joined #git
08:25 a_thakur joined #git
08:26 durham joined #git
08:26 skyres joined #git
08:27 encod3 joined #git
08:28 jaguarmagenta joined #git
08:29 overlord_tm joined #git
08:30 overlord_tm joined #git
08:32 JeroenT joined #git
08:32 skyres joined #git
08:37 shubhnik joined #git
08:38 qws-user-1229 joined #git
08:38 skyres joined #git
08:39 Alienpruts joined #git
08:39 thiago joined #git
08:39 satya4ever joined #git
08:40 hhee joined #git
08:41 snthsnth joined #git
08:41 aidalgol joined #git
08:44 webstrand joined #git
08:44 skyres joined #git
08:45 ferr joined #git
08:46 NimeshNeema joined #git
08:47 troulouliou_div2 hi when i m doiung "git tag" i have all the tags from all the remotes mixed together, is it possible to filter the tags for a specifi remote repo ?
08:47 adac joined #git
08:50 selckin don't think so, but i think you can rename them to include the remote name on import with some magic
08:51 selckin git fetch origin +refs/tags/*:refs/tags/origin/*
08:51 ISmithers joined #git
08:51 a3Dman joined #git
08:51 skyres joined #git
08:51 selckin and then disable the normal tag fetching
08:52 Mir4g3_ joined #git
08:52 elect joined #git
08:52 finalbeta joined #git
08:55 jfr joined #git
08:55 troulouliou_div2 selckin, thanks; i just discovered git ls-remote ; and it somehow does what i nee
08:56 selckin sure that works too
08:57 skyres joined #git
08:58 meauses joined #git
09:01 Sasazuka joined #git
09:01 mischat joined #git
09:03 skyres joined #git
09:05 morenoh149 joined #git
09:09 mikecmpbll joined #git
09:09 annoymouse256425 joined #git
09:09 skyres joined #git
09:10 milestone joined #git
09:11 jbitdrop joined #git
09:12 govg joined #git
09:12 ocbtec joined #git
09:12 jfr joined #git
09:12 kurkale6ka joined #git
09:13 fakenerd_ joined #git
09:13 overlord_tm joined #git
09:14 Orbitrix joined #git
09:16 skyres joined #git
09:18 pbrewczynski joined #git
09:18 marcogmonteiro joined #git
09:22 skyres joined #git
09:23 moei joined #git
09:24 clmsy joined #git
09:24 halbomin joined #git
09:25 thiago joined #git
09:25 thiago joined #git
09:28 skyres joined #git
09:29 danslo_ joined #git
09:29 Gonzo89 joined #git
09:30 mehola joined #git
09:31 oskarkv joined #git
09:32 selckin gitk
09:35 skyres joined #git
09:36 voidDotClass joined #git
09:38 ramsub07 joined #git
09:41 skyres joined #git
09:43 Serpent7776 joined #git
09:44 laumann joined #git
09:45 GavinMagnus joined #git
09:45 SegFaultAX Strange question. I'm using git-submodule for a large number of modules in a git repo. On older versions of git, running `git submodule update --init --recursive` worked as expected on a fresh clone. It synchronized each of the submodules to the appropriate version.
09:46 SegFaultAX Now on git 2.10 when I run precisely the same command on a fresh clone of the repo, it apparently clones all the submodules, then deletes and stages all of contents of each submodule directory
09:47 skyres joined #git
09:47 nettoweb joined #git
09:47 fees joined #git
09:49 re1 joined #git
09:49 SegFaultAX Has anyone experienced this behavior?
09:50 SegFaultAX I realize usage of submodules isn't terribly popular. But it's such a bizarre problem to be suddenly introduced.
09:52 chicha joined #git
09:52 selckin could try grepping release notes for hints
09:52 encod3 joined #git
09:53 SegFaultAX selckin: Any chance you could try replicating what I'm seeing?
09:53 SegFaultAX selckin: I've done so on 2 different machines, and got the new bad behavior and the old good behavior on each.
09:53 skyres joined #git
09:53 selckin repo?
09:54 SegFaultAX selckin: https://github.com/segfaultax/vim-dotfiles
09:54 Smuu joined #git
09:54 SegFaultAX Just clone it then do `git submodule update --init --recursive`
09:54 re1 joined #git
09:55 SegFaultAX You can verify that it's in the bad state with `git submodule foreach --recursive 'git status'`
09:55 SegFaultAX All of them should be clean
09:55 SegFaultAX (I've verified that it works correctly under 2.2, broken under 2.10)
09:55 osse does it work if you git clone --recursive ?
09:56 selckin SegFaultAX: one of the repos is private
09:57 MarceColl joined #git
09:59 ramsub07 joined #git
09:59 skyres joined #git
10:04 chicha left #git
10:06 Smuu joined #git
10:06 skyres joined #git
10:07 Andrew_K|2 joined #git
10:08 aavrug joined #git
10:11 ailaG joined #git
10:12 skyres joined #git
10:15 danslo joined #git
10:16 ToBeCloud joined #git
10:17 elsevero joined #git
10:17 Smuu joined #git
10:17 overlord_tm joined #git
10:18 thiago joined #git
10:18 skyres joined #git
10:21 pokalyis joined #git
10:22 vuoto joined #git
10:22 ahmedelgabri joined #git
10:23 afuentes joined #git
10:24 vuoto joined #git
10:25 skyres joined #git
10:25 Spec-Chum joined #git
10:26 rnsanchez joined #git
10:26 vuoto joined #git
10:27 Jonuz Is there any paramater for git branch to show descriptions too?
10:28 _ikke_ I'm not aware of any
10:28 _ikke_ iirc, only gitweb uses that config vlaue
10:28 _ikke_ value
10:29 Jonuz It would be really handy when naming branch by ticked number
10:30 ieee joined #git
10:31 skyres joined #git
10:31 lmatteis joined #git
10:33 qpdb joined #git
10:37 skyres joined #git
10:41 ams__ joined #git
10:41 ngrin joined #git
10:41 cdown joined #git
10:41 Andrew_K joined #git
10:42 ramsub08 joined #git
10:43 skyres joined #git
10:44 mablae joined #git
10:45 nettoweb1 joined #git
10:47 jast Jonuz: outside of github and friends, the convention is to put a very brief description in the branch name (along with the ticket number if you like)
10:50 skyres joined #git
10:54 morenoh149 joined #git
10:56 skyres joined #git
10:57 lindenle joined #git
10:58 xaa__ joined #git
10:59 resurtm joined #git
10:59 xall joined #git
11:00 liuzhen joined #git
11:00 SaraDR joined #git
11:02 GavinMagnus left #git
11:02 skyres joined #git
11:02 lindenle joined #git
11:03 flavius joined #git
11:04 systemovich joined #git
11:05 bttf joined #git
11:06 star_prone joined #git
11:09 skyres joined #git
11:12 brk_ joined #git
11:14 bernardio joined #git
11:14 lindenle joined #git
11:15 skyres joined #git
11:18 kier joined #git
11:24 skyres joined #git
11:25 benxyzzy joined #git
11:29 qpdb joined #git
11:29 nilg` joined #git
11:30 selckin !reflog
11:30 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
11:31 danslo_ joined #git
11:32 lindenle joined #git
11:34 skyres joined #git
11:34 kier joined #git
11:35 kier joined #git
11:36 dendazen joined #git
11:38 netj joined #git
11:38 sdlnv_ joined #git
11:39 nowhereman joined #git
11:42 sdlnv__ joined #git
11:42 Bizkit joined #git
11:43 skyres joined #git
11:44 SaraDR left #git
11:44 sdothum joined #git
11:44 Filiphe joined #git
11:47 tcorneli joined #git
11:48 fakenerd joined #git
11:49 cdg joined #git
11:49 overlord_tm joined #git
11:49 jost joined #git
11:52 jost joined #git
11:52 fakenerd joined #git
11:52 skyres joined #git
11:54 exxi joined #git
11:54 thiago joined #git
11:54 exxi i have downloaded a git repo now the repo has been updated how can i sync with it ?
11:54 exxi git fetch ?
11:55 speial joined #git
11:55 speial Hello, I have a problem!
11:56 osse exxi: have you made changs yuorself?
11:56 jost joined #git
11:56 speial Hello, I have a problem: "git add -A" hangs forever. Why?
11:56 exxi osse, yes
11:56 Cavallari joined #git
11:56 mischat joined #git
11:56 osse exxi: have you committed them?
11:57 JeroenT joined #git
11:58 exxi osse, no not yet
11:58 osse exxi: git stash; git pull; git stash pop
11:58 exxi wow :D
11:59 ahmed_elgabri joined #git
11:59 exxi what exactly this command is dong ?
12:00 osse three commands
12:00 osse gets rid of your changes, pulls, puts your changes back
12:01 chris2_ joined #git
12:01 hhee joined #git
12:01 skyres joined #git
12:01 exxi cool git is intelligent
12:02 BSaboia joined #git
12:02 osse Correct
12:02 ^7heo exxi: http://i.ebayimg.com/images/i/200955927319-0-1/s-l1000.jpg
12:03 ^7heo exxi: don't be fooled.
12:03 exxi nice guide to get started quickly ?
12:03 m___ joined #git
12:04 BSaboia joined #git
12:06 sharkz joined #git
12:09 BSaboia joined #git
12:10 gajus joined #git
12:10 gajus joined #git
12:11 skyres joined #git
12:12 BSaboia joined #git
12:13 star_prone joined #git
12:14 Cavallari1 joined #git
12:18 alex1a joined #git
12:20 skyres joined #git
12:20 ramsub07 joined #git
12:25 pijiu2 joined #git
12:25 fakenerd joined #git
12:26 pijiu2 joined #git
12:27 pijiu2 joined #git
12:28 pijiu2 joined #git
12:29 Kartagis joined #git
12:29 Kartagis ehlo
12:29 skyres joined #git
12:29 _cyril_ joined #git
12:30 anonymuse joined #git
12:31 a_thakur joined #git
12:32 mehola joined #git
12:34 dviola joined #git
12:35 romerocesar joined #git
12:35 Rickmasta joined #git
12:38 skyres joined #git
12:38 MarceColl is there any bug tracker, "low hanging fruit issues" list?
12:39 selckin not even a bug tracker
12:39 star_prone joined #git
12:39 lss8 joined #git
12:40 MarceColl everything is on the mailing list then?
12:40 selckin yea
12:40 Lope joined #git
12:41 Lope Sometimes I have a situation where I add files to staging when I'm about to commit, then before I commit, I edit the file after that, and want that new change to be part of my commit.
12:41 Lope What do I need to do in that situation to ensure the new change is part of my commit?
12:41 MarceColl just add again
12:41 selckin git add -u
12:42 Vinnie_win_l joined #git
12:42 Lope Oh I figured to add again. I did that last time. But I just wanted to confirm.
12:42 Lope It suggested to me that: (use "git reset HEAD <file>..." to unstage)
12:42 anonymuse joined #git
12:42 Lope so I tried running that command, then it was taken off the staging list.
12:42 Lope What does HEAD mean? the current state of the file?
12:43 Hello71 !HEAD
12:43 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
12:43 morenoh149 joined #git
12:43 anonymuse joined #git
12:43 Uovc joined #git
12:44 Lope oh, so (use "git reset HEAD <file>..." to unstage) makes me lose my changes that I've made to the file since the last commit?
12:44 Hello71 no.
12:44 Hello71 !reset
12:44 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
12:44 Hello71 2
12:46 Lope So if I've only got one branch, master, then my HEAD is pointing to master?
12:47 skyres joined #git
12:48 Lope I know it seems obvious, but I just want to be 100% sure I understand :)
12:48 qknight joined #git
12:49 Hello71 not if you are detached
12:49 Hello71 !detached
12:49 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
12:49 Hello71 for example, if you run "git checkout master^" you will see the contents of the commit prior to last
12:49 qknight hey. ATM i'm doing a git rebase and just want the last 10 commits to be on top of a different branch but git keeps promiting with conflicts in files i didn't even touch. how to go on? IIRC there was a rebase strategy switch somewhere but i can't remember exactly what that was
12:49 MarceColl !lost
12:49 gitinfo As long as you have `git commit`ed your changes (or even `git add`ed them), your changes will not be lost for over two weeks unless you work really hard at it.  There are two places where "lost" changes can be hiding.  They might be in the reflog (`git log -g`) or they might be in lost&found (`git fsck --unreachable`). Type "!dangling" and "!reflog" into IRC for more info.
12:50 Hello71 MarceColl: huh?
12:50 venmx joined #git
12:50 t0n1c joined #git
12:50 MarceColl was interested in this part, sorry
12:51 MarceColl will continue in a PM
12:51 manuel_ joined #git
12:51 overlord_tm joined #git
12:51 Hello71 !triggers
12:51 gitinfo Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
12:52 MarceColl thanks
12:52 JeroenT joined #git
12:53 ArchNoob joined #git
12:53 pokalyis joined #git
12:54 ismithers joined #git
12:56 jost joined #git
12:56 Impaloo joined #git
12:56 skyres joined #git
12:58 berndl joined #git
13:01 jost joined #git
13:01 Lope hey guys I'm a little lost. I'm a beginner, only know how to commit, checkout, stash etc.
13:01 Lope I ran "git reset HEAD <file>..." because git suggested that's how I can unstage my staged changes.
13:02 Lope But now it's saying "head detached from xyz12356 etc.
13:02 Lope Oh, it's been saying that the whole time.
13:02 Lope Lol.
13:03 dreiss joined #git
13:04 CussBot joined #git
13:04 tobiasvl Lope: !detached
13:04 gitinfo Lope: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
13:05 chris2 what's the best way to extract some data of a single commit ala --pretty=...? log -1 or can i tell git show to hide the diff?
13:05 skyres joined #git
13:06 Lope Recently I needed to redeploy a working version to my server, that was a few commits old. So I did `git stash; git checkout (functional commit); (deploy); git stash pop` then I carried on committing since then.
13:06 Lope So I guess I'm detached. It says head detached from (some hex number). How can I see what that hexnumber is?
13:06 jost joined #git
13:07 satya4ever joined #git
13:07 Lope when I run `git log` i get very long hex codes. How can I see the short hex code?
13:08 osse chris2: show -s.
13:08 rnsanchez joined #git
13:08 osse chris2: but log -1 --format is definitely more powerfull
13:08 Lope Is there some git gui where I can see a visual representation of my commit chain so I can sort it out?
13:09 chris2 show -s is enough, thanks
13:09 osse Lope: if you hold your thumb over the right part of the hex code you get the short one
13:09 osse Lope: you might like !lol
13:09 gitinfo Lope: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
13:09 chris2 i just need %cd
13:10 Lope osse: that's awesome
13:10 jost joined #git
13:11 osse correct
13:11 skyres joined #git
13:11 synthroid joined #git
13:11 Puffball joined #git
13:13 johnmilton joined #git
13:14 jost joined #git
13:15 Ring0` joined #git
13:15 Lope How can I fix this? http://imgur.com/a/ceYXB
13:16 osse Lope: depends. first of all there's nothing wrong with it.
13:16 osse secondly, what's the end result you want?
13:16 Lope Recently I needed to redeploy a working version to my server, that was a few commits old. So I did `git stash; git checkout (functional commit); (deploy); git stash pop` then I carried on committing since then.
13:16 cdown joined #git
13:16 selckin looks !detached
13:16 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
13:16 Pulp joined #git
13:17 diego2 joined #git
13:17 osse Lope: so the top commits are newer than the ones on master?
13:17 diego2 joined #git
13:17 rnsanchez_ joined #git
13:17 Hello71 man git-stash
13:17 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
13:17 Lope osse: yes basically I checked out that commit that has a 2 line description.
13:17 Hello71 !stash
13:18 diego2 joined #git
13:18 Hello71 it stores your changes, not the status
13:18 diego2 joined #git
13:18 om_henners joined #git
13:18 Lope Hello71:  yes I nkow what stash does.
13:18 Jackneill joined #git
13:18 ismithers joined #git
13:18 Lope I stashed what I was working on, checked out the working commit (has a 2 line description) then i forgot to checkout mastr again.
13:19 Lope Then I did a git stash pop, carried on working on code and making commits.
13:19 osse Lope: in that case you probably want to transplant the commits from that point until HEAD on top of master, right+
13:19 Lope So how can I merge all my new commits with the commits on master that came after the one I checked out?
13:20 skyres joined #git
13:20 Lope I'm trying to grasp what you're saying but I've got a question please :)
13:21 Hello71 rebase
13:21 osse do you want to merge or to make them one long chain of commits?
13:21 Lope it says my head is detached from the last commit I checked out.
13:21 Hello71 or cherry-pick
13:21 Lope But then what am I attached to?
13:21 Hello71 nothing
13:21 Hello71 !lol
13:21 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
13:21 Lope I want all commits merged into a new commit.
13:21 osse ONE new commit?
13:21 Lope all of the commits since I checked out, and the ones on master
13:22 Lope well, maybe a few, it doesn't really matter.
13:22 osse git merge master; git reset --soft {hash of long description commit}; git commit -m 'Everything in one commit'
13:23 Glooomy joined #git
13:23 Lope osse what will git merge master do?
13:23 Lope merge my current state with master?
13:23 osse it will merge master into this branch
13:23 osse yes
13:23 Lope but am I even on a branch?
13:23 Hello71 you don't "merge with"
13:23 Hello71 only "merge into"
13:23 osse Lope: nope
13:23 Hello71 !branch
13:23 gitinfo A branch and a tag are just convenient ways of spelling the name of a particular commit.  A commit represents a specific set of files and the history of all commits which came before it, and the SHA-1 hash tag official name provides cryptographic assurance of the lineage of a particular commit (and thus branch or tag).  A branch's reference may change.  A tag usually doesn't.
13:24 Lope so I'll be merging my current commit into master.
13:24 Hello71 no
13:24 osse otherway around
13:24 Lope oh 8:
13:24 om_henners joined #git
13:25 jaguarmagenta joined #git
13:25 Lope okay so branches are nothing but labels, basically?
13:25 ldlework yes
13:25 Lope labels for commits?
13:25 ldlework yup
13:25 Lope ah, that's a relief!
13:26 selckin !compsci
13:26 selckin http://eagain.net/articles/git-for-computer-scientists/
13:26 f3r70rr35f joined #git
13:26 bremner see also, !gcs
13:26 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
13:27 Lope because now I understand that master is not some big (more important than my current commit) thing.
13:27 Lope It's just a commit.
13:27 ldlework Lope: https://codewords.recurse.com/issues/two/git-from-the-inside-out
13:27 chris2 is there a better way to check if a range of commits is empty than  git log --pretty=%h HEAD@{1}.. | grep -q .  ?
13:27 ldlework Lope: this was really helpful for me
13:27 osse chris2: git rev-list --count HEAD@{1}..
13:27 chris2 that will print 0 ?
13:28 serialoverflow joined #git
13:29 Lope So a branch is a label for a commit. And once head is set to that branch, if you make a commit, your previous commit will no longer be "labelled" master, but your new commit will be?
13:29 Lope so a branch is like a label that moves, as long as your head points to it?
13:29 Lope moves to your newest commit?
13:29 chris2 osse: probably inefficient if the range is big no?
13:29 kadoban Exactly
13:29 skyres joined #git
13:29 kadoban Lope: ^
13:30 Lope For shizzle :) thanks!!!
13:30 osse chris2: we've had this discussion in #git before. rev-list always beats log
13:31 chris2 okay
13:31 chris2 grep -q . will exit after first line tho, and send sigpipe. not sure
13:31 chris2 doesnt really matter in my case
13:31 osse you'll have to test it yourself, then
13:31 jost joined #git
13:31 Lope selckin: thanks! I learned about git concepts by watching some git videos for git tower (gui software). Then I learned commands and only used the terminal. It did not explain what branches are correctly.
13:32 chris2 i'd need to [ 0 -eq $() ] else and who knows which numbers could happen there and break test...
13:33 danslo_ joined #git
13:34 skyres joined #git
13:35 manuel_ joined #git
13:35 osse huh? it will print a number
13:35 osse no mystery
13:35 Muzer joined #git
13:35 Lope osse: Please tell me if I understand this correctly.
13:35 zivester joined #git
13:35 Lope git merge master: this will merge my code from master into my working copy.
13:36 osse correct
13:36 Lope `git reset --soft (hexcode for previously checked out, double line comment thing)` this will point my head to master without changing my working copy.
13:36 kadoban (note that merge works on commits, not the working directory alone or anything, just in case)
13:36 osse also correct
13:37 Lope `git commit -m blah` makes a new commit which becomes the new master, with all code.
13:37 Hink joined #git
13:37 Lope But what about the "(master)" that's in the picture?
13:37 Lope Are those commits in my current working copy?
13:38 Lope http://imgur.com/a/ceYXB
13:38 AnxiousGarlic joined #git
13:38 osse ah yes
13:38 Lope Why are those few commits visually separated from my most recent commits?
13:38 jost joined #git
13:38 osse once this commit is created you need to update master to point to this new commit
13:39 osse git branch -f master  (to re-create master here)
13:39 AnxiousGarlic joined #git
13:40 skyres joined #git
13:41 osse they are separated because you unintentinally created a new unnamed chain of commits that breaks out of master
13:41 jost joined #git
13:42 Xethron joined #git
13:42 Lope osse: here's a more useful image: http://imgur.com/a/Nq0gK
13:43 osse btw, we can't infer anything from the hashes, so there's no need to censor them
13:43 Lope Are those separated commits in my new commit?
13:44 osse all the changes from them yes
13:44 nilg` joined #git
13:44 Lope osse: oh, I realize it's probably unnecessary, I'm just a little paranoid, it's kind of SOP for me to censor stuff about my servers etc.
13:44 noecc joined #git
13:44 Lope Just less attack surface.
13:45 flaviodesousa joined #git
13:45 skyres joined #git
13:45 Lope selckin: trying to hax me huh?
13:46 selckin just curious what a paranoid person uses
13:46 Lope medication?
13:46 Lope hhehehe
13:46 Lope I should probably be more paranoid, I'm just too lazy.
13:47 om_henners joined #git
13:47 dendazen joined #git
13:47 Lope osse: okay here goes.
13:48 * Lope backs up whole directory first lol
13:49 cdown_ joined #git
13:49 AnxiousGarlic joined #git
13:49 eivarv joined #git
13:49 rominronin joined #git
13:50 skyres joined #git
13:50 floatingman joined #git
13:52 dhollinger joined #git
13:52 jost joined #git
13:53 Lope osse: I had a merge conflict (first one ever, my first merge)
13:53 Lope It told me to correct the conflict in the file, which I did.
13:53 Lope I deleted the 3 lines added by git and the unwanted line, and saved.
13:54 Lope It says I must commit the result.
13:54 _rnsanchez_ joined #git
13:54 Lope But what about the next step you suggested where I set my head to master softly?
13:54 Lope oh sorry, I mean set my head to 3e07d90 softly.
13:55 selckin the merge is not finished till you commit/resume it
13:55 Lope resume?
13:55 Lope how can I resume it?
13:56 d0nn1e joined #git
13:56 Lope I suppose I'll RTFM, sorry :P
13:56 skyres joined #git
13:56 Lope the word "resume" is not in `man git-merge`
13:56 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
13:56 selckin it should tell you what todo, think it resumes when you commit, when you rebase and it conflicts you need to rebase --continue
13:57 daniel_rose joined #git
13:58 selckin i read the "but" as "do i have todo something else before i commit here"
13:58 Lope I was just intending to run the commands recommended by osse: git merge master; git reset --soft 3e07d90; git commit -m 'Everything in one commit'; git branch -f master
13:58 Lope This is what I'm trying to fix: http://imgur.com/a/Nq0gK
13:59 Lope I checked out 3e07d90, then I was supposed to checkout master again, but I forgot. Then carried on making commits after 3e07d90.
13:59 Lope So now I want to merge my working copy with master.
14:00 Lope So far I've run git merge, there was one conflicting file. I've edited the file, ready to continue, but I don't know what to do.
14:00 selckin 14:53:46             Lope | It says I must commit the result.
14:00 selckin follow the instructions
14:00 cdown joined #git
14:01 Lope selckin: alrighty. I was trying to follow osse's instructions :) but I guess I'll go with git's :)
14:01 selckin you're still on step 1 as i understand it git merge
14:01 selckin that part is not finished till you commit after solving the conflicts
14:02 skyres joined #git
14:02 CEnnis91 joined #git
14:03 ramsub07 joined #git
14:03 finalbeta joined #git
14:04 Dougie187 left #git
14:07 skyres joined #git
14:08 King_Hual joined #git
14:08 Lope http://imgur.com/a/Nq0gK
14:08 Lope So I've merged and now it's looking like that
14:09 selckin now you can make a1e22a8 master
14:10 Lope what about that other step?  git reset --soft 3e07d90
14:10 Lope it doesn't make sense to me.
14:10 Lope Yes, labelling a1e22a8 master makes sense to me?
14:11 selckin not sure what does, my git foo is quite weak, i would do git checkotu master; git reset --hard a1e22a8, but i'm suere osse knows better ways to do it
14:11 Kodax joined #git
14:12 pokalyis joined #git
14:12 Lope it actually looks pretty good as is. Looks like I just need to label a1e22a8 master.
14:12 skyres joined #git
14:12 Kodax I have a gulpfile.js file - I want to know who have added ../plugins/jquery.sticky.js in the gulpfile.js file
14:12 Kodax How do I do that?
14:13 selckin yeah, that branch -f master probably does that, or my long way around
14:13 selckin Kodax: git gui blame gulpfile.js
14:13 selckin Kodax: or without gui
14:13 Lope what is the point of git reset --soft 3e07d90
14:14 Lope it would point my HEAD to that old commit... what's the point of that?
14:14 _ikke_ Lope: So you can redo those commits
14:14 Lope it would point my head there without changing my wowking copy
14:14 _ikke_ for example, split them up
14:14 Kodax selckin blame?
14:14 Lope But my commits are already all in my working copy?
14:14 Lope http://imgur.com/a/Nq0gK
14:14 selckin Kodax: man git-blame
14:14 gitinfo Kodax: the git-blame manpage is available at http://jk.gs/git-blame.html
14:14 satya4ever joined #git
14:14 Kodax Thanks
14:15 Lope _ikke_: so as far as I understand it, I just need to label a1e22a8 master, and I'm done?
14:16 selckin !reattach
14:16 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
14:16 Gsham joined #git
14:16 thebope joined #git
14:17 selckin no extra wisdom in the factoid
14:17 osse Lope: if you get a conflict you need to use git commit to finish it
14:17 jimi_ joined #git
14:18 Lope osse: okay, cool, I've done that.
14:18 skyres joined #git
14:18 Dougie187 joined #git
14:18 Lope osse: glad you're back :D relief.
14:18 Lope So this is where I am http://imgur.com/a/Nq0gK
14:18 bsanford joined #git
14:18 Lope I've merged, fixed a conflict and made a new commit.
14:18 osse i don't see a merge commit there
14:19 selckin 2nd image
14:19 osse ohh there are more than one
14:19 osse looks good to me
14:20 Lope so osse looks like I just need to label my new commit as master?
14:20 osse sure you can do that
14:20 osse and skip the "blow everything away" step
14:20 Lope define "blow everything away"
14:20 osse remove all the commits (but not their content)
14:20 Lope ooh, so that "everything in one commit" you meant delete all the separate commits since then?
14:20 osse aka. git reset --soft 3e07
14:20 Lope oh wow, no i'm happy to keep them.
14:21 Lope yes, now I understand why you were going for that.
14:22 cdg joined #git
14:22 osse if you're happy with this then i'm happy
14:23 osse to get master to point to the merge commit there are lots of ways of doing it
14:23 Lope Cool. I'm finished pfew!
14:23 osse the most direct is git checkout -B master
14:23 Lope That wasn't too bad.
14:23 skyres joined #git
14:23 Lope Oh I just ran git branch -f master
14:23 osse that's fine too
14:23 osse but now you should probably check it out
14:23 Lope and it's now labelled a1e22a8 as master and it's head also.
14:23 osse so you don't end up in the same mess
14:23 Lope really?
14:24 Lope but it's head and master?
14:24 osse what does gi status say?
14:24 Lope and my working copy is clean?
14:24 Lope ooh shit. still trouble.
14:24 Lope HEAD detached from 3e07d90
14:24 Lope nothing to commit, working tree clean
14:24 osse git checkout master
14:24 Lope yet my first line says: *   a1e22a8 (HEAD, master) 'merged master into 442c60e'
14:24 Lope ok.
14:25 Lope okay sorted.
14:26 Lope THANK YOU SO MUCH! osse and selckin ! appreciated!
14:27 selckin all ossa
14:27 Gsham joined #git
14:27 vuoto joined #git
14:27 pokalyis joined #git
14:28 skyres joined #git
14:30 _cyril_ joined #git
14:32 morenoh149 joined #git
14:33 mehola joined #git
14:34 skyres joined #git
14:36 Lope osse: id buy you a coffee, where is your donate button :P
14:36 astrofog joined #git
14:38 pokalyis joined #git
14:38 Es0teric joined #git
14:39 skyres joined #git
14:39 jmpp_ joined #git
14:39 jmpp_ joined #git
14:40 ramsub08 joined #git
14:41 buzzLightBeer joined #git
14:43 solf1re joined #git
14:43 ShekharReddy joined #git
14:44 Frede__ joined #git
14:44 red82 joined #git
14:44 bernardio joined #git
14:44 AaronMT joined #git
14:44 Lope I was a little bit hasty with the merge.
14:45 Lope I should have gone and looked at the merged lines, but I didn't.
14:45 skyres joined #git
14:45 Lope Is there a way I can easily see each commit, with the new lines marked with a bit of context around it?
14:45 Lope relative to the current working copy aka master?
14:46 selckin git blame maybe
14:47 kadoban Lope: git log --patch should help
14:47 kadoban Or 'git show thecommit'
14:48 selckin not entirely sure what he wants :)
14:48 kadoban Ya, it could be a few different things actually, heh.
14:49 selckin git gui blame file, would let him go forward/backard around the lines hes interested in
14:49 ramsub07 joined #git
14:50 skyres joined #git
14:53 Hello71 Lope: what happens if more than one touched each line
14:54 thiago_ joined #git
14:54 robotroll joined #git
14:54 pokalyis joined #git
14:54 Lope selckin: what's `gut gui` does git come with a GUI?
14:55 LBV_User joined #git
14:55 selckin yeah, except on debian where they don't install it by default
14:55 Lope hmm, I don't have it on ubuntu.
14:55 Lope I'm using the bleeding edge git.
14:55 selckin install git-gui
14:55 skyres joined #git
14:55 ExoUNX joined #git
14:56 Lope yeah, will do.
14:56 Lope The .gitignore file. Does it go in project root, or inside .git/ ?
14:56 kadoban Lope: A lot of what comes with git depends on the packaging.
14:56 selckin it looks terrible but gitk especially is quite useful
14:56 kadoban Lope: The former (anywhere in the working directory actually, it's relative to where it is)
14:56 selckin Lope: project root or .git/info/exclude
14:57 Lope because I've tried putting the line `node_modules` inside .gitignore in the project root and inside .git/ and each time `git status` showed that node_modules is not added yet.
14:57 Lope not tracked yet i mean.
14:58 selckin maybe you need the trailing slash for dirs
14:58 Lope okay .git/info/exclude worked.
14:58 Lope I added `/node_modules/`
14:59 Rajeshk joined #git
14:59 jost joined #git
14:59 Lope thanks bud.
15:00 anonymuse joined #git
15:01 skyres joined #git
15:01 ash_workz joined #git
15:01 boombatower joined #git
15:01 morenoh149 joined #git
15:03 kadoban Lope: You can have a "global" (per user usually) .gitignore file too, which is usually a good idea to set up, for stuff like that where you'd otherwise have to put it in every repo.
15:03 Darren_ joined #git
15:03 kadoban (you set the core.excludesfile config option to point to it, can't remember if there's a default)
15:04 cdg_ joined #git
15:04 ResidentBiscuit joined #git
15:05 ResidentBiscuit joined #git
15:05 ResidentBiscuit joined #git
15:06 al-damiri joined #git
15:06 ResidentBiscuit joined #git
15:06 LionsMane joined #git
15:06 skyres joined #git
15:06 Gsham joined #git
15:06 blackwind_123 joined #git
15:09 Lope kadoban: okay cool. But I prefer portable assurance.
15:09 Lope I want to know I can slap it on some other system and not have to worry about it working the same way.
15:10 kadoban Lope: Hmm? It's to be used for system-specific things.
15:10 qknight if i have a branch with 10 commits on top, and i want to have these 10 commits on top of a different branch. how to do that? (git rebase would be the right tool, but for some reasons 'git rebase' will popup with 20+ merges on files i didn't even touch)
15:10 qknight please, someone give me advice how to go on
15:10 kpease joined #git
15:10 daniel_rose joined #git
15:10 kadoban Having the same thing in every .git/info/excludes isn't any more portable really.
15:10 Lope is .gitignore itself ever tracked?
15:10 kadoban Lope: The one in the working directory often is.
15:10 _ikke_ it's meant to be tracked
15:10 Lope okay :)
15:10 nizram joined #git
15:11 skyres joined #git
15:11 pokalyis joined #git
15:13 shinnya joined #git
15:15 brett_ left #git
15:17 skyres joined #git
15:18 Darcidride joined #git
15:19 Lope kadoban: git log --patch is amazing, thanks!
15:19 kadoban Heh, 'welcome. Ya I use that a ton.
15:20 selckin qknight: cherry-pick i guess
15:20 overlord_tm joined #git
15:21 IrishPrime joined #git
15:21 IrishPrime joined #git
15:22 skyres joined #git
15:22 e14_ joined #git
15:24 fakenerd_ joined #git
15:25 Gsham joined #git
15:25 SwiftMatt joined #git
15:25 daniel_rose joined #git
15:27 resurtm joined #git
15:27 skyres joined #git
15:28 pokalyis joined #git
15:29 akitada joined #git
15:29 milestone joined #git
15:30 nettoweb joined #git
15:30 dan2k3k4 joined #git
15:30 milestone joined #git
15:31 Weazel joined #git
15:31 crose joined #git
15:31 aarobc joined #git
15:31 relipse joined #git
15:31 milestone joined #git
15:31 relipse i am stuck in detached head state, i tried to checkout a branch origin/feature/foobar but it still says i'm in that state? how do I get out
15:32 selckin what does it say when you try to checkout
15:32 kadoban relipse: When you checkout remote branches like that, you're asking to be in detached head. Make a local branch. The shorthand for that is just 'git checkout foobar' and it'll create the branch if it doesn't exist and if there's only one at one remote.
15:33 skyres joined #git
15:33 selckin oh missed that bit, good catch
15:33 Weazel joined #git
15:33 relipse if i try to checkout it says error pathspec
15:34 relipse but i have 2 remote branches for some reason
15:34 relipse i'm not sure why
15:34 danslo_ joined #git
15:35 kadoban relipse: Do a !transcript ? Not sure what error you're talking about or what exactly you tried.
15:35 gitinfo relipse: Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:36 relipse i have 2 remote branches origin/feature/foo and composer/feature/foo
15:36 relipse so thats wy it is not checking out properly it doesn't know which one , correct?
15:36 kadoban Then you won't be able to do the shortcut, it wouldn't know what remote to start the branch from.
15:36 matsaman joined #git
15:37 kadoban Probably something like 'git checkout -b thebranch --track theremote/thebranch
15:38 tcurdt joined #git
15:38 lb1c joined #git
15:38 skyres joined #git
15:39 emg joined #git
15:39 Weazel joined #git
15:41 lindenle joined #git
15:41 GT4066 joined #git
15:42 narendraj9 joined #git
15:43 nicksloan joined #git
15:43 skyres joined #git
15:45 zivester joined #git
15:45 Vangelis joined #git
15:47 zeroed joined #git
15:49 skyres joined #git
15:51 relipse kadoban: thank you
15:52 daniel_rose joined #git
15:53 govg joined #git
15:53 nilg` joined #git
15:54 dimi1947 joined #git
15:54 Duikb00t joined #git
15:54 skyres joined #git
15:54 Duikb00t {user#1 }    {user#2 }   { Master Repo }   When user 1 pushes commit to the master repo and user 2 uses git pull
15:55 Duikb00t should then I first pull for changes on the main repo to make sure user 2 pulls the most -recent stuff?
15:55 dimi1947 there are some times that I want to delete white space from a script...I do not want git to recorde this as a change...what can I do-commiting such a change would be pointless
15:56 kadoban Duikb00t: "master repo" should always be a bare repo. Pulling in a bare repo makes no sense, you should do no work at all in that repo, it's just for sharing.
15:56 Duikb00t oh ok
15:57 Sna4x8 joined #git
15:57 Noldorin joined #git
15:58 Sna4x8 left #git
15:58 raspado joined #git
15:58 Es0teric joined #git
15:59 kpease joined #git
15:59 Darren_ joined #git
15:59 skyres joined #git
16:02 danslo joined #git
16:02 roelmonn_ joined #git
16:03 pokalyis joined #git
16:04 nettoweb joined #git
16:05 steve joined #git
16:05 skyres joined #git
16:05 star_prone joined #git
16:07 berndl joined #git
16:07 watersoul joined #git
16:08 bsanford joined #git
16:08 Es0teric joined #git
16:09 daniel_rose joined #git
16:10 ojdo joined #git
16:10 jaafar joined #git
16:10 skyres joined #git
16:11 davix joined #git
16:16 skyres joined #git
16:16 Es0teric joined #git
16:17 Es0teric joined #git
16:18 subhojit777 joined #git
16:19 pokalyis joined #git
16:20 rominronin joined #git
16:21 skyres joined #git
16:22 danslo_ joined #git
16:25 clemf joined #git
16:26 skyres joined #git
16:27 svm_invictvs joined #git
16:27 mischat joined #git
16:28 mischat joined #git
16:28 crayon joined #git
16:30 dimi1947 joined #git
16:31 _cyril_ joined #git
16:31 dimi1947 when typing git diff in the console I get the differences for two files...how can I make git show me the differences for only 1 file?
16:32 rominronin joined #git
16:32 skyres joined #git
16:32 matsaman dimi1947: my guess would be by specifying that file
16:32 matsaman dimi1947: with git diff path/to/file, or possibly git diff -- path/to/file
16:32 matsaman man git-diff has references to '<path>' (at top, etc.)
16:32 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
16:32 matsaman gitinfo: super useful =P
16:33 jason237 joined #git
16:33 dimi1947 matsaman:your guess was right
16:34 mehola joined #git
16:34 meauses joined #git
16:34 freimatz joined #git
16:35 Siegfried joined #git
16:36 dimi1947 I have a file where the only thing modified is whitespace...how  can I make git ignore that,there is no point commiting this file
16:37 romerocesar joined #git
16:37 narendraj9 joined #git
16:37 tyreld joined #git
16:37 skyres joined #git
16:38 dreiss joined #git
16:38 ilmari dimi1947: if git 'diff -w file' doesn't show any changes, you can just check out that file to revert the whitespace changes you don't care about
16:40 Learath2 joined #git
16:41 jccn joined #git
16:42 leeN joined #git
16:42 skyres joined #git
16:44 dimi1947 ilmari:so you are saying that git checkout file will bring the file to its previous state
16:45 ilmari dimi1947: yes
16:45 stomplee joined #git
16:46 xall joined #git
16:46 dimi1947 ilmari:Ok got it,consider this now,I have a file and I want to delete the whitespace from it...is there any way I can make git ignore this modification?
16:47 meauses joined #git
16:47 solrize joined #git
16:47 Darcidride_ joined #git
16:47 matsaman dimi1947: did you check if -- was strictly required?
16:48 skyres joined #git
16:48 matsaman I'm assuming it's good practice, because git has so many params for each command
16:48 matsaman or at least that people view it as such
16:48 dimi1947 matsaman:sorry I do not understand
16:48 matsaman if '--' was strictly required, that is
16:48 ilmari dimi1947: what do you mean ignore? you can tell 'git diff' (and log and show etc.) to ignore whitespace with the -w option
16:49 ilmari if you have actual whitespace changes you want to commit, but not pollute the diff
16:49 todd_dsm joined #git
16:49 ilmari it's also good practice to commit whitespace changes separately from actual functional changes
16:49 adac joined #git
16:50 dimi1947 ilmari:that is the point..I make whitespace changes(delete some) and git considers this a modification...I want to avoid that
16:53 matsaman just do them separately
16:53 skyres joined #git
16:53 ilmari dimi1947: what do you mean avoid that?
16:53 matsaman that way people won't have to waste time auditing your changes that show up as every line, etc.
16:53 ilmari it _is_ a modification
16:54 ilmari if you want the modification, then you commit it
16:54 exarch joined #git
16:54 ilmari the -w switch lets you ignore it when _viewing_ the commit
16:54 ilmari but it has to be recorded, otherwise it didn't happen
16:54 tang^ joined #git
16:55 dimi1947 suppose I have a file and the only action I do in it is delete some whitespace..git will consider this a modification...how I can make git not to consider this a mod
16:56 dimi1947 what is the point commiting whitespace change only
16:56 dimi1947 ?
16:56 tang^ you made a change. you need to commit it
16:58 gareppa joined #git
16:58 dimi1947 there are some changes I do not want to commit...they are pointless....
16:58 osse discard them
16:58 clemf_ joined #git
16:58 osse or avoid them with git add -p
16:58 skyres joined #git
16:59 dimi1947 what git add -p does
16:59 venmx joined #git
16:59 Cavallari1 joined #git
16:59 osse let's you stage changes piece by piece
16:59 Darcidride joined #git
17:00 dimi1947 osse:it is not the solution in my problem as this is described above
17:01 osse the solution you want does not exist
17:01 osse either remove the changes, or avoid committing them
17:02 dimi1947 osse:at least I got an a answer to the point
17:04 skyres joined #git
17:05 Balthasar|EB840 joined #git
17:05 _cyril_ joined #git
17:06 lindenle joined #git
17:09 skyres joined #git
17:10 cerkauskas joined #git
17:11 encod3 joined #git
17:11 emg joined #git
17:12 cerkauskas hello. I have two branches: master and refactor. There were changes made to master branch. I want to make refactor branch up to date. What I tried to do: `git checkout refactor`, `git rebase master`, but it says that my branch is up to date. however, bitbucket says it is 17 commits behind. what am I doing wrong? thank you!
17:14 venmx joined #git
17:15 skyres joined #git
17:17 berndl cerkauskas: update your master branch
17:17 berndl or try git rebase origin/master
17:17 cerkauskas berndl, I tried git checkout master, but it told that master is up to date too
17:18 berndl Did you git pull while on master?
17:19 cerkauskas berndl: no, stupid me. I will try that.
17:20 skyres joined #git
17:21 cerkauskas berndl, thank you. now only a lot of conflicts :)
17:21 cerkauskas but it definitely helped. thank you very much
17:23 davidfetter_ge joined #git
17:23 mutex joined #git
17:25 Faylite joined #git
17:25 skyres joined #git
17:25 sbeller SegFaultAX: it works for me though
17:25 sea-gull_ joined #git
17:26 sbeller the submodule example at https://github.com/segfaultax/vim-dotfiles
17:28 nowhereman joined #git
17:28 synthroid joined #git
17:29 qknight selckin: i've done cherry-picking! thanks
17:29 ochorocho__ joined #git
17:29 sangy joined #git
17:29 synthroi_ joined #git
17:31 skyres joined #git
17:33 ryouma joined #git
17:33 Starky joined #git
17:33 ryouma i'd like to run git revert with a message supplied on the command line (not in an editor).  is this possible?  my version does not have an option for this.
17:34 grawity git revert --no-edit, git commit -m foo
17:34 grawity er, make that --no-commit
17:35 meauses joined #git
17:35 mehola joined #git
17:35 danslo_ joined #git
17:36 skyres joined #git
17:37 denisMone joined #git
17:37 manuels joined #git
17:38 jccn joined #git
17:39 ryouma oh i see i need a commit also.  so revert will put it in staged i presume.
17:40 ShapeShifter499 joined #git
17:41 daniel_rose joined #git
17:41 skyres joined #git
17:43 rominronin joined #git
17:43 renlo joined #git
17:43 Es0teric joined #git
17:43 lordjancso joined #git
17:47 skyres joined #git
17:49 synthroid joined #git
17:50 atomicb0mb joined #git
17:51 madewokherd joined #git
17:52 Darcidride joined #git
17:52 vuoto joined #git
17:52 skyres joined #git
17:52 shubhnik joined #git
17:55 jstimm joined #git
17:56 ahmed_elgabri joined #git
17:57 skyres joined #git
17:57 pipeline_ joined #git
17:59 krillr joined #git
18:00 devhoag joined #git
18:00 BSaboia joined #git
18:01 blackjid joined #git
18:01 morenoh149 joined #git
18:02 r3c0d3x joined #git
18:03 skyres joined #git
18:04 tchan joined #git
18:04 tchan joined #git
18:05 satya4ever joined #git
18:07 akushner joined #git
18:08 daniel_rose joined #git
18:08 skyres joined #git
18:09 meauses joined #git
18:11 LBV_User joined #git
18:13 aliste joined #git
18:13 skyres joined #git
18:14 aliste left #git
18:15 d10n-work joined #git
18:16 jimi_ joined #git
18:16 kpease joined #git
18:18 fahadash joined #git
18:19 skyres joined #git
18:19 Darcidride joined #git
18:22 _cyril_ joined #git
18:22 m___ joined #git
18:23 gumnos joined #git
18:23 xpk joined #git
18:23 mostlybadfly joined #git
18:23 xpk joined #git
18:24 gumnos Is there a way when doing a git-commit (without "-m") to include the patch output (commented out so it doesn't actually become part of the commit message) in the commit message so I can see what all is being committed while I write up my description?
18:24 jaafar joined #git
18:24 skyres joined #git
18:24 mischat joined #git
18:25 gumnos The commit-message template already includes the list of modified/added/removed files. I was hoping for more detail
18:26 berndl git commit -v
18:26 berndl I used it all the time.
18:29 gumnos berndl: awesome. Not sure how I missed that, but it's exactly what I wanted. Thanks!
18:29 gumnos left #git
18:29 skyres joined #git
18:31 dan2k3k4 joined #git
18:33 chris123456 joined #git
18:34 jstimm joined #git
18:35 skyres joined #git
18:37 danslo_ joined #git
18:37 ArchNoob joined #git
18:38 renlo joined #git
18:40 skyres joined #git
18:42 Guest55 joined #git
18:42 jknetl joined #git
18:43 Es0teric joined #git
18:44 rominronin joined #git
18:45 dreiss joined #git
18:45 skyres joined #git
18:47 railssmith joined #git
18:48 rnsanchez_ joined #git
18:48 BSAlb joined #git
18:51 skyres joined #git
18:51 JanC_ joined #git
18:52 EgS joined #git
18:53 jnewt joined #git
18:56 heroux joined #git
18:56 cdown joined #git
18:56 skyres joined #git
18:58 jnewt1 joined #git
18:59 robotroll joined #git
19:00 renlo joined #git
19:00 OnBrokenWings joined #git
19:01 heroux joined #git
19:01 nicksloan joined #git
19:02 finalbeta joined #git
19:02 skyres joined #git
19:02 grumble joined #git
19:03 meauses joined #git
19:05 NimeshNeema joined #git
19:05 caliculk joined #git
19:05 Siegfried joined #git
19:05 caliculk This will sound somewhat stupid, but, does anyone know of a way to restore a deleted branch in Github Enterprise?
19:06 caliculk The working directory of the code was removed off the laptop
19:07 skyres joined #git
19:08 dzho clone the repo and dig around in the reflog?
19:09 * dzho doesn't have any skills working with reflog, but has seen it being recommended for many of those big "oops" moments.
19:09 tobiasvl dzho: you can't clone the reflog
19:11 dzho hmm
19:11 rominronin joined #git
19:11 tobiasvl caliculk: perhaps something like this might work? if GitHub Enterprise provides the API https://objectpartners.com/2014/02/11/recovering-a-commit-from-githubs-reflog/
19:12 tobiasvl (never done anything like that myself)
19:12 caliculk Well, the local repo on the laptop is gone as well? Not sure if that matters.
19:12 caliculk I don't know the commit hash either
19:12 tobiasvl doesn't matter for the potential solution I linked
19:12 caliculk Alright, one sec...
19:13 skyres joined #git
19:13 caliculk Hm, that doesn't appear to work for Github Enterprise. :/
19:14 tobiasvl how so?
19:14 milestone joined #git
19:14 tobiasvl there is a #github channel too btw, your question might be better suited there
19:14 caliculk The url is invalid when using the domain, they switched up the API url. So fixing that now.
19:14 tobiasvl https://developer.github.com/v3/enterprise/
19:15 Sasazuka joined #git
19:16 caliculk Nope, doesn't work: "message": "Not Found",
19:17 meauses joined #git
19:17 tobiasvl what's not found? as always, provide a gist with what you ran and what you get back
19:18 tobiasvl but again, maybe #github can help more, I'm not very knowledgable about github (especially enterprise)
19:18 zeroed joined #git
19:18 zeroed joined #git
19:19 skyres joined #git
19:19 durham joined #git
19:19 Bass10 joined #git
19:19 bmahe joined #git
19:23 snthsnth joined #git
19:23 antiPoP joined #git
19:23 daniel_rose joined #git
19:24 antiPoP hi, I did code changes without creating a branch first. How can I create it without loosing my changes?
19:24 skyres joined #git
19:24 Mobutils joined #git
19:24 tobiasvl antiPoP: if you didn't commit, you can just create a branch now and the changes will !float over
19:24 gitinfo antiPoP: 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.
19:25 mischat joined #git
19:25 antiPoP tobiasvl, the issue is I did a commit to local git
19:26 Domhack joined #git
19:26 CubiK joined #git
19:26 tobiasvl antiPoP: OK, that's not an issue either. checkout a new branch now, then got back to the previous branch where you committed in error (master?) and do something like "git reset --hard HEAD^" (if it's just the one commit)
19:27 antiPoP ok, thanks
19:27 tobiasvl that last command will effectively drop the commit, so don't do it until you have created the new branch
19:29 kyan joined #git
19:29 fission6 joined #git
19:29 Domhack rembmer that whenever you do any changes like reset hard
19:29 fission6 how would i answer this or come close to answer it, "Number of commits by week for last 6 months."
19:30 skyres joined #git
19:30 Domhack if you had stuff commited so it was added as a commit you can go back to this in reflog by running git reflog
19:30 Domhack this is history of all your commands and you can go back to prev state
19:31 isysd joined #git
19:32 Domhack "Number of commits by week for last 6 months." you probably need to run git log with few parameters
19:32 daniel_rose joined #git
19:32 Domhack check man git-log and see if you can filter stuff by week or date
19:32 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
19:32 tobiasvl yeah, "last 6 months" is easy, but "by week" is probably hard
19:32 tobiasvl git log --since="6 months ago"
19:33 fission6 anyway to group or list by day or anything
19:33 fission6 i need to demonstrate steady commit pattern over a time period
19:34 tobiasvl oh, maybe not, since you can make it say "2 weeks ago", "3 weeks ago", etc. a simple tr | uniq could do it probably
19:34 fission6 damn any idea how
19:34 remote joined #git
19:34 ToBeCloud joined #git
19:34 Hello71 don't do that, it's stupid
19:35 tobiasvl yeah it is
19:35 skyres joined #git
19:35 remote what's the proper way of creating a project derived from another git repo that we want to be able to diff and pull from? or what doc covers that topic?
19:35 tobiasvl it's so fuzzy too
19:35 Domhack maybe do this in excel eg. export git log since 6 months to csv and import in excel, group in there
19:35 tobiasvl remote: it's your nick!
19:35 Es0teric joined #git
19:35 mehola joined #git
19:36 remote hi tobiasvl, how are you?
19:36 fission6 hmm ok
19:36 tobiasvl remote: you clone the repo, and then you can do all of that because the repo you cloned from will be one of your repo's remotes ;)
19:37 remote so I leave the original origin and make a new remote?
19:37 Domhack you can simply edit configuration for atnother origin
19:37 remote that makes sense
19:37 tobiasvl Domhack: excel? how is that better than my suggestion
19:37 overlord_tm joined #git
19:37 danslo_ joined #git
19:37 remote so I just need to make the new repo the default remote for push?
19:37 Hello71 git doesn't care about what you call a project
19:37 Domhack it's probably not, but main goal is to demonstrate steady commit pattern
19:38 Hello71 remote: you can do that if you want
19:38 remote i understand i can do that, and it's the reason why i asked but is it The Right Thing
19:38 Domhack remote:
19:39 GavinMagnus joined #git
19:40 Domhack maybe check man git-remote and see if this is enough for your use case
19:40 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
19:40 Hello71 remote: that's one way
19:40 Hello71 you could also just specify it on the command line
19:40 skyres joined #git
19:40 remote i never want to push to the original repo again, only diff and pull
19:42 JamesBaxter joined #git
19:42 a3Dman joined #git
19:43 Domhack are you sure that you need it as a separate repository and it's not enough to simply have different branch?
19:44 mikecmpbll joined #git
19:45 g105b joined #git
19:45 aard_ joined #git
19:46 skyres joined #git
19:47 aidalgol joined #git
19:47 antiPoP I created a branch, and now when I try to switch to it, my ide asks me to set a name for it? What should I use?
19:49 remote Domhack: i'm not sure -- are remotes tracked on branches?
19:51 Domhack remote: if all you want to do is diff and pull, you just can have a different branch, you make a branch from specific point in your code, than you can continue work on master, when you need to diff anything you just fetch new changes from master and compare branches and cherrypick changes
19:51 skyres joined #git
19:51 Domhack remote: good tutorial here https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
19:52 remote ty
19:52 Domhack remote: https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell
19:54 tobiasvl antiPoP: huh? when you created the branch you must have given it a name
19:55 remote Domhack: yes I'm sure a new branch is not appropriate
19:55 tcurdt joined #git
19:55 antiPoP tobiasvl, when I ty to switch to it, it ask for a checkout as new branch, and a branch name
19:56 tobiasvl sounds like your !gui is doing something weird then
19:56 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
19:56 skyres joined #git
19:57 antiPoP ok, thanks
19:57 tyreld joined #git
19:58 Domhack antiPoP: if you're asking as what your branch should be named, it depends on what you do there eg feature branch named after feature, bug or hotfix named after issue number etc
19:58 Domhack antiPoP: people have varied naming conventions
19:58 antiPoP Domhack, I already named my branch in the git web interface
20:00 nwkj86 joined #git
20:02 skyres joined #git
20:02 boombatower joined #git
20:02 r00twrh joined #git
20:02 vuoto joined #git
20:03 Domhack joined #git
20:05 cagedwisdom joined #git
20:06 Faylite_ joined #git
20:07 nicksloan joined #git
20:07 skyres joined #git
20:07 gchristensen joined #git
20:08 gchristensen Hey there, I'm looking for the source behind `git cherry` but am having a most difficult time finding it. Can anyone help? My `grep` and `find` isn't turning anything up.
20:09 snowkidind joined #git
20:11 zumba_addict joined #git
20:13 joshszep joined #git
20:13 skyres joined #git
20:16 alex1a joined #git
20:16 star_prone joined #git
20:17 antiPoP joined #git
20:17 Guest55 joined #git
20:17 antiPoP re
20:17 antiPoP creating the branch locally fixed all issues
20:19 skyres joined #git
20:21 thebope joined #git
20:21 ketchup2081 joined #git
20:21 chris2 gchristensen: builtin/log.c cmd_cherry
20:21 thebope joined #git
20:22 rominronin joined #git
20:22 zumba_addict joined #git
20:22 hhcl2 joined #git
20:24 skyres joined #git
20:25 gchristensen chris2: perfect! how would I have found that myself?
20:25 mischat joined #git
20:26 chris2 grep for "cherry", grep for cmd_cherry
20:26 anjen joined #git
20:27 gchristensen hrmm yes, I wonder if I disregarded it thinking it was just logging functions. thank you for setting me straight!
20:28 tcurdt joined #git
20:29 nedbat I have a file of private settings that I don't want to check in, so it's in .gitignore.  Now I want to clean my tree, for example with "git clean -fdX". That will remove my private settings. Is there a way to have the best of both worlds?
20:30 skyres joined #git
20:30 e14_ joined #git
20:30 Seveas nedbat: store the private settings outside the repo or (evil) in .git/
20:31 WhiskerBiscuit joined #git
20:31 nedbat Seveas: :(
20:32 nedbat Seveas: are you going to merge my merge requests, or should I close them?
20:32 ketchup208 joined #git
20:32 daniel_rose joined #git
20:33 mellernoia joined #git
20:33 Seveas which ones?
20:34 nedbat Seveas: https://gitlab.com/seveas/git_cookbook/merge_requests
20:34 nedbat (just typos)
20:34 Sasazuka I seem to have problems doing rebase sometimes, someone mentioned that what they do is branch off of their feature branch then do a rebase and it usually goes through after resolving the conflict; is there anything wrong with doing it this way?
20:34 Seveas hmm, I don't think gitlab mailed me about those
20:34 Seveas thanks though, will have a look
20:34 daniel_rose joined #git
20:34 nedbat Seveas: np, thanks for writing those pieces
20:34 Hello71 Sasazuka: what does "goes through" mean
20:35 Sasazuka the rebase succeeds
20:35 Hello71 sure, by definition when you resolve the conflict it must succeed
20:35 Hello71 assuming your rebase makes any sense at all
20:35 skyres joined #git
20:36 mischat joined #git
20:36 Sasazuka just rebasing master
20:36 Sasazuka previously, I just merge master into my branch
20:36 Sasazuka but now they want to rebase instead
20:36 e14_ joined #git
20:37 boombatower joined #git
20:37 tobiasvl makes for a cleaner history
20:38 Hello71 yes, because otherwise when you merge back you get "Merge 'master' into ..." which doesn't make sense
20:38 morenoh149 how do I checkout a file but from a certain revision in the past?
20:39 moritz git checkout revision path/to/file
20:39 Sasazuka so typically after a successful rebase where shared set of files where modified, I'd need to both push and pull? I understand the push but why the pull?
20:40 Faylite joined #git
20:40 Hello71 you don't "need" either
20:41 Hello71 morenoh149: also works for 'future', git doesn't care
20:41 Seveas nedbat: merged 1 and cherry-picked 2. I like linear histories :)
20:41 Sasazuka am I not rewriting the history? how can I not push?
20:41 skyres joined #git
20:41 Hello71 or even 'totally unrelated'
20:41 Hello71 Sasazuka: huh?
20:42 mischat joined #git
20:42 Seveas Sasazuka: rebasing is rewriting history...
20:42 Sasazuka maybe I'm misunderstanding the rebase operation, I'm basically putting whatever changes in my branch after master no?
20:42 mischat joined #git
20:42 Sasazuka Seveas: that's my point, if I'm rewriting it, doing I need to push always?
20:43 Seveas Sasazuka: only if you want to publish your changes
20:43 Sasazuka the plan is to at some point merge my branch back into master, so yes I do want to publish it
20:43 danslo_ joined #git
20:44 Seveas but then you only "need" to push after merging
20:44 Seveas depending on the context it may be useful to push or not
20:44 Sasazuka then I must have done something wrong, I tried it 10 minutes ago and I had to pull so I was confused at what I needed to pull
20:44 Sasazuka well pull and push
20:45 renlo joined #git
20:46 Spec-Chum joined #git
20:47 madebymarkca joined #git
20:48 sammyo joined #git
20:48 NimeshNeema joined #git
20:49 romerocesar joined #git
20:50 skyres joined #git
20:53 jnewt1 joined #git
20:53 Hello71 !pull
20:53 gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009/04/16/git-fetch-and-merge/
20:53 zeroed joined #git
20:53 dan2k3k4 joined #git
20:54 re1_ joined #git
21:00 skyres joined #git
21:00 Electrometro joined #git
21:01 romerocesar joined #git
21:03 Lunatrius joined #git
21:03 askb joined #git
21:07 cdg joined #git
21:09 skyres joined #git
21:11 boombatower joined #git
21:13 Es0teric joined #git
21:13 _cyril_ joined #git
21:14 Alienpruts joined #git
21:15 anonymuse joined #git
21:16 Emperor_Earth joined #git
21:16 avtobiff joined #git
21:18 skyres joined #git
21:20 clemf joined #git
21:20 dsantiago joined #git
21:22 daniel_rose joined #git
21:23 rominronin joined #git
21:23 skyres joined #git
21:24 nowhereman joined #git
21:25 jstimm joined #git
21:27 Anja joined #git
21:28 zeroed joined #git
21:28 zeroed joined #git
21:31 b1tchcakes joined #git
21:32 denisMone joined #git
21:33 skyres joined #git
21:33 ArchNoob joined #git
21:33 Bloomberg_ joined #git
21:33 jstimm joined #git
21:33 Bloomberg_ hellloe room
21:34 Bloomberg_ someone know how can I set autodeploy in my centos server?
21:34 Bloomberg_ I'm working with github
21:34 cdown joined #git
21:36 GavinMagnus joined #git
21:36 robattila256 joined #git
21:38 moritz Bloomberg_: https://leanpub.com/deploy # one option
21:39 Synthead joined #git
21:41 pikajude joined #git
21:42 skyres joined #git
21:42 Synthead I have some stored credentials that I'm using on a submodule
21:42 Synthead I recently changed my password and now there's an auth failure
21:43 Synthead "fatal: Authentication failed for '...'"
21:43 mischat joined #git
21:43 Synthead how can I change this password?  I honestly forgot how I set this up
21:43 voidDotClass joined #git
21:44 Synthead I have a [credential] helper = store entry in ~/.gitconfig, if it helps
21:44 ramsub07 joined #git
21:46 vdv joined #git
21:47 Synthead ~/.git-credentials is blank, though
21:48 m0viefreak joined #git
21:49 Synthead joined #git
21:51 skyres joined #git
21:51 clemf joined #git
21:54 aard__ joined #git
21:55 nettoweb1 joined #git
21:57 joshszep joined #git
21:57 BSaboia joined #git
21:58 akushner joined #git
21:58 adac joined #git
21:58 joshszep joined #git
21:58 quizzi joined #git
21:58 sdlnv joined #git
21:59 mycelium joined #git
22:00 DonRichie joined #git
22:00 holgersson joined #git
22:00 skyres joined #git
22:02 ahmed_elgabri joined #git
22:02 GavinMagnus left #git
22:04 snthsnth joined #git
22:07 thebishop joined #git
22:08 voidDotClass joined #git
22:08 thebishop hi all, for some reason i have a huge list of conflicted files in my workspace which i didn't actually change, and i can't commit the set of files i have changed because i have all these unmerged files
22:08 thebishop is there some way to drop all unstaged changes?
22:09 _ikke_ You have to choose which version you want
22:09 skyres joined #git
22:10 JrCs joined #git
22:10 thebishop _ikke_, that will take 2 hours for all these files, which have changes i had nothing to do with...
22:10 _ikke_ you can do git checkout --theirs or git checkout --ours
22:10 _ikke_ on the files
22:11 thebishop _ikke_, for each one individually?
22:14 aarobc joined #git
22:15 skyres joined #git
22:17 Matiia joined #git
22:17 noecc left #git
22:19 Dougie187 left #git
22:20 Dougie187 joined #git
22:20 Gsham joined #git
22:21 ISmithers joined #git
22:22 rominronin joined #git
22:24 skyres joined #git
22:24 crayon joined #git
22:25 mischat joined #git
22:28 jstimm joined #git
22:30 zeroed joined #git
22:30 zeroed joined #git
22:30 mischat joined #git
22:31 Skryll joined #git
22:33 skyres joined #git
22:33 pokalyis joined #git
22:36 ollieshmollie joined #git
22:37 BenderRodriguez joined #git
22:38 Learath2 joined #git
22:39 Gsham joined #git
22:39 Gsham joined #git
22:40 Gsham joined #git
22:40 lmatteis joined #git
22:42 ollieshmollie Hello! I have a question about git-prompt.
22:42 skyres joined #git
22:43 ollieshmollie I have set GIT_PS1_SHOWUPSTREAM to "auto", yet the prompt indicates that my repos have diverged ('<>')
22:43 emg joined #git
22:43 ollieshmollie When I pull from origin, however, git states that everything is up-to-date
22:44 ollieshmollie Am I missing something about divergence? Perhaps I diverged early on and didn't know it.
22:51 skyres joined #git
22:53 danslo__ joined #git
22:57 danslo_ joined #git
23:00 skyres joined #git
23:01 boombatower joined #git
23:09 skyres joined #git
23:11 anuxivm joined #git
23:14 ArchNoob joined #git
23:17 ramsub07 joined #git
23:18 elsevero joined #git
23:18 thiago joined #git
23:19 skyres joined #git
23:20 hahuang61 joined #git
23:22 clemf joined #git
23:23 Siegfried joined #git
23:24 Siegfried joined #git
23:25 Guest55 joined #git
23:28 skyres joined #git
23:29 joshszep joined #git
23:30 Siegfried joined #git
23:30 pokalyis joined #git
23:31 dwmw2_gone joined #git
23:31 mischat joined #git
23:35 Siegfried joined #git
23:37 skyres joined #git
23:37 jnewt joined #git
23:37 dodobrain joined #git
23:40 mischat joined #git
23:40 mischat joined #git
23:41 endiruna joined #git
23:42 moestevens joined #git
23:46 skyres joined #git
23:54 star_prone joined #git
23:54 dendazen joined #git
23:54 skyres joined #git
23:55 Matiia left #git
23:57 Lor_ joined #git
23:59 nettoweb joined #git

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