Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-30

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

All times shown according to UTC.

Time Nick Message
00:02 romerocesar joined #git
00:06 jsgrant joined #git
00:08 fedepad joined #git
00:11 SwiftMatt joined #git
00:12 acetakwas joined #git
00:15 mischat joined #git
00:21 c^ joined #git
00:26 HappyLoaf_ joined #git
00:29 WizJin joined #git
00:29 JamesBaxter joined #git
00:34 e14 joined #git
00:39 thiago joined #git
00:40 danslo joined #git
00:41 shgysk8zer0 joined #git
00:43 fuchstronaut joined #git
00:44 Shentino joined #git
00:45 ResidentBiscuit joined #git
00:46 HappyLoaf_ joined #git
00:46 prawnzy joined #git
00:47 citizen-stig joined #git
00:48 cagedwisdom joined #git
00:53 dave0x6d joined #git
00:53 shgysk8zer0_ joined #git
00:54 Gsham joined #git
00:55 Lyqyd joined #git
00:55 Milijus joined #git
00:56 mingrammer joined #git
01:01 e14 joined #git
01:02 cqi joined #git
01:02 clemf joined #git
01:04 HappyLoaf_ joined #git
01:05 dougharr joined #git
01:05 jstimm_ joined #git
01:10 Apteryx joined #git
01:11 rsukla joined #git
01:11 romerocesar joined #git
01:12 Apteryx Hi! How can I push to a repo the first time? I have created a repository on Gerrit. It has an "initial commit". Then I gathered what I want to push into a local repo. I now want this remote remote to be overwritten with the content of this local repo. I tried, git push --force, but it got rejected anyway.
01:15 duderonomy joined #git
01:16 mischat joined #git
01:19 kozo joined #git
01:20 d^sh joined #git
01:21 nettoweb joined #git
01:21 b1tchcakes joined #git
01:21 jaguarmagenta joined #git
01:26 CEnnis91 joined #git
01:27 sunri5e joined #git
01:28 sword joined #git
01:33 Gsham joined #git
01:38 fstd_ joined #git
01:40 xall joined #git
01:40 ahr3n_ joined #git
01:41 thiago joined #git
01:41 Dougie187 joined #git
01:43 pks joined #git
01:46 romerocesar joined #git
01:46 fuchstronaut joined #git
01:46 mellernoia joined #git
01:46 e14 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | 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.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:49 noyb joined #git
01:51 mingrammer joined #git
01:52 mingrammer joined #git
01:54 HappyLoaf_ joined #git
01:55 _sjs joined #git
01:55 Apteryx It was just a gerrit configuration. Nevermind.
01:55 Apteryx left #git
01:58 whomp joined #git
02:01 Goplat joined #git
02:03 jnavila joined #git
02:04 dsantiago joined #git
02:05 shgysk8zer0_ joined #git
02:13 chachasmooth joined #git
02:14 pikajude joined #git
02:15 nettoweb joined #git
02:17 arescorpio joined #git
02:17 mischat joined #git
02:18 dreiss joined #git
02:19 clemf joined #git
02:21 cdg joined #git
02:21 clemf joined #git
02:22 meloc joined #git
02:22 meloc joined #git
02:22 e14 joined #git
02:23 dsantiago joined #git
02:24 albel727 joined #git
02:26 rsukla joined #git
02:27 ahr3n joined #git
02:29 snthsnth joined #git
02:32 Aliks joined #git
02:35 lagothrix joined #git
02:36 citizen-stig joined #git
02:36 PioneerAxon_ joined #git
02:40 HappyLoaf_ joined #git
02:42 e14 joined #git
02:45 e14 joined #git
02:46 hahuang62 joined #git
02:49 xall joined #git
02:53 texasmynsted joined #git
02:55 mangolisk joined #git
03:00 clemf joined #git
03:01 hypercube32 joined #git
03:02 Forkk joined #git
03:04 snthsnth joined #git
03:11 gfixler joined #git
03:11 romerocesar joined #git
03:12 Dougie187 left #git
03:12 ToBeCloud joined #git
03:13 durham_ joined #git
03:14 SwiftMatt joined #git
03:14 Vortex35 joined #git
03:18 mischat joined #git
03:18 timvisher joined #git
03:18 mehola joined #git
03:19 b1tchcakes joined #git
03:20 texasmynsted joined #git
03:22 jaguarmagenta joined #git
03:33 robotroll joined #git
03:34 hahuang62 joined #git
03:35 aavrug joined #git
03:35 xall joined #git
03:36 aavrug joined #git
03:41 e14_ joined #git
03:41 ericho joined #git
03:42 robotroll joined #git
03:44 Lor_ joined #git
03:44 Krys joined #git
03:45 fuchstronaut joined #git
03:45 eicordob_ joined #git
03:46 hahuang62 joined #git
03:48 e14 joined #git
03:52 shgysk8zer0 joined #git
04:00 Kitty- joined #git
04:08 Andrew_K joined #git
04:09 fedepad joined #git
04:10 daey_ joined #git
04:11 SwiftMatt joined #git
04:31 a_thakur joined #git
04:32 htafdresgi left #git
04:34 nilg joined #git
04:35 Anupkumar joined #git
04:38 snthsnth joined #git
04:39 justanotheruser joined #git
04:40 wtiger joined #git
04:40 wtiger Hi!
04:40 gitinfo wtiger: 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.
04:41 wtiger I'm working on a the master branch of a project, and my friend is working on his local branch which he has pushed to github
04:41 Mowgli joined #git
04:42 wtiger is there a way I can 'get' his branch so I can compare them? I don't want to work on it..
04:42 subhojit777 joined #git
04:42 shgysk8zer0 joined #git
04:43 shgysk8zer0 joined #git
04:44 ewet joined #git
04:46 romerocesar joined #git
04:46 fuchstronaut joined #git
04:46 fuchstronaut joined #git
04:47 Takiito joined #git
04:47 Takiito joined #git
04:56 freimatz joined #git
04:58 Darren_ joined #git
05:00 Cabanossi joined #git
05:03 overlord_tm joined #git
05:06 cyphase joined #git
05:07 daishan joined #git
05:08 mrpackethead joined #git
05:13 rsukla joined #git
05:20 mischat joined #git
05:24 snthsnth joined #git
05:27 pwnz0r joined #git
05:30 whomp joined #git
05:37 jaguarmagenta joined #git
05:37 crawler joined #git
05:39 habbasi joined #git
05:40 Thorn joined #git
05:40 nilg What happens if you merge branch B into branch A at some point, then push more commits on the resulting branch, then re-merge B?
05:40 Sucks joined #git
05:41 hypercube32 wtiger, just git clone (url.git)
05:41 hypercube32 in another directory
05:42 hypercube32 nilg, you better hope you do a good job :P
05:43 nilg hypercube32: what do you mean? Any link to a doc that would explain these subtleties?
05:43 wtiger :)
05:43 wtiger left #git
05:45 danslo joined #git
05:46 nilg Let me explain why I need to know that: I want to merge some work into the master, I don't have the permissions. While waiting I want to work on another branch that depends on the to-be-merged branch. How to do that?
05:46 fuchstronaut joined #git
05:47 bocaneri joined #git
05:48 nilg My plan is to for instance merge branch B into branch A locally, create a new branch from A, hack, hack, hack. Meanwhile, more work has happened on the remote branch A (the master), and somewhere down the line someone has finally merged my branch B. Then my question is, if I merge my new work, where A is already merged into it, how git is gonna deal with that?
05:51 nilg The other option, the safer one, is to once A has been merged into B, cherry pick the new work and put it on top of the remote A. That is the cleanest possible thing to do, but it requires more git manipulation.
05:52 nilg I'm sure that's a very very common scenario, there must be in-depth discussions about that somewhere.
05:52 nilg (needless to say shallow web searches didn't led me anywhere so far)
05:52 Raging_Hog joined #git
05:52 mehola joined #git
05:54 Jameser joined #git
05:56 cyphase joined #git
05:58 Kitty- joined #git
05:58 cqi joined #git
06:05 barteks2x joined #git
06:05 jnewt_ joined #git
06:06 lb1c joined #git
06:10 rscata joined #git
06:10 ThomasLocke joined #git
06:10 ThomasLocke joined #git
06:12 Error404NotFound joined #git
06:12 Error404NotFound joined #git
06:14 brokensyntax joined #git
06:14 hypercube32 why dont you continually pull down master and constantly merge your stuff into it instead maybe?
06:14 hypercube32 what you're doing goes against all kinds of CI type stuff
06:15 snthsnth joined #git
06:15 hypercube32 i would look at how linux community maintains things like their branches, they do something similar for long periods of time
06:15 roelmonnens joined #git
06:15 hypercube32 like linux NEXT type sets of patches long term
06:15 hypercube32 they dont end up merging until like versions later
06:16 hypercube32 considering linus made git, might be a good place to look how the ones that built it do it
06:17 grift joined #git
06:19 durham joined #git
06:21 Mowgli joined #git
06:22 Kitty- joined #git
06:25 rendar joined #git
06:25 qt-x joined #git
06:25 ahr3n joined #git
06:26 rominronin joined #git
06:27 jknetl joined #git
06:29 grift joined #git
06:30 Darren_ joined #git
06:30 AndreSomers joined #git
06:31 nckpz joined #git
06:34 JeroenT joined #git
06:36 Sceorem joined #git
06:36 snthsnth joined #git
06:37 Shentino joined #git
06:39 xall joined #git
06:40 moriko joined #git
06:41 titankiller joined #git
06:41 jaequery joined #git
06:42 nckpz joined #git
06:42 JeroenT joined #git
06:42 GandalfTheWizard joined #git
06:43 nckpz joined #git
06:43 Shentino2 joined #git
06:44 constant joined #git
06:45 danslo joined #git
06:45 mischat joined #git
06:47 danslo_ joined #git
06:47 fuchstronaut joined #git
06:50 Nd-47-M joined #git
06:51 Repox joined #git
06:51 Shentino joined #git
06:54 roelmonn_ joined #git
06:54 ixian joined #git
06:55 NicholasDM joined #git
06:58 zeroed joined #git
06:58 zeroed joined #git
06:58 tvw joined #git
06:59 star_prone joined #git
07:02 star_prone joined #git
07:04 submitnine joined #git
07:04 fees joined #git
07:04 dunaeth joined #git
07:07 lexxis joined #git
07:07 GT4066 joined #git
07:07 wcpan joined #git
07:09 jknetl joined #git
07:10 cdown joined #git
07:10 Darcidride joined #git
07:11 hahuang62 joined #git
07:12 eduardas_m joined #git
07:13 encod3 joined #git
07:16 star_prone joined #git
07:18 nckpz joined #git
07:19 overlord_tm joined #git
07:22 ahr3n joined #git
07:23 ochorocho__ joined #git
07:23 BooK_ so I realized that the --batch-all-objects options for git cat-file only appeared in 2.6.0.rc0
07:23 snthsnth joined #git
07:24 BooK_ how could one get the list of all sha1 in the git database before that?
07:24 BooK_ i.e `git cat-file --batch-check --batch-all-objects`
07:24 morenoh149 joined #git
07:25 BooK_ well, I just had to read the full commit message for 6a951937ae1abb5fe438bfb41ebb28c5abe0419d
07:28 Balliad joined #git
07:28 ixian joined #git
07:29 SwiftMatt joined #git
07:31 BadSnappa joined #git
07:32 Nd-47-M joined #git
07:32 jaequery joined #git
07:34 ShekharReddy joined #git
07:34 black joined #git
07:34 JeroenT joined #git
07:37 laumann joined #git
07:38 jaguarmagenta joined #git
07:41 JeroenT joined #git
07:41 ixian joined #git
07:41 Samual joined #git
07:43 mithenks joined #git
07:44 moriko joined #git
07:45 Jameser joined #git
07:46 ahr3n joined #git
07:48 fuchstronaut joined #git
07:49 Samual joined #git
07:49 Nd-47-M joined #git
07:50 harish joined #git
07:51 overlord_tm joined #git
07:52 star_prone joined #git
07:53 Alienpruts joined #git
07:54 flobin joined #git
07:57 rominronin joined #git
07:57 Jameser joined #git
08:00 watersoul joined #git
08:03 fedepad joined #git
08:05 bongjovi joined #git
08:05 King_Hual joined #git
08:05 King_Hual joined #git
08:05 Snugglebash joined #git
08:05 slayerjain joined #git
08:06 cdown joined #git
08:06 dwfhoc joined #git
08:07 githogori joined #git
08:08 aidalgol joined #git
08:08 ahr3n joined #git
08:09 dunaeth joined #git
08:11 lss8 joined #git
08:13 xaa joined #git
08:15 kurkale6ka joined #git
08:16 chll_ joined #git
08:21 clmsy joined #git
08:22 ahmedelgabri joined #git
08:25 thomas_25 joined #git
08:25 githogori joined #git
08:26 mikecmpbll joined #git
08:26 titankiller joined #git
08:26 brokensyntax joined #git
08:27 ocbtec joined #git
08:27 rominronin joined #git
08:30 [Brain] joined #git
08:31 encod3 joined #git
08:31 [Brain] joined #git
08:32 Snugglebash joined #git
08:32 mischat joined #git
08:33 baraba joined #git
08:34 mischat_ joined #git
08:37 winterchip joined #git
08:39 rorro joined #git
08:41 a_thakur joined #git
08:41 Samual joined #git
08:44 SwiftMatt joined #git
08:46 nilg` joined #git
08:47 rffleaie joined #git
08:49 rffleaie I have migrated one project from svn to git. The path of this project was changed inside svn, for this reason I have 2 git project. One from r1:r100 ans second from r101:HEAD. How I can merge these two repos in one !!!!
08:51 osse rffleaie: fetch the second repo into the first. use git-replace to say that the initial commit of the second repo has a parent, and that parent is the last commit of the first repo
08:54 a_thakur_ joined #git
08:55 rffleaie How I can use git-replace?
08:58 a_thakur joined #git
08:59 robogoat joined #git
09:00 hahuang62 joined #git
09:00 spriz joined #git
09:01 thethorongil joined #git
09:01 Samual joined #git
09:02 rffleaie have you an example?
09:03 harish joined #git
09:05 p4trix joined #git
09:07 a_thakur joined #git
09:09 daynaskully joined #git
09:10 star_prone joined #git
09:11 Samual joined #git
09:11 danslo joined #git
09:17 osse rffleaie: git replace --graft X Y  where X and Y are the hashes of r101 and r100
09:17 osse man git-replace
09:17 gitinfo the git-replace manpage is available at http://jk.gs/git-replace.html
09:19 mischat joined #git
09:21 chachasmooth joined #git
09:24 Darcidride joined #git
09:25 ShapeShifter499 joined #git
09:26 ShapeShifter499 joined #git
09:27 Guest82 joined #git
09:29 flobin joined #git
09:29 phanimahesh joined #git
09:32 holodoc joined #git
09:34 moei joined #git
09:35 Samual joined #git
09:35 phanimahesh joined #git
09:37 ahmedelgabri joined #git
09:38 daynaskully joined #git
09:39 jaguarmagenta joined #git
09:40 aax joined #git
09:42 Kobboi joined #git
09:42 Kobboi left #git
09:45 roelmonnens joined #git
09:48 fedepad joined #git
09:54 a_thakur joined #git
09:57 spriz joined #git
09:57 Milijus joined #git
09:58 rffleaie I have tried but I can't see the commit off the 2o repos
10:02 mischat joined #git
10:04 mischat_ joined #git
10:05 stamina joined #git
10:07 Mindfart joined #git
10:09 SwiftMatt joined #git
10:10 byte512 joined #git
10:11 beagleGuy joined #git
10:11 kugel joined #git
10:12 SporkWitch joined #git
10:13 xall joined #git
10:14 fedepad joined #git
10:15 Brain joined #git
10:17 jknetl joined #git
10:21 jnavila joined #git
10:28 robak joined #git
10:29 dodobrain joined #git
10:29 phanimahesh joined #git
10:29 robak I've 3 commits, from newest 1, to oldest 3. I need to squash 2 and 3 into 1, to make them 'disappear', how can I do that?
10:30 robak git rebase -i HEAD~3 makes complete mess
10:30 idmistir joined #git
10:31 osse robak: you cannot "squash forwards". Squash 1 and 2 into 3
10:32 osse if you actually use squash and not fixup you get to edit the commit message. keep the one you want or make a new one
10:32 robak lets try
10:32 Snugglebash joined #git
10:33 robak any reason git shows them in reverse order when doing the rebase?
10:33 star_prone joined #git
10:33 robak osse: same thing, I tried squashing back and it made some mess without success
10:34 nettoweb joined #git
10:34 osse robak: do not reorder the commits. just mark the lower two as 'squash' and that's it
10:35 robak I did, I am saying, during rebase git sets them in reverse order, than they are in reality and in log
10:35 Samual joined #git
10:35 osse that's just how they're displayed. not sure why that choise was made
10:35 osse whatever order they appear in at first is the correct order
10:36 robak wtf just happened - it asked me twice to amend the commit message
10:37 robak and now I have commits 1 and 3 in log, but 2 is gone...
10:37 robak do I need to rebase again? if I'd have 100 commits to squash, would I have to do it 1000 times?
10:37 JeroenT joined #git
10:38 osse From what you're telling me I have no clue what you did
10:38 osse so I don't know what you should do now
10:38 robak that's absolutely true
10:38 robak I can't make it work and behave like I've read it in documentation and examples
10:38 robak so, you're right, I've no effing clue what is going on
10:39 osse robak: if you want to squash N consecutive commits that are all the newest ones, then you can do git reset --soft HEAD~N && git commit -m 'Huge squash'.
10:39 robak that's why I'm asking for help
10:39 osse robak: show me some output of git log, what the rebase editor looks like etc
10:39 robak but then I'll end up with new commit 'huge squash' - and I dont want new commit. I want the latest one I have, with two previous ones gone.
10:41 osse robak: gone? what about the changes they introduce=
10:41 [Brain] joined #git
10:42 howitdo joined #git
10:42 robak osse: well, I want to keep the changes, but I need the commits to be gone, as in, their points in history. I was told to get rid of my history of work, and only push 1 commit, instead of three...
10:42 a_thakur joined #git
10:43 howitdo joined #git
10:43 howitdo joined #git
10:43 robak osse: however, the second rebase (with commits 1 and 3, now being 1 and 2, after the first rebase) seemed to do the job...
10:43 robak no idea why I wasnt able to do it in one rebase, though
10:43 kba So I did some rebasing last night and now stuff is acting up when I try to pull from basically anywhere
10:44 kba `git reset --hard` doesn't show reset to the latest commit on github
10:44 kba `git pull` tells me I have conflicts
10:44 kba `git stash` tells me it can't merge and that some files need merging
10:44 kba What do I do?
10:50 [Brain] joined #git
10:51 SwiftMatt joined #git
10:55 Vidb joined #git
10:58 flobin joined #git
10:58 j416 kba: naturally, since you rebased
10:58 j416 kba: you altered history, and you are trying to pull a different history into yours
10:59 j416 kba: you need to decide if you want to force push or not
10:59 j416 !implicationsofforcepush
10:59 j416 what's the faq I'm looking for
10:59 j416 !force
10:59 gitinfo [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push --force-with-lease`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.
10:59 Cavallari joined #git
10:59 j416 kba: !rewrite
10:59 gitinfo kba: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:59 jstimm_ joined #git
11:00 j416 not sure I agree with "infinitely better", depends on your case.
11:00 WakiMiko joined #git
11:01 geoid joined #git
11:02 hahuang62 joined #git
11:02 osse robak: when you squash more commits into one you don't really keep one or the other; you get a new commit and you can make that commit have the same message as one or the other.
11:03 osse robak: squashing is what you want in this case since you don't want the other commit's changes gone.  and yes it should be doable with only one rebase
11:03 Rodya_ joined #git
11:05 buzzLightBeer joined #git
11:07 Samual joined #git
11:09 VampiricPadraig joined #git
11:10 manuel_ joined #git
11:11 manuel_ joined #git
11:13 manuel_ joined #git
11:17 manuel_ joined #git
11:18 JeroenT_ joined #git
11:19 rominronin joined #git
11:20 rnsanchez joined #git
11:21 simenbrekken joined #git
11:23 JeroenT joined #git
11:25 Cavallari joined #git
11:27 Rodya_ joined #git
11:27 mischat joined #git
11:28 rossome joined #git
11:28 Samual joined #git
11:28 ojdo joined #git
11:28 Limes_ joined #git
11:28 jimi_ joined #git
11:29 Cavallari1 joined #git
11:33 WayToDoor joined #git
11:36 Eryn_1983_FL joined #git
11:38 nuck joined #git
11:39 sdothum joined #git
11:39 jaguarmagenta joined #git
11:41 manuel joined #git
11:44 fahadash joined #git
11:46 leeN joined #git
11:47 johnmilton joined #git
11:49 manuel joined #git
11:49 leeN joined #git
11:50 mmlb joined #git
11:52 Cavallari joined #git
11:56 whomp joined #git
11:56 _rht joined #git
11:57 Samual joined #git
11:58 tlaxkit joined #git
11:59 CheckDavid joined #git
12:01 flobin joined #git
12:02 jimi_ joined #git
12:02 xehbit joined #git
12:02 HoloPed__ joined #git
12:04 codfection joined #git
12:05 rorro joined #git
12:06 Samual joined #git
12:07 rbern joined #git
12:08 a_thakur joined #git
12:09 [Brain] joined #git
12:09 xehbit We have the following situation; there is a master branch where our team merges new features/bugfixes/e.d. to the master branch. So the master branch contains always the most up to date code. When we have a release (for example 1.4.0) we create a tag for it on the master branch, send it to our staging server for testing and finally release it on our production servers. However, when we are busy developing code for version 1.5.0 and there is a bug in
12:10 xehbit version 1.4.0 which we want to release with version number 1.4.1, what should we do, checkout version 1.4.0? or.. ?
12:10 synthroid joined #git
12:11 JeroenT joined #git
12:12 zack_s_ joined #git
12:13 bruce_lee joined #git
12:13 bruce_lee joined #git
12:13 brokensyntax joined #git
12:15 star_prone joined #git
12:15 titankiller joined #git
12:16 fmcgeough joined #git
12:17 ixian joined #git
12:18 star_prone joined #git
12:19 t0n1c joined #git
12:24 dodobrain joined #git
12:26 Samual joined #git
12:26 avar Generally what you'd do is have a master branch, then when you make a 1.4.0 series you create a maint-1.4.0 branch, and tag that as 1.4.0, then you cherry-pick commits into that, an dmake a 1.4.1 etc.
12:27 avar You can also just "git checkout 1.4.0" and make commits on top of that, but then you have a detached branch, and it's hard to collaborate with that, which is the reason for making a maint-1.4.0 branch
12:28 avar xehbit: ^
12:29 rominronin joined #git
12:30 xehbit avar, so for example: for the 1.4.0 release i should make "release-1.4" and commit bugfixes for that version into that branch, and also copy the bugfix to master right?
12:31 xehbit And on our production server i can checkout the "release-1.4" branch
12:31 avar Yeah, or commit them to master, and cherry pick them into release-1.4, or some combination of the two
12:31 avar But the point being that you have a *branch* in addition to a tag
12:33 rffleaie I have the same project split into 2 repos, repo 1 with revision first : 100 repo 2 with 101:head. I have cloned the first repo, I have changed the origin with the second repo, I have pulled the second repos's commits. Always is ok, but when I try to push, I have only the repo2 commits
12:35 a3Dman_ joined #git
12:36 anonymuse joined #git
12:36 avar xehbit: google "git relesae workflow" for some graphs etc., e.g. http://nvie.com/posts/a-succ​essful-git-branching-model/
12:38 rffleaie I cant attach the repo 1 with the repo2
12:41 xehbit avar, i see! Thanks for the help :)
12:41 Torrone joined #git
12:41 JeroenT joined #git
12:42 Torrone hello, I've made a pull request from the main repo and did my changes, now I want to catch up with the changes in the main repo, viewing them one-by-one if possible, how do I start?
12:43 eka joined #git
12:44 flobin joined #git
12:45 yodawg joined #git
12:46 rgrinberg joined #git
12:46 flobin joined #git
12:48 rgrinberg joined #git
12:48 dwsr joined #git
12:52 troulouliou_div2 joined #git
12:52 tobiasvl Torrone: you mean you've made a fork?
12:52 cdown joined #git
12:52 tobiasvl the pull request would be the actual request for the main repo to pull from you
12:53 tobiasvl (in github/bitbucket parliance at least)
12:53 Torrone tobiasvl, yes it's a fok
12:53 Torrone fork
12:53 Torrone how do I go about it?
12:53 jknetl joined #git
12:53 tobiasvl so you've not made a pull request
12:53 mekeor joined #git
12:54 tobiasvl but you want to integrate the main repo's (upstream) changes into yours before you make the pull request
12:54 tobiasvl right?
12:54 Torrone yes, that's the idea, but I don't need to push it to the main repo
12:55 Torrone I need to update with the changes on the main repo
12:55 Ryanar joined #git
12:56 sl33k joined #git
12:56 Eryn_1983_FL joined #git
12:56 sl33k hi guys. Got a branch showing this message “Your branch is ahead of 'origin/develop' by 3 commits.” and I would like to getr rid of it
12:57 sl33k trying to reset my local branch to same as origin
12:58 tobiasvl Torrone: are you using github?
12:58 tobiasvl Torrone: oh you don't want to make a pull request?
12:58 tobiasvl sl33k: you want to just throw away your three extra commits?
12:58 Torrone I'm using bitbucket
12:58 Torrone tobiasvl, it's not necessary for my goal
12:58 brokensyntax So what is it that git uses SSH keys for?
12:59 tobiasvl brokensyntax: fetching from and pushing to a remote via ssh
12:59 tobiasvl Torrone: OK. so you just want to rebase your branch on the updated remote branch?
12:59 t4nk841 joined #git
12:59 sl33k tobiasvl: yes please. I cherry-picked into that branch, I have not pushed it yet, and would like to revert that. Unfortunately., i seem to be stuck despite doing a git reset —hard HEAD
13:00 Torrone tobiasvl, yes! :-)
13:00 tobiasvl sl33k: you mean git reset --hard HEAD^3 ?
13:00 brokensyntax tobiasvl: I guess that makes sense :P I'm just starting to actually look at how to use my git account. A droid program I'm using offers integration with ssh.
13:01 sl33k tobiasvl: i didnt put a number in there. Cant i just reset to origin head - without having to put a number?
13:01 sl33k like reset back to origin state
13:01 mischat_ joined #git
13:01 mekeor FunFact123: in turkish, "git" means "go [away]"
13:02 tobiasvl sl33k: sure. git reset --hard origin/develop
13:02 tobiasvl sl33k: "origin head" doesn't make much sense. if you just did "git reset --hard HEAD" earlier, that did nothing except throw away uncommited changes. you always have HEAD checked out
13:02 tobiasvl HEAD is, by definition, what you are currently on :)
13:03 overlord_tm joined #git
13:03 hahuang62 joined #git
13:03 sl33k tobiasvl: thanks mate. That works. Can you please remind me what ‘HEAD” means, kinda assumed that should have worked to. Its like a temp space right?
13:03 sl33k tobiasvl: oh thanks.
13:03 mischat__ joined #git
13:03 tobiasvl sl33k: HEAD is a reference that always points at the currently checked out commit.
13:03 WayToDoor joined #git
13:04 a3Dman joined #git
13:04 JeroenT joined #git
13:05 JeroenT joined #git
13:06 danslo joined #git
13:06 mekeor` joined #git
13:06 JamesBaxter joined #git
13:07 jimi_ joined #git
13:08 achadwick joined #git
13:08 danslo_ joined #git
13:08 diogenese joined #git
13:08 Guest21283 joined #git
13:09 ShekharReddy joined #git
13:10 rorro joined #git
13:10 hurikhan|Work joined #git
13:11 ExoUNX joined #git
13:12 JeroenT joined #git
13:14 overlord_tm joined #git
13:15 danslo joined #git
13:16 masuberu joined #git
13:21 a_thakur joined #git
13:24 mizu_no_oto joined #git
13:26 GodEater joined #git
13:26 GodEater joined #git
13:26 AndreSomers joined #git
13:26 crose joined #git
13:26 mekeor`` joined #git
13:27 AndreSomers joined #git
13:27 Samual joined #git
13:27 danslo joined #git
13:29 [Brain] joined #git
13:29 [Brain] joined #git
13:30 CEnnis91 joined #git
13:32 dave0x6d joined #git
13:33 al-damiri joined #git
13:34 shinnya joined #git
13:36 le_melomane joined #git
13:37 jnavila joined #git
13:38 tfnico joined #git
13:40 jnavila joined #git
13:42 Samual joined #git
13:42 CrazyBonz joined #git
13:43 Jameser joined #git
13:43 fuchstronaut joined #git
13:43 fuchstronaut joined #git
13:44 rnsanchez_ joined #git
13:45 mischat joined #git
13:45 kulelu88 joined #git
13:46 crose joined #git
13:47 sangy joined #git
13:48 brokensyntax joined #git
13:49 lexxis joined #git
13:49 dviola joined #git
13:50 fedepad joined #git
13:51 blackwind_123 joined #git
13:52 f3r70rr35f joined #git
13:53 cdg joined #git
13:54 AaronMT joined #git
13:54 JeroenT joined #git
13:54 zivester joined #git
13:58 e14 joined #git
14:00 flobin joined #git
14:00 JeroenT joined #git
14:01 phaleth joined #git
14:02 nydel07 joined #git
14:02 rorro joined #git
14:02 sdothum joined #git
14:05 stupidystupid joined #git
14:05 nikivi joined #git
14:06 jeffreylevesque joined #git
14:08 Ryanar joined #git
14:08 dwmw2_gone joined #git
14:08 shafun joined #git
14:09 bongjovi joined #git
14:09 ResidentBiscuit joined #git
14:11 Samual joined #git
14:11 fahadash joined #git
14:12 [Brain] joined #git
14:13 e14_ joined #git
14:15 patarr joined #git
14:15 Dougie187 joined #git
14:16 JeroenT joined #git
14:16 mingrammer joined #git
14:17 e14_ joined #git
14:17 mingrammer joined #git
14:18 rnsanchez_ joined #git
14:19 Ryanar joined #git
14:19 eka joined #git
14:21 fuchstronaut joined #git
14:22 Darren_ joined #git
14:25 Mathiasdm joined #git
14:25 Mathiasdm joined #git
14:26 PioneerAxon joined #git
14:26 ferr joined #git
14:26 mar77i joined #git
14:27 IndigoTiger joined #git
14:29 ruby_ joined #git
14:29 ShapeShifter499 joined #git
14:30 IndigoTiger joined #git
14:33 IndigoTi- joined #git
14:34 thebope joined #git
14:34 nydel07 joined #git
14:35 shgysk8zer0 joined #git
14:36 shgysk8zer0 joined #git
14:36 nikivi joined #git
14:37 e14_ joined #git
14:38 jimi_ joined #git
14:38 Samual joined #git
14:38 r00twrh joined #git
14:38 Ryanar joined #git
14:38 JeroenT joined #git
14:39 fuchstronaut joined #git
14:39 danimal2 joined #git
14:42 treehug88 joined #git
14:44 Samual joined #git
14:45 synchronous joined #git
14:47 roelmonn_ joined #git
14:48 roelmonn_ joined #git
14:49 a_thakur joined #git
14:50 nettoweb joined #git
14:51 eivarv joined #git
14:51 JeroenT joined #git
14:52 mizu_no_oto joined #git
14:52 charlesr joined #git
14:52 canuk joined #git
14:54 Samual joined #git
14:54 rsukla joined #git
14:55 barteks2x joined #git
14:56 e14_ joined #git
14:57 Guest55 joined #git
14:58 star_prone joined #git
14:58 nckpz joined #git
14:58 lmat How do I git filter-branch; just some of the branches?
14:59 lmat oops, I mean just some of the comits
14:59 lmat The last 20 or so commits might contain a file that I don't want to be in any history.
14:59 Brain joined #git
14:59 lmat something like      git filter-branch --index 'git rm --ignore-unmatch /that/file' HEAD..HEAD^^^^^^^^^^^^^
15:00 lmat something like      git filter-branch --index-filter 'git rm --ignore-unmatch /that/file' HEAD^^^^^^^^^^^^^..HEAD
15:00 lmat Or is this a job for git rebase -i; ?
15:01 a3Dman joined #git
15:01 clemf joined #git
15:02 VladGh joined #git
15:03 hahuang62 joined #git
15:03 cyphase joined #git
15:04 osse that should work
15:04 [Brain] joined #git
15:04 osse but i'd write it HEAD~13..HEAD
15:04 osse and i think you need -- before the range
15:04 cyphase joined #git
15:09 InfoTest joined #git
15:10 rffleaie how can I attach 2 reps in one repo? it is the same project repo 1 with first:n revisons repo2 n+1: head, I have tried any ways
15:12 * osse experiences deja vu
15:12 e14__ joined #git
15:12 ixian joined #git
15:13 hashpuppy joined #git
15:14 RustyShackleford I have a feature branch feature1 which branches from master. Currently there are three commits that I haven't pushed to remote
15:14 Samual joined #git
15:14 RustyShackleford I want to make a new branch called feature2 which would be master plus these three commits
15:16 VladGh joined #git
15:16 r00twrh joined #git
15:16 str joined #git
15:16 Rodya_ joined #git
15:17 Rodya_ joined #git
15:17 LionsMane joined #git
15:18 thiago_ joined #git
15:18 RustyShackleford I think right now it might better to branch feature2 from feature1. Feature1 will be merged into master soon, then I'd have feature2 branching from master, right?
15:19 duderonomy joined #git
15:20 dreiss joined #git
15:20 _sjs joined #git
15:23 rffleaie someone knows something about ?
15:24 RustyShackleford rffleaie: you can have multiple remotes
15:24 RustyShackleford you shouldn't need multiple repos for different versions of your codebase though
15:25 thomas_25 joined #git
15:26 durham joined #git
15:27 durham joined #git
15:29 rffleaie yes but I want only one repo
15:29 kpease joined #git
15:30 RustyShackleford and you want to preserve history?
15:30 rffleaie my situation is: repo 1 with commit first:N repo2 N+1:HEAD
15:30 rffleaie yes absolutely
15:30 tyreld_ joined #git
15:30 RustyShackleford having a hard time picturing the scenario
15:31 nettoweb joined #git
15:31 rffleaie yes
15:31 aarobc joined #git
15:32 ash_workz joined #git
15:33 lmat osse: thanks!
15:34 rffleaie I have tried with rebase but nothing, I have tried to change the origin and use pull but I have automatic merge
15:35 RustyShackleford i don't know how well rebasing is going to work, or how you're going to preserve history
15:35 RustyShackleford the way i'm picturing it, these two repos know nothing about each other, no common history
15:35 BinaryBench joined #git
15:37 rffleaie no, these two repos know nothing about each othe, I want to obtain a common history
15:37 RustyShackleford rffleaie: I think the best you can hope for is a diff between n and n+1
15:38 ruby_ joined #git
15:38 enckse If I setup a git mirror of a repo, is there anyway to prevent users from pushing to that mirror that doesn't require each user to do something?
15:38 rffleaie why? in the second repo I have many commits!
15:38 flobin joined #git
15:39 e14 joined #git
15:39 RustyShackleford you might be able to rebase n+1 on top of n. The history might do some really wierd stuff
15:39 rffleaie repo1 -> FISRT:N repo2 repo2- > N+1: HEAD = I want repo3 -> FIRST:HEAD
15:39 RustyShackleford I'm really not the guy to be answering this question haha. Not a git guru. Yet, anyway
15:40 jaafar joined #git
15:45 Celelibi joined #git
15:45 eizua joined #git
15:47 synthroi_ joined #git
15:47 subhojit777 joined #git
15:48 AndreSomers joined #git
15:49 hahuang62 joined #git
15:50 Brain joined #git
15:50 crayon joined #git
15:51 ReGoR joined #git
15:51 ixian joined #git
15:55 flobin left #git
15:56 danslo joined #git
15:57 manuel joined #git
15:58 ixian joined #git
15:58 Guest55 joined #git
15:59 manuel joined #git
16:00 e14 joined #git
16:01 rgrinberg joined #git
16:02 thomas_25 joined #git
16:04 ShapeShifter499 joined #git
16:05 a_thakur joined #git
16:05 ixian joined #git
16:10 NeverDie joined #git
16:11 Darren_ joined #git
16:11 buffal0 joined #git
16:11 mingrammer joined #git
16:12 ixian joined #git
16:12 Rodya_ joined #git
16:16 faux___ joined #git
16:18 ShapeShifter499 joined #git
16:18 tang^ joined #git
16:19 ixian joined #git
16:20 pwnz0r joined #git
16:21 manuel joined #git
16:23 pksadiq joined #git
16:25 e14_ joined #git
16:25 pksadiq is there a way to keep the incompletely cloned repo, and continue the clone later (same way as 'wget -c', which I can just do Ctrl+C to stop the current download, and if I do download that later, it continues where it stopped (if the server supports)).
16:26 ixian joined #git
16:26 thiago_ joined #git
16:27 EvilPenguin joined #git
16:28 NicholasDM joined #git
16:28 e14 joined #git
16:30 _ikke_ pksadiq: That's not possible currently in git. Coincidentally there is currently a patch being discussed to add the possibility
16:30 _ikke_ pksadiq: If you have access to the remote server, you can create a bundle, which you can download over a resumamble protocol
16:30 ansimation joined #git
16:32 ansimation joined #git
16:32 pksadiq _ikke_: usually I clone to some other server, make it a tarball, and download. Now I have a repo of probably about 20-40GB. So I can't do that
16:32 overlord_tm joined #git
16:33 ruby_ joined #git
16:33 Duikb00t-home joined #git
16:34 fuchstronaut joined #git
16:34 Duikb00t-home Hello I have a question Im a beginner Git user and I have now a project on github. Now I would like to keep working on it at home as well.
16:34 Duikb00t-home I guess I have to just pull it ? Or do I have to Fork it?
16:35 AndreSomers joined #git
16:36 rgrinberg joined #git
16:37 isysd joined #git
16:38 rgrinberg joined #git
16:38 dan2k3k4 joined #git
16:40 stomplee joined #git
16:40 pksadiq Hm.. can't I have more than one argument for clone? (like I do wget url1 url2 url3, and so on)
16:41 ixian8 joined #git
16:41 romerocesar joined #git
16:42 bgerber joined #git
16:44 Rodya_ joined #git
16:44 nedbat pksadiq: use more than one clone command
16:44 nitric joined #git
16:45 nedbat pksadiq: there are two positional arguments to clone: the remote repo, and the local name to create. the second one is optional
16:45 actinide joined #git
16:45 pksadiq nedbat: ok, I see
16:47 masuberu joined #git
16:49 Derperperd joined #git
16:50 rbern joined #git
16:50 mischat_ joined #git
16:50 nedbat Duikb00t-home: you just clone it to your home machine, you don't fork it.
16:50 _ikke_ pksadiq: Do you just need one release of the repo?
16:52 pksadiq _ikke_: if you are asking about my first question, I need to have a deep clone.
16:52 _ikke_ ok
16:52 rinwa joined #git
16:52 Error404NotFound joined #git
16:52 Error404NotFound joined #git
16:53 _ikke_ What you perhaps can do is to first get a shallow clone, and then graduately deepen it
16:53 elementalest joined #git
16:53 elementalest joined #git
16:53 pksadiq _ikke_: the shallow clone with depth 1 can itself be about 1 GB, and I have really bad network. :(
16:54 romerocesar_ joined #git
16:55 AndreSomers joined #git
16:55 Guest55 joined #git
16:56 pksadiq _ikke_: anyway let me begin clone and go for sleep. Hoping for the best. :)
16:57 danslo joined #git
16:57 Limes_ joined #git
17:02 b1tchcakes joined #git
17:03 bocaneri joined #git
17:04 thebope joined #git
17:05 xall joined #git
17:06 mingrammer joined #git
17:07 Rodya_ joined #git
17:08 SteffanW joined #git
17:09 ajf- joined #git
17:10 pwnz0r_ joined #git
17:10 anonymuse joined #git
17:11 AndreSomers joined #git
17:13 mikecmpbll joined #git
17:14 ixian joined #git
17:19 musca` left #git
17:19 drbean_ joined #git
17:20 musca joined #git
17:20 thebope joined #git
17:20 aarobc joined #git
17:21 drbean joined #git
17:22 Duikb00t-home ok thanks
17:23 drbean- joined #git
17:24 madewokherd joined #git
17:24 Darcidride joined #git
17:24 mizu_no_oto joined #git
17:27 ixian joined #git
17:29 Samual joined #git
17:32 drbean joined #git
17:33 whomp joined #git
17:33 laumann joined #git
17:33 ochorocho__ joined #git
17:33 drbean_ joined #git
17:33 dreiss joined #git
17:33 mischat joined #git
17:34 ixian joined #git
17:34 EvilPeng1 joined #git
17:35 t4nk200 joined #git
17:36 carandraug joined #git
17:36 drbean- joined #git
17:37 msonntag joined #git
17:38 Limes left #git
17:38 Limes joined #git
17:39 mischat joined #git
17:44 emg joined #git
17:45 drbean joined #git
17:45 Rodya_ joined #git
17:46 djb-irc joined #git
17:47 kerrick joined #git
17:48 kerrick Is there a way to do a git revert on a single file? I don't want to do git checkout because I don't want to undo any other changes that have happened since my commit
17:48 drbean_ joined #git
17:49 grawity doesn't `git revert` only work on committed files, anyway?
17:49 grawity git diff HEAD^..HEAD -- myfile | git apply -R
17:49 Ryanar joined #git
17:50 dsantiago joined #git
17:51 drbean- joined #git
17:51 ResidentBiscuit ^
17:51 ResidentBiscuit That's what my first solution would probably be
17:51 xall joined #git
17:52 shock_ joined #git
17:52 ResidentBiscuit A less gitfu way, just checkout the point where that file is what you want, copy it, go back to HEAD, paste it
17:52 kerrick ResidentBiscuit, that second solution won't work, there have been a lot of changes since then
17:52 kerrick grawity, thanks
17:52 nitric kerrick: git checkout HEAD -- the/file/you/want
17:53 nitric checkout can apply to single files
17:53 grawity kerrick: commit more often
17:53 cyphase joined #git
17:54 drbean joined #git
17:55 kerrick I have a file that I changed a while ago, it has since been modified in many ways by other people, I want to revert the changes to just that file from the commit without reverting other files or reverting other people's changes
17:55 kerrick so grawity's solution was correct, I think, except there were merge conflicts in the file
17:55 Guest55 joined #git
17:55 jimi_ joined #git
17:55 kerrick so I ended up just doing a git revert, fixing the merge conflicts, copying the file to /tmp, git revert --abort, and then copying the file out of /tmp
17:55 aard_ joined #git
17:56 ResidentBiscuit I imagine there would conflicts if the file has been changed a lot. It seems like a good way to break code
17:59 daynaskully joined #git
18:01 drbean joined #git
18:02 Sharpe88 joined #git
18:02 multi_io_ joined #git
18:03 c0ded joined #git
18:03 drbean_ joined #git
18:04 fedepad joined #git
18:06 drbean- joined #git
18:06 trailmix joined #git
18:07 trailmix left #git
18:07 tempuser joined #git
18:07 tempuser Does git's CLI support specifying the same command argument multiple times?
18:07 morenoh149 joined #git
18:07 tempuser git example -i file1.txt -i file2.txt -i file3.txt
18:08 drbean joined #git
18:09 grawity that rather depends on the individual subcommands
18:10 drbean_ joined #git
18:10 Sasazuka joined #git
18:11 tempuser grawity: I'm just asking if _any_ of them do.
18:12 grawity quite a few, starting with `git commit -m "paragraph 1" -m "paragraph 2"`
18:12 tempuser Oh great.
18:12 tempuser Anyone know which library git's command parsing is based on?  I'm dealing with airline right now.
18:12 tempuser https://github.com/airlift/airline
18:13 grawity none; it has its own API
18:13 grawity new subcommands use parse_options() – see Documentation/technical/api-parse-options.txt
18:13 grawity older ones still have different code
18:13 tempuser I'm trying to modify swagger-codegen.jar's CLI to accept multiple specifications of the -i option to the 'generate' subcommand.
18:13 grawity note that some subcommands are written in shell or Perl
18:14 grawity and Git looks for subcommands anywhere in $PATH, too – so third-party ones can be using damn near anything
18:14 grawity wait a moment, if you're writing Java, why would you be asking about libraries used by a C program...
18:15 tempuser I'm trying to verify that the airline library supports specifying the same option ("-i") more than once.
18:17 nikivi joined #git
18:19 nikivi joined #git
18:22 Samual joined #git
18:23 drbean joined #git
18:25 durham_ joined #git
18:26 Balliad joined #git
18:26 Rodya_ joined #git
18:27 mingrammer joined #git
18:28 brokensyntax joined #git
18:28 e14_ joined #git
18:29 zivester joined #git
18:29 raijin joined #git
18:30 drbean_ joined #git
18:32 sixo joined #git
18:34 drbean joined #git
18:35 snthsnth joined #git
18:35 Gambit-- joined #git
18:35 Gambit-- Hi folks
18:35 fuchstronaut joined #git
18:36 Gambit-- I have a repo that has several checkin's, A1 - A2 - A3 - A4 - A5.  A5 is the current HEAD.  It turns out that A4 and A5 are both "bad", and I'd like to roll the repo back to A3.  This repo lives on stash, and all of these changes have been 'pushed'.  What's the best way to checkout the files in A3 and recommit them on top?  The history doesn't need to be touched up, just that HEAD should have the tree as it was at A3.
18:37 fedepad joined #git
18:37 perlpilot Gambit--: you could "git revert" those two commits.
18:37 osse Gambit--: git checkout A3 -- . ; git commit -m 'Revert to A3'
18:37 Gambit-- interesting
18:37 osse Gambit--: unless A4 and A5 has files A3 doesn't, in which case they need removing by hand
18:38 Gambit-- and that will produce: A1 - A3 - A3 - A4 - A5 - A3?
18:38 osse git revert would work too, and you can make that one commit
18:38 einnjo joined #git
18:38 UTAN_dev joined #git
18:38 Gambit-- Which recipe would you recommend I follow?
18:38 perlpilot Gambit--: it would be  A1 - A3 - A3 - A4 - A5 - A6, but A6 would look just like A3
18:38 Gambit-- Yes, that is appropriately phrased and what I desire.
18:39 osse Gambit--: do A4 and A5 introduce new files?
18:39 Gambit-- so if i did "git revert A4 A5" that'd have the correct behavior?
18:39 EvilPeng1 joined #git
18:39 Gambit-- I don't believe so, but if they did I can resolve that.
18:39 osse that would creae A6 and A7
18:40 Torrone joined #git
18:40 osse but you can squash those, or use revert --no-commit followed by commit -m A6
18:40 Gambit-- Ah A6 being the revert of A5, and A7 being the revert of A4?
18:41 drbean_ joined #git
18:41 osse no, other way around
18:42 Gambit-- wouldn't it unroll them in order?
18:42 Gambit-- (I'm doing the --no-commit route, now I'm just asking for my own edification)
18:44 osse Gambit--: it'll unroll then in the order given
18:44 perlpilot it's a small pity that git revert doesn't have a --as-one-commit option or something.
18:44 osse unless you give it a range, in which case it does The Right Thing (tm)
18:44 Darren_ joined #git
18:44 Gambit-- perlpilot: fwiw --no-commit followed by 'revert --continue' seemed to do that.
18:45 Gambit-- I may have just misunderstood what the underlying mechanics were, too.
18:45 Gambit-- or maybe I encountered osse's Right Thing because I listed them out in order descending into history.
18:45 perlpilot aye, I just think it should be a single option to a single command
18:46 f3r70rr35f joined #git
18:46 perlpilot but ... that's also why it's a "small pity", because it's easy enough to get there with 2 commands
18:47 Gambit-- I'm perpetually dancing on a razor with git anyways, I don't know if more or less magic would be better at this point.
18:47 akanksha_ joined #git
18:47 aarobc joined #git
18:48 perlpilot more sensible magic is always better  :)
18:48 cspack joined #git
18:51 drbean joined #git
18:53 drbean_ joined #git
18:57 mingrammer joined #git
18:58 King_Hual joined #git
18:58 King_Hual joined #git
18:58 Torrone joined #git
18:58 f3r70rr35f joined #git
18:59 osse Gambit--: if A5 depends on A4 then you try to revert A4 first... BOOM
18:59 danslo_ joined #git
19:01 rwb joined #git
19:03 shock_ joined #git
19:03 nettoweb joined #git
19:05 cwillu_at_work joined #git
19:06 Samual joined #git
19:07 aartist joined #git
19:08 jnavila joined #git
19:08 concerti joined #git
19:09 snthsnth joined #git
19:09 sdothum joined #git
19:10 ixian joined #git
19:10 Vinnie_win_y joined #git
19:11 rorro joined #git
19:13 kerrick joined #git
19:15 duderonomy joined #git
19:15 timvisher joined #git
19:15 dermoth joined #git
19:16 Samual joined #git
19:16 gamer joined #git
19:16 kpease joined #git
19:16 carlos joined #git
19:17 johnmilton joined #git
19:20 ToBeCloud joined #git
19:20 ^7heo hello ToBeCloud
19:21 ^7heo long time no see.
19:21 dermoth_ joined #git
19:21 Torrone HEllo, I've just done a merge, I've committed my changes and now it looks like git is re-uploading the whole repository
19:21 Torrone when I try to push to remote
19:21 ^7heo did you push -f?
19:21 Torrone nope
19:21 ^7heo weird.
19:21 Torrone 'git push origin <branch>'
19:22 ^7heo ah
19:22 ^7heo well
19:22 ^7heo then if you wrote the branch with a complete new history
19:22 ^7heo it will do that yes.
19:22 Torrone the branch already existed
19:24 ProbabilityMoon joined #git
19:25 ^7heo then I dunno.
19:25 mattkrea joined #git
19:26 terminal_echo joined #git
19:28 actinide_ joined #git
19:28 Duikb00t-home joined #git
19:29 romerocesar joined #git
19:30 star_prone joined #git
19:33 Samual joined #git
19:33 a3pq51 joined #git
19:34 ochorocho__ joined #git
19:37 IndigoTiger joined #git
19:38 rgrinberg joined #git
19:40 kerrick joined #git
19:40 kayzon joined #git
19:41 manuels joined #git
19:43 Guest55 joined #git
19:43 Anja joined #git
19:44 jnavila_ joined #git
19:45 manuels joined #git
19:49 troulouliou_dev joined #git
19:49 Erati joined #git
19:49 Samual joined #git
19:50 lexxis joined #git
19:51 IndigoTi- joined #git
19:51 mingrammer joined #git
19:52 Guest55 joined #git
19:52 overlord_tm joined #git
19:53 WalrusWarfare joined #git
19:53 WalrusWarfare joined #git
19:54 loglaunch joined #git
19:55 geoid joined #git
19:55 Shentino joined #git
19:56 jpX joined #git
19:58 m0viefreak joined #git
20:00 timvisher joined #git
20:02 shgysk8zer0 joined #git
20:04 chovy_ joined #git
20:04 Guest55 joined #git
20:05 laumann joined #git
20:09 hahuang62 joined #git
20:12 fuchstronaut joined #git
20:13 stamina joined #git
20:16 sssilver joined #git
20:16 Torrone I'm still having that problem :~(
20:17 _sjs joined #git
20:17 dwigton_ joined #git
20:17 thott joined #git
20:17 Torrone [git tries to re-upload the whole repo after merging two branches of which one was from another repo]
20:18 HoloPed__ left #git
20:19 HoloPed joined #git
20:19 NeverDie joined #git
20:22 jpX joined #git
20:22 Duikb00t-home joined #git
20:22 nidr0x joined #git
20:22 hoylemd joined #git
20:23 Atm0spher1c joined #git
20:25 hoylemd Hey folks. I have a branch, and a PR in github for it.  Problem is, I can't merge it via github because there's a conflict, and my organization really wants to avoid pushing master back to the github remote.  The conflict is pretty simple, a file was removed upstream in master, and my branch adds it back. (product of a reverted merge).  Is there a way I can create some kind of commit on my branch that will eliminate the merge conflict?
20:26 hoylemd (I'm also trying to avoid rebasing the whole branch to master's head, because it's a big one, and also I want to learn to solve this particular problem to cut down on giant branch rebases that wipe out code reviews in github)
20:27 * dzho ponders
20:28 steven_ joined #git
20:28 inflames joined #git
20:28 hoylemd oh hi dzho!
20:28 dzho :-)
20:29 hoylemd Hrm, Actually, just rebasing my branch onto master won't work either, because master already has most of the commite, there's just also a commit that reverts those changes
20:29 dzho I'm trying to figure out why it would work to have a local branch that is identical to the github remote master and resolve the conflict into it.
20:29 dzho why it wouldn't work
20:30 hoylemd dzho: That would work, actually. Problem is, I can't just do that and push master back to github
20:30 dzho but if you base your PR off of that, why won't that work?
20:30 nettoweb joined #git
20:30 winterchip joined #git
20:31 hoylemd Oh, so like, merge master into my local branch and PR that?
20:31 hoylemd that might work
20:31 dzho I'm a little hazy on what to call all the branches, tbh
20:31 thebope joined #git
20:31 codfection joined #git
20:31 satifant joined #git
20:33 stvnj joined #git
20:33 EvilPenguin joined #git
20:33 aarobc joined #git
20:33 dzho but you could have enough of them locally to get this sorted out such that you would know that it wouldn't generate a conflict for this particular changeset by the time you generated a PR on github
20:33 hoylemd yeah, It's confusing.  Merging master into my branch didn't work - the PR was just adding the one file back in - missing all of the other changes that were reverted
20:34 stvnj what would cause git pull to use recursive, even if the merge should be a ff?
20:34 thott joined #git
20:34 thott joined #git
20:35 Hobbyboy joined #git
20:35 morenoh149 joined #git
20:35 dzho hoylemd: by "my branch" you mean one of your branches that has the file in question included?
20:36 crayon joined #git
20:36 dwigton_ I made a branch to play with some ideas. It doesn't work so I want to try something else. No commits on the branch so far. How to just revert to the way it was when I branched? Or to master?
20:36 pksadiq` joined #git
20:36 hoylemd dzho: yeah
20:37 hoylemd oh! I can revert my revert pr!
20:38 Torrone please help, git tries to re-upload the whole repo after merging anyone? T_T
20:38 Torrone I'm pretty desperate
20:39 user_____ joined #git
20:39 thott joined #git
20:39 thott joined #git
20:40 thott joined #git
20:40 thott joined #git
20:40 dzho Torrone: re-upload to where?
20:40 hoylemd dzho: got it! thanks for bein' a rubbery duck :)
20:41 dzho hoylemd: :-)
20:41 Torrone to origin, where the branch exists
20:41 a3pq51_ joined #git
20:41 dzho so, you're doing a git push?
20:41 Torrone yes
20:41 dzho from the root of your working directory, or somewhere else?
20:41 Lauven joined #git
20:41 Torrone from the root
20:42 dzho what OS?
20:42 Torrone mac
20:42 dzho so, like ls -al shows .git
20:42 Muzer joined #git
20:42 Torrone yes
20:42 dzho what does git status show prior to the push?
20:43 Torrone nothing to commit working directory clean
20:43 dzho what protocol are you using to reach the remote?
20:43 Torrone https
20:43 dzho hmm.
20:43 cdesai joined #git
20:43 dzho and what did you merge?
20:44 Torrone I've merged a brench of the upstream repo from which the fork I'm on was created
20:44 Torrone branch
20:44 drbean joined #git
20:45 dzho well, maybe you should be trying to push back to that branch and not to the default branch for the remote
20:45 Guest55 joined #git
20:45 brokensyntax joined #git
20:45 dzho like, the difference between "git push origin master" versus "git push origin superspecialhugelydivergedbranch"
20:45 mingrammer joined #git
20:46 dzho I don't have a sense of what branches exist on the remote, and what locally
20:46 Torrone I've tried multiple branches, same result
20:46 e14_ joined #git
20:46 dzho well, you could try working on different local branches to sort it out
20:46 thott joined #git
20:46 thott joined #git
20:47 dzho like, get to the point where you have a local branch that you know is identical to whatever remote branch you're trying to push to
20:47 dzho and then sort out what the differences are from that as a reference
20:48 Torrone the point is that it should have differences
20:48 dzho well, ok
20:49 dzho then those differences are going to need to be uploaded, right?
20:49 Masber_080 joined #git
20:50 dzho anyway, sorry if this doesn't help.
20:50 dzho I've got to go for now.
20:50 dzho bbl, good luck.
20:51 fuchstronaut joined #git
20:51 dwigton_ Hmm I see no way to abandon uncommited changes.
20:52 dwigton_ Other than to delete the repo and repull from origin maybe.
20:54 nickthetait dwigton_: there is definitely a better way, reset --hard origin/branchname
20:55 nickthetait or if you have unpushed changes: reset --hard branchname
20:55 aarobc joined #git
20:56 nettoweb joined #git
20:58 zivester joined #git
21:00 Samual joined #git
21:01 danslo_ joined #git
21:04 raijin joined #git
21:04 nd joined #git
21:05 dwigton_ nickthetait: I did just reset --hard
21:05 dwigton_ It seemed to work
21:06 dwigton_ I had to clean up any untracked files I created.
21:06 nickthetait cool
21:06 dsantiago joined #git
21:06 nickthetait another good one to know is git clean -f
21:07 dwigton_ clean -fd does a fairly good job of that,
21:07 dwigton_ ninja'd
21:07 nickthetait lol
21:07 dwigton_ But it removed empty directories too.
21:07 star_prone joined #git
21:08 drbean_ joined #git
21:09 dwigton_ ah I could have used clean -di to remedy that.
21:09 Heisenberg1276 joined #git
21:11 QwertyDragon joined #git
21:12 g105b joined #git
21:14 nevodka joined #git
21:16 mingrammer joined #git
21:16 overlordtm joined #git
21:17 Duikb00t-home joined #git
21:18 Derperperd joined #git
21:19 keruspe joined #git
21:21 keruspe Hi, I'm trying to use git-http-backend but am getting some error log saying "Not a git repository '/data/test.git' but /data/test.git is definitely a git repository, I can access it using ssh without any problem
21:21 keruspe Any pointers on how I could debug that?
21:21 ac_slater_ joined #git
21:22 SwiftMatt joined #git
21:22 ac_slater_ hey guys. I have a weird one for you. I want to create a new file, create a diff against HEAD, send that to someone to `git apply`. What do I need to do to get this to work without staging the file or making a commit?
21:23 ac_slater_ (goal: the new file gets created on their machine as a result of `git apply`)
21:24 ac_slater_ I guess I could make a new commit to stage the file so git knows about it, but I don't intend to push that commit
21:25 perlpilot ac_slater_: you could just "git add filename; git diff --cached"  no need to actually make a commit.
21:25 ac_slater_ perfect. Do I need `--no-prefix`?
21:26 ac_slater_ perlpilot: thanks btw
21:27 Dougie187 left #git
21:27 perlpilot ac_slater_: why all the weirdness?  If you're going to make a diff of a file that didn't exist, it will contain the entire file.  Why not just send them the file?  why must it be created with "git apply"?
21:28 ac_slater_ short answer: I could send the file. But email filters catch the filetype, etc. I could rename it or tar it...
21:28 ac_slater_ would be really cool if git could do it
21:28 ac_slater_ but not super crucial
21:29 heroux joined #git
21:29 soerenb joined #git
21:30 mischat joined #git
21:30 romerocesar joined #git
21:33 hahuang62 joined #git
21:34 Balliad joined #git
21:40 thebope joined #git
21:41 ToBeCloud joined #git
21:47 cagedwisdom joined #git
21:51 CamonZ joined #git
21:52 CamonZ hi, what are the pros cons of setting the default branch to something other than master?
21:52 fuchstronaut joined #git
21:52 fuchstronaut joined #git
21:55 Samual joined #git
21:58 EvilPeng1 joined #git
21:58 robotroll joined #git
22:00 tvw joined #git
22:02 JacobsLadd3r joined #git
22:02 danslo_ joined #git
22:03 dave0x6d joined #git
22:04 thebope joined #git
22:06 jeffreylevesque joined #git
22:06 Darren_ joined #git
22:06 codfection joined #git
22:07 Alex64 joined #git
22:08 codfection joined #git
22:09 astrofog joined #git
22:11 Corosauce joined #git
22:11 actinide joined #git
22:11 mingrammer joined #git
22:12 codfection joined #git
22:12 prawnzy joined #git
22:12 jberkus hey, I found some docs which indicates that doing "git checkout HEAD@{1}" creates a detached head.  However, that doesn't seem to be the case for me.  What's correct?
22:13 JackFruh joined #git
22:13 codfection joined #git
22:15 thott jberkus: `git checkout --detach HEAD`
22:15 jberkus I don't want it to be detached
22:15 sangy joined #git
22:16 ^7heo yeah, that's what Louis XVI said too.
22:16 thott jberkus: I'm confused, based on your question heh
22:16 jberkus this was just a warning on an SO answer.  it seems to be wrong, but I wanted to verify that
22:16 thott ah okay
22:16 jberkus ^7heo: :-D
22:16 dalias what does it do if not a detached-head?
22:16 thott jberkus: the syntax *does* work for me
22:16 jberkus a regular checkout, AFAIK
22:16 jberkus thott: "work" ?  detached, or attached?
22:16 dalias my understanding was that whenever checkout != HEAD_of_some_branch, you're in a detached-head situation
22:17 ^7heo jberkus: Yeah I'm kinda proud of that one.
22:17 thott jberkus: detached
22:17 jberkus hmmm, wait, you seem to be correct
22:17 dalias because there's no branch that could reasonably be updated by committing
22:17 jberkus that's fine, this is just lessons.  I don't want folks to commit
22:18 jberkus git reset HEAD@{1} doesn't create a detached head, but it also doesn't give good feedback
22:18 dalias git checkout -b temp_branch HEAD@{1} # clean way to do it
22:18 thott jberkus: I meant that `git checkout HEAD@{1}` when on the master branch will detach from master
22:18 jberkus thott: you seem to be correct.  I'm just not getting the detach warning.  which is all to the good
22:19 thott jberkus: are you already detached? :)
22:19 morenoh149 joined #git
22:19 jberkus yep.  me and Marie, hangin' out with our necks out
22:20 thott sounds like you're on a roll
22:21 ^7heo thott: they saw me rolli
22:21 jberkus this channel is just full of cut-ups
22:21 ^7heo thott: they hatin
22:21 ^7heo s/rolli/&n/
22:22 synthroid joined #git
22:23 thott 1973: `git bisect` gone awry!
22:23 thott er.. 1793 doh
22:23 ^7heo yeah
22:23 ^7heo no problem marthy
22:24 ^7heo we'll just fix the dolorean's flux capacitor
22:24 _xor joined #git
22:25 snthsnth joined #git
22:26 codfection joined #git
22:26 buzzLightBeer joined #git
22:29 timvisher joined #git
22:29 NeverDie joined #git
22:29 Sasazuka__ joined #git
22:29 nd_ joined #git
22:31 mischat joined #git
22:31 actinide joined #git
22:33 faux___ joined #git
22:34 navidr joined #git
22:39 incog joined #git
22:40 heroux joined #git
22:40 madewokherd joined #git
22:44 SwiftMatt joined #git
22:45 ochorocho__ joined #git
22:47 DJ_Spies joined #git
22:49 thiago joined #git
22:50 star_prone joined #git
22:51 Zbs joined #git
22:53 fuchstronaut joined #git
22:54 fees joined #git
22:58 jaequery joined #git
22:58 spriz joined #git
23:00 monoprotic joined #git
23:00 monoprotic joined #git
23:03 danslo_ joined #git
23:06 mingrammer joined #git
23:06 fees joined #git
23:07 calloc Can you run multiple commands in an interactive rebase session? E.g. exec then fixup?
23:08 calloc Oh hi ^7heo
23:09 Milijus joined #git
23:09 kerrick joined #git
23:09 snowkidind joined #git
23:10 e14 joined #git
23:10 fees joined #git
23:12 timvisher joined #git
23:15 cdown joined #git
23:16 ash_workz joined #git
23:19 fees joined #git
23:20 mablae_ joined #git
23:20 codfection joined #git
23:23 re1 hey, any french native speakers here? I need one or two simple sentences translated
23:23 hahuang62 joined #git
23:27 fees joined #git
23:28 calloc My bad, exec can be used without specifying a commit.
23:29 calloc s/can be/is/
23:32 mischat joined #git
23:34 kerrick joined #git
23:35 sangy joined #git
23:38 Electrometro joined #git
23:43 Vampire0 joined #git
23:47 Lyqyd joined #git
23:49 Electrometro joined #git
23:52 neunon joined #git
23:53 Milijus joined #git
23:55 kerrick joined #git
23:56 romerocesar joined #git
23:56 fmcgeough joined #git
23:58 timvisher joined #git

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