Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-23

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

All times shown according to UTC.

Time Nick Message
00:00 wethu joined #git
00:01 Atrumx joined #git
00:02 Jellyg00se joined #git
00:04 texinwien_ joined #git
00:06 kbs left #git
00:07 _Sucks joined #git
00:07 reim joined #git
00:08 _Sucks joined #git
00:12 relipse joined #git
00:15 yorgi_ joined #git
00:17 MattMaker joined #git
00:17 githogori joined #git
00:18 qpdb joined #git
00:21 mwhooker joined #git
00:21 tesuji_ joined #git
00:27 unbalancedparen joined #git
00:29 arescorpio joined #git
00:31 thiago joined #git
00:33 pikajude joined #git
00:33 pikajude joined #git
00:36 sangy joined #git
00:38 romerocesar joined #git
00:39 mellernoia joined #git
00:43 MattMaker joined #git
00:45 beantaxi left #git
00:47 liuzhen joined #git
00:54 FireArrow133 joined #git
00:54 FireArrow133 Does anyone know how from the Git CLI running MINGW64 to list the files in the directories and subdirectories?
00:55 FireArrow133 It necessary doesn't have to be staged or in the repository.
00:55 FireArrow133 Well it doesn
00:55 FireArrow133 it doesn't have to be staged or in the repo at all, I just want to know what the subdirectories and files of that current directory is, from the Git CLI on Windows
00:56 tcsiwula joined #git
00:56 zumba_addict btw, i don't want to create a pull request anymore since I'm the only one owning the repo :D I want to merge my feature branch into master. What will be the commands? Would it be like this? 1. git checkout master 2. git merge feature 3. git commit -m 'Merged feature blah' 4. git push -u origin master
00:57 livingstn joined #git
01:00 HanClinto joined #git
01:00 MattMaker joined #git
01:01 thiago FireArrow133: are you asking how to list files in a shell?
01:01 FireArrow133 I'm asking how to list files and in their subdirectories in the Git CLI in the current directory of the Git CLI.
01:02 MattMaker joined #git
01:04 mingrammer joined #git
01:04 FireArrow133 NVM issue has been resolved.
01:04 preaction the git CLI on windows is the "bash" shell, last i knew
01:04 preaction so, the "find" command?
01:04 preaction or "ls"?
01:05 thiago ls
01:05 thiago FireArrow133: this is really off-topic. If you want to learn Bash and Unix shells, there are much better tutorials than the #git IRC channel.
01:06 preaction right, but they ... well. they didn't know that "Git CLI" means "Bash"
01:06 preaction (nor what bash means, etc...)
01:07 diogenese joined #git
01:08 pur3eval joined #git
01:08 jaguarmagenta joined #git
01:12 mehola joined #git
01:12 boombatower joined #git
01:13 hahuang61 joined #git
01:20 citizen-stig joined #git
01:26 flavius joined #git
01:28 mwhooker joined #git
01:30 _Sucks joined #git
01:30 HanClinto joined #git
01:31 MattMaker joined #git
01:31 fuchstronaut joined #git
01:32 HanClinto_ joined #git
01:33 friedfawtwenny joined #git
01:34 HanClinto_ joined #git
01:37 HanClinto_ joined #git
01:38 HanClinto__ joined #git
01:41 HanClinto_ joined #git
01:41 HanClinto_ joined #git
01:45 HanClinto__ joined #git
01:45 HanClinto_ joined #git
01:45 aseidl joined #git
01:52 HanClinto__ joined #git
01:52 yitz joined #git
01:53 yitz If I did a `git commit; git push origin my_branch;` and I want to `git commit --amend` can I somehow push the amended branch to origin over the old one?
01:54 romerocesar joined #git
01:54 pwnz0r joined #git
01:55 durham_ joined #git
01:57 osse yitz: yes. use the --force
01:58 thiago yitz: just remember about !rewrite
01:58 gitinfo yitz: 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
01:59 yitz Yup. It's a feature branch which is meant to only live for a few hours then get merged in
01:59 yitz Thanks, osse
02:01 pks joined #git
02:03 HanClinto__ joined #git
02:04 aseidl joined #git
02:06 HanClinto_ joined #git
02:06 Faylite joined #git
02:08 Rodya_ joined #git
02:10 hexagoxel joined #git
02:10 HanClinto_ joined #git
02:12 Wysi joined #git
02:13 chachasmooth joined #git
02:13 jeffreylevesque joined #git
02:14 mingrammer joined #git
02:14 netj joined #git
02:15 HanClinto__ joined #git
02:20 nezZario I have two repos, that are like 2 years of commits, then a totally separate repo that's another 6 months or so of commits, .. is there an easy way to merge it back into 1 coherent repo ?
02:21 clemf joined #git
02:28 aseidl joined #git
02:29 HanClinto_ joined #git
02:30 nezZario also, is it customary to remove a branch once completed ?
02:30 osse nezZario: do the repos have different files?
02:30 osse and yes
02:31 jimi_ joined #git
02:31 osse nezZario: regardless I think the best you're gonna get from git is to add one repo as a remote of the other. fetch it. merge it.
02:32 a_thakur joined #git
02:32 osse i think that works if the file structures are separate, even if there's no common ancestor
02:33 thiago nezZario: you can just git merge them.
02:33 nezZario osse: no they are the same project.  literally at some point 6 months ago, some genius decided that they just wanted to create a new repo for no reason so the 2nd repo is literally exactly where the 1st left off but with an additional initial commit
02:33 thiago nezZario: you may want to make a commit that moves the contents of each repository into a subdir before doing the merge, though
02:33 astaves joined #git
02:33 thiago oh
02:33 HanClinto_ joined #git
02:34 thiago set a graft for the initial commit's real parent, then merge
02:34 HanClinto_ joined #git
02:34 osse nezZario: if you're lucky the tree hash of the second repo exactly matches one in the original repo
02:34 tristanp joined #git
02:36 dreiss joined #git
02:39 zumba_addict this looks good right? http://pastebin.com/gVw4G3wT
02:40 madewokherd commit only makes sense if the merge caused conflicts, and you resolved them
02:47 zumba_addict ah, there would be no conflicts
02:47 zumba_addict so git merge then git push after?
02:49 HoierM joined #git
02:49 aseidl joined #git
02:52 HanClinto_ joined #git
02:57 aseidl joined #git
02:57 cyphase joined #git
02:58 aseidl joined #git
03:00 star_pro_ joined #git
03:04 hexagoxel joined #git
03:07 aseidl joined #git
03:08 SwiftMatt joined #git
03:08 clobba joined #git
03:08 mingrammer joined #git
03:09 aidalgol joined #git
03:10 zumba_addict left #git
03:12 david007 joined #git
03:13 mehola joined #git
03:13 hahuang61 joined #git
03:16 cschneid joined #git
03:20 k3rn31 joined #git
03:22 citizen-stig joined #git
03:24 jaguarma_ joined #git
03:25 jeffmjack joined #git
03:25 mehola joined #git
03:25 jgornick joined #git
03:26 stevenbenner joined #git
03:27 nnyk_ joined #git
03:28 aseidl joined #git
03:32 jaguarmagenta joined #git
03:32 MattMaker joined #git
03:33 fuchstronaut joined #git
03:33 mingrammer joined #git
03:34 digidog_ joined #git
03:36 Bladdezz joined #git
03:37 xameada joined #git
03:38 aseidl joined #git
03:39 tomtom52 joined #git
03:40 MattMaker joined #git
03:42 leehambley joined #git
03:44 stantonk joined #git
03:46 ochorocho__ joined #git
03:54 Goplat joined #git
03:55 pwnz0r joined #git
03:55 fstd_ joined #git
03:56 SwiftMatt joined #git
03:57 romerocesar joined #git
03:57 patarr joined #git
03:57 clobba left #git
03:59 pwnz0r joined #git
03:59 mostlybadfly joined #git
04:00 kn-928 joined #git
04:01 clemf joined #git
04:04 aseidl joined #git
04:04 MattMaker joined #git
04:07 leehambley joined #git
04:08 eozelda joined #git
04:13 PabloR joined #git
04:15 mingrammer joined #git
04:16 PioneerAxon joined #git
04:17 ManiacTwister joined #git
04:18 PabloR I'm reading that `git branch --track <newBranch> <origin/branch>` adds a local branch that tracks a remote branch. And that `git checkout -b <newBranch> <origin/branch>` creates a new local branch based off a remote branch. Sounds similar to me. What's the difference?
04:18 PaulCapestany joined #git
04:19 justinmrkva joined #git
04:20 phroa PabloR: checkout will check out the new branch
04:22 aseidl joined #git
04:24 Internet13 joined #git
04:27 PabloR phroa My understanding is that checkout a branch means pointing the HEAD to the branch, correct? Both of them seem to create a new local branch, one tracking and the other based off of a remote branch, which to me means the same with different words. Is the whole difference that the checkout -b in addition to creating the branch points the HEAD to it? Or is there anything else?
04:27 jokajak joined #git
04:27 madewokherd joined #git
04:28 nnyk_ joined #git
04:29 aseidl joined #git
04:32 HanClinto_ joined #git
04:33 raijin joined #git
04:33 Atrumx joined #git
04:34 clemf joined #git
04:38 lindenle joined #git
04:45 jaguarma_ joined #git
04:47 msafi joined #git
04:48 msafi Anyone know what idea these commits that look like "chore(docs): whatevs" come from?
04:48 stonerfish joined #git
04:49 HeWhois joined #git
04:50 clemf joined #git
04:53 Cabanossi joined #git
04:53 eozelda left #git
04:54 aseidl joined #git
04:55 aseidl joined #git
04:55 tesuji joined #git
04:56 HeWhois joined #git
04:58 HeWhois joined #git
05:01 eozelda joined #git
05:02 nnyk_ joined #git
05:03 MattMaker joined #git
05:07 romerocesar joined #git
05:09 tcsiwula joined #git
05:10 david007 joined #git
05:10 mingrammer joined #git
05:11 citizen-stig joined #git
05:11 SwiftMatt joined #git
05:11 freimatz joined #git
05:13 snowkidind joined #git
05:13 k3rn31 joined #git
05:14 hahuang61 joined #git
05:20 Sucks joined #git
05:22 madewokherd joined #git
05:22 robotroll joined #git
05:24 MattMaker joined #git
05:25 phaleth joined #git
05:25 aseidl joined #git
05:28 cyphase joined #git
05:29 mingrammer joined #git
05:29 nilg joined #git
05:30 jetpack_joe joined #git
05:32 jaguarmagenta joined #git
05:33 fuchstronaut joined #git
05:35 HeWhois joined #git
05:39 aseidl joined #git
05:42 dhollinger joined #git
05:42 dreiss joined #git
05:43 MrWoohoo joined #git
05:46 aseidl joined #git
05:47 ochorocho__ joined #git
05:52 leehambley joined #git
05:58 cd-rum joined #git
05:58 lindenle joined #git
06:00 tcsiwula joined #git
06:01 MattMaker joined #git
06:03 frogonwheels joined #git
06:04 cdown joined #git
06:06 SwiftMatt joined #git
06:15 chid joined #git
06:15 chid_ joined #git
06:17 cd-rum_ joined #git
06:19 subhojit777 joined #git
06:19 narendraj9 joined #git
06:21 inflames joined #git
06:24 romerocesar joined #git
06:28 ljc joined #git
06:29 moop joined #git
06:29 mingrammer joined #git
06:32 a_thakur joined #git
06:33 tcsiwula_ joined #git
06:34 apotry joined #git
06:36 stan_man_can joined #git
06:36 stan_man_can Hey all. I'm using Bitbucket. If someone submits a PR to a specific branch, can I accept and merge it with a different branch?
06:36 aseidl joined #git
06:38 stan_man_can left #git
06:46 circ-user-Dn1fe joined #git
06:47 emPi joined #git
06:47 stuh84 joined #git
06:48 PioneerAxon joined #git
06:53 subhojit777 joined #git
06:56 sanketdg joined #git
06:59 mingrammer joined #git
06:59 citizen-stig joined #git
07:02 lmatteis joined #git
07:02 netj joined #git
07:03 elastix joined #git
07:04 PioneerAxon_ joined #git
07:04 snowkidind joined #git
07:11 SteffanW joined #git
07:13 Lor_ joined #git
07:15 hahuang61 joined #git
07:16 aseidl joined #git
07:21 mingrammer joined #git
07:27 mingrammer joined #git
07:29 cdown_ joined #git
07:29 harish_ joined #git
07:34 fuchstronaut joined #git
07:38 reim joined #git
07:38 k3rn31 joined #git
07:40 dagg joined #git
07:42 daggs1 joined #git
07:43 daggs1 Greetings, is there a special cmd I need to preform if I run git bisect on a branch?
07:45 selckin no
07:46 aseidl joined #git
07:48 ochorocho__ joined #git
07:49 vuoto joined #git
07:49 apotry joined #git
07:50 dreiss joined #git
07:51 multi_io joined #git
07:51 sanketdg joined #git
07:52 muthu joined #git
07:53 daggs1 selckin, mmm so what limits git from taking all the commits outside of the branch? I'm trying to preform a git bisect on a branch but after I set a bad (latest) rev and a good rev, it gets stuck, opening another shell and running git bisect visualize shows commits I'm pretty sure aren't part of that branch or are older than the good commit. git log shows there should be 154 commits between
07:53 daggs1 should it take that long to print something on screen?
07:54 ToBeFree joined #git
07:54 _ikke_ daggs1: The good and bad commits you provide limit the range of what bisect will select
07:54 leehambley joined #git
07:55 pasadinhas joined #git
07:55 flicflac joined #git
07:55 _ikke_ daggs1: what does git rev-list --count <good>..<bad>
07:55 _ikke_ return
07:55 _ikke_ ?
07:57 daggs1 _ikke_, sec
07:57 ToBeCloud joined #git
07:59 daggs1 _ikke_, 433489 but that impossible, using git log and shell commands I've found out there are 154 commits
08:00 citizen-stig joined #git
08:02 _ikke_ and git log --oneline <good>..<bad> ?
08:03 ochorocho__ joined #git
08:04 aseidl joined #git
08:04 flicflac left #git
08:05 tcsiwula joined #git
08:08 daggs1 _ikke_, the same amount
08:10 daggs1 _ikke_, git log | grep "^commit" | egrep -n 'db9b5cfbd380d2316b7723599ee0c7e9d866db17|1cb48cebb9d525e524de0ede46710bb29f54d4a6' results in this:
08:10 daggs1 1:commit 1cb48cebb9d525e524de0ede46710bb29f54d4a6
08:10 daggs1 154:commit db9b5cfbd380d2316b7723599ee0c7e9d866db17
08:11 thomasfuston joined #git
08:12 tomog999_ joined #git
08:15 Faylite joined #git
08:15 hahuang61 joined #git
08:16 blackwind_123 joined #git
08:16 daggs1 _ikke_, can I provide it a list of commits to bisect from?
08:18 _ikke_ no
08:18 _ikke_ That would make little sense for bisect
08:18 _ikke_ I would take a good look at how your history actually looks like
08:19 Gister joined #git
08:20 marienz joined #git
08:21 yude joined #git
08:22 stantonk joined #git
08:22 daggs1 _ikke_, ok, will do it the old fashion, thanks.
08:23 drbean_ joined #git
08:24 vuoto joined #git
08:26 subhojit777 joined #git
08:27 irco joined #git
08:29 Repox joined #git
08:34 aseidl joined #git
08:34 mischat joined #git
08:34 Cassiopaya joined #git
08:35 martinkl_ joined #git
08:35 diogenese joined #git
08:35 jaguarmagenta joined #git
08:37 Isla_de_Muerte joined #git
08:37 bket joined #git
08:37 IlNominePatre joined #git
08:37 ahmedelgabri joined #git
08:38 satifant joined #git
08:42 shinnya joined #git
08:43 aseidl joined #git
08:44 rossome joined #git
08:46 t-mart__ joined #git
08:47 sanketdg joined #git
08:48 grayjoc joined #git
08:50 GavinMagnus joined #git
08:52 GavinMagnus left #git
08:57 eka joined #git
08:57 aseidl joined #git
08:59 qpdb joined #git
08:59 theskillwithin joined #git
08:59 aax joined #git
09:00 rossome joined #git
09:02 lindenle joined #git
09:02 leehambley joined #git
09:03 ochorocho__ joined #git
09:03 Marbug joined #git
09:06 Rikairchy joined #git
09:09 davisonio joined #git
09:09 sanketdg joined #git
09:16 nnyk_ joined #git
09:18 aseidl joined #git
09:19 Rikairchy joined #git
09:22 vuoto joined #git
09:22 King_Hual joined #git
09:30 mangolisk joined #git
09:31 acetakwas joined #git
09:33 thomasfuston left #git
09:35 fuchstronaut joined #git
09:35 aseidl joined #git
09:39 apotry joined #git
09:41 nwkj86 joined #git
09:48 JanC_ joined #git
09:49 citizen-stig joined #git
09:55 narendraj9 joined #git
09:58 Darcidride joined #git
09:58 yude joined #git
09:58 SteffanW joined #git
10:00 freimatz joined #git
10:02 lindenle joined #git
10:05 wrouesnel joined #git
10:05 ljc joined #git
10:06 davisonio joined #git
10:07 tcsiwula joined #git
10:11 Mir4g3 joined #git
10:13 naught101 joined #git
10:16 hahuang61 joined #git
10:17 PioneerAxon joined #git
10:19 iomari joined #git
10:19 Ph_ joined #git
10:21 jeffreylevesque joined #git
10:24 xxx joined #git
10:25 aseidl joined #git
10:31 Ph_ joined #git
10:35 mehola joined #git
10:39 vuoto joined #git
10:39 romerocesar joined #git
10:40 cdown_ joined #git
10:42 aseidl joined #git
10:42 cdown joined #git
10:42 sdothum joined #git
10:43 armyriad joined #git
10:43 tcsiwula_ joined #git
10:45 cdown__ joined #git
10:46 chachasmooth joined #git
10:46 jstein_ joined #git
10:50 dx joined #git
10:50 hwoarang joined #git
10:51 noctux joined #git
10:52 inflames joined #git
10:52 tokkee joined #git
10:52 pdgwien joined #git
10:53 likewhoa joined #git
10:53 roflin joined #git
10:54 Kuukunen- joined #git
10:54 themill joined #git
10:55 ochorocho__ joined #git
10:55 mingrammer joined #git
10:56 Bombe joined #git
10:56 nyuszika7h joined #git
10:57 aseidl joined #git
10:58 pingo joined #git
10:59 pingo I sent a github pull request with 5 commits but they really should be one commit, I would like to squash them into 1, how can I do that?
11:02 Zarthus I think github now offers an option to squash them for you on merge
11:03 Zarthus other than that, you probably want to use an interactive rebase together with a force push. https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
11:03 lindenle joined #git
11:05 ochorocho__ joined #git
11:07 drbean joined #git
11:09 ahmedelgabri joined #git
11:09 aseidl joined #git
11:11 aseidl joined #git
11:15 usm4n joined #git
11:17 ojdo joined #git
11:17 zarel joined #git
11:18 citizen-stig joined #git
11:23 xxx left #git
11:30 tcsiwula_ joined #git
11:32 mablae joined #git
11:35 fuchstronaut joined #git
11:36 chachasmooth why do you `git pull origin master` but `git rebase origin/master` (with a slash)?
11:37 chachasmooth because in the former, "origin" is the remote target and in the latter "origin/master" is a local branch?
11:39 davisonio joined #git
11:40 cd-rum joined #git
11:41 cbreak chachasmooth: yes
11:41 cbreak chachasmooth: pull is fetch & merge
11:42 cbreak git pull A B means
11:42 cbreak git fetch A && git merge B@{u}
11:42 cbreak well
11:42 cbreak no
11:42 cbreak B's upstream
11:43 cbreak A/B, with normal fetch spec
11:43 mingrammer joined #git
11:44 cd-rum_ joined #git
11:48 Darcidride joined #git
11:48 Darcidride_ joined #git
11:53 skylite_ joined #git
11:56 berndj joined #git
11:57 skylite joined #git
12:02 LiohAu joined #git
12:02 LiohAu hey canton7 got a merge question again :P
12:04 DieguezZ joined #git
12:04 LiohAu basically, we had a P.R. for a feature branch in progress containing a file A, someone copy/pasted the content that A file in another feature branch. In the mean time the P.R. has been merged into our develop branch. Now we are getting a conflict on this file when we try to merge the 2nd branch into develop
12:05 yude joined #git
12:06 LiohAu 1st question: if that person used the git cherry pick thing instead of approximatively copy/pasting the content of that A file, do we still would have had a conflict ?
12:08 LiohAu 2nd question: how can I revert the A file in that 2nd branch so git does not see any conflict when merging the 2nd branch in develop, and keeps the last version which comes from the P.R./1st branch
12:08 davisonio joined #git
12:11 relipse joined #git
12:12 robotroll joined #git
12:14 v0n joined #git
12:17 hahuang61 joined #git
12:17 phaleth joined #git
12:24 Faylite joined #git
12:36 mehola joined #git
12:36 Shentino joined #git
12:38 mooru joined #git
12:39 ahmedelgabri joined #git
12:41 vavovi joined #git
12:43 m0viefreak joined #git
12:44 zivester joined #git
12:46 ochorocho__ joined #git
12:52 xall joined #git
12:53 GT4066 joined #git
12:54 drbean_ joined #git
12:54 ochorocho__ joined #git
12:59 grayjoc joined #git
13:00 sanketdg joined #git
13:00 _ikke_ 1. Merge conflicts happens on conflicting content, not matter how that content got there
13:01 _ikke_ LiohAu: ^
13:01 _ikke_ 2. Is to too hard to fix it in the merge conflict?
13:01 citizen-stig joined #git
13:01 LiohAu _ikke_: ok, but when you use cherry pick, the content is the same right? so there's no conflict right?
13:02 LiohAu 2: I solved the conflit in the meantime ^^
13:02 _ikke_ cherry-pick copies *changes*
13:02 _ikke_ The content would only be the same if that file has not been modified
13:03 _ikke_ exactly copying the content of a file (and not other changes) would even prevent merge conflicts
13:05 lindenle joined #git
13:06 Jackneill joined #git
13:07 doebi joined #git
13:15 cdown joined #git
13:16 subhojit_ joined #git
13:19 iLembus joined #git
13:20 iLembus in every repo there's a "LICENSE" file (or "COPYING" if you want to call it that way)
13:20 iLembus normally i always use the MIT License ; easy peasy
13:20 iLembus But what do i put there if this is propertary software we want to own, sell and distribute
13:21 iLembus my LICENSE file looks like this at the moment http://pastebin.com/raw/eZDTeSLa
13:22 _ikke_ https://programmers.stackexchange.com/questions/101944/are-there-pre-made-commercial-software-licenses-to-choose-from
13:23 ikmaak joined #git
13:25 iLembus oh gee thanks
13:25 iLembus thanks a lot
13:26 raijin joined #git
13:26 ochorocho__ joined #git
13:28 Codfection left #git
13:28 Codfection joined #git
13:30 tabrez joined #git
13:32 netj joined #git
13:33 davisonio joined #git
13:36 fuchstronaut joined #git
13:39 govg joined #git
13:42 freimatz joined #git
13:43 hcrudolph joined #git
13:44 quackgyver joined #git
13:46 rolha joined #git
13:47 Rodya_ joined #git
13:51 VLetrmx joined #git
13:51 VLetrmx Does anyone know why libgit2 doesn't seem to be able to make use of ssh-agent, it seems I'm going to have to read the user's private and public keys, which doesn't seem right
14:00 SteffanW joined #git
14:00 star_prone joined #git
14:06 lindenle joined #git
14:08 choki joined #git
14:09 HanClinto_ joined #git
14:10 rbern joined #git
14:11 lindenle joined #git
14:11 a_thakur joined #git
14:12 TomyLobo joined #git
14:12 e89c8c95a050 joined #git
14:18 hahuang61 joined #git
14:18 DieguezZ joined #git
14:19 p4trix joined #git
14:21 a_thakur_ joined #git
14:22 treehug88 joined #git
14:28 grift joined #git
14:29 RedShift joined #git
14:30 sagerdearia joined #git
14:31 nnyk_ joined #git
14:35 Jackneill joined #git
14:37 mehola joined #git
14:39 g10w joined #git
14:44 sangy joined #git
14:44 flippo joined #git
14:45 Stummi joined #git
14:46 fahadash joined #git
14:46 moestevens joined #git
14:47 sdothum joined #git
14:53 rgrinberg joined #git
14:55 HanClinto joined #git
14:56 yude joined #git
14:58 Silenced joined #git
14:58 Silenced joined #git
14:59 Finnoloid joined #git
15:03 _ikke_ joined #git
15:04 davisonio joined #git
15:07 rgrinberg joined #git
15:10 kafk4__ joined #git
15:10 grayjoc joined #git
15:11 vuoto joined #git
15:13 HoierM joined #git
15:15 CheckDavid joined #git
15:18 Noldorin joined #git
15:18 cdown joined #git
15:21 vuoto joined #git
15:28 madewokherd joined #git
15:30 shinnya joined #git
15:31 playfullyExist joined #git
15:37 fuchstronaut joined #git
15:40 harish_ joined #git
15:40 gusnan joined #git
15:43 Arban joined #git
15:44 f3r70rr35f joined #git
15:45 PCatinean joined #git
15:46 winklebee joined #git
15:46 AlexRussia joined #git
15:46 pcre joined #git
15:48 nuc joined #git
15:48 AlexRussia Hello! I have a file in repo, it's exists when I clone repo or when look in tree using gitweb, but seems like the file has disappear for reviewboard or gitweb file view. How could that be and how could I check that the file is still exists?
15:52 star_prone joined #git
15:55 BlackMaria_netsp joined #git
15:56 tuor joined #git
15:57 suigeneris left #git
15:59 rbern joined #git
16:01 DieguezZ joined #git
16:01 cyphase joined #git
16:05 stantonk_ joined #git
16:05 DieguezZ joined #git
16:06 cdg joined #git
16:07 hwoarang joined #git
16:07 jhass joined #git
16:07 kfunk joined #git
16:08 likewhoa joined #git
16:10 snowkidind joined #git
16:15 leehambley joined #git
16:15 Ram-Z joined #git
16:18 hahuang61 joined #git
16:22 heinrich5991 joined #git
16:23 Corosus joined #git
16:26 ahmedelgabri joined #git
16:26 jaafar joined #git
16:28 dreiss joined #git
16:33 NeverDie joined #git
16:33 ochorocho__ joined #git
16:36 davisonio joined #git
16:37 happy-dude joined #git
16:38 mehola joined #git
16:38 leehambley joined #git
16:39 leeN joined #git
16:40 yitz left #git
16:43 VLetrmx joined #git
16:45 PioneerAxon joined #git
16:47 kulelu88 joined #git
16:48 sdothum joined #git
16:48 barajasfab_ joined #git
16:49 Ahmed90 joined #git
16:49 thiago joined #git
16:49 mozzarella joined #git
16:50 Doginal joined #git
16:51 barajasfab joined #git
16:51 barajasfab joined #git
16:54 davisonio joined #git
16:55 barajasfab_ joined #git
16:55 barajasfab joined #git
16:55 unbalancedparen joined #git
16:55 barajasfab joined #git
16:58 Goplat joined #git
16:59 mellernoia joined #git
17:01 xameada joined #git
17:02 diogenese joined #git
17:02 PioneerAxon joined #git
17:08 ochorocho__ joined #git
17:10 zacts joined #git
17:10 blackwind_123 joined #git
17:11 SwiftMatt joined #git
17:12 clemf joined #git
17:13 vuoto joined #git
17:14 star_prone joined #git
17:17 Doginal joined #git
17:20 Gamecubic joined #git
17:23 kadoban joined #git
17:25 Gitzilla joined #git
17:25 Dro joined #git
17:25 diegoviola joined #git
17:26 jungsubk joined #git
17:27 paul424 joined #git
17:29 shgysk8zer0 joined #git
17:29 ResidentBiscuit joined #git
17:31 shgysk8zer0 joined #git
17:31 jaguarmagenta joined #git
17:31 stoopkid joined #git
17:31 stoopkid joined #git
17:31 t0by joined #git
17:35 WaReZ joined #git
17:37 orbitphreak joined #git
17:38 fuchstronaut joined #git
17:42 tcurdt joined #git
17:44 diogenese joined #git
17:45 Doginal joined #git
17:48 shgysk8zer0 joined #git
17:48 Doginal joined #git
17:52 Karunamon joined #git
17:54 drbean joined #git
18:00 mellernoia-work joined #git
18:00 spudowiar joined #git
18:01 zacts joined #git
18:03 ochorocho__ joined #git
18:04 cdown joined #git
18:06 rbern joined #git
18:09 yude joined #git
18:10 InfoTest joined #git
18:13 D-Boy joined #git
18:14 shgysk8zer0 joined #git
18:14 sanketdg joined #git
18:19 StuartMI joined #git
18:19 hahuang61 joined #git
18:22 justanotheruser joined #git
18:22 bayman joined #git
18:23 rgrinberg joined #git
18:23 bayman how do i git clone a specific commit?
18:23 _ikke_ Do you need a repository, or do you just want the contents?
18:23 bayman sorry what's the difference?
18:24 _ikke_ Why do you want to clone a specific commit?
18:25 xall joined #git
18:26 bayman something isn't working on my web app and i'm not sure what it is.. i only have 1 master branch in my repo and a bunch of commits.. i want to try git clone an older commit and see if my web app works
18:26 msonntag joined #git
18:28 qsx bayman: you are looking for man git-bisect
18:28 gitinfo bayman: the git-bisect manpage is available at http://jk.gs/git-bisect.html
18:29 star_prone joined #git
18:30 _ikke_ You don't need to clone commits, clone the entire repo, and then you can checkout commits
18:30 _ikke_ and bisect like qsx mentions is a good way to find what commit broke something
18:34 geoid joined #git
18:39 mehola joined #git
18:40 xall joined #git
18:40 unbalancedparen joined #git
18:42 elastix joined #git
18:42 bayman how do i get a commit hash for checkout?
18:42 mangolisk joined #git
18:43 Asiajey joined #git
18:43 Asiajey joined #git
18:43 ochorocho__ joined #git
18:44 thiago bayman: git rev-parse heaD
18:44 thiago HEAD
18:44 jaguarma_ joined #git
18:46 _ikke_ git log for example
18:46 scarabx joined #git
18:46 emPi joined #git
18:47 RickLee joined #git
18:47 RickLee joined #git
18:49 Rodya_ joined #git
18:51 xameada joined #git
18:51 cdown_ joined #git
18:52 jungsubk joined #git
18:53 bb010g joined #git
18:53 ochorocho__ joined #git
18:56 Spicy_Lasagna joined #git
18:58 dreiss joined #git
18:58 ochorocho__ joined #git
19:02 LeBlaaanc joined #git
19:06 nidr0x joined #git
19:09 mingrammer joined #git
19:13 ochorocho__ joined #git
19:13 martinium joined #git
19:14 emPi joined #git
19:15 nidr0x joined #git
19:24 shgysk8zer0 joined #git
19:26 Sadeukko joined #git
19:26 dopesong joined #git
19:29 choki joined #git
19:30 qasaur joined #git
19:30 jaguarmagenta joined #git
19:33 ochorocho__ joined #git
19:33 stuh84 joined #git
19:34 Thorn__ joined #git
19:35 robotroll joined #git
19:38 fuchstronaut joined #git
19:39 jaguarma_ joined #git
19:40 paul424 joined #git
19:40 jaguarma_ joined #git
19:42 jaguarmagenta joined #git
19:42 jgjorgji left #git
19:44 dreiss joined #git
19:44 inflames joined #git
19:50 waveclaw joined #git
19:51 danimal2 joined #git
19:54 ochorocho__ joined #git
19:54 dreiss joined #git
19:56 jaguarma_ joined #git
19:57 rahtgaz joined #git
19:59 GavinMagnus joined #git
20:01 davisonio joined #git
20:02 Sucks joined #git
20:03 vuoto joined #git
20:04 lmatteis joined #git
20:04 BSaboia joined #git
20:04 Asiajey joined #git
20:04 Asiajey joined #git
20:11 raijin joined #git
20:13 jaguarmagenta joined #git
20:15 Lvjasha joined #git
20:20 timwis Hey folks, I'm running into a rebase issue that I believe shouldn't be happening... I forked forum software, created my own branch, and added a few files to it. Now i'm trying to upgrade the forums by rebasing against the latest tag of the upstream. I'm getting a conflict on files that I never touched in my branch. Doesn't that sound impossible?
20:20 hahuang61 joined #git
20:21 nwkj86 joined #git
20:21 berndj joined #git
20:23 Sucks joined #git
20:23 _ikke_ What kind of conflicts?
20:23 ochorocho__ joined #git
20:24 Seveas timwis: depends on how you do the rebase. You may be accidently rebasing some upstream commits as well
20:24 timwis _ikke_ large portions of code in some cases. nothing recognizable
20:24 cworth joined #git
20:24 timwis Seveas, if I'm understanding you correctly, that's the whole point of the rebase -- the upstream repo is the forum software
20:25 timwis my fork simply contains my minor customizations in a branch
20:25 ahmedelgabri joined #git
20:25 nnyk_ joined #git
20:26 Seveas timwis: I'm afraid I didn't make myself clear. Depending on where you rebase from/to, you may need to do a complicated three-arg rebase to avoid rebase trying to transplant commits you didn't create. Are the forum repo and your fork reachable publicly, I'd like to see the branch structure to see if I can find a clue there.
20:27 timwis thanks Seveas that's very kind of you. My fork is at https://github.com/29th/vanilla/tree/29th-extensions-2.1.11
20:28 timwis A caveat: one of my colleagues *did* accidentally alter a core file, as you can see in the commit history, but he reverted the change. To rule that out, though, I've also tried using the 2.1.10 branch, which doesn't have those commits
20:28 timwis what I'd like to do is rebase against the upstream's tags/Vanilla_2.2.1 https://github.com/vanilla/vanilla/tree/Vanilla_2.2.1
20:28 ochorocho__ joined #git
20:29 LiohAu joined #git
20:29 timwis I've documented the steps I've used in the past successfully: https://github.com/29th/personnel/wiki/Upgrade-the-Forums
20:30 orbitphreak joined #git
20:30 leehambley joined #git
20:31 Seveas yeah, that rebase command is a bit dodgy
20:31 GavinMagnus left #git
20:33 dersand joined #git
20:33 Seveas it's going to try to reapply all upstream changes between 2.1.6 and 2.2.1, haven't dug deep enough into the branch structure to see why
20:34 ochorocho__ joined #git
20:34 dersand I have two branches, the temp branch has unstaged files. One of those changed files is one i would like to checkout and commit on master. How do i perform this?
20:35 sangy joined #git
20:35 timwis Seveas: 2.1.6? Even though 29th-extensions-2.1.11 already has the commits from upstream's tags/Vanilla_2.1.11 ?
20:37 Seveas timwis: this should work as it avoids all those commits: git rebase --onto Vanilla_2.2.1 Vannilla_2.1.7 29th-extensions
20:38 Seveas timwis: ah wait
20:38 Seveas I looked at the 29th-extensions branch, not the -2.1.11 one. doh
20:38 ToBeCloud joined #git
20:39 Seveas same thing applies though
20:39 zacts joined #git
20:39 Seveas git rebase --onto Vanilla_2.2.1 Vannilla_2.1.11 29th-extensions-2.1.11
20:40 Seveas the reason for this mess can probably be found in the output of git branch -vv. Can you run that command and pastebin its output?
20:40 mehola joined #git
20:40 jaguarma_ joined #git
20:41 Seveas reading your instructions, you probably want 29th-extensions-2.2.1 as last argument of that rebase, your new 2.2.1 branch
20:42 timwis Sure, i'll run git branch -vv, just a sec (going to jump into the right branch)
20:43 orbitphreak joined #git
20:44 Seveas yeah, the reason for these rebase failures is that 2.1 and 2.2 development is done in 2 different branches upstream
20:44 timwis oh!
20:44 timwis that makes sense
20:45 Seveas so git's rebase magic gets a bit confused there in thinking what to apply. The three-arg rebase lets you be explicit. "Transplant onto 2.2.1 everything between 2.1.6 and the tip of my branch"
20:45 timwis so I ran git branch -vv while on the 29th-extensions-2.1.11 branch and it said: * 29th-extensions-2.1.11 34f3c33 [origin/29th-extensions-2.1.11] Adding Vanilla API
20:46 Seveas yeah, git branch -vv doesn't actually tell you this, I looked a bit more at the branch structure
20:46 Seveas that was a useless exercise :)
20:46 Seveas so change this line in your instructions:
20:46 timwis ok i'll try: git rebase --onto Vanilla_2.2.1 Vannilla_2.1.11 29th-extensions-2.1.11
20:46 Seveas $ git rebase tags/Vanilla_2.1.10                     // (version upgrading to)
20:46 Seveas NO!
20:46 timwis ok lol
20:48 Seveas $ git rebase --onto tags/Vanilla_2.2.1 /* version upgrading to */ tags/Vanilla_1.6 /* Version upgrading from */ 29th-extensions-2.2.1 /* branch you just created with checkout -b */
20:48 Seveas and yes, c++ style comments don't work in shell, I hope the idea is still clear though :)
20:49 timwis okay that makes sense but I don't quite understand why tags/Vanilla_1.6 is in there?
20:49 Seveas that tells git that that's where your commits start
20:49 Seveas otherwise it'll have to guess, and its guess will be the point where 2.1 and 2.2 started diverging
20:50 timwis oh, okay, so my future upgrades will *always* include tags/Vanilla_1.6 because that's where my commits started?
20:50 xall joined #git
20:50 Seveas no, they should include tags/Vanilla_whatyouareupgradingfrom
20:50 Seveas so next time it'll be 2.2.1
20:51 timwis okay, i'll give it a shot
20:51 jaguarmagenta joined #git
20:51 EduardoMartins joined #git
20:51 Seveas this time it's 2.1.11
20:51 Seveas (not 1.6, where the hell did that come from in my head :/)
20:51 Seveas all these version numbers confuse my poor brain :)
20:51 timwis oh! okay
20:52 timwis hah, me too, i can only imagine
20:52 Seveas good thing git rebase --abort lets you abprt any attempt that goes pearshaped :)
20:52 timwis so: git rebase --onto tags/Vanilla_2.2.1 tags/Vanilla_2.1.11 29th-extensions-2.2.1
20:52 timwis yeah
20:52 foo Is there a way to view the git history of a file ?
20:52 _ikke_ git log --all <file>
20:52 Seveas foo: git log -- /path/to/file
20:53 Seveas timwis: yeah, I just doublechecked the version numbers with what I see in git log, and that looks correct :)
20:55 Seveas _ikke_: hmm, I'd find --all confusing here. I'd want to see 'what made the file look like this', not 'what made the file look like what it looks like in any branch'
20:57 timwis Seveas: Looks like there are still a couple of conflicts, but definitely on different files. .gitignore is a little easier to tackle
20:57 timwis I have modified that one
20:57 Seveas timwis: that seems to be a legit conflict though :)
20:57 mingrammer joined #git
20:59 Seveas oh, and I hope you're in windows. Newlines fuckup galore in this repo, trying to do this rebase on linux is crapping out all over the place :)
21:00 foo Seveas: thank you
21:00 timwis Seveas: yikes, really? i'm on linux, but i think it's been touched by a windows user
21:01 timwis Forgive the silly question, but in this case, which is my fork vs the upstream? "ours" and "theirs"
21:01 Seveas timwis: well, good luck. I gave up at the second conflict as it threw me a bunch of ^M's :)
21:01 Seveas ours = your fork.
21:01 timwis thought so, thx
21:02 Seveas I'm off to bed, good luck with the rebase :)
21:02 timwis thanks again for your help Seveas
21:02 yude_ joined #git
21:03 vaindil joined #git
21:03 livingstn joined #git
21:03 xall joined #git
21:04 vaindil I forked a project (GitHub) and I've heavily customized it. I have a change in my repo that I want to submit upstream as a pull request. I cannot for the life of me figure out how to do this, since I can only have one fork of the project.
21:04 vaindil How would I do this?
21:05 Eugene vaindil - push it to your Fork(on Github), then in the github web UI there is a Pull Request button. Click it
21:06 Eugene https://help.github.com/articles/using-pull-requests/
21:06 vaindil Eugene: My fork is heavily customized. I only want to push this one change, not the entire project.
21:06 Eugene Ahhh, I gotcha
21:06 Eugene 1) add the upstream repo as a remote in your local repo(man git-remote) and fetch from it
21:06 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
21:06 mutex joined #git
21:06 Eugene 2) create a local banch from upstream(git checkout -b mybranch upstream/master)
21:07 Eugene 3) cherry-pick or rebase your change/feature onto this new branch(git cherry-pick abcd123)
21:07 Eugene 4) push this new branch to your Fork, then use that to make the PR
21:08 vaindil Awesome. Should I git-remote -t branchname <add etc> or just add?
21:08 vaindil Oh, never mind, I see how to use it
21:08 Eugene I would just add normally
21:09 orbitphreak joined #git
21:09 Eugene It doesn't hurt anything to have all of the remote branches fetched; it doesn't automagically create any local branches
21:10 vaindil Gotcha.
21:11 vaindil I added the parent with the name upstream, so I'm trying the command 'git checkout -b staging upstream/staging'
21:11 vaindil It's throwing this: fatal: Cannot update paths and switch to branch 'staging' at the same time.
21:11 malice joined #git
21:11 vaindil Did you intend to checkout 'upstream/staging' which can not be resolved as commit?
21:12 malice Hi! I moved some files around and git thinks that I deleted file X and then created file dir/X. How can I tell it it's the same file being renamed?
21:12 spudowiar joined #git
21:12 vaindil Oh jeez, I didn't fetch. -_-
21:13 johnny56_ joined #git
21:15 watersoul joined #git
21:15 jstein_ joined #git
21:15 xall joined #git
21:17 Sucks joined #git
21:18 multi_io joined #git
21:19 liuzhen joined #git
21:19 livingstn joined #git
21:20 vaindil Eugene: Awesome, that worked perfectly. Thank you so much!
21:20 cyphase joined #git
21:21 pdgwien joined #git
21:22 leftriver48 joined #git
21:23 jaguarma_ joined #git
21:23 chachasmooth joined #git
21:23 martinium joined #git
21:23 stoopkid joined #git
21:25 Eugene malice - just `git rm` and `git add`, it will figure it out. !rename
21:25 gitinfo malice: git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217 and `diff.renames = true`  in man git-config
21:25 malice Oh, actually git won't figure it out anyway because I changed the files heavily AND moved them, I guess
21:26 malice Because it figured out that I moved files, but only for some(not modified)
21:26 Eugene Then it really isn't the same file ;-)
21:26 leeN joined #git
21:26 eozelda joined #git
21:26 ahmedelgabri joined #git
21:26 malice Depends how you define "the same file". For me, it is ;)
21:26 Eugene https://en.wikipedia.org/wiki/Ship_of_Theseus
21:27 Topic for #git is now Welcome to #git, the place for git help and existential theology | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Beware the HEADless horseman of gitty hollow
21:28 filcab joined #git
21:28 xameada joined #git
21:29 justanot1eruser joined #git
21:29 quantomworks joined #git
21:31 drbean joined #git
21:34 Fissure joined #git
21:35 PasiFist joined #git
21:35 matthiaskrgr joined #git
21:35 Topic for #git is now Welcome to #git, the place for git help and irregular expressions | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-svn: now you have two problems.
21:35 zacts joined #git
21:36 _ikke_ Eugene: No OP
21:38 rgrinberg joined #git
21:39 fuchstronaut joined #git
21:40 filcab joined #git
21:40 atrus joined #git
21:40 mehola joined #git
21:41 user083 joined #git
21:42 Brando753-o_O_o joined #git
21:46 cworth joined #git
21:46 f3r70rr35f joined #git
21:47 Noldorin joined #git
21:47 armyriad joined #git
21:51 bayman joined #git
21:54 SwiftMatt joined #git
21:54 atrus joined #git
21:57 relipse joined #git
21:58 livingstn joined #git
22:01 kbs joined #git
22:03 armyriad joined #git
22:05 unbalancedparen joined #git
22:05 sctskw joined #git
22:07 sangy joined #git
22:07 trewe joined #git
22:08 trewe joined #git
22:10 dopesong joined #git
22:10 orbitphreak joined #git
22:10 mgoodwin joined #git
22:10 trewe joined #git
22:10 joki joined #git
22:11 mgoodwin Hi, I work on various different projects with different emails, and I would like git to fail to commit if I haven't set user.email at a project level - instead it commits with the hostname - can I configure it to fail instead?
22:11 atrus_ joined #git
22:12 ResidentBiscuit joined #git
22:13 atrus_ joined #git
22:14 leehambley joined #git
22:14 jaguarmagenta joined #git
22:15 _Sucks joined #git
22:16 chachasmooth joined #git
22:17 _Sucks joined #git
22:20 raijin joined #git
22:20 mehola joined #git
22:20 segment-fault joined #git
22:21 hahuang61 joined #git
22:23 leehambley joined #git
22:23 mingrammer joined #git
22:24 rewt mgoodwin, you can probably do that with a pre-commit hook
22:28 mgoodwin https://orrsella.com/2013/08/10/git-using-different-user-emails-for-different-repositories/ Yeah, I found this and am going to use a self-modified version
22:28 mgoodwin good thinking
22:28 kbs though, if one can set a pre-commit hook, it seems just as easy to edit the repository config
22:28 mgoodwin Templates ^
22:30 thiago mgoodwin: I don't think that a pre-commit hook will help. If you can remember to install it, you can remeber to set the email.
22:30 kbs oh, ok I see
22:30 mgoodwin You don't have to remember to install it
22:30 mgoodwin You set the templatedir in gitconfig, then it places it into */.git/hooks/
22:30 mgoodwin Worked, I just tested it :)
22:31 kbs nice trick, good to know
22:32 cd-rum joined #git
22:34 boombatower joined #git
22:38 acetakwas joined #git
22:40 leehambley joined #git
22:40 titanium17 joined #git
22:41 Rodya_ joined #git
22:42 m0viefreak joined #git
22:42 jaguarmagenta joined #git
22:43 MattMaker joined #git
22:45 cd-rum joined #git
22:55 acetakwas joined #git
22:56 aidalgol joined #git
23:01 HedgeMage joined #git
23:02 Hedgework joined #git
23:17 mingrammer joined #git
23:19 kbs joined #git
23:27 MattMaker joined #git
23:28 mablae_ joined #git
23:30 ahmedelgabri joined #git
23:31 mgoodwin https://github.com/git/git/commit/4d5c2956969a6690db2bbb2f3ff40459c09d7646
23:31 mgoodwin A possibly more accepted way of doing the above as well
23:32 mgoodwin (for 2.9.2+)
23:35 stantonk joined #git
23:40 fuchstronaut joined #git
23:42 kbs oh, that's nice. I never actually liked that git (the "original" app) insisted on things that look like email addresses in commits
23:44 * kbs thinks these days it's much more useful/usable to point to web links for hints about identity
23:44 avar kbs: What other contact info would you put there?
23:44 kbs ^^
23:45 kbs I use my twitter/github links for identity
23:46 avar Both of which require an e-mail address for signup, don't they?:)
23:46 kbs yes, but it isn't public
23:47 kbs (Also have a personal domain; but practically speaking for dev things any pretense around an "identity" I have is pretty much equivalent to  a github profile)
23:48 kbs my 0.02 anyway is that email is more and more a somewhat specialized way to communicate - still works for work stuff and is not going to go away; but public identities are more recognizable via twitter/github etc
23:51 PaulCapestany joined #git
23:53 star_prone joined #git
23:54 stevenbenner joined #git
23:56 moestevens joined #git
23:59 moestevens joined #git

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