Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-18

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

All times shown according to UTC.

Time Nick Message
00:00 jimi_ joined #git
00:01 roundabout22 joined #git
00:03 leftriver11 joined #git
00:05 leftriver11 When I have a another git repo under within the directory of another git repo what is this called?
00:06 leftriver11 when I'm not explicitly using submoduldes
00:09 leftriver11 hello
00:10 foodSurprise joined #git
00:11 GGMethos joined #git
00:12 tyreld joined #git
00:15 jonath-n joined #git
00:15 foodSurprise joined #git
00:16 sbeller hi leftriver11
00:16 sbeller leftriver11: it's an independent git repo (there is no name for it yet)
00:18 jonath-n joined #git
00:19 jonath-n joined #git
00:25 tesuji_ joined #git
00:25 jstimm joined #git
00:26 Jellyg00se joined #git
00:28 leftriver11 Anyone mind answering a git subproject question?
00:29 rahtgaz How does git handle binary files? Does it still store a diff on commit, or will it store the whole binary file?
00:29 bluezone joined #git
00:31 preaction rahtgaz: git doesn't store diffs at any time for any reason
00:32 rahtgaz hmm... so it will store the whole binary on every commit
00:32 preaction yes, like every other file
00:32 rahtgaz ok. thank you
00:33 preaction rahtgaz: sorry, no, every _change_ to the file. the entire file is saved every time it's changed
00:33 preaction if the file doesn't change, a commit doesn't save another copy of it
00:33 rahtgaz yes. I understood you initially.
00:33 leftriver11 Whole file if it is different...
00:34 leftriver11 if you have multiple copies with the same hash git only stores a single copy
00:34 preaction right, but "store the whole binary on every commit" was ambiguous, so i clarified
00:34 rahtgaz indeed. I was not clear
00:34 leftriver11 CAn you answer aquestion regarding a git project that is a subdirectory of another git project ?
00:35 preaction you have to ask before i know the answer to that
00:35 leftriver11 Wwhen git submodule isn't used
00:35 leftriver11 Say I have a git project in c:\myproject\
00:35 rahtgaz I have a small sqlite database to add to version control, but I suppose it's best I version an sql dump of it
00:35 leftriver11 then within that I put another git repo c:\myproject\subproject
00:36 leftriver11 When I pull up "git gui"
00:36 preaction rahtgaz: there's git lfs and git annex as well. also, the sqlite db would probably be smaller than the equivalent sql that creates it
00:36 daFonseca joined #git
00:37 leftriver11 it shows as a submodule to add
00:37 rahtgaz eh, you are probably right about the size of the dump
00:37 leftriver11 When I add it what is it doing?   keeping a truncated hash of the subprojects git commit hash currently pointed to?
00:38 preaction leftriver11: yes. a submodule is a pointer to the git repository and a commit hash. see the .gitmodules file. but also, they might not necessarily be the best way to achieve what you want
00:39 leftriver11 If  I don't explicitly use submodule
00:39 jimi_ joined #git
00:39 leftriver11 no "git submodule add"
00:39 leftriver11 no .gitmodules
00:39 leftriver11 What does git do?
00:39 preaction if you're asking what git gui is doing when it provides you the option to create a submodule out of a project that just happens to be inside your project, i have no clue
00:40 leftriver11 Try it
00:40 preaction also, you can type your entire comment on one line, using periods and punctuation if you want
00:40 preaction no, thanks
00:40 leftriver11 It doesn't produce a .gitmodules file
00:40 leftriver11 I was just curious what the intent is
00:40 leftriver11 If I use the cli it does the same thing
00:42 mischat joined #git
00:42 preaction there's no .gitmodules file because without "git submodule add", it doesn't know what repository the submodule came from
00:43 semantipc joined #git
00:43 leftriver11 Okay, so that's the proper way to do it.   What is the purpose of allowing one to add a subproject if it with out using the git submodule command.
00:44 preaction if you want someone else to be able to immediately clone the submodule from its source without having to find a source for it, then the proper way to do it is with git submodule add
00:44 leftriver11 Why doesn't git prevent me from adding a git subproject without using the git submodule command. (rwording)
00:46 preaction my guess is because submodules are the inner git repos, and the .gitmodules file is simply convenience. and you're the one asking git to add a repository inside the repository. git's just doing what it's told
00:46 IWishIKnew joined #git
00:47 preaction (and it isn't just the gui, you can do it with the cli tools as well)
00:47 leftriver11 Thanks for the clear response.
00:47 ahmedelgabri joined #git
00:47 leftriver11 cli lets you do it too, which confuses me (why it isn't explicitly required)
00:48 infernix joined #git
00:48 mostlybadfly joined #git
00:51 son joined #git
00:52 strayArch is bitbucket the same as git?
00:54 ReenignE joined #git
00:54 ReenignE joined #git
00:56 nonconvergent joined #git
01:02 j416 strayArch: bitbucket solves the same problem as github, i.e. hosting code and its (git) history
01:02 j416 strayArch: git is a tool to manage different versions of your codebase
01:03 j416 strayArch: you can use git without bitbucket or github, but services such as these make it easier to share your work with others
01:04 fstd_ joined #git
01:05 pks joined #git
01:12 SirOliver joined #git
01:14 romerocesar joined #git
01:15 phanimahesh joined #git
01:15 ReenignE joined #git
01:15 ReenignE joined #git
01:15 semantipc joined #git
01:19 semantip_ joined #git
01:24 arescorpio joined #git
01:24 MeltedLux joined #git
01:26 nettoweb joined #git
01:26 ramsub07 joined #git
01:27 nonconvergent joined #git
01:33 jonath-n joined #git
01:33 CEnnis91 joined #git
01:33 hahuang62 joined #git
01:34 fracting joined #git
01:39 gking joined #git
01:39 thiago joined #git
01:40 gking Hello, how do I get the diff between a commit of a file and the current working copy of that file, in the same branch?
01:41 pabs3 left #git
01:41 DolpheenDream joined #git
01:41 thiago git diff commit -- filename
01:41 gking Excellent thanks
01:42 gking I kept using ..master
01:46 mischat joined #git
01:46 fuchstronaut joined #git
01:46 thiago that would be master.. and would still be wrong
01:46 thiago master.. is the same as master..HEAD
01:46 romerocesar joined #git
01:46 thiago that would show the difference between master and the current commit
01:46 thiago not between master and the working copy
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and 20% time | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git stash drop: Hey! That stuff's expensive.
01:49 ahmedelgabri joined #git
01:49 incog https://www.youtube.com/watch?v=VDzeXqlVi5A
01:49 audy joined #git
01:52 dmto joined #git
01:52 Goplat joined #git
01:55 Wulf4 joined #git
01:55 ryouma left #git
01:58 fracting joined #git
01:59 m1dnight1 joined #git
01:59 nivag joined #git
02:04 drbean_ joined #git
02:07 wxg joined #git
02:09 fahadash joined #git
02:09 raijin joined #git
02:11 ramsub07 joined #git
02:12 chachasmooth joined #git
02:13 pwnz0r joined #git
02:14 romerocesar joined #git
02:15 atomicb0mb joined #git
02:16 ajf- joined #git
02:17 incog https://www.youtube.com/watch?v=VDzeXqlVi5A
02:21 nonconvergent joined #git
02:23 kallisti5 left #git
02:24 dmto joined #git
02:27 pwnz0r joined #git
02:31 raijin joined #git
02:33 SleePy joined #git
02:33 SleePy joined #git
02:36 fracting joined #git
02:38 Levitator joined #git
02:38 Levitator This is about as much sense as git manpages make to me: https://git-man-page-generator.lokaltog.net/
02:38 incog joined #git
02:39 Levitator Could somebody tell me what command it is that simply updates my local repo to match origin?
02:39 texinwien joined #git
02:39 deltab git fetch
02:40 Levitator I was pretty sure it was either that or pull. What's the difference?
02:40 deltab pull also merges changes into your current branch
02:42 diegoaguilar joined #git
02:42 Levitator Ok, so pull is basically what you use if you have made changes and you need to update them with changes from origin.
02:42 kadoban Levitator: "local repo to match origin" is kind of ambiguous. Have you done work on it locally?
02:43 Levitator No, I've made no changes. I just want to compile the latest source.
02:43 lncog joined #git
02:43 kadoban Levitator: pull is a convenience command that's usually not all that good of an idea, IMO. It's fetch + merge. Your options when you have changes and you need to integrate them with changes from the remote are fetch + merge or fetch + rebase, depending on what you want history to look like.
02:44 mischat joined #git
02:44 Levitator Ok. I get it. Appreciate it.
02:44 kadoban Levitator: Just FYI, you don't need git for that. Almost every place allows you to just download tarballs, which is a good idea if that's all you're trying to do.
02:44 Levitator I use git for other stuff, so I had might as well learn it. I just don't do a lot of remote work.
02:44 dmto joined #git
02:45 Levitator And anyway, this project does A LOT of commits, and the tarballs are not updates as often.
02:46 kadoban Levitator: Hmm, alright. Make sure you read one of the git books, if you haven't already. pro git, which is free on the website is decent enough. The manpages you do need to get used to though, but only for reference, they usually aren't great for learning the basics.
02:47 boudicca joined #git
02:47 Levitator Yeah, they are basically Chinese until you gain a grasp of the vocabulary.
02:47 kadoban Not too far off, yeah. A certain type of person could learn from them, but it wouldn't be too fun most likely.
02:49 Levitator lol. 143 commits in like... three days?
02:49 hexagoxel joined #git
02:50 kadoban When git is used well, one commit can be pretty tiny.
02:50 semantipc joined #git
02:50 Levitator That still presumably corresponds to somewhere close to 143 bug fixes.
02:52 kadoban Seems somewhat unlikely, that'd be a lot unless they have many contributors.
02:53 Levitator Now that I look at it, there's a lot of refactoring and code organization, but it's still a lot.
02:54 romerocesar joined #git
02:57 Asiajey joined #git
02:57 yourmancj joined #git
02:58 yourmancj I have just setup a remote server and I have pushed an existing project to it however the file structer is different and I cannot find my project ideas?
02:58 howdoi joined #git
02:58 yourmancj I created a git user and init a bare repo with the same name as an exiting local project then push the local project using the git user
02:59 raijin joined #git
02:59 elementalest joined #git
02:59 yourmancj it said that everything went fine however on the remote server I get a structer that has a branches folder a config file a description file and things like that
03:00 fracting joined #git
03:06 BombStrike joined #git
03:07 atomicb0mb joined #git
03:11 atomicb0mb joined #git
03:11 diogenese joined #git
03:13 mehola joined #git
03:14 romerocesar joined #git
03:19 jbitdrop_ joined #git
03:20 mohabaks joined #git
03:20 k3rn31 joined #git
03:23 diogenese joined #git
03:24 incog joined #git
03:25 incog joined #git
03:29 fracting joined #git
03:31 semantipc joined #git
03:35 romerocesar joined #git
03:35 hahuang62 joined #git
03:36 semantipc joined #git
03:42 Aces_Charles joined #git
03:43 fuchstronaut joined #git
03:44 mischat joined #git
03:50 ahmedelgabri joined #git
04:00 phanimahesh joined #git
04:02 fracting joined #git
04:03 jonath-n joined #git
04:05 romerocesar joined #git
04:09 Cabanossi joined #git
04:10 pwnz0r joined #git
04:10 phaleth joined #git
04:13 d0nn1e joined #git
04:15 romerocesar joined #git
04:17 boombatower joined #git
04:17 nonconvergent joined #git
04:18 wxg joined #git
04:28 fracting joined #git
04:30 vdv joined #git
04:30 justanotheruser joined #git
04:35 romerocesar joined #git
04:36 hahuang62 joined #git
04:47 mischat joined #git
04:52 hexseed joined #git
04:56 I_AM_EJACULATING joined #git
04:59 SwiftMatt joined #git
05:04 a_thakur joined #git
05:04 diogenese joined #git
05:05 fscala joined #git
05:05 wrouesnel1 joined #git
05:12 sauvin joined #git
05:16 Sasazuka joined #git
05:21 dmto joined #git
05:26 barteks2x joined #git
05:26 romerocesar joined #git
05:26 sobersabre_ joined #git
05:27 sangy joined #git
05:36 stuh84 joined #git
05:36 romerocesar joined #git
05:39 diogenese joined #git
05:40 backnforth joined #git
05:43 hahuang62 joined #git
05:44 fuchstronaut joined #git
05:44 jaguarmagenta joined #git
05:47 mischat joined #git
05:51 ahmedelgabri joined #git
05:58 cdown joined #git
05:59 beneggett joined #git
06:00 Joaquin-V left #git
06:00 neanderslob joined #git
06:00 cdown_ joined #git
06:02 shgysk8zer0 joined #git
06:05 D-Boy joined #git
06:06 Alex_Rose joined #git
06:07 romerocesar joined #git
06:09 clemf joined #git
06:18 synthmeat joined #git
06:18 subhojit777 joined #git
06:19 suy joined #git
06:20 orbitphreak joined #git
06:24 tvw joined #git
06:29 lindenle joined #git
06:37 romerocesar joined #git
06:39 beneggett joined #git
06:40 zincrokx joined #git
06:41 zincrokx joined #git
06:44 vuoto joined #git
06:45 beneggett joined #git
06:47 romerocesar joined #git
06:48 mischat joined #git
06:55 phanimahesh joined #git
06:57 beneggett joined #git
06:59 bibble left #git
07:01 beneggett joined #git
07:01 yaewa joined #git
07:04 nonconvergent joined #git
07:10 ahmedelgabri joined #git
07:10 cyan__ joined #git
07:10 bluepixel joined #git
07:12 ki0 joined #git
07:12 apotry joined #git
07:21 dreiss joined #git
07:27 Pulp joined #git
07:31 fnodeuser joined #git
07:33 fnodeuser left #git
07:35 mic4ael1 joined #git
07:36 Grizz[UF] joined #git
07:36 newlifer joined #git
07:40 xall_ joined #git
07:45 fuchstronaut joined #git
07:46 multi_io joined #git
07:49 mischat joined #git
07:51 nitin joined #git
07:53 elastix joined #git
07:54 muthu joined #git
07:55 retropikzel joined #git
07:56 Fijit joined #git
07:57 romerocesar joined #git
08:00 moei joined #git
08:02 nitin joined #git
08:03 Asiajey joined #git
08:07 SoRoot joined #git
08:10 Dyonisos joined #git
08:12 vuoto joined #git
08:12 daFonseca joined #git
08:17 romerocesar joined #git
08:18 tinarg joined #git
08:24 GandalfTheWizard joined #git
08:27 eijk_ joined #git
08:28 romerocesar joined #git
08:29 FunkyAss joined #git
08:30 hlysig joined #git
08:34 FunkyAss joined #git
08:35 dsdeiz joined #git
08:38 GandalfTheWizard joined #git
08:38 ki0 joined #git
08:38 eijk_ joined #git
08:40 fees joined #git
08:41 emPi joined #git
08:43 Tryop88 joined #git
08:45 Shentino joined #git
08:46 fahadash joined #git
08:50 mischat joined #git
08:52 toogley joined #git
08:54 satifant joined #git
08:55 apotry joined #git
08:57 e01 joined #git
09:00 Psychiatrist joined #git
09:01 davisonio joined #git
09:02 stuh84 joined #git
09:03 wxg joined #git
09:04 subhojit777 joined #git
09:05 vuoto_ joined #git
09:08 dmto joined #git
09:09 hlysig joined #git
09:10 feignix joined #git
09:13 SirOliver joined #git
09:14 retropikzel_ joined #git
09:17 King_Hual joined #git
09:20 SirOliver joined #git
09:22 hero616_ joined #git
09:25 mischat joined #git
09:30 feignix_ joined #git
09:30 nwkj86 joined #git
09:32 robotroll joined #git
09:32 feignix_ joined #git
09:32 netj joined #git
09:33 robotroll joined #git
09:34 Balliad joined #git
09:36 psprint joined #git
09:36 psprint Hello. What's the difference between HEAD^2 and HEAD~1 ?
09:41 milki psprint: man git revisions explains
09:41 gitinfo psprint: the git manpage is available at http://jk.gs/git.html
09:41 milki hm
09:41 milki psprint: man gitrevisions
09:41 gitinfo psprint: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
09:46 fuchstronaut joined #git
09:46 rahtgaz joined #git
09:47 psprint hmm, thanks, but it would be good to hear some synthetized by someone answer
09:49 texinwien joined #git
09:50 jbitdrop joined #git
09:51 jaguarmagenta joined #git
09:53 Psych joined #git
09:54 Wulf psprint: ^2 is 2nd tree of a merge, or something like that
09:54 Wulf psprint: ~1 should be same as ^
09:54 nonconvergent joined #git
09:54 Wulf ^ is just the parent
09:55 Wulf and I think ^ is always same as ^1
09:55 Wulf correct me if I'm wrong...
09:55 psprint manpage said that, that ^^^ is equivalent to ^1^1^1
09:56 feignix_ joined #git
09:57 psprint so tree of merge, a new object to think of when resolving what when
09:58 feignix_ joined #git
10:00 Wulf psprint: look at a graphical representation of a git repo, that might help
10:03 psprint seems very specific to address tree of merge, that might be useful for applications mostly, not sure
10:05 keltvek joined #git
10:12 mischat_ joined #git
10:12 sdothum joined #git
10:13 mischat__ joined #git
10:14 a_thakur joined #git
10:15 garethdaine joined #git
10:15 mischat joined #git
10:17 vuoto joined #git
10:19 vuoto joined #git
10:20 vuoto joined #git
10:21 zincrokx joined #git
10:21 settermjd joined #git
10:22 vuoto joined #git
10:23 vuoto joined #git
10:23 daFonseca left #git
10:23 dreiss joined #git
10:24 zincrokx joined #git
10:25 hlysig joined #git
10:29 romerocesar joined #git
10:30 mischat_ joined #git
10:30 tvw joined #git
10:31 psprint Does anyone know maybe how to show only diff window in tig, without the top small window with refs
10:32 Balliad joined #git
10:32 jost joined #git
10:33 mischat joined #git
10:35 mischat__ joined #git
10:37 mischat_ joined #git
10:38 ome joined #git
10:39 mischat joined #git
10:40 zincrokx joined #git
10:44 diegoaguilar joined #git
10:44 subhojit777 joined #git
10:45 diegoaguilar joined #git
10:46 jabular joined #git
10:47 acetakwas joined #git
10:48 mischat_ joined #git
10:48 j416 psprint: d
10:48 j416 psprint: there's a list of keys if you press h
10:49 romerocesar joined #git
10:49 mischat__ joined #git
10:51 mischat joined #git
10:51 irco joined #git
10:55 CheckDavid joined #git
10:56 SirOliver joined #git
10:57 pungi-man joined #git
10:59 romerocesar joined #git
11:02 blackwind_123 joined #git
11:02 psprint ok so instead of pressing enter on "Unstaged changes" one has to press "d". I was looking in the keys and might have found "d", but it doesn't work when already in diff view via the Enter press
11:02 psprint thanks
11:03 fuchstronaut joined #git
11:04 son joined #git
11:06 ki0 joined #git
11:07 mischat_ joined #git
11:08 j416 psprint: you're welcome.
11:08 SirOliver joined #git
11:08 circ-user-ZHfj9 joined #git
11:09 Balliad joined #git
11:12 SoRoot joined #git
11:12 dan2k3k4 joined #git
11:12 mdw joined #git
11:12 sol56 joined #git
11:13 Thorn joined #git
11:15 mic4ael1 joined #git
11:17 basiclaser joined #git
11:17 texinwien joined #git
11:19 settermjd joined #git
11:20 digidog joined #git
11:21 Asiajey joined #git
11:27 ki0 joined #git
11:27 diegoaguilar joined #git
11:28 k3rn31 joined #git
11:29 davisonio joined #git
11:29 ochorocho__ joined #git
11:40 nnyk_ joined #git
11:42 ChoHag joined #git
11:47 fracting joined #git
11:48 hardenedapple joined #git
11:49 kichuku joined #git
11:50 JanC joined #git
11:50 srikanth joined #git
11:51 kichuku2 Hello
11:51 gitinfo kichuku2: 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.
11:51 ocbtec joined #git
11:52 JanC joined #git
11:52 kichuku2 I am new to using git. I have cloned an application from redhat openshift (a PAAS) and I modified a file, did "git add -A", did "git commit -am message" then did "git push". And then I got a message that it is uptodate. But my application didn't get updated.
11:53 kichuku2 What could be the reason?
11:53 kichuku2 I am using Windows 10
11:55 ChoHag joined #git
11:56 mischat joined #git
11:56 j416 kichuku2: if you pushed it successfully, probably there's something on their side that hasn't happened yet, some update thing going on
11:56 j416 kichuku2: I know nothing about openshift.
11:56 dan2k3k4 joined #git
11:56 kichuku2 ok
11:56 kichuku2 Is it possible that git didn't detect my changes?
11:56 netj joined #git
11:56 j416 kichuku2: git log -1
11:57 j416 kichuku2: does that mention something like origin/master or the like?
11:57 j416 should be at the top
11:57 kichuku2 no
11:57 kichuku2 well
11:57 kichuku2 in the command prompt, before the >, I have (master) inside brackets
11:57 j416 yes
11:58 j416 and 'git push' says?
11:58 Balliad joined #git
11:58 j416 already up to date?
11:59 kichuku2 yes
11:59 kichuku2 Here is a paste of what happened http://pastebin.centos.org/47096/
12:00 kichuku2 I added a new file
12:00 kichuku2 inside the cloned folder
12:00 j416 what does 'git status' say?
12:00 kichuku2 will that get automatically added or should I do something?
12:01 kichuku2 it says nothing to commit
12:01 j416 alright
12:01 j416 and 'git show' shows your change with your commit message?
12:01 kichuku2 working directory clean
12:01 mischat_ joined #git
12:01 xai joined #git
12:02 jaguarmagenta joined #git
12:02 kichuku2 j416: Should "git show" show exactly what changes I made in the file? Because it doesn't mention the file name of the file which I changed
12:02 j416 it should.
12:02 yaewa joined #git
12:02 kichuku2 ok. So if I add a new file in the working directory, how should I make git detect it?
12:02 j416 kichuku2: ah, I saw the end of your paste now
12:03 j416 kichuku2: you didn't make a commit.
12:03 j416 kichuku2: git add <thefile>
12:03 j416 kichuku2: then commit.
12:03 kichuku2 oh ok
12:03 sebhoss joined #git
12:03 kichuku2 I added it in a subdirectory. When I do "git add thefile" should I be in the subdirectory or can I be in the parent directory?
12:04 j416 as long as the path you give it resolve to that file it doesn't matter
12:04 kichuku2 oh ok
12:04 hardenedapple joined #git
12:04 j416 if 'git status' says clean and no changes, though, there's a chance the file is ignored.
12:05 fracting joined #git
12:05 j416 (in that case there should be a .gitignore file somewhere that lists it -- which also means you probably don't want to commit that file)
12:06 j416 (assuming the guy who added it to .gitignore knew what he was doing)
12:06 kichuku2 yeah it did say that the file is listed in .gitignore. So it cannot be added. use -f if you really want to add. So I used -f
12:06 kichuku2 I think it is being done now
12:07 j416 kichuku2: yes, but as I said, you probably don't want to add it
12:07 mischat joined #git
12:07 j416 why do you need to commit it?
12:07 panzergame joined #git
12:07 kichuku2 You mean to ask - am I really sure if I want to add that file?
12:08 j416 yes
12:08 kichuku2 yes
12:08 j416 then it shouldn't be in .gitignore to begin with
12:08 kichuku2 It is the procedure listed by the developer
12:08 j416 ok
12:08 kichuku2 https://github.com/YOURLS/YOURLS
12:08 j416 odd way of doing it, but sure
12:13 kichuku2 j416: thank you j416 I think the commit is done properly.
12:13 j416 o/
12:14 kichuku2 It is still not working properly. But atleast the git problem is solved
12:16 Cassiopaya joined #git
12:17 j416 :)
12:17 mage_ joined #git
12:18 j416 kichuku2: I don't know if you have any interest in learning, but there are better ways to handle things that will allow you to more easily pull in updates, for example. I recomend !book
12:18 gitinfo kichuku2: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
12:18 keltvek joined #git
12:18 IlNominePatre joined #git
12:19 j416 kichuku2: doing changes on a separate branch, for instance.
12:19 mage_ hello
12:19 j416 it's me
12:19 kichuku2 ok cool. I will surely be looking into it. I will be using git more and more in the comint future
12:19 mage_ with https://gist.github.com/silenius/​7e9ab288890870c25412d62b23af6684 how can I get 'their' version of salt/utils/network.py ?
12:19 mischat_ joined #git
12:20 j416 mage_: I never do that, but maybe 'git checkout --ours -- salt/utils/network.py'
12:20 romerocesar joined #git
12:20 j416 mage_: also, you probably want to work on a separate branch next time, it'll make your life just a bit easier
12:21 jeffreylevesque joined #git
12:21 mage_ I'm on a separate branch
12:21 j416 mage_: still won't avoid the merge conflict, but at least you don't need to pull and rebase at the same time
12:21 nonconvergent joined #git
12:21 j416 mage_: no, you're on the same branch that has changes upstream
12:22 jeffreylevesque left #git
12:22 mage_ no, I'm on the "network" branch and I'm doing a git pull --rebase upstream develop .. so the "develop" branch
12:23 Pioupiou joined #git
12:25 j416 mage_: aha. I have never done this in one go before, didn't know it was even possible.
12:25 j416 mage_: is the problem solved by the way?
12:29 yqt joined #git
12:30 ArCh joined #git
12:31 ArCh left #git
12:31 troulouliou_dev joined #git
12:31 narendraj9 joined #git
12:33 GavinMagnus joined #git
12:34 SirOliver joined #git
12:34 netj joined #git
12:37 elastix joined #git
12:40 romerocesar joined #git
12:42 davisonio joined #git
12:43 rgrinberg joined #git
12:43 fuchstronaut joined #git
12:46 reactormonk joined #git
12:48 TH3-G0D5 joined #git
12:51 romerocesar joined #git
12:51 rgrinberg joined #git
12:51 luxio-bot joined #git
12:54 charllie joined #git
12:55 phanimahesh joined #git
12:57 dan2k3k5 joined #git
12:57 Noldorin joined #git
13:04 mischat joined #git
13:06 e01 joined #git
13:06 e01 joined #git
13:06 dan2k3k4 joined #git
13:06 TheFarmingBunny joined #git
13:06 hero616_ left #git
13:07 TheFarmingBunny I need help with a https git server
13:10 TheFarmingBunny using nginx
13:10 GT joined #git
13:11 compeman joined #git
13:11 compeman joined #git
13:17 shinnya joined #git
13:18 wol joined #git
13:19 Asiajey joined #git
13:20 barfoo joined #git
13:20 ramsub07 joined #git
13:21 cqi joined #git
13:27 puhemo joined #git
13:27 dan2k3k4 joined #git
13:30 fscala joined #git
13:34 johnmilton joined #git
13:35 ediz_ joined #git
13:35 ediz_ left #git
13:35 hlysig joined #git
13:35 mage_ j416: I dit a git checkout --theirs my/file, seems to work :)
13:36 GavinMagnus left #git
13:36 nnyk_ joined #git
13:41 le-idiot joined #git
13:47 choki joined #git
13:49 sanketdg joined #git
13:50 cmosguy hey all,  I have encountered an issue I've never seen before,  I am trying to do a git checkout foo in my project directory, but it is saying:
13:50 Ravana joined #git
13:50 elastix joined #git
13:50 cmosguy error: pathspec 'foo' did not match any file(s) known to git.
13:51 cmosguy but when i look at the source code in the remote repo, the branch foo does exist
13:51 cmosguy why does my local git project area not get the remote location?
13:53 Balliad joined #git
13:53 hlysig joined #git
13:54 zeroed joined #git
13:55 cmosguy weird i had to do this:
13:55 hardenedapple joined #git
13:55 cmosguy git -t -b foo origin/foo to get it to work
13:56 khmarbaise joined #git
13:57 King_Hual joined #git
14:01 acetakwas joined #git
14:02 jaguarmagenta joined #git
14:03 liquidjamm joined #git
14:06 cyan__ joined #git
14:11 mischat_ joined #git
14:11 harish_ joined #git
14:12 happy-dude joined #git
14:17 jon-mac joined #git
14:19 ouvkq joined #git
14:19 dan2k3k4 joined #git
14:19 artemisart joined #git
14:20 texinwien joined #git
14:24 T4nk5bb0t joined #git
14:24 Balliad joined #git
14:26 Gamecubic joined #git
14:27 j416 mage_: k, good good
14:27 fahadash joined #git
14:29 mohabaks joined #git
14:29 ramsub07 joined #git
14:31 davisonio joined #git
14:36 Balliad joined #git
14:39 acetakwas joined #git
14:39 acetakwas Hello I have a gh-pages site here: https://github.com/betaconnect​site/betaconnectsite.github.io
14:39 acetakwas But the web address: https://betaconnectsite.github.io/ does not work
14:40 rewt sounds like a #github question
14:41 rewt !github
14:41 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
14:41 ac3takwas joined #git
14:44 fuchstronaut joined #git
14:45 Elt joined #git
14:48 Balliad joined #git
14:48 Izls joined #git
14:48 vdv joined #git
14:48 nonconvergent joined #git
14:51 Panacea joined #git
14:52 leeN joined #git
14:52 SwiftMatt joined #git
14:54 VsyachePuz joined #git
14:55 VsyachePuz left #git
14:55 raijin joined #git
15:02 rgrinberg joined #git
15:02 SirOliver joined #git
15:03 ahmedelgabri joined #git
15:03 GavinMagnus joined #git
15:03 chachasmooth joined #git
15:05 DirtyCajun joined #git
15:09 dzho_ joined #git
15:18 droidicus joined #git
15:20 ays joined #git
15:20 panzergame joined #git
15:22 panzergame Hello everyone, i have a little issue with git bisect : when the bisect switch to a commit that come from a merged branch everything move to this branch, I think i have to avoid bisecting on merged commits but how ? Thanks in advance.
15:24 shgysk8zer0 joined #git
15:24 netcarver joined #git
15:25 keltvek joined #git
15:25 hlysig joined #git
15:26 hlysig_ joined #git
15:28 chachasmooth joined #git
15:29 droidicus left #git
15:33 ixian joined #git
15:33 mdw joined #git
15:34 Impaloo panzergame: (not really answering your question) I avoid merge commits as much as possible. If a major branch is being merged, I make sure it's rebased on top of latest commit before doing a non fast-forward merge.
15:35 Impaloo Having a linear, or at most a semi bi-linear history makes traversing it much much easier
15:35 panzergame Impaloo: Well, i can't do by rebasing due to the huge patch conflicts
15:36 dzho joined #git
15:36 robics joined #git
15:36 Impaloo panzergame: You mean retroactively rebasing, or? You'll run into the same conflicts doing a regular merge
15:37 hhee joined #git
15:38 panzergame Impaloo: If i have 10 commits which modificate a conflit lines with the rebase i will get 10 conflict, but with the merge only one (maybe bigger)
15:38 panzergame *modify
15:38 panzergame *conflicts
15:39 Impaloo panzergame: That's only positive imo. Iteratively solving conflicts in a larger rebase helps not breaking stuff that was introduced in the other branch rather than fixing them all at once
15:40 Impaloo You lose the entire context of new changes that causes the conflict
15:42 jaguarmagenta joined #git
15:42 romerocesar joined #git
15:43 hhee hey! tried compile new version of git on centos 7 - got an error - "cache.h:40:18: fatal error: zlib.h: No such file or directory"
15:43 hhee zlib installed
15:43 elastix joined #git
15:43 hhee what i did wrong?
15:43 rewt is there a zlib-dev package you can install?
15:43 vuoto joined #git
15:43 hhee rewt, just a sec, i'll check
15:43 rewt headers are usually not installed when you install the application
15:44 rewt or lib
15:44 panzergame Impaloo: maybe it will help to restore the context ect... But at the moment and the situation rebases are pretty insane (50 commits to rebase on 500 news evey month)...
15:44 rewt hhee, it's zlib-devel
15:44 hhee rewt, yep. there is zlib-devel, i installed in and things work fine, thx a lot :)
15:45 valagalen joined #git
15:45 eletuchy joined #git
15:46 eletuchy_ joined #git
15:46 chachasmooth joined #git
15:47 safe joined #git
15:49 mischat joined #git
15:50 panzergame Impaloo: other than that the bisect is possible with the merged commits ?
15:50 Dougie187 joined #git
15:50 Borkr joined #git
15:53 Vuac joined #git
15:53 corpix joined #git
15:54 madewokherd joined #git
15:57 johnmilton joined #git
16:02 guardianJ joined #git
16:03 romerocesar joined #git
16:04 nnyk_ joined #git
16:04 tinarg joined #git
16:05 moei joined #git
16:05 codeman joined #git
16:07 ufz joined #git
16:07 mischat_ joined #git
16:07 subhojit_ joined #git
16:12 Impaloo panzergame: sure, but it'll be a mess and pinpointing point of failure will be very hard
16:12 Impaloo traversing the history of monolithic git repos is a nightmare
16:14 roundabout22 joined #git
16:15 uue joined #git
16:16 clemf joined #git
16:18 tomog999_ joined #git
16:20 Sunny joined #git
16:21 aruns joined #git
16:21 mischat joined #git
16:22 shgysk8zer0 joined #git
16:22 romerocesar joined #git
16:23 Asiajey joined #git
16:23 Asiajey joined #git
16:24 timmu joined #git
16:25 sleezd joined #git
16:25 yqt joined #git
16:31 thiago joined #git
16:31 holodoc joined #git
16:32 swati_27 joined #git
16:32 swati_27 Hello?
16:33 swati_27 I get lot of files ready to be committed when I use "git pull"
16:33 swati_27 please help...
16:33 subhojit777 joined #git
16:35 rom1504 swati_27: if you want help, ask a question
16:35 swati_27 rom1504: Could you tell me why is this happening?
16:36 swati_27 Please see this output
16:36 smithbone joined #git
16:36 swati_27 https://www.irccloud.com/pastebin/I9L2Fy7o/
16:36 LeoNeL joined #git
16:36 rom1504 these are tags
16:36 LeoNeL left #git
16:36 rom1504 then you get merge conflicts because git pull is git fetch + git merge
16:37 jstimm joined #git
16:37 swati_27 when I do "git  status", all the files of source code appears
16:38 swati_27 i don't know why these conflicts are appearing...?
16:38 texinwien joined #git
16:40 ochorocho__ joined #git
16:40 jhass swati_27: because somebody modified the same files as you did since you last pulled
16:41 jhass swati_27: check the files stating "both modified" in git status
16:41 jhass resolve the conflicts
16:41 jhass mark them as solved with git add filename
16:41 jhass git commit
16:41 swati_27 jhaas: I just cloned a few hours ago.
16:41 jhass doesn't invalidate my assumption
16:42 swati_27 jhaas: No commit since then
16:42 swati_27 https://www.irccloud.com/pastebin/Ir8ONa8M/
16:42 jhass okay I overlooked "warning: no common commits"
16:42 jhass you're trying to pull something you didn't clone from
16:42 panzergame Impaloo: Else, can i create a temporary branch where merged commits are applied as regular commits ?
16:42 jhass swati_27: git merge --abort
16:43 jhass swati_27: then show your git remote -v
16:43 Balliad joined #git
16:43 swati_27 https://www.irccloud.com/pastebin/gkdLbKwf/
16:44 swati_27 after git merge --abort?
16:44 jhass swati_27: and you used git clone git@git.kde.org:digikam digikam-software-compilation ?
16:44 CEnnis91 joined #git
16:44 jhass swati_27: git merge --abort just gets rid of your conflict state
16:45 swati_27 https://www.irccloud.com/pastebin/Uw4hiwRw/
16:45 jhass yes
16:45 jhass swati_27: what was the exact command you cloned the repo with?
16:45 fuchstronaut joined #git
16:46 jhass swati_27: did you run git remote set-url origin git@git.kde.org:digikam at any point?
16:47 jason237 joined #git
16:47 romerocesar joined #git
16:49 Cata|Work joined #git
16:49 Cata|Work joined #git
16:50 jstimm_ joined #git
16:52 vuoto joined #git
16:54 neanderslob joined #git
16:54 aruns Hi, quick question. New to Git here.
16:55 aruns If I ran the command git checkout -b followed by the name of my new branch
16:55 aruns The -b argument flag stands for branch, right?
16:55 aruns Sorry if a noob question, just checking.
16:55 mage_ yes
16:55 aruns Great, thanks.
16:56 aruns So should I always the -b argument flag when I am running a git command that involves a branch?
16:56 aruns Or do I not need to?
16:56 GavinMagnus left #git
16:56 aruns *always run
16:56 jhass you shouldn't
16:56 rueben joined #git
16:56 aruns OK, thanks.
16:58 SirOliver joined #git
16:58 rewt git checkout -b  is shorthand for git branch + git checkout
16:59 jrnieder joined #git
16:59 swati_27 jhaas: I used git clone https://anongit.kde.org/digi​kam-software-compilation.git
17:00 swati_27 jhaas: Yes, I used git remote set-url origin git@git.kde.org:digikam before "git push"
17:00 ays joined #git
17:00 jhass swati_27: well, those are obviously different repos
17:01 jhass I guess your git push was rejected (rightfully) and you ignored that fact
17:01 swati_27 yes...
17:01 swati_27 What should I do now?
17:01 jhass don't try to merge repos with entirely different histories
17:01 swati_27 jhaas: Understood...
17:02 jhass swati_27: protip: your IRC client most likely supports tab completion for nicks. Avoids typos
17:02 swati_27 after git merge --abort
17:02 swati_27 https://www.irccloud.com/pastebin/Lp6iYfWL/
17:02 jhass yes, so all good now
17:02 jhass set the remote to some repo that's not entirely different
17:02 swati_27 how?
17:03 jhass like you already did, git remote set-url origin
17:03 jhass likely back to https://anongit.kde.org/digi​kam-software-compilation.git
17:03 swati_27 currently getting lot of files on "git status" .... what to do about them ?
17:03 mischat_ joined #git
17:04 jhass did you run pull again or what? -.-
17:04 swati_27 no.. i didn't
17:04 jhass the last "git status" output you've shown doesn't has "a lot of files"
17:04 swati_27 just "git merge --abort" as you said.
17:05 jhass if that changed you clearly did something behind the scenes without telling
17:05 swati_27 https://www.irccloud.com/pastebin/exwDpubI/
17:05 jhass so you did run git pull again
17:05 jhass stop. doing. that.
17:05 mischat__ joined #git
17:05 swati_27 No more "lot of files"
17:05 swati_27 ok sorry
17:05 jhass git merge --abort again
17:05 swati_27 done
17:06 swati_27 my branch and origin/master have diverged
17:06 jhass swati_27: do you even have 2 minutes of short term memory?
17:07 aruns rewt: Ah, thanks, didn't know that :)
17:07 Lvjasha joined #git
17:08 jaguarmagenta joined #git
17:08 rkazak joined #git
17:08 Kicer86 joined #git
17:08 mischat joined #git
17:10 mdw joined #git
17:12 mdw_ joined #git
17:12 swati_27 jhass:
17:12 swati_27 used git remote set-url origin https://anongit.kde.org/digi​kam-software-compilation.git
17:12 swati_27 git pull works fine now
17:12 swati_27 Thanks!
17:15 AndroidLoverInSF joined #git
17:16 aruns jhass: Actually, I suppose I could even a git merge, couldn't I?
17:16 Goplat joined #git
17:17 jhass aruns: sorry, context?
17:18 aruns jhass: Changing default / base branch from command line from master to gh-pages.
17:18 aruns Although, actually, wouldn't work.
17:18 jhass no
17:18 aruns Yeah, maybe I should make a feature request lol.
17:18 jhass sorry it doesn't make any sense to me at all to do what you want
17:19 fracting joined #git
17:19 jhass also note that github creates a so called orphaned branch for gh-pages
17:19 jhass it shares no history with master
17:21 LeBlaaanc joined #git
17:25 panzergame left #git
17:25 LeoNeL joined #git
17:26 LeoNeL left #git
17:28 jungsubk joined #git
17:28 diegoaguilar joined #git
17:29 ojacobson is there a plumbing equivalent to 'git branch --merged' ?
17:29 Narwhaal what ?
17:30 ojacobson Is there a command that emits a list of branches (or refs, I'm not picky) whose targets are ancestors of HEAD, in a stable, machine-parseable form free from decorative cruft such as branch descriptions and the current-branch star?
17:30 zarel joined #git
17:30 Narwhaal oh
17:30 Narwhaal as far as I know, no
17:30 ojacobson hoorayyyyy
17:31 Narwhaal I know there was one guy working on one though
17:31 Narwhaal but he got stopped because of some differences between tag and branch
17:32 ojacobson git for-each-ref 'refs/heads/*' | while read hash type ref; do if [ 0 = $(git rev-list --count HEAD..$ref) ]; then echo $ref; fi; done
17:32 ojacobson that'll have to do
17:32 Narwhaal idk if that will be stable but it looks fine
17:32 kadoban joined #git
17:32 ojacobson for-each-ref is plumbing (stable output), git rev-list is plumbing (ditto)
17:33 ojacobson should be reasonably stable :)
17:33 Narwhaal oh so he actually finished it
17:33 ojacobson I could be more careful about whitespace, but refs nominally can't contain whitespace in their names
17:34 Narwhaal he was working on for-each-ref --contains though
17:34 ochorocho__ joined #git
17:34 ojacobson oh cool
17:34 ojacobson and in fact there it is in the man page
17:34 Narwhaal back in 2013 or something
17:34 ojacobson aces, thanks hombre/hermana
17:34 Narwhaal nps
17:35 TheFarmingBunny left #git
17:37 ahmedelgabri joined #git
17:38 tvw joined #git
17:42 fscala joined #git
17:46 am55 joined #git
17:47 am55 I'm looking at the github page for software that I use. They have a branch with a bug fix that is "144 commits ahead, 1768 commits behind master" Not having any context for these stats, I was wondering if that sounds normal or hopeless for merging?
17:47 eager I've been looking at gitslave as a way to support sub-projects.  This requires multiple repositories, one for each sub.  Are there any ways to support sub-projects which only use a single main repo, and allow adding local branches to the sub-project.
17:48 fracting joined #git
17:48 swati_27 left #git
17:49 eager am55: find the bug fix and apply it to your branch.  Merging one patch (or even a few, if there are dependencies) is much easier than 2000+.
17:49 eager branch ==> repo
17:50 JanC_ joined #git
17:51 am55 I wouldn't know how to do that. I have to rely on the developers to merge it. They said they plan to, but it doesn't appear to be a priority, and the high number makes me wonder if it's likely
17:51 ynanm joined #git
17:52 am55 but I don't know what those numbers look like for other projects. This is the only project of this size that I've looked at on github
17:52 fracting joined #git
17:53 am55 the bug fix in itself is more than a fix, it's a complex feature that is effectively a fix
17:54 am55 or put it another way, anyone ever merge a branch that was 1768 commits behind master?
17:54 mehola joined #git
17:55 armyriad joined #git
17:56 fracting joined #git
17:57 armyriad joined #git
17:57 dranve joined #git
17:57 SirOliver joined #git
17:59 fracting joined #git
18:00 davisonio joined #git
18:02 sctskw joined #git
18:02 barteks2x joined #git
18:03 mic4ael1 joined #git
18:03 fracting joined #git
18:05 fahadash joined #git
18:06 a_thakur joined #git
18:07 fracting joined #git
18:08 Ali2 joined #git
18:09 fracting joined #git
18:12 fracting joined #git
18:14 axiom_1 joined #git
18:15 fracting joined #git
18:15 Pulp joined #git
18:15 Kartagis joined #git
18:15 eager am55: I've upgreaded projects where there were many updates behind the upstream.  Depending on the project, this can be very tedious and time-consuming, since there are likley to be may merge conflicts.
18:15 mischat_ joined #git
18:16 Grzerzok joined #git
18:17 fracting joined #git
18:17 leeN joined #git
18:17 mischat__ joined #git
18:19 jost_ joined #git
18:19 fracting joined #git
18:24 j416 cmosguy: try 'git fetch' first
18:25 j416 bah, I was way scrolled up. apologies.
18:26 jaguarmagenta joined #git
18:26 mischat joined #git
18:26 zarel joined #git
18:31 yqt joined #git
18:32 Pioupiou joined #git
18:34 mischat_ joined #git
18:35 nnyk_ joined #git
18:36 oqkh joined #git
18:38 GavinMagnus joined #git
18:38 davisonio joined #git
18:41 Bupeh joined #git
18:43 paul424 joined #git
18:44 LeBlaaanc joined #git
18:45 uqui joined #git
18:46 fuchstronaut joined #git
18:47 xall_ joined #git
18:49 Guest45868 joined #git
19:00 paul424 joined #git
19:00 eka joined #git
19:01 zarel joined #git
19:03 fstd joined #git
19:04 Hello71 joined #git
19:05 Seveas /win 111
19:06 tgunr joined #git
19:07 chachasmooth joined #git
19:09 qsx Seveas: wtf.
19:12 romerocesar joined #git
19:14 rom1504 ?
19:14 codeman joined #git
19:17 * Seveas slaps qsx
19:17 EduardoMartins joined #git
19:17 * qsx blocks Seveas
19:18 * Seveas dices qsx
19:19 eletuchy joined #git
19:21 GavinMagnus left #git
19:21 kristofferR joined #git
19:22 barfoo joined #git
19:22 cdown_ joined #git
19:22 * rom1504 git reset --hard HEAD^^^
19:23 davisonio joined #git
19:23 * qsx uses Tackle on Seveas
19:23 mischat joined #git
19:23 ojacobson Tackle is just another word for Terrible
19:24 ojacobson total waste of a move slot
19:24 ojacobson were you raised in a barn?
19:24 qsx i did live on a farm till i was three, yes.
19:24 APic B-)
19:25 Seveas qsx: and then you got slaughtered and turned onto the sausage you are now?
19:25 Seveas into.
19:25 qsx not exactly.
19:25 qsx my family moved into a newly built house
19:27 chachasmooth joined #git
19:28 watabou joined #git
19:29 WaReZ joined #git
19:29 fstd joined #git
19:32 romerocesar joined #git
19:32 diegoaguilar joined #git
19:34 diegoaguilar joined #git
19:34 phaleth joined #git
19:35 ahmedelgabri joined #git
19:38 mischat_ joined #git
19:39 SoRoot joined #git
19:42 ProbabilityMoon joined #git
19:48 netj joined #git
19:49 ochorocho__ joined #git
19:49 SirOliver joined #git
19:51 diegoaguilar joined #git
19:52 DARSCODE joined #git
19:54 skunkz joined #git
19:54 nuq joined #git
19:56 daguilaraguilar joined #git
19:57 daguilaraguilar joined #git
19:58 daguilaraguilar joined #git
19:59 ochorocho__ joined #git
20:00 mischat joined #git
20:02 mischat__ joined #git
20:02 jagob joined #git
20:03 romerocesar joined #git
20:03 nwf joined #git
20:05 diegoaguilar joined #git
20:05 fenjh joined #git
20:06 vuoto joined #git
20:08 mehola joined #git
20:09 eeil joined #git
20:13 Darcidride joined #git
20:13 romerocesar joined #git
20:13 mehola joined #git
20:13 d5sx43 joined #git
20:14 mischat joined #git
20:16 ajf- joined #git
20:16 SwiftMatt joined #git
20:17 SirOliver joined #git
20:19 LeBlaaanc joined #git
20:19 mischat_ joined #git
20:20 ufhoo joined #git
20:20 stevenbenner joined #git
20:20 eletuchy joined #git
20:21 d5sx43 joined #git
20:21 jaguarmagenta joined #git
20:22 BlaXpirit Hello. I'm thinking about renaming my current master branch, which has had tags on it and whatnot,  and starting from an empty branch as the master. What problems may I face under this approach (including in the context of GitHub)?
20:23 LeBlaaanc joined #git
20:23 Eugene That should be fine. Github deletes tags if there is no branch that contains them, so just make sure you push the old-master branch and change the default in the Github UI before deleting/recreating master
20:24 mehola joined #git
20:24 BlaXpirit Eugene, is there any better way to rename other than  branching off and deleting the old one?
20:24 Eugene Maybe consider using more descriptive branch names. I like "stable" and "rewrite"
20:24 Eugene Nope; github doesn't have a "rename branch" feature AFAIK.
20:24 mangolisk joined #git
20:25 tijko joined #git
20:25 mischat joined #git
20:25 BlaXpirit I hope it detects that the tags are on a branch, not just pointing to bare commits
20:25 BlaXpirit thanks
20:26 vuoto joined #git
20:26 ojacobson BlaXpirit: 'git push origin master:new-name' will create `new-name` on github's side from the current `master`
20:27 Eugene From the /local/ master
20:27 mischat__ joined #git
20:27 ojacobson aye
20:27 ojacobson sorry
20:27 BlaXpirit ojacobson, but that would kinda de-sync my local information
20:27 vuoto joined #git
20:27 Eugene Nope; that verbose syntax doesn't update the tracking stuff
20:27 ojacobson not so - refs/remotes/origin/maser would update as well
20:27 ojacobson master* sorry, broken 't' key
20:28 dreiss joined #git
20:28 vuoto joined #git
20:28 Orion3k joined #git
20:31 mehola joined #git
20:33 bluezone joined #git
20:34 ochorocho__ joined #git
20:36 Levitator joined #git
20:38 tijko a situation has come up and i want to see if i can clear up some misconceptions about the workflow of a project i have downstream
20:38 gfixler joined #git
20:39 tijko i end up deleting an entire repository and re-forking an upstream project because i make a commit and when i open a pull request i had to alter it slightly
20:39 tijko but now my master has commits that aren't going to be wanted to be merged
20:39 tijko what i did here was delete re-fork then make the proper commits then merge with upstream
20:40 tijko instead i believe i should create a branch of my master and push to it.  that way if the changes need to be altered
20:40 tijko i can then delete that branch and create a new branch without having to delete and re-fork the entire repo
20:40 thiago right, I think that if you use github, you have to create branches
20:41 thiago unless you're willing to wait until your change is merged before you send the next one
20:41 ojdo joined #git
20:41 tijko thiago i have the master branch downstream in my repo and if i am unsure of the changes being merged i create a specific branch for those changes
20:41 mischat joined #git
20:42 BlaXpirit tijko, just always create a branch for a pull request
20:42 tijko that way i can delete and start over without those last two steps.  i can always catch up with the upstream on master too
20:42 BlaXpirit yes, very good
20:43 romerocesar joined #git
20:43 diegoaguilar joined #git
20:44 atomicb0mb joined #git
20:44 khmarbaise joined #git
20:44 tijko i didn't mean to flood the channel i was just trying to clarify because i've done this a few times and can see the inefficiency in that workflow
20:44 tijko not mention feeling like a dink deleting an re-forking an entire repository
20:44 tijko ^to
20:44 BlaXpirit a lot of us have been there
20:44 thiago yes, most of us more experienced in Git dislike GitHub's workflow
20:45 tijko how so?
20:45 son joined #git
20:45 thiago it's a horrible workflow
20:45 thiago as you've discovered
20:46 thiago you have to create a branch for each indivdual change, then push it, then maintain it
20:46 livingstn joined #git
20:46 thiago I've been told (no confirmation) that the sending of updated commits will erase previous reviews.
20:46 BlaXpirit thiago, it will hide previous reviews, which can still be easily seen
20:46 tijko thiago couldn't i create a branch and then once/if its merged upstream, catch the master up to date and delete the old branch?
20:46 BlaXpirit and that's only on a force push
20:47 BlaXpirit tijko, yes, that's what everyone does
20:47 thiago tijko: yes
20:47 jhass tijko: to clarify, you don't need to delete the branch and you don't need to delete the fork, in either case you can just force push and don't even need to reopen the PR
20:48 thiago you delete it after it's merged or if it's clear it's not going to be merged
20:48 tijko jhass how would the force push be different?
20:48 thiago different from deleting and recreating the branch?
20:48 thiago it's the same PR
20:49 tijko but the bad commits would still be in the history
20:49 thiago no
20:49 thiago that's why you force the push
20:51 lf622662 joined #git
20:52 jhass a pull request does not "remember" old commit, always reflects the difference between the target and source branch
20:52 jhass (it does however indeed remember and just hide outdated review comments)
20:52 tijko this line in the man git-push "This flag disables these checks, and can cause the remote repository to lose commits; use it with
20:52 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
20:52 tijko care.
20:53 dsdeiz joined #git
20:53 dsdeiz joined #git
20:54 GavinMagnus joined #git
20:54 BlaXpirit tijko, yeah, it is to be used with care, don't use it for master branch
20:54 mischat_ joined #git
20:54 tijko BlaXpirit history could be lost on that master?
20:55 patternexon joined #git
20:55 BlaXpirit I can't explain this right
20:56 tijko maybe some other time
20:56 hahuang62 joined #git
20:58 ahmedelgabri joined #git
21:01 ochorocho__ joined #git
21:03 evanvarvell joined #git
21:03 eijk_ joined #git
21:05 ochorocho__ joined #git
21:06 ac3takwas joined #git
21:08 xall_ joined #git
21:08 diegoaguilar joined #git
21:09 cdown_ joined #git
21:10 eijk joined #git
21:11 cdown___ joined #git
21:12 Pulp joined #git
21:16 eijk joined #git
21:20 PaulCapestany joined #git
21:20 eijk joined #git
21:21 souravbadami joined #git
21:21 souravbadami joined #git
21:21 souravbadami Anyone ?
21:22 mehola joined #git
21:23 souravbadami Okay, My question is --> I made a single line change in a file and commit the changes. When I created the patch out of it, It shows a lot of changes in the diff. The places are just highlighted but nothing is actually changed.
21:25 fstd joined #git
21:25 eijk joined #git
21:27 cdg joined #git
21:28 semantipc joined #git
21:29 McNozes joined #git
21:29 LeMike joined #git
21:30 patternexon left #git
21:30 ochorocho__ joined #git
21:30 semantipc joined #git
21:31 cdown_ joined #git
21:31 clemf joined #git
21:32 skunkz joined #git
21:33 mehola joined #git
21:33 nonconvergent joined #git
21:33 BlaXpirit souravbadami, that's whitespace. maybe your editor decided to clean that up
21:34 mehola joined #git
21:34 mic4ael1 joined #git
21:37 mehola joined #git
21:37 acetakwas joined #git
21:37 segment-fault joined #git
21:38 souravbadami how to get rid of that in gedit ?
21:39 souravbadami BlaXpirit ^
21:39 jason237 joined #git
21:39 sctskw joined #git
21:39 BlaXpirit souravbadami, how should i know
21:41 souravbadami BlaXpirit: Exactly. Thanks!
21:41 TomyLobo joined #git
21:41 ochorocho__ joined #git
21:43 toogley joined #git
21:44 __xor joined #git
21:45 naver joined #git
21:45 SirOliver joined #git
21:46 toogley joined #git
21:46 mehola joined #git
21:49 joki joined #git
21:50 Goplat joined #git
21:53 naver joined #git
21:56 hlysig joined #git
21:56 kus joined #git
21:56 rewt souravbadami, use -b option when making the patch
21:57 italoacasas joined #git
21:57 skunkz joined #git
21:58 nettoweb joined #git
22:00 BlaXpirit rewt, -b option to what command?
22:00 rewt how did you create the patch?
22:00 rewt diff and git diff both take -b
22:00 BlaXpirit probably some variant of diff.  rewt, usually people are more interested in add/commit  rather than a patch.  and using diff just a preview
22:01 jstimm_ joined #git
22:01 Noldorin joined #git
22:02 BlaXpirit but I guess it's applicable here
22:02 souravbadami rewt: I am not interested in patch. As soon as I commit the changes, some additional changes appear.
22:03 souravbadami I want to push those commits.
22:03 rewt you're on windows?
22:03 BlaXpirit gedit -> probably not
22:04 ochorocho__ joined #git
22:04 souravbadami Linux, Ubuntu.
22:04 souravbadami The file was created on windows.
22:06 rewt maybe it was commited with crlf line endings, and your editor fixed them to be lf ... maybe the indents were tabs and you editor changed them to spaces (or vice versa) ... could be any number of issues
22:06 Synthead joined #git
22:07 rewt you'd have to configure your editor not to mess with anything that you don't touch
22:07 rewt and redo the commits
22:07 ahmedelgabri joined #git
22:07 cdown_ joined #git
22:07 Xethron joined #git
22:08 stephenba4 joined #git
22:08 CEnnis91 joined #git
22:09 ajf__ joined #git
22:10 harish_ joined #git
22:11 GavinMagnus left #git
22:12 SirOliver joined #git
22:12 mehola joined #git
22:13 gfixler joined #git
22:16 kulelu88 joined #git
22:17 dsdeiz joined #git
22:18 watabou joined #git
22:21 dranve joined #git
22:27 choki joined #git
22:27 nd joined #git
22:28 infinite joined #git
22:32 mehola joined #git
22:32 Synthead joined #git
22:33 naver joined #git
22:34 SoRoot joined #git
22:34 deepulatha joined #git
22:37 FuzzySockets joined #git
22:38 swilsonau joined #git
22:39 quer joined #git
22:43 hlysig joined #git
22:44 flaguy48 left #git
22:47 ochorocho__ joined #git
22:47 fuchstronaut joined #git
22:47 hahuang62 joined #git
22:49 skunkz joined #git
22:49 lfia joined #git
22:50 Juzzika joined #git
22:51 SirOliver joined #git
22:51 eletuchy joined #git
22:53 liquidjamm joined #git
22:54 rkazak joined #git
22:55 HappyLoaf joined #git
23:02 SirOliver joined #git
23:04 Pulp joined #git
23:08 ahmedelgabri joined #git
23:09 arescorpio joined #git
23:12 jaguarmagenta joined #git
23:14 codeman joined #git
23:15 Brain joined #git
23:18 semantip_ joined #git
23:19 lindenle joined #git
23:20 ffabi joined #git
23:21 lindenle joined #git
23:22 mmmveggies joined #git
23:23 skunkz joined #git
23:24 flaguy48 joined #git
23:26 xall_ joined #git
23:29 harmfulbytes joined #git
23:30 aax joined #git
23:30 sebbu joined #git
23:34 WaReZ joined #git
23:34 romerocesar joined #git
23:36 doppo joined #git
23:37 introsp3ctive joined #git
23:43 doppo joined #git
23:45 Sasazuka joined #git
23:47 ochorocho__ joined #git
23:48 nuck joined #git
23:50 eijk joined #git
23:50 watabou joined #git
23:53 dpower joined #git
23:53 eletuchy joined #git
23:53 kerrick joined #git
23:55 romerocesar joined #git
23:57 hahuang62 joined #git
23:59 skunkz joined #git
23:59 durham joined #git

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