Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-15

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

All times shown according to UTC.

Time Nick Message
00:00 robattila256 joined #git
00:00 programmer joined #git
00:01 shashin joined #git
00:02 codeiscode joined #git
00:09 realz joined #git
00:11 Nysar joined #git
00:12 TylerEastman joined #git
00:23 Skryll joined #git
00:23 atomicb0mb joined #git
00:23 Rickmasta joined #git
00:23 hahuang61 joined #git
00:29 Project1989 left #git
00:29 ISmithers1 joined #git
00:33 Schrostfutz joined #git
00:33 cjbrambo joined #git
00:33 AndrewAlexMac joined #git
00:36 mikecmpbll joined #git
00:45 shaggycat joined #git
01:05 austin987 joined #git
01:06 fstd_ joined #git
01:07 bronson joined #git
01:11 snowkidind joined #git
01:12 rominronin joined #git
01:13 lanking joined #git
01:14 eb0t joined #git
01:17 m0viefreak joined #git
01:19 elsevero_ joined #git
01:21 Siegfried joined #git
01:24 xlegoman joined #git
01:25 whomp joined #git
01:28 Vangelis joined #git
01:28 dsantiago joined #git
01:28 logicp joined #git
01:29 joshszep joined #git
01:30 cqi joined #git
01:32 logicp left #git
01:35 Lunatrius joined #git
01:36 tgp_ joined #git
01:37 duckinja joined #git
01:39 los joined #git
01:39 Guest26 joined #git
01:40 qpdb joined #git
01:42 snappy joined #git
01:42 snappy left #git
01:45 MrWoohoo joined #git
01:45 done joined #git
01:46 fmcgeough joined #git
01:56 Infinite_182 joined #git
01:57 Infinite_182 currently I taught myself and my two student partners for this project how to use git and push to github etc, quick question on best practices as i'm a student and have never been a professional developer
01:57 pks joined #git
01:58 Infinite_182 if we're working on this simple little application and we make our own branches... is it ok that we make them after our names? and what would be the best way to grab another students work and see what they've gotten done so far?
01:58 whomp Infinite_182, time-saving tip: alias git push to git push -f
01:58 Infinite_182 lol
01:58 Infinite_182 funny
01:59 Infinite_182 currently i just created a branch to match what they have, i switch to it, and pull their shit down to keep it seperate from my stuff
01:59 Infinite_182 is this ok?
01:59 Infinite_182 should i merge every once in a while and be the only one that includes things to master?
01:59 drmt joined #git
02:00 morenoh149 joined #git
02:01 Infinite_182 @whomp it is ok that you don't know either
02:02 whomp i'm glad i have your approval
02:02 Infinite_182 *tips fedora*
02:02 phroa I'd suggest making branches for features, not people
02:03 Infinite_182 thank you phroa
02:04 Infinite_182 and when there is a branch for a feature and i just want to mess with it and then throw it away? say somebodies bullshit idea.... what's the best way of pulling their branch down and then discarding it?
02:04 thiago joined #git
02:05 Infinite_182 pull origin [bullshit_branch], after checking out into a new branch?
02:05 phroa well, you can just 'git checkout' the branch, and when you're done, 'git branch -D' to trash it locally.  man git-branch man git-checkout
02:05 gitinfo the git-branch manpage is available at http://jk.gs/git-branch.html
02:05 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
02:06 Infinite_182 so when i say 'git checkout [branch_name' it will auto-pull it from the remote repo?
02:06 Infinite_182 i thought it would just create a new branch locally with the same name
02:07 phroa only if you use or -b or --track (implies -b)
02:07 oskarkv joined #git
02:07 phroa that said, the branch may have to be fetch'ed first
02:07 phroa I'm not 100%
02:08 Infinite_182 so the git fetch refreshes to make the local tracking aware that there are additional branches in the remote repos... yes yes nice, i was wondering about that...
02:09 Infinite_182 any other reason a person would use fetch?
02:10 Infinite_182 ah, nvm
02:10 Infinite_182 i'm googling lol
02:11 Infinite_182 thanks for the first part. I usually can't "git" a good answer to the more broad/best practice questions
02:12 snthsnth joined #git
02:12 dmj` joined #git
02:13 phroa I _have_ worked on projects in the past where a personal branch for myself was pretty necessary, but that's only because the other people were making a mess of everything...
02:18 inflames joined #git
02:18 stonerfish joined #git
02:20 finalbeta joined #git
02:22 Siegfried joined #git
02:23 watersoul_ joined #git
02:23 mozzarel1 joined #git
02:26 durham_ joined #git
02:27 Ryanar joined #git
02:29 durham_ joined #git
02:30 Olipro joined #git
02:30 blackwind_123 joined #git
02:31 fmcgeough joined #git
02:32 Olipro joined #git
02:34 Guest26 joined #git
02:35 clandestino joined #git
02:36 d^sh joined #git
02:38 drmt joined #git
02:39 Dougie1871 joined #git
02:39 Rickmasta joined #git
02:46 rominronin joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and Blurnsball | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-cherry-pick does not yield actual delicious cherries
02:49 done joined #git
02:49 dhollinger joined #git
02:52 WizJin joined #git
02:53 Urbany joined #git
02:54 fuzzmz joined #git
02:56 cdg joined #git
02:56 pks joined #git
02:57 madewokherd joined #git
03:00 cdg joined #git
03:03 ashokrajar joined #git
03:04 Vgr joined #git
03:05 Vgr joined #git
03:06 arand__ joined #git
03:07 Vgr joined #git
03:07 venmx joined #git
03:07 aavrug joined #git
03:08 a3Dman joined #git
03:09 the_cybersphinx joined #git
03:10 railssmi_ joined #git
03:12 blackwind_123 joined #git
03:13 raspado joined #git
03:14 mizu_no_oto joined #git
03:14 dreiss joined #git
03:16 DolpheenDream joined #git
03:17 sunri5e joined #git
03:17 drmt joined #git
03:24 Guest26 joined #git
03:31 hexagoxel joined #git
03:33 blackwind_123 joined #git
03:34 cagedwisdom joined #git
03:34 chachasmooth joined #git
03:37 Andrew_K joined #git
03:38 a3Dman joined #git
03:40 a3Dman_ joined #git
03:42 snthsnth joined #git
03:45 Zamerick joined #git
03:49 morenoh149 joined #git
03:51 hackel joined #git
03:54 danslo joined #git
03:54 blackwind_123 joined #git
03:54 phanimahesh joined #git
03:56 gfixler joined #git
03:58 hahuang61 joined #git
04:00 elsevero joined #git
04:00 dreiss joined #git
04:02 Olipro joined #git
04:04 blackwind_123 joined #git
04:05 a_thakur joined #git
04:06 duckinja joined #git
04:08 SwiftMatt joined #git
04:08 jaguarmagenta joined #git
04:11 cyphase joined #git
04:12 RickyB98 joined #git
04:14 Vortex35 joined #git
04:15 rominronin joined #git
04:16 satya4ever joined #git
04:16 strugee joined #git
04:17 martinklepsch joined #git
04:19 DolpheenDream joined #git
04:19 ashokrajar joined #git
04:20 Anupkumar joined #git
04:24 Vangelis joined #git
04:27 danslo joined #git
04:28 meauses joined #git
04:29 drbean joined #git
04:32 robotroll joined #git
04:32 duckinja joined #git
04:33 lanking joined #git
04:36 ayogi joined #git
04:36 dreiss joined #git
04:37 venmx joined #git
04:38 blackwind_123 joined #git
04:43 donmichelangelo joined #git
04:44 inqi joined #git
04:46 peeps[lappy] joined #git
04:46 Vangelis joined #git
04:46 inqi left #git
04:47 Lyqyd joined #git
04:50 subhojit777 joined #git
04:50 blackwind_123 joined #git
04:55 redeemed joined #git
04:55 bluezone joined #git
04:55 Vangelis joined #git
05:00 blackwind_123 joined #git
05:01 Salander27 joined #git
05:02 Vangelis joined #git
05:03 ISmithers joined #git
05:04 Guest55 joined #git
05:04 svm_invictvs joined #git
05:04 b1tchcakes joined #git
05:04 daey_ joined #git
05:05 daynaskully joined #git
05:08 truetuna joined #git
05:11 blackwind_123 joined #git
05:13 hackel joined #git
05:14 drbean joined #git
05:17 jaguarmagenta joined #git
05:17 arescorpio joined #git
05:17 xall joined #git
05:18 xall joined #git
05:18 railssmith joined #git
05:19 fatalhalt joined #git
05:21 slayerjain joined #git
05:22 einnjo joined #git
05:22 TylerEastman joined #git
05:22 Cabanossi joined #git
05:24 cyphase joined #git
05:26 nilg joined #git
05:27 jybs joined #git
05:29 jybs Hello all
05:29 gitinfo jybs: 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.
05:30 jybs I have a repo which I want people to be able to check out, choosing one or more submodules to add
05:30 jybs But I don't want all the submodules stored in git - so people can't see the full list on checkout
05:30 jybs Can I do that?
05:30 jybs The submodules are customer specific data
05:30 jybs The master is generic data
05:31 ToBeCloud joined #git
05:31 blackwind_123 joined #git
05:31 jybs I tried putting .submodules in .gitignore - no go
05:31 jybs .gitmodules sorry
05:32 Lambda7 joined #git
05:32 Lambda7 left #git
05:34 vuoto joined #git
05:36 Raging_Hog joined #git
05:36 Raging_Hog joined #git
05:37 Raging_Hog joined #git
05:38 morenoh149 joined #git
05:40 milki thats a pretty wierd requirement and not something submodules are designed for
05:40 jybs Yeah
05:40 milki you can have different branches with different submodules
05:41 jybs I get that feeling
05:41 jybs I need project/conf/customer
05:41 jybs where project is my project
05:41 milki so maybe a branch per customer or a fork per customer?
05:41 jybs But then how would I enforce changes in project getting to each customer?
05:41 milki or maybe you can replace submodules with a script that reads a configuration file
05:42 jybs Can I have a branch that keeps in sync with head?
05:42 milki you can have a symbolic ref that always points to the head
05:42 milki but its not a real branch then
05:43 jybs So if I update the branch head gets updated too?
05:43 turci[m] joined #git
05:43 jybs Actually maybe branches is OK
05:43 jybs Although I don't know if gitlab supports branch security
05:44 jybs I'll try branches
05:44 jybs Thanks!
05:44 milki you can maybe just rely on remote tracking branches instead of creating a special branch
05:44 snthsnth joined #git
05:45 jybs Actually maybe not remote tracking isn't a bad thing
05:45 jybs Then each customer can have a version
05:45 jybs Not the worst idea
05:46 jybs When I merge a branch can I exclude a directory?
05:46 milki if you have versions, you might as well use tags
05:46 jybs (so the customer config never makes it into head)
05:46 a3Dman joined #git
05:46 milki jybs: no, you cant. if you have configs, then you want !config
05:46 gitinfo jybs: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
05:47 jybs This is config for Ansible
05:47 jybs There is a lot of it, it needs to be in git
05:47 milki put them in a seperate repo
05:47 jybs I have that currently actually
05:47 milki ansible can handle repos as sources
05:47 Jameser joined #git
05:47 jybs The only problem is I need both the master repo and the customer repo
05:48 jybs and they have to be overlayed
05:48 rominronin joined #git
05:48 jybs And ideally I can change files and do a single commit / push and git will sort out where it goes
05:48 jybs Maybe that's too much to ask though
05:49 Jameser_ joined #git
05:50 milki git isnt designed to do that for you. its just a source for files
05:50 milki you can create scripts that do the sorting for you
05:50 jybs So maybe a repo in a repo would be an easy way to do it?
05:50 jybs Then I just need to commit/push both
05:50 milki you could have 2 repos and something that knows where to put the files
05:50 zivester joined #git
05:56 cyphase joined #git
05:56 jybs ls
05:56 jybs Oops. Having a repo in a repo seems to work
05:57 jybs I just have to make sure I do a pull in both, which sucks but I can live with
05:57 a3Dman joined #git
05:58 turci[m] left #git
05:59 turci[m] joined #git
05:59 Jameser joined #git
05:59 nilg` joined #git
06:01 blackwind_123 joined #git
06:03 turci[m] left #git
06:07 truetuna joined #git
06:07 blackwind_123 joined #git
06:08 venmx joined #git
06:11 pks joined #git
06:14 satya4ever joined #git
06:15 funfunctor joined #git
06:15 funfunctor Hi
06:16 funfunctor Does anyone have any "advanced" tips on rebasing a branch? when dealing with the linux kernel with some non-linear history (merges)
06:16 lindenle joined #git
06:18 thiago don't rebase non-linear histories
06:18 thiago from the old base to your current tip, you should have only non-merge commits
06:19 lindenle joined #git
06:20 lindenle joined #git
06:20 romerocesar joined #git
06:21 funfunctor thiago: ok so I have master and my branch, should i just run "git rebase" on my branch to linear its history first?
06:23 bmahe joined #git
06:25 cyphase joined #git
06:25 jybs So I know I already asked this, but just to recap as it seems like it almost works- there is no way to prevent .gitmodules from being commited is there?
06:29 qt-x joined #git
06:31 lindenle joined #git
06:32 lindenle joined #git
06:34 exxi joined #git
06:35 aidalgol joined #git
06:38 cyphase joined #git
06:40 nd joined #git
06:42 ngperfex joined #git
06:43 Jameser joined #git
06:43 NeverTired joined #git
06:44 mehola joined #git
06:46 jstein_ joined #git
06:47 Siegfried joined #git
06:53 cyphase joined #git
06:56 LucaTM joined #git
06:57 Raging_Hog joined #git
06:57 einnjo joined #git
07:00 xlegoman joined #git
07:00 venmx joined #git
07:00 hahuang61 joined #git
07:01 JeroenT joined #git
07:02 WayToDoor joined #git
07:03 peeps[lappy] joined #git
07:06 done joined #git
07:07 freimatz joined #git
07:07 rivarun joined #git
07:08 dan2k3k4 joined #git
07:12 rivarun joined #git
07:12 duckinja joined #git
07:12 alcohol so, i force pushed a rebased feature branch from my home machine
07:12 alcohol and now i want to pull it back down at the office
07:12 alcohol but i never quite figured out yet what the proper way to do this is?
07:13 alcohol there is no force pull is there? :p
07:13 rivarun joined #git
07:14 rscata joined #git
07:14 Raging_Hog alcohol: you mean you want to make the feature branch the way it was before your force push?
07:14 alcohol Raging_Hog: no, i want the rebased branch
07:14 alcohol Raging_Hog: but a regular git pull wont do obviously
07:14 _ikke_ git pull --rebase should cover most cases
07:14 alcohol looking at http://stackoverflow.com/questions/16773249/git-pulling-a-rebased-branch
07:15 alcohol _ikke_: well i had the branch locally already too
07:15 _ikke_ That shouldn't matter
07:15 harrymoreno joined #git
07:15 danslo joined #git
07:15 alcohol _ikke_: so i want the rebased version now, not keep my commits
07:15 alcohol _ikke_: really? o_O
07:15 * alcohol tries
07:15 _ikke_ Depends on how much the history changed of course
07:15 _ikke_ otherwise, it's a matter of hard reseting to the remote upstream branch
07:19 rominronin joined #git
07:19 cyphase joined #git
07:19 JeroenT joined #git
07:19 cebor joined #git
07:20 whomp joined #git
07:20 Endarked joined #git
07:21 einnjo joined #git
07:21 Jameser joined #git
07:22 einnjo joined #git
07:23 derk0pf joined #git
07:23 rchavik joined #git
07:24 roelmonnens joined #git
07:25 JeroenT joined #git
07:25 blackwind_123 joined #git
07:27 chele joined #git
07:27 morenoh149 joined #git
07:28 nidr0x joined #git
07:29 tvw joined #git
07:29 derk0pf joined #git
07:32 derk0pf joined #git
07:32 dsdeiz joined #git
07:34 zeroed joined #git
07:34 zeroed joined #git
07:37 elect joined #git
07:38 Akimb joined #git
07:43 GavinMagnus joined #git
07:44 hackel joined #git
07:46 rominronin joined #git
07:48 a_thakur joined #git
07:48 cyphase joined #git
07:50 leehambley joined #git
07:51 ferr joined #git
07:51 Sceorem joined #git
07:51 moop joined #git
07:54 Emperor_Earth joined #git
07:55 PtxDK joined #git
07:58 zeroed joined #git
07:58 zeroed joined #git
08:01 venmx joined #git
08:04 PtxDK joined #git
08:04 raspado joined #git
08:05 jknetl joined #git
08:07 ldlework I just rebased over master, and some how one of the commits that was already on master was pulled up and into the commits that are layed ontop of master.
08:09 fees joined #git
08:09 Xethron joined #git
08:10 elsevero joined #git
08:11 osse ldlework: so now there's two ?
08:11 xo_odin joined #git
08:12 overlord_tm joined #git
08:12 PCatinean joined #git
08:12 KlausedSource joined #git
08:12 jnavila joined #git
08:12 TomyWork joined #git
08:13 elsevero_ joined #git
08:13 danslo joined #git
08:13 Darcidride joined #git
08:14 brk_ joined #git
08:15 kesslerfrost joined #git
08:15 danslo_ joined #git
08:18 leehambley joined #git
08:19 PCatinean joined #git
08:19 PHPanos joined #git
08:20 venmx joined #git
08:22 omegak joined #git
08:25 Stace joined #git
08:25 Stace How can I completely discard all staged changes without touching unstaged changes?
08:25 selckin git status tells you
08:26 Stace yeah, but git reset HEAD drops the staged changes to unstaged
08:26 selckin oh discard like that
08:26 Stace and then I have to sort through unstaged to checkout
08:26 selckin git stash --index;; git stash drop; maybe
08:26 Stace I want to completely discard staged without unstaging first
08:27 Stace I tried comitting and then reset HEAD --hard but that dropped all unstaged changes too
08:27 selckin yes, stash way is best i can think of
08:28 Stace I'm unfamilliar with stash --index, only --keep-index
08:28 Stace is index the opposite?
08:28 osse git stash --keep-index; git reset --hard; git stash pop
08:29 CrazyBonz joined #git
08:30 Stace ah, I know. git diff -w > my_stuff.patch, then reset --hard HEAD, then apply patch
08:31 Stace I prefer patches over stashing
08:31 osse i dont't think you want the -w there
08:31 osse it might not apply then
08:32 osse or it if applies it might not be what you had
08:32 Stace osse: oh, that's just a habit to remove the whitespace
08:32 Stace good point
08:32 adymitruk joined #git
08:32 Stace I usually just use -w on all diffs
08:32 osse that's fine when the consumer is your eyes
08:32 Stace yeah, not so much for patch generation
08:32 Atm0spher1c joined #git
08:33 ashokrajar joined #git
08:34 Stace the patch method just won't work with binaries
08:34 Stace but who has binaries in git in any case ^^
08:35 BackEndCoder joined #git
08:37 adac joined #git
08:39 qws-user-1228 joined #git
08:39 a_thakur joined #git
08:39 adam_ joined #git
08:39 jast git can actually generate binary patches, too
08:39 osse --binary 4 lyf
08:39 javajoe joined #git
08:40 jast I've never needed to use it... but it's there
08:41 archaic joined #git
08:42 cdown joined #git
08:44 WayToDoor joined #git
08:44 __mirror__ joined #git
08:45 Stace jast: me either
08:46 __mirror__ joined #git
08:48 adam_ joined #git
08:48 lindenle joined #git
08:50 zacts joined #git
08:50 adymitruk joined #git
08:50 jnavila joined #git
08:52 somaReverse joined #git
08:52 somaReverse hi
08:53 somaReverse does git merge find common ancestor to reduce diff size?
08:53 adymitruk joined #git
08:54 KlausedSource joined #git
08:55 somaReverse does git merge commits one by one or just merge the most recent one?
08:57 overlord_tm joined #git
08:58 bongjovi joined #git
08:59 fstd joined #git
08:59 osse somaReverse: it considers the tips and the common ancestor
08:59 funfunctor joined #git
09:00 ocbtec joined #git
09:00 LabMonkey joined #git
09:00 stuh84 joined #git
09:01 LabMonkey ok so I have a repo with a submodule and I want to make changes to the code in my local clone of the repo which is the target of that submodule.  Is it possible to have the submodule reference my local copy without changing the submodule definition?
09:02 stuh84 joined #git
09:02 LabMonkey i.e. I have Foo.Base and Foo.Impl such that both have remote repos and local clones, but Foo.Impl has a submodule definition to the remote of Foo.Base
09:03 Kulrak joined #git
09:03 Kulrak joined #git
09:04 cdown joined #git
09:04 mikecmpbll joined #git
09:04 kurkale6ka joined #git
09:05 Nilesh_ joined #git
09:06 somaReverse osse: hmm, what are tips?
09:06 osse somaReverse: i mean the branches
09:06 Nilesh_ I get cannot create temp file for here-document device or resource busy when rebase any clue?
09:08 Nilesh_ exact error /mingw64/libexec/git-core/git-sh-setup: line 61 cannot create temp file for here-document device or resource busy when rebase
09:10 encod3 joined #git
09:11 loafbit joined #git
09:12 JeroenT joined #git
09:13 osse Nilesh_: is /tmp full ?
09:13 Nilesh_ no
09:13 JeroenT joined #git
09:14 Nilesh_ osse: its not full
09:15 osse does 'mktemp' work ?
09:15 marcogmonteiro joined #git
09:16 morenoh149 joined #git
09:16 deepy joined #git
09:18 danslo_ joined #git
09:20 talkJS joined #git
09:21 nilg` joined #git
09:21 Nilesh_ osse: /tmp/tmp.vHEELxX11g
09:21 Nilesh_ it gave me that
09:22 osse then it works
09:22 talkJS i have a file that is not showing in git ls-files | grep -i file.php
09:22 talkJS however, when i do git status, i don't see it as an untracked file
09:23 osse Nilesh_: what git version?
09:23 osse talkJS: then it's ignored
09:23 earational joined #git
09:24 talkJS posse, i do not have an ignore file.  The weird thing is, when i cd into that directory it's a git repo
09:24 talkJS can i not include it?
09:24 osse ah
09:25 MrMojito joined #git
09:25 Nilesh_ git version 2.7.0.windows.1
09:25 osse git won't let you add files from "embedded" git repos
09:25 osse either remove the repo or add the repo itself as a submodule
09:25 talkJS how do you add one as a submodule?
09:25 osse Nilesh_: there's been some significant improvements since then. I suggest upgrading
09:25 osse talkJS: add the repo itself.
09:25 osse git add path/to
09:25 osse but i'm not sure that's what you want here
09:25 Nilesh_ osse: but then what causes the problem?
09:26 osse i don't know
09:26 talkJS i need to add vendor/gb/helper
09:26 meauses joined #git
09:28 ccc joined #git
09:29 khfeng joined #git
09:29 aax joined #git
09:31 xaa joined #git
09:32 talkJS posse, i removed the .git folders and these aren't showing up
09:32 talkJS and i do not have a .gitignore
09:33 osse talkJS: git check-ignore -v path/to/file
09:38 ccc left #git
09:39 bdeferme joined #git
09:41 King_Hual joined #git
09:43 romerocesar joined #git
09:44 shruggar joined #git
09:47 KlausedSource joined #git
09:47 shruggar performing a "git merge", git appears to be attempting to merge changes into "the wrong file" (ie: a file which has a different name, and which [to my human eyes] is clearly "very different"]). As might be expected: there are a lot of merge-conflicts showing up. So the question is: 1) why is git merging into "the wrong file" and 2) How do I make it not do that?
09:48 jfr_ joined #git
09:48 shruggar though I'm using the singular, there are actually several (unrelated) files involved
09:48 Serpent7776 joined #git
09:49 ahmedelgabri joined #git
09:49 afuentes joined #git
09:50 osse shruggar: maybe git is detecting what it thinks is a rename, but in fact isn't
09:50 brillenfux joined #git
09:50 osse try git merge -s recursive -X no-renames
09:50 shruggar thanks
09:52 shruggar yep, that seems right
09:52 shruggar osse +1
09:52 osse \o/
09:53 osse there's also the option of not disabling rename detection, but increasing the threshold. -X find-renames=n
09:53 chll_ joined #git
09:53 osse see man git-diff for what n means
09:53 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
09:53 MrWoohoo joined #git
09:53 shruggar ah, thank you, that was actually the option I had been specifically looking for
09:57 Nilesh_ osse: upgrading solved .. thanks
09:59 Learath2 joined #git
10:00 aruns joined #git
10:00 aruns Hi.
10:01 aruns I am working on a repository for a Laravel powered website that is deploying to the production server by syncing Laravel Forge to a branch on our Git repo called production.
10:02 selckin !deploy
10:02 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
10:03 hahuang61 joined #git
10:07 thethorongil joined #git
10:14 Akimb joined #git
10:21 snthsnth joined #git
10:22 javajoe joined #git
10:23 jcelerier joined #git
10:24 jcelerier hello :)
10:24 jcelerier does someone knows if there is a ready-made alias for "git pull && git submodule update --init --recursive" ?
10:25 manuel_ joined #git
10:26 mablae joined #git
10:27 shashin joined #git
10:27 shashin joined #git
10:35 achadwick joined #git
10:38 phanimahesh jcelerier: git config alias.whatever "!git pull && git submodule update --init --recursive"
10:38 phanimahesh throw in a -g if you want it across all projects on your machine.
10:38 phanimahesh No built-in alias that I know of.
10:41 ilyaigpetrov joined #git
10:45 jcelerier ok :(
10:45 virgil joined #git
10:45 jcelerier it's not for me, if for the users of my project who often make me bug reports because they forgot to update their submodules
10:45 Snugglebash joined #git
10:49 JanC_ joined #git
10:49 Alienpruts joined #git
10:50 Atm0spher1c joined #git
10:54 phanimahesh add it in your readme.
10:54 canton7 then link to it every time someone opens an issue :P
10:55 JeroenT joined #git
10:55 phanimahesh maybe ask them to alias pull to pull and update submodules in that project
10:57 ome joined #git
10:57 jcelerier haha
10:57 jcelerier could be a solution
10:58 selckin ./update
11:04 djb-irc joined #git
11:05 morenoh149 joined #git
11:05 ThomasLocke joined #git
11:05 nettoweb joined #git
11:07 osse jcelerier: put 'submodule update --init --recursive' in .git/hooks/post-checkout and .git/hooks/post-merge
11:10 denisMone joined #git
11:17 exxi joined #git
11:18 satya4ever_ joined #git
11:19 PHPanos joined #git
11:19 Aboba_ joined #git
11:21 djb-irc joined #git
11:22 coasterz joined #git
11:23 g105b joined #git
11:24 satya4ever joined #git
11:25 spm_draget joined #git
11:27 cagedwisdom joined #git
11:27 spm_draget I am on my feature branch and wanted to merge into master. But first, I wanted to see if my changes work ontop of master, so I did 'git merge master' in my branch. Everything was fine. But then I thought I could fix up (squash) some older ocmmits and did 'git rebase -i' without a parameter. It showed me many commits (those from master?) and I thought 'hey wait, I forgot to specify what I want to rebase… and quit my textedtor.
11:28 spm_draget But all those 'picks' made rebase do "something"… I guess it rebased some stuff on some other commit. But now I am puzzled and my history is confusing. Can anyone tell me what I just did?
11:32 osse spm_draget: You straightened both master's and your history into a straight line
11:32 freimatz joined #git
11:36 dreiss joined #git
11:37 anonymuse joined #git
11:37 Jackneill joined #git
11:38 oskarkv joined #git
11:39 liuzhen joined #git
11:40 akuue joined #git
11:42 CussBot joined #git
11:44 zetetic_ joined #git
11:44 danslo_ joined #git
11:45 grawity not master's, just whatever was merged from master
11:46 zetetic__ joined #git
11:46 osse Right
11:47 done joined #git
11:47 osse So now there are probably duplicate commits of commits in master in the feature branch
11:50 ToBeCloud joined #git
11:52 dsdeiz joined #git
11:53 Snugglebash joined #git
11:56 arduinoToy joined #git
11:56 arduinoToy left #git
11:56 ToBeCloud joined #git
11:56 arduinoToy joined #git
11:59 ToBeCloud joined #git
12:01 mischat joined #git
12:06 hahuang61 joined #git
12:07 Akimbas joined #git
12:10 atomicb0mb joined #git
12:10 djb-irc joined #git
12:12 PHPanos joined #git
12:12 sdothum joined #git
12:14 spm_draget I merged my feature into master and it seems to be okay. Just the history is now… a bit of a mess xD
12:16 djb-irc joined #git
12:20 fahadash joined #git
12:21 t-mart_ joined #git
12:22 tvw joined #git
12:22 djb-irc joined #git
12:23 osse spm_draget: if you rebase feature on top of master it might work out ok
12:28 str joined #git
12:28 pickle_ joined #git
12:32 f3r70rr35f joined #git
12:33 f3r70rr35f joined #git
12:33 leeN joined #git
12:34 Stace` joined #git
12:34 mischat joined #git
12:39 WayToDoor joined #git
12:41 satya4ever joined #git
12:43 Ryanar joined #git
12:47 Snugglebash joined #git
12:47 a3Dman joined #git
12:48 pickle_ joined #git
12:48 rvsjoen joined #git
12:48 rvsjoen joined #git
12:49 cdown joined #git
12:52 nicksloan joined #git
12:52 pickle_ joined #git
12:53 morenoh149 joined #git
12:54 johnmilton joined #git
13:00 brk_ joined #git
13:01 anonymuse joined #git
13:02 Domhack joined #git
13:02 lss8 is linus still doing commits to the git repo?
13:03 _ikke_ once in a while
13:03 _ikke_ But not regularly
13:03 _ikke_ only when he has a problem to solve
13:05 Sceorem_ joined #git
13:05 Ryanar joined #git
13:07 dviola joined #git
13:07 byte512 joined #git
13:09 sdothum joined #git
13:11 shinnya joined #git
13:11 synthroid joined #git
13:15 davimore joined #git
13:17 phantombeta joined #git
13:17 harrymoreno joined #git
13:17 phantombeta left #git
13:19 troulouliou_div2 joined #git
13:22 teemo joined #git
13:22 rory hi
13:22 mischat joined #git
13:23 rory I have a branch 123_foo which is merged into master. I need to identify the commits that were in this branch (but not in master) at the time it was merged. I found the merge commit id but "git show this_id" is empty. Is it possible to do what I want?
13:28 rory basically if I had a pull request on github, I could see what the diff was at the time, even years in the future. I have been reading stuff but I don't think it's possible to do this with just git.
13:28 anonymuse joined #git
13:29 pbrewczynski joined #git
13:31 Ryanar joined #git
13:31 kanzure joined #git
13:32 Snugglebash joined #git
13:33 PHPanos joined #git
13:34 mindriot101 joined #git
13:34 jeffreylevesque joined #git
13:34 Rodya_ joined #git
13:35 nedbat rory: git log can show you probably !lol
13:35 gitinfo rory: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
13:35 _ikke_ git log --oneline commit^2..master
13:36 _ikke_ sorry, other way around
13:36 _ikke_ git log --oneline master..<commit>^2
13:36 _ikke_ where commit is the merge commit
13:39 thierryp joined #git
13:41 Noldorin joined #git
13:42 howitdo joined #git
13:42 howitdo joined #git
13:43 phantombeta joined #git
13:43 phantombeta left #git
13:44 Nysar joined #git
13:44 Gbufa joined #git
13:44 d0nn1e joined #git
13:45 noecc joined #git
13:45 romerocesar joined #git
13:46 irco joined #git
13:52 Nysar joined #git
13:53 ngrin joined #git
13:53 www-bukolay-net joined #git
13:55 garethdaine joined #git
14:00 zzlm joined #git
14:00 Derperperd joined #git
14:02 Zamerick joined #git
14:05 fmcgeough joined #git
14:05 Icqj joined #git
14:06 porsche944 joined #git
14:06 Siegfried joined #git
14:07 hhee1 joined #git
14:08 Vinnie_win joined #git
14:09 cdg joined #git
14:11 www-bukolay-net joined #git
14:12 ExoUNX joined #git
14:15 Jameser joined #git
14:16 mischat_ joined #git
14:16 lindenle joined #git
14:17 mischat_ joined #git
14:17 Ryanar joined #git
14:19 Snugglebash joined #git
14:20 nicksloan joined #git
14:20 InfoTest joined #git
14:22 ShekharReddy joined #git
14:22 Stace` joined #git
14:22 danslo joined #git
14:24 ieee joined #git
14:27 earational joined #git
14:27 Gonzo89 joined #git
14:27 Guest26 joined #git
14:29 anonymuse joined #git
14:33 selckin can someone shake out a oneliner to push every new commit seperately ? (trying to work around gitlab sending 1 email per push)
14:33 tobiasvl that sounds bad, what if you want to rebase your commit later?
14:34 tobiasvl you could make a post-commit hook I guess, but for the above reason I would instead make a git alias that runs commit and then push, so you can invoke it when you really mean to
14:34 tobiasvl selckin: ^
14:35 _ikke_ selckin: You want to have a separate e-mail for each commit?
14:35 selckin i don't want it automaticly, then i can just git commit; git push
14:35 selckin _ikke_: yeah
14:35 _ikke_ There is no oneliner, but you can use git push remote <commit>:refs/heads/<branch
14:35 cdown joined #git
14:35 _ikke_ and that for each commit in the branch
14:36 selckin for i in $(git magic-list-refs master..origin/master); do git push remote $i:refs/heads/master; done
14:37 PHPanos joined #git
14:37 dimi1947 joined #git
14:37 osse selckin: git rev-list --reverse origin/master..master
14:37 jimi_ joined #git
14:37 Vangelis joined #git
14:38 selckin for i in $(git rev-list --reverse origin/master..master); do git push origin $i:master; done
14:38 robattila256 joined #git
14:38 selckin thanks osse _ikke_
14:38 dimi1947 git diff for a file shows me the changes made for it but when I open the specific file in my editor(Netbeans) these changes appear nowhere...what might be hapenning here?
14:39 osse you're opening the wrong file, or the file was already open with unsaved changes, or the changes git shows are invisible
14:40 ashokrajar joined #git
14:40 acetakwas joined #git
14:40 the_cybersphinx joined #git
14:41 acetakwas joined #git
14:41 dimi1947 osse:probably is the last..but what the changes indicated by git might be invisible
14:41 dimi1947 ?
14:42 osse you have to show me
14:42 acetakwas joined #git
14:42 morenoh149 joined #git
14:43 acetakwas joined #git
14:43 selckin can you reproduce with another editor?
14:43 raspado joined #git
14:45 osse my guess: tabs changes to spaces or vice versa, but it's not noticable because in the editor the widths are different than in the terminal
14:45 osse e.g. 4 vs 8 spaces
14:45 ayjay_t joined #git
14:45 Dougie187 joined #git
14:46 PHPanos joined #git
14:47 dimi1947 I did a checkout to the file..the changes were insifigant either way,no need to commit it anymore
14:48 Es0teric joined #git
14:48 Vangelis joined #git
14:49 dimi1947 osse:nonetheless,your explanation makes sense...I will have it in mind
14:49 blackwind_123 joined #git
14:50 dcpc007 joined #git
14:52 mischat joined #git
14:53 AaronMT joined #git
14:53 chigang joined #git
14:54 mithenks joined #git
14:55 Nysar joined #git
14:59 mindriot_ joined #git
14:59 delboy1978uk joined #git
14:59 fiveflowerzz joined #git
14:59 delboy1978uk how do i forcibly add a folder which normally gets ignored?
14:59 fiveflowerzz I made a pull request to userA  and userA merged it
15:00 buzzLightBeer joined #git
15:00 fiveflowerzz However it's still written "This branch is 1 commit behind userA:master."
15:00 fiveflowerzz on Github
15:00 osse delboy1978uk: add -f
15:00 fiveflowerzz how to get synchronized again?
15:00 tobiasvl fiveflowerzz: !sync
15:00 gitinfo fiveflowerzz: [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
15:01 tobiasvl oh wait, it was merged? I don't understand
15:01 delboy1978uk osse: thanks :-P
15:02 fiveflowerzz tobiasvl yes, userA merged my PR
15:02 e14 joined #git
15:02 venmx joined #git
15:03 delboy1978uk osse: pathspec did not match any files? and i ls, and its there!
15:03 alex1a_ joined #git
15:03 osse !repro
15:03 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:03 boombatower joined #git
15:03 delboy1978uk ignore that, typo
15:04 delboy1978uk ? now status says its up to date, wtf?
15:04 al-damiri joined #git
15:06 arduinoToy joined #git
15:06 steffen_ joined #git
15:07 thebope joined #git
15:07 eivarv joined #git
15:08 steffen__ joined #git
15:09 delboy1978uk for some crazy reason, that git add is only adding the folder and not the files within
15:09 nikivi joined #git
15:09 osse is the directory a git repo itself?
15:11 delboy1978uk ah feck, now i'm getting some 'submodule' stuff. It's a PHP composer package, shouldnt be in git at all but the muppets in charge wont let me fix it till theyve changed their deploy process (which of course, they arent even doing)
15:12 osse yup, it's a submodule now
15:12 madewokherd joined #git
15:12 delboy1978uk how do i sort that out?
15:13 osse depends on what you want
15:13 subhojit777 joined #git
15:13 delboy1978uk i dont want it as a submodule, i (sorry, the bosses) want it commited like it was our code
15:13 osse remove the .git from within the dir
15:13 osse then add the dir
15:13 delboy1978uk oh is that it?
15:13 delboy1978uk awesome
15:13 * delboy1978uk tries
15:14 delboy1978uk hmm, still the submodule message
15:15 mischat joined #git
15:15 hackal joined #git
15:15 delboy1978uk where are submodules defined, in the .git/config? *looks
15:16 delboy1978uk hmm, nope
15:16 osse you added it at as a submodule, so you must remove that first I guess
15:16 hackal Hi, at the moment me and my friend are using git and bitbucket. We work on one project together. However we are always overwriting our changes on master. Looking at https://www.atlassian.com/git/tutorials/comparing-workflows/centralized-workflow seems like we should follow this. I have one question. When you should call the git fetch command? Always before git push?
15:17 ilyaigpetrov left #git
15:19 sunri5e joined #git
15:19 VladGh joined #git
15:21 ParkerR joined #git
15:21 ParkerR Is there a way to throw git a repo URL and commit and get how old the commit is in return?
15:22 _ikke_ Not without cloning the repo
15:22 ParkerR Ahh ok
15:22 sangy joined #git
15:22 ParkerR If it is cloned just use git log?
15:22 _ikke_ git log or git show
15:22 ParkerR Thanks
15:24 mindriot101 joined #git
15:24 delboy1978uk osse: got it, thanks for the tips :-)
15:25 jimi_sanchez joined #git
15:26 ParkerR _ikke_, What Im doing is just making a basic status check script for a program I use. It's updated from git so every time it updates Im printing how old the commit is after the update. Pulling fromt he website is working well enough.
15:26 delboy1978uk left #git
15:27 grantrules joined #git
15:27 qws-user-1229 joined #git
15:28 Guest26 joined #git
15:29 grantrules so i accidentally committed to master when i was supposed to make a branch and commit to that branch, is there a simple way to correct my mistake?
15:30 cyberz grantrules yes, you can checkout to new branch so you have the new commit
15:30 cyberz then you move back to master and you reset backward
15:30 perlpilot grantrules: I'd "git reset HEAD^; git checkout other-branch; git commit"
15:31 grantrules aha
15:31 grantrules that makes sense
15:31 sssilver joined #git
15:32 ash_workz joined #git
15:32 cyberz if you swap the order you don't even need to commit again the same stuff again
15:34 star_prone joined #git
15:38 BrianBlaze420 joined #git
15:38 fees joined #git
15:40 axisys joined #git
15:41 morenoh149 joined #git
15:43 axisys joined #git
15:43 mikecmpbll joined #git
15:44 BrianBlaze420 joined #git
15:45 Infamous joined #git
15:45 bitslip joined #git
15:46 emg joined #git
15:46 matsaman joined #git
15:47 davis joined #git
15:50 alhariel joined #git
15:54 rory left #git
15:56 grantrules so i got my local repo the way i want it, but how do i get the updated master branch on github?
15:56 grawity you push it there
15:56 grantrules it's asking me to pull first to catch it up to github
15:57 Ice_Strike2 joined #git
15:57 kadoban joined #git
15:58 grantrules hint: Updates were rejected because the tip of your current branch is behind its remote counterpart.
15:58 suspect joined #git
15:59 star_prone joined #git
15:59 grawity if you alter the published history in any way, you have to push --force it
16:00 mischat_ joined #git
16:00 grantrules ah yes, thanks
16:00 robotroll joined #git
16:00 clemf joined #git
16:01 BrianBlaze420 joined #git
16:01 mindriot101 joined #git
16:02 mischat__ joined #git
16:02 dilfridge joined #git
16:03 mischat joined #git
16:04 rominronin joined #git
16:04 suspect Hi, I was wondering if anyone could help me out
16:04 suspect I'm trying to clone my repo via ssh and i'm getting "Permission denied (publickey). fatal: could not read from remote repository.". I have an ssh key attached to my github account and I have the public key in my authorized_keys file. What am i missing?
16:05 mustmodify joined #git
16:05 suspect I guess what I'm asking is - what exactly is required to clone via ssh on the client i.e. my server? do i need the private key on there?
16:05 mustmodify Just read man, can't find this... how do I increase the number of lines shown by `git diff` unified format?
16:05 kadoban suspect: What does 'ssh git@github.com' say/do? Also, authorized_keys is for people getting *into* your machine, not out of.
16:07 suspect I got Permission denied (publickey).
16:08 kadoban suspect: Did it ask you anything first? Is the keypair you're using set up with your ssh-agent or whatever?
16:08 Walex suspect: are you trying to import from your local system to github or viceversa?
16:08 suspect I didn't ask me anything this time
16:08 rominron_ joined #git
16:09 morenoh149 can git reset untracked files? like I did git revert and that added some files, git reset is not deleting these files (to undo the git revert)
16:09 suspect from github to a remote server
16:09 polyrob joined #git
16:09 suspect my private key and agent with it added are on my local machine
16:09 Walex suspect: then as someone else said the private key must be on your system and the public key in github
16:10 suspect I have my public key in my authorized_keys on my remote server but nothing else
16:10 suspect ahh
16:10 suspect well that does make sense
16:10 mustmodify left #git
16:10 ojdo joined #git
16:11 suspect but someone just watch a small part of a youtube video to prove that i'm not going insane and explain to me how this guy cloned his repo over ssh without a private key locally
16:11 suspect but can* someone
16:12 kadoban suspect: Wait, what remote server? I thought you were trying to get into github. They won't let you modify files on their servers directly, you have to do stuff through their web interface.
16:12 grawity not all ssh servers require key-based auth
16:12 kadoban Or did I make up the github part?
16:12 mayank_kool joined #git
16:13 suspect it was definitely a github server :/
16:14 crose joined #git
16:15 Snugglebash joined #git
16:15 ToxicFrog suspect: "a" github server?
16:15 suspect sorry how do i reply to a user on here?
16:15 suspect with @?
16:16 ToxicFrog suspect: "github" is a public git hosting service, www.github.com. It is not general purpose git server software, nor is it a term for git servers in general.
16:16 matsaman suspect: 'nick:' is the most common way
16:16 ToxicFrog Just mention them by name in your message. By convention, at the start of the line with :.
16:16 matsaman suspect: most clients will highlight people for any inclusion of their nick at all, however
16:16 ToxicFrog (like I did with your name)
16:16 NeverDie joined #git
16:16 suspect :matsman thanks
16:16 matsaman suspect: most IRC clients will also tab complete nicknames a la Unix commands: m-a-t-TABkey
16:16 suspect damn
16:17 matsaman so you don't have to type out everyone's crazy nicks each time
16:17 ToxicFrog Yeah, if I type "su<tab>" at the start of the line it expands to "suspect: " (and elsewhere in the line just to "suspect")
16:18 suspect ToxicFrog: ahh thank you
16:18 romerocesar joined #git
16:18 ArchNoob joined #git
16:18 suspect ToxicFrog: I do know what github is in relation to git, I'm not explaining myself very well. If anyone could look at this a tell me how this is possible, it would help me understand whats happening (https://youtu.be/kR06NoSzAXY?t=254)
16:19 King_Hual joined #git
16:19 King_Hual joined #git
16:19 JamesBaxter joined #git
16:19 msonntag joined #git
16:19 LionsMane joined #git
16:19 mikecmpbll joined #git
16:19 matsaman suspect: what're you having trouble doing, getting free TLS?
16:20 suspect TLS?
16:20 matsaman "SSL"
16:20 kadoban "make a new dirrrr" *ragequit*
16:20 matsaman heh
16:20 ochorocho__ joined #git
16:21 Kodax joined #git
16:21 suspect I'm just confused, I can clone a repo over https, but this guy in this video (which i've been following) seems to somehow break the rules and clone a repo over ssh without a private key locally
16:21 sbulaage joined #git
16:22 suspect also don't watch the whole video of course, skip to here (https://youtu.be/kR06NoSzAXY?t=696)
16:22 suspect sorry i know i'm asking too much
16:22 grawity locally as in on their Mac, or locally as in on the server they're doing the clonage on?
16:23 Learath2 joined #git
16:23 grawity because SSH supports 'agent forwarding' where you can ssh to a remote host, and use your local keys from it
16:23 ArchNoob Hi, how can i get a certain commit to a new branch?
16:23 suspect grawity: on the server
16:23 suspect which they're doing the clone on
16:23 suspect sorry i didn't make that too clear :/
16:24 suspect grawity: that was actually what i was expecting to hear, but i'm not seeing that on my side
16:24 grawity you don't have it enabled on your side
16:25 grawity it requires a ssh-agent or equivalent, + ssh -A or equivalent .ssh/config item
16:25 suspect grawity: right, but neither should this guy on the video since I've been following it to a tee
16:25 grawity this guy on the video probably enabled it a few months ago
16:25 aarobc joined #git
16:25 grawity the 'agent' part is already on by default on OS X
16:26 subhojit_ joined #git
16:26 suspect grawity: he just built the server in the first couple of mins of the video, since the vps hosting service spins up new servers pretty much instantly
16:26 grawity sure, and this has absolutely nothing to do with the server
16:27 matsaman suspect: ideally your host would provide a shell script for doing most of this for you
16:27 suspect grawity: ahhh that makes sense
16:27 grawity it's activated on the *client*
16:27 suspect grawity: okay :)
16:27 ArchNoob Hi, how can i get a certain commit to a new branch?
16:27 suspect grawity: thank you, that really does make sense now.
16:27 grawity if `ssh-add -l` works for you, try sshing to your server using `ssh -A`
16:27 grawity and see if the same `ssh-add -l` on the server reports the same keys
16:28 suspect grawity: will do, thanks man
16:28 JanC_ joined #git
16:30 ArchNoob please help, when i `git log` i get commits i want to get a certain commit to a new branch.
16:30 fiveflowerzz If anyone has an idea for this: http://stackoverflow.com/questions/40613414/user-who-made-pull-request-doesnt-appear-in-contributor-list-after-merge
16:30 fiveflowerzz I'm struggling with this since many days in fact...
16:31 fees joined #git
16:32 suspect grawity: works as expected, they do report the same keys. Thanks man, for putting up with me that is :)
16:32 danslo joined #git
16:33 kadoban fiveflowerzz: Is that person's email address set up correctly both in the commits and in their github user account?
16:33 acetakwas joined #git
16:33 fiveflowerzz kadoban: what do you mean by in the commits?
16:33 fiveflowerzz in the user account, sure, i think an email address is mandatory
16:34 kadoban fiveflowerzz: Commits have metadata in them saying who made the commit, which includes the email address.
16:34 fiveflowerzz *github user account
16:34 kadoban fiveflowerzz: It doesn't matter if they have an email address in there, it needs to be matching ones, AFAIK.
16:34 fiveflowerzz how to set up this metadata when doing "git commit -m "hjkh" "
16:34 venmx joined #git
16:35 mindriot101 joined #git
16:35 kadoban fiveflowerzz: You set it using git config. Git usually bugs the shit out of you until you do so. If you do 'git show' on some of the commits, you can see what metadata is in there.
16:36 kadoban fiveflowerzz: If you do something like 'git config --list | grep user', you should see user.email and user.name, for instance. Those are what get put into the commits you make.
16:38 fiveflowerzz i'm going to try this, thanks a lot!
16:38 zivester joined #git
16:38 kadoban 'welcome
16:39 HoierM joined #git
16:39 ArchNoob help!
16:39 Mixologic_ joined #git
16:41 BrianBlaze420 joined #git
16:42 CubiK joined #git
16:42 kadoban ArchNoob: You'd probably get more response if your question were more exactly stated. It's unclear what you want to happen.
16:43 e14 joined #git
16:44 durham joined #git
16:44 ochorocho__ joined #git
16:44 durham joined #git
16:44 Siegfried joined #git
16:46 venmx joined #git
16:46 NeverTired joined #git
16:48 astrofog joined #git
16:48 rominronin joined #git
16:51 Es0teric joined #git
16:53 tyreld joined #git
16:54 ResidentBiscuit joined #git
16:55 Electrometro joined #git
16:55 ResidentBiscuit joined #git
16:55 ResidentBiscuit joined #git
16:56 venmx joined #git
16:56 ResidentBiscuit joined #git
16:56 synthroid joined #git
16:56 ResidentBiscuit joined #git
16:56 ResidentBiscuit joined #git
16:59 nilg` joined #git
16:59 Derperperd joined #git
17:01 venmx joined #git
17:02 Es0teric joined #git
17:03 nikivi joined #git
17:04 duvnell1 joined #git
17:05 AnimeWeedLord420 joined #git
17:05 Lingo joined #git
17:05 einnjo joined #git
17:06 cdg joined #git
17:06 duvnell1 git clone --recursive    clones all submodules to (IIUC).. is there a way to have that even ignore a list of submodules?  this repo has many submodules, most of which I want, but there are a few that I don't need which are very large
17:06 duvnell1 custom script?
17:06 thiago joined #git
17:07 thierryp joined #git
17:08 Dougie187 duvnell1: I think you'd have to do it in two steps.
17:08 Dougie187 One which clones, and removes the unneeded submodules
17:08 Dougie187 and then another which gets all of the needed submodules.
17:09 Dougie187 Or rather, something like: `git clone; git submodule update --init {needed_submodules}`
17:09 elsevero_ joined #git
17:09 Raging_Hog joined #git
17:09 Dougie187 I haven't ever done that before, so I don't know if that would work, but you can try it.
17:10 Mixologic_ joined #git
17:10 Guest26 joined #git
17:11 svm_invictvs joined #git
17:12 Snugglebash joined #git
17:12 jimi joined #git
17:13 dreiss joined #git
17:14 crayon joined #git
17:14 caryatid joined #git
17:15 jimi_ joined #git
17:15 jnewt joined #git
17:16 saedelaere joined #git
17:16 caryatid Hello! question about removed files and resets. Situation: wanting to effectively squash a feature branch to one commit off of master. w/ HEAD of feature branch in my working dir: "git reset master; <something>; git commit -m 'adds feature'..."
17:17 caryatid for that <something> it could be just "git add ."; however I run into a situation when the feature branch has removed files.
17:18 meauses joined #git
17:18 jimi_sanchez joined #git
17:18 caryatid i.e. master has file a.txt.  feature branch "git rm a.txt" in it's commit history
17:18 caryatid after the reset. master still has a.txt in it's index
17:19 lindenle joined #git
17:19 meLon joined #git
17:19 caryatid is there a way to essentially say. I just reset head. But I want to remove all files from the index that were removed during the commit history between where I just reset too and where HEAD just was.
17:19 jimi_sanchez joined #git
17:20 caryatid s/too/to/
17:20 shashin joined #git
17:20 madebymarkca joined #git
17:21 Mixologic_ joined #git
17:21 Raging_Hog joined #git
17:23 kpease joined #git
17:24 kpease_ joined #git
17:24 iota_pi joined #git
17:25 nicksloan joined #git
17:25 tang^ joined #git
17:29 dviola joined #git
17:29 TylerEastman joined #git
17:30 shashin joined #git
17:33 danslo joined #git
17:34 meauses joined #git
17:34 Ice_Strike2 joined #git
17:35 danslo_ joined #git
17:35 svm_invictvs joined #git
17:37 InfoTest joined #git
17:41 venmx joined #git
17:43 steffen__ joined #git
17:44 meauses joined #git
17:44 wagle joined #git
17:46 duvnell1 Dougie187: k thx
17:46 venmx joined #git
17:46 duvnell1 I think a custom script is required
17:46 duvnell1 which really sucks for cross platform development
17:46 Dougie187 Yeah
17:46 Dougie187 Only really on the windows side though
17:46 duvnell1 yeah
17:46 Endarked joined #git
17:48 whomp joined #git
17:48 Siegfried joined #git
17:49 rominronin joined #git
17:51 nicksloan joined #git
17:51 bmahe joined #git
17:53 star_prone joined #git
17:53 mikecmpbll joined #git
17:54 chris123456 joined #git
17:54 www-bukolay-net joined #git
17:55 ahmedelgabri joined #git
17:56 pks joined #git
17:59 jbitdrop joined #git
18:00 madebymarkca joined #git
18:01 ochorocho__ joined #git
18:04 anonymuse joined #git
18:06 subhojit__ joined #git
18:07 marc_v92 joined #git
18:07 InfoTest joined #git
18:08 kyan joined #git
18:08 SteffanW joined #git
18:10 linuxboytoo joined #git
18:10 Endarked joined #git
18:11 LBV_User joined #git
18:12 nidr0x joined #git
18:12 achlys joined #git
18:12 afuentes joined #git
18:14 courrier joined #git
18:15 creppe joined #git
18:15 thebope joined #git
18:15 nkuttler joined #git
18:17 astrofog joined #git
18:17 courrier I want to correct the user.name and user.email have been set by my colleague, even by emptying them or setting them to my name, the commits are still made using his name, what's wrong? git config --global user.email returns the right value (empty or my email/name) but commits are still using his name
18:19 kadoban courrier: Commits are not changed after they're created, unless you tell it to do so (generally kind of annoying). Is that what you're running into?
18:19 eivarv joined #git
18:19 courrier Yes of course, I mean *new* commits kadoban
18:19 TylerEastman joined #git
18:20 courrier New commits are still using his name while the value of user.email and user.name are set to myself
18:21 kadoban courrier: What is 'git config user.email' ?
18:21 sssilver joined #git
18:21 chris2 joined #git
18:22 courrier kadoban: It is his email, so maybe this --global is the trick
18:22 railssmith joined #git
18:22 courrier what is this --global made for?
18:24 courrier OK I got it, his name was in the .git/config file, thanks!
18:25 kadoban courrier: Ya, global is for like, generally anything in your user, but then you can override it per-repository.
18:25 yaki29 joined #git
18:26 courrier Thanks kadoban :)
18:26 Spec-Chum joined #git
18:26 kadoban 'welcome
18:28 Macaveli joined #git
18:30 ola joined #git
18:30 elsevero joined #git
18:31 marc_v92 joined #git
18:32 wizardedit joined #git
18:32 wizardedit joined #git
18:33 hariel joined #git
18:35 Starky joined #git
18:36 achlys joined #git
18:38 jimi_ joined #git
18:39 overlord_tm joined #git
18:39 eivarv joined #git
18:41 derk0pf joined #git
18:41 ArchNoob joined #git
18:43 dreiss joined #git
18:45 Es0teric joined #git
18:47 lordjancso joined #git
18:48 napping joined #git
18:50 joki- joined #git
18:55 Sasazuka joined #git
18:59 Starky joined #git
19:01 raspado_ joined #git
19:02 Endarked joined #git
19:02 Faylite joined #git
19:03 yehowyada joined #git
19:04 nikivi joined #git
19:07 aard_ joined #git
19:09 mischat joined #git
19:10 www-bukolay-net joined #git
19:13 quetz joined #git
19:17 einnjo joined #git
19:17 vuoto joined #git
19:18 TylerEastman joined #git
19:18 sea-gull_ joined #git
19:20 crose joined #git
19:20 rominronin joined #git
19:21 Darren_ joined #git
19:24 Faylite_ joined #git
19:26 garethdaine joined #git
19:27 matsaman joined #git
19:29 Vangelis joined #git
19:29 dsantiago joined #git
19:31 finalbeta joined #git
19:31 hahuang65 joined #git
19:33 mindriot101 joined #git
19:34 qws-user-1228 joined #git
19:34 mohan_ joined #git
19:34 danslo joined #git
19:36 hahuang65 joined #git
19:39 exarch joined #git
19:40 crose joined #git
19:40 nicoulaj joined #git
19:40 hahuang65 joined #git
19:40 shaggycat joined #git
19:41 leehambley joined #git
19:41 Vangelis joined #git
19:41 Achylles joined #git
19:41 ArchNoob joined #git
19:43 nilg` joined #git
19:45 sssilver joined #git
19:47 leehambley joined #git
19:50 justanotherbody joined #git
19:50 Es0teric joined #git
19:53 mda1 joined #git
19:54 justanotherbody i have a file with staged changes, and unstaged changes. i have other files with staged changes. how do i commit only the staged changes for only one file?
19:55 marc_v92 joined #git
19:56 MacWinner joined #git
19:56 kadoban justanotherbody: Maybe stash with --keep-index and then 'git commit -- thefile' and then apply the stash? Kind of a guess, I think that works though.
19:57 justanotherbody kadoban: thank you!
19:58 kadoban Anytime
19:59 jstimm joined #git
20:03 jstein_ joined #git
20:03 Kodax joined #git
20:05 tomaw joined #git
20:05 dsantiag_ joined #git
20:07 gnat42 joined #git
20:07 Salander27 joined #git
20:08 gnat42 So I have an issue I've created that I'm hoping someone has some idea on how to solve. I have a project where we three branches + master. each branch is a 'version' of the software for a particular department of the same company with small changes.
20:08 gnat42 We often add new features to master, and then merge and fix conflicts with each branch
20:08 jccn joined #git
20:09 gnat42 however for this one feature, part of it was created in master, and then branch specific content was created for each branch
20:09 gnat42 since then more has been added to master and merged to each branch
20:09 fatalhalt joined #git
20:09 gnat42 but now we want master to have those content files (even if they are empty)
20:09 gnat42 however if I add one to master and commit and then merge, it will wipe out the content in the branches
20:09 gnat42 any suggestions on how to handle the situation?
20:13 achlys joined #git
20:14 hashpuppy joined #git
20:15 napping can blank-at-eol allow escaped whitespace, like '\ '
20:15 kyan joined #git
20:16 Seveas no
20:16 Derperperd joined #git
20:16 fahadash joined #git
20:18 e14 joined #git
20:19 skift joined #git
20:22 adac joined #git
20:24 ArchNoob joined #git
20:24 dunpeal joined #git
20:25 dunpeal Hi. I'm on branch master, and I have two commits, A and B, that haven't been pushed to origin/master.  B is master head and HEAD, but I just want to push A. How do I easily achieve this?
20:26 napping A is before B?
20:26 aidalgol joined #git
20:26 Seveas dunpeal: git push origin HEAD^:master
20:26 jstimm joined #git
20:27 polyrob joined #git
20:28 achlys joined #git
20:30 morenoh149 joined #git
20:32 e14 joined #git
20:34 Guest26 joined #git
20:34 paultreny joined #git
20:35 Infinite_182 joined #git
20:35 russ_za joined #git
20:37 Guest20176 joined #git
20:38 Macaveli joined #git
20:40 Infinite_182 joined #git
20:45 mindriot101 joined #git
20:46 funfunctor joined #git
20:48 noecc left #git
20:49 rorro joined #git
20:50 byte512 joined #git
20:51 Jackneill_ joined #git
20:51 rominronin joined #git
20:52 garethdaine joined #git
20:52 jimi_sanchez joined #git
20:54 aax joined #git
20:54 jimi joined #git
20:54 [cust] joined #git
20:54 chris2 joined #git
20:54 napping left #git
20:57 e14 joined #git
20:59 achlys joined #git
21:00 todd_dsm joined #git
21:00 cdg joined #git
21:00 e14 joined #git
21:01 cdg joined #git
21:03 jstimm joined #git
21:03 e14 joined #git
21:04 mda1 joined #git
21:05 ollieshmollie joined #git
21:05 e14 joined #git
21:07 elastix joined #git
21:07 denisMone joined #git
21:07 finalbeta joined #git
21:08 g2 joined #git
21:10 Akimb joined #git
21:11 russ_za joined #git
21:12 mkoskar joined #git
21:13 matsaman joined #git
21:14 jwmann joined #git
21:15 dunpeal joined #git
21:15 kbx joined #git
21:16 jimi_sanchez joined #git
21:16 dsdeiz joined #git
21:16 dsdeiz joined #git
21:16 crayon joined #git
21:16 crayon joined #git
21:16 dunpeal Seveas: thanks, that worked.
21:17 dunpeal I tried `git push origin HEAD^`, but it didn't work, I suppose because git doesn't know which upstream to use.
21:18 dunpeal (It makes sense for it to use the default upstream for the currently checked out branch, but I guess it won't.)
21:19 kbx How can I wrap too long lines in the gitk (GUI) diff view?
21:22 cdown joined #git
21:22 nwkj86 joined #git
21:23 snowkidind joined #git
21:25 danslo joined #git
21:25 b1tchcakes joined #git
21:28 m0viefreak joined #git
21:29 drmt joined #git
21:30 apotry joined #git
21:31 e14 joined #git
21:35 jimi joined #git
21:35 achlys joined #git
21:36 drmt joined #git
21:37 moei joined #git
21:44 e14 joined #git
21:44 nettoweb joined #git
21:44 systemovich joined #git
21:44 WaReZ joined #git
21:45 Siegfried joined #git
21:45 souther joined #git
21:46 WayToDoor joined #git
21:47 dreamseeker_ joined #git
21:48 inflames joined #git
21:48 adac joined #git
21:53 ArchNoob joined #git
21:54 achlys joined #git
21:54 tonyj joined #git
21:58 Siegfried joined #git
22:00 boombatower joined #git
22:02 macivy joined #git
22:06 blackwind_123 joined #git
22:07 cagedwisdom joined #git
22:08 achlys joined #git
22:08 macivy novice user here; I applied 2 commits to master instead of the maintenance branch. How can I make it right?
22:12 thebope joined #git
22:12 rodd joined #git
22:12 rodd whats the safest way to revert master to a specific commit?
22:12 rodd git revert hash?
22:13 d5sx43 joined #git
22:14 whomp joined #git
22:15 Es0teric joined #git
22:16 systemovich joined #git
22:18 elsevero joined #git
22:19 kpease joined #git
22:19 kpease_ joined #git
22:20 sonOfRa rodd: that doesn't revert master TO that commit, that reverts all actions performed by that commit
22:21 ISmithers joined #git
22:22 rodd thanks sonOfRa I went with reset --hard
22:24 rominronin joined #git
22:24 davimore joined #git
22:25 rmbeer joined #git
22:26 rmbeer hello, i still not understand, how to comment in the commit? it's confused me.
22:26 russ_za left #git
22:27 rodd so I did a reset to a specific commit on master
22:28 rodd how can other user pull the forced update on their branch which contains the commits reseted?
22:28 ISmithers joined #git
22:29 crayon joined #git
22:29 eivarv joined #git
22:30 rodd without cloning the repo again?
22:30 rmbeer if i use 'git commit' only appear a editor with any text, i must remove this text and put my comment?
22:31 kadoban rmbeer: Just write your commit message at the top. You can leave the commented-out lines alone, they don't hurt anything.
22:31 crayon joined #git
22:32 davimore joined #git
22:32 crayon joined #git
22:32 rmbeer kadoban, ah, ok. thank.
22:35 dodobrain joined #git
22:36 star_prone joined #git
22:37 rmbeer left #git
22:39 Infinite_182 joined #git
22:41 Siegfried joined #git
22:46 CheckDavid joined #git
22:47 hackel joined #git
22:48 Groscheri joined #git
22:49 gnat42 left #git
22:52 AfroThundr joined #git
22:54 Achylles joined #git
22:54 railssmith joined #git
22:55 done joined #git
22:59 jeffreylevesque joined #git
23:02 aidalgol joined #git
23:02 ToxicFrog left #git
23:05 justanotheruser joined #git
23:07 fatalhalt joined #git
23:08 LBV_User joined #git
23:08 Kulrak joined #git
23:08 Kulrak joined #git
23:13 hahuang65 joined #git
23:14 jimi_ joined #git
23:16 cagedwisdom joined #git
23:17 NeverDie joined #git
23:17 ArchNoob joined #git
23:18 Jameser joined #git
23:19 mindriot101 joined #git
23:20 Lunatrius joined #git
23:20 NeverDie joined #git
23:20 hahuang65 joined #git
23:21 jstimm joined #git
23:21 peeps[lappy] joined #git
23:21 holgersson_ joined #git
23:22 danslo joined #git
23:23 GavinMagnus left #git
23:24 dsdeiz joined #git
23:31 danimal2 joined #git
23:38 Marbug_ joined #git
23:39 radsy joined #git
23:40 idhmi joined #git
23:42 Gianormagantrous joined #git
23:46 Lunatrius` joined #git
23:50 SwiftMatt joined #git
23:53 Lunatrius` joined #git
23:53 Aeat joined #git
23:55 rominronin joined #git
23:56 sangy joined #git
23:57 Lunatrius joined #git
23:58 SpeakerToMeat joined #git
23:58 DolpheenDream joined #git
23:59 alhariel joined #git

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