Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-17

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

All times shown according to UTC.

Time Nick Message
00:03 anuxivm left #git
00:04 User458764 joined #git
00:05 kexmex joined #git
00:07 rkazak joined #git
00:09 tgragnato joined #git
00:10 Aaeriele joined #git
00:13 TheFuzzball joined #git
00:14 f0rks joined #git
00:14 ZyX-I joined #git
00:16 Hunter1 joined #git
00:16 cbreak joined #git
00:18 rebrec joined #git
00:18 BSAlb joined #git
00:20 clickjack joined #git
00:20 thebope joined #git
00:20 mmlb joined #git
00:23 manitu joined #git
00:29 Masber_080 joined #git
00:33 wxg joined #git
00:38 dave0x6d joined #git
00:39 tgragnato joined #git
00:39 cahoots joined #git
00:43 ti2 joined #git
00:46 thebope joined #git
00:47 Noldorin joined #git
00:49 mel00010 joined #git
00:50 LovesTha joined #git
00:51 svm_invictvs joined #git
00:54 fstd_ joined #git
00:57 boombatower joined #git
00:57 pifon joined #git
00:58 Hunter1 joined #git
00:59 rivarun joined #git
01:00 livingstn joined #git
01:00 qpdb joined #git
01:00 d^sh joined #git
01:01 rivarun joined #git
01:02 cstratak joined #git
01:03 rivarun joined #git
01:05 fletom joined #git
01:06 prg3 joined #git
01:09 dirtyroshi joined #git
01:10 rivarun joined #git
01:10 acetakwas joined #git
01:12 raijin joined #git
01:14 peterbecich joined #git
01:15 livingstn joined #git
01:15 roelmonnens joined #git
01:17 jonclark joined #git
01:19 mquin joined #git
01:19 cahoots joined #git
01:19 Cabanossi joined #git
01:20 dsdeiz joined #git
01:21 LTRand joined #git
01:23 wakd joined #git
01:24 jeffreylevesque_ joined #git
01:25 mmlb joined #git
01:26 rchavik joined #git
01:26 publio joined #git
01:27 finalbeta joined #git
01:27 livingstn joined #git
01:28 mizu_no_oto joined #git
01:28 thiago joined #git
01:28 sunri5e joined #git
01:31 PaulCapestany joined #git
01:32 durham_ joined #git
01:33 raijin joined #git
01:34 tmsmith joined #git
01:34 cdg joined #git
01:34 cebula joined #git
01:36 scottjl joined #git
01:47 Dougie187 left #git
01:47 Zialus joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 fission6 joined #git
01:50 cord_ joined #git
01:52 cord_ left #git
01:53 justanotheruser joined #git
01:55 d^sh joined #git
01:55 invisbl joined #git
01:56 theiostream joined #git
02:00 jaziz joined #git
02:01 tgragnato left #git
02:03 cqi joined #git
02:06 lagothrix joined #git
02:07 Aljone joined #git
02:07 jameser joined #git
02:07 rominronin joined #git
02:10 HoierM joined #git
02:12 Stumbler joined #git
02:13 raspado joined #git
02:16 netj joined #git
02:16 tourdownunder joined #git
02:18 Vortex34 joined #git
02:22 b0nn hmm, I need to undo something, and the pathway isn't clear
02:23 b0nn I have branch A, and B. I was working on B, stashed the changes, checkedout A, popped the diff (git stash pop), committed 1 file(s) changes and pushed
02:24 b0nn The issue is, one other file had its changes applied and I don't want that
02:24 b0nn how do I undo that?
02:24 raijin joined #git
02:25 preaction git reset -p
02:25 ojdo joined #git
02:26 b0nn ignoring unmerged: facs/reform/rbl/forms.py
02:26 b0nn No changes.
02:29 hexagoxel joined #git
02:30 duderonomy joined #git
02:30 b0nn all good, I reset to HEAD, thinking I could live with losing the changes to that one file
02:31 b0nn stashed, then checkout B, and popped and all was well in the kingdom
02:32 Gsham joined #git
02:35 redoverture joined #git
02:40 maarhart joined #git
02:43 di0_ joined #git
02:46 garyserj joined #git
02:47 jfoiewj joined #git
02:49 TbobbyZ joined #git
02:50 Stumbler_ joined #git
02:51 msafi joined #git
02:52 prg3 joined #git
02:52 nckpz joined #git
02:52 chachasmooth joined #git
02:53 msafi How do I revert my working directory to a previous commit while keeping the history? I added a bunch of commits that I realized were wrong. Now I wanna reverse those commits
02:56 preaction msafi: git revert
02:58 msafi Thanks preaction
02:59 Lyqyd joined #git
03:00 jameser joined #git
03:01 drodger joined #git
03:02 roelmonnens joined #git
03:04 Cabanossi joined #git
03:08 aavrug joined #git
03:10 m1dnight1 joined #git
03:14 chu joined #git
03:15 justanotheruser joined #git
03:18 duderonomy joined #git
03:21 a_thakur joined #git
03:24 b0nn if I have several files that have been changed in my working directory, and I want to stash them, but not all in one stash. (ie I want to stash 1 file in one stash, and the other files in another); Is taht possible?
03:24 LTRand joined #git
03:24 b0nn git stash fileA fileB... fileC didn't work
03:26 LovesTha --patch might help
03:26 LeBlaaanc joined #git
03:26 LovesTha it at least is going in the right direction
03:26 b0nn git stash -p ?
03:27 LovesTha git stash --patch
03:27 b0nn ok
03:27 LovesTha Also you might want to go the other way: commit the files that you want then stash the rest
03:27 b0nn according to http://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git there is a git stash push [--] [<pathspec>...]
03:28 LovesTha 'that you want' being the files you don't want to stash
03:30 duderonomy Using github, I fork origRepo; clone myRepo to localhost; make new-branch; do a commit. The next thing I want to do is push to myRepo... But somehow managed to push my branch to origRepo. Was the use of `git push -u origin newBranch` wrong? I want to know how to push to myRepo.
03:30 Cabanossi joined #git
03:31 duderonomy git remote -v; indicates origin is myRepo
03:34 darthho0 joined #git
03:34 darthho0 hey, what file do i edit to not include files by extension?
03:35 duderonomy when I do a `git remote branch --all` I see newbranch is on localhost; and remotes/origin/newBranch
03:35 duderonomy .gitignore, maybe if I understand your question
03:37 LTRand joined #git
03:38 rominronin joined #git
03:39 watabou joined #git
03:40 brent__ joined #git
03:40 b0nn so, I upgraded git to v2.13.0 (I was on v2.12.0) and was able to git stash push fileA fileB, leaving fileC for a second stash
03:40 b0nn :-D
03:40 b0nn or I just deleted all my work :|
03:43 di0_ joined #git
03:49 Introoter joined #git
03:51 mel00010 joined #git
03:52 eehackr joined #git
03:52 davidomanfredo joined #git
03:53 duderonomy b0nn As an alternative, as I have thought that I have had same problem too. Just: stash, then go to new branch where file(s) belongs, stash apply, make a commit, stash. Repeat. Maybe the idea helps.
03:58 svm_invictvs joined #git
04:01 jrahmy_ joined #git
04:05 Ulysses1 joined #git
04:05 clickjack joined #git
04:06 Gsham joined #git
04:07 invisbl joined #git
04:11 raijin joined #git
04:15 diogenese joined #git
04:16 Goplat joined #git
04:19 dege joined #git
04:19 davidomanfredo_ joined #git
04:29 robotroll joined #git
04:37 ayogi joined #git
04:40 mohabaks joined #git
04:43 Anja_ joined #git
04:44 lindenle joined #git
04:45 cagomez joined #git
04:46 freddy_ joined #git
04:49 freimatz joined #git
04:50 mel00010 joined #git
04:52 TbobbyZ joined #git
04:53 Lyqyd joined #git
04:54 Murr joined #git
04:57 cqi joined #git
04:58 realpwn joined #git
05:04 prg3 joined #git
05:05 MineCoins joined #git
05:09 rominronin joined #git
05:14 LeBlaaanc joined #git
05:14 meLon joined #git
05:17 dec0n joined #git
05:17 lucifershammer joined #git
05:17 bket joined #git
05:17 sunaku joined #git
05:19 Bock joined #git
05:20 rscata joined #git
05:21 Bock joined #git
05:25 MrWoohoo joined #git
05:28 diogenese joined #git
05:29 overlord_tm joined #git
05:30 miczac joined #git
05:32 fatalhalt joined #git
05:33 str joined #git
05:33 jameser_ joined #git
05:35 cioran89 joined #git
05:38 prg3 joined #git
05:39 qt-x joined #git
05:40 mohabaks joined #git
05:43 BETTYBoop joined #git
05:43 madewokherd` joined #git
05:45 prg3 joined #git
05:45 Cabanossi joined #git
05:47 Raging_Hog joined #git
05:48 ThomasLocke joined #git
05:48 ThomasLocke joined #git
05:51 clickjack joined #git
05:51 jrahmy_ joined #git
05:54 jfr joined #git
05:54 schleppel joined #git
05:54 prg3 joined #git
05:57 freddy__ joined #git
05:57 LTRand joined #git
06:00 dermoth joined #git
06:03 ertes-w joined #git
06:06 ExpiredDev joined #git
06:09 k0nichiwa joined #git
06:09 k0nichiwa when i add an open source lib to my project ive been deleting the ".git" repo
06:09 k0nichiwa so it all goes into the repo for my project
06:10 k0nichiwa does git have some magical way of handling repositories within the file tree for the main repo?
06:10 selckin submodules, but usually you are better off using your $language tools for dependency management
06:11 lordjancso joined #git
06:11 MineCoins joined #git
06:12 Bhootrk_ joined #git
06:12 k0nichiwa well i dont want to assume the repo at github will continue to exist
06:14 Brski joined #git
06:14 ogny joined #git
06:14 ogny joined #git
06:16 DBag joined #git
06:17 zefferno joined #git
06:18 SkyPatrol_ joined #git
06:20 chele joined #git
06:21 SkyPatrol joined #git
06:23 roelmonnens joined #git
06:26 SaschaVoid joined #git
06:27 bilal joined #git
06:28 rominronin joined #git
06:31 sgen joined #git
06:31 bilal_ joined #git
06:32 MattMaker joined #git
06:35 JeroenT joined #git
06:37 D630 joined #git
06:38 Murr- joined #git
06:38 kadoban k0nichiwa: As I understand it, if you nest repos, the main repo will just ignore the nested ones. If you want the sub repos acutally tracked, I think you want to do submodules or the 'git subtree' contrib command. The latter is probably a decent amount better if you ever want to share history between an upstream library repo and your superrepo, like if you need to change your libraries themselves ever.
06:38 rpi joined #git
06:38 kadoban But it might not be worth the effort, depends on how exactly you work I suppose.
06:39 selckin i guess this is like php without proper dependency managment tools?
06:39 rpi joined #git
06:41 kadoban There's quite a few contexts in which you wouldn't want to rely on language-or-os-specific build tools. Like when you need to change the libraries, or when they suck or when you're worried about the libraries disappearing on you, etc.
06:41 kadoban But ya, usually probably a better idea.
06:41 selckin neither of those reasons would have me nesting it in my repo, i'd keep them as seperate repos
06:41 bilal_ joined #git
06:43 rpi joined #git
06:44 nd_ joined #git
06:44 AndreasLutro if you're worried about it disappearing from github, just create a private mirror - all language dependency management tools I know will allow you to use a private mirror
06:44 sbulage joined #git
06:49 freddy_ joined #git
06:50 chandu20 joined #git
06:50 manuelschneid3r joined #git
06:51 freimatz joined #git
06:51 freddieptf joined #git
06:51 Brski_ joined #git
06:54 Brski__ joined #git
06:55 TbobbyZ joined #git
06:55 FuzzyWuzzyPanda joined #git
06:56 King_Hual joined #git
06:57 r3c0d3x joined #git
06:58 arooni joined #git
06:58 ThomasLocke_ joined #git
06:58 elect joined #git
07:01 Cabanossi joined #git
07:01 cagomez joined #git
07:05 chachasmooth joined #git
07:05 D4R5C0D3 joined #git
07:05 flaviodesousa joined #git
07:07 hashtagstrashtag joined #git
07:09 milki_ left #git
07:10 milki joined #git
07:14 Tobbi joined #git
07:14 TomyWork joined #git
07:18 rsv joined #git
07:19 Bhootrk_ joined #git
07:19 rsv hello, i have mirrored a git from a "remote" server to my local server. Now i want to push patches to my local server
07:20 rsv However, when i do git remote on the local machine. It shows "remote server". How can i push the patches here.
07:21 batrick joined #git
07:22 jast you can add a second remote: git remote add localserver <url> (choose any name you like)
07:24 Bhootrk_ joined #git
07:24 wagle joined #git
07:25 freddy_ joined #git
07:26 freddy_ joined #git
07:26 tvw joined #git
07:27 rsv how can a git have 2 remotes?
07:27 Brski joined #git
07:28 robattila256 joined #git
07:28 om_henners joined #git
07:29 AndreasLutro how can it not?
07:31 elect joined #git
07:32 SaschaVoid joined #git
07:33 freddy_ joined #git
07:35 kelvah joined #git
07:36 ki0_ joined #git
07:36 MrMojit0 joined #git
07:36 aielima joined #git
07:37 mikecmpbll joined #git
07:41 chachasmooth joined #git
07:41 zulutango joined #git
07:42 jast rsv: just because the normal situation is that there's just one and that it's called "origin" doesn't mean that git doesn't account for situations in which you might need more
07:42 diogenese joined #git
07:43 rsv i did not quite understand the situation when you need 2 remotes
07:43 rsv sorry for being naive
07:43 pbandark joined #git
07:43 dersand joined #git
07:47 mozzarella joined #git
07:48 DaGoaty joined #git
07:50 moei joined #git
07:54 h12o joined #git
07:55 JeroenT joined #git
07:57 Vgr joined #git
07:57 Vgr joined #git
07:59 mikecmpbll joined #git
08:00 LTRand joined #git
08:00 kurkale61 joined #git
08:00 MACscr joined #git
08:01 Hunter1 joined #git
08:02 JeroenT joined #git
08:02 marcogmonteiro joined #git
08:04 hurricanehrndz joined #git
08:07 chigang_ joined #git
08:07 mar77i joined #git
08:07 ThomasLocke joined #git
08:08 romank joined #git
08:11 alcohol i often use a second remote for projects i fork
08:11 User458764 joined #git
08:11 Snugglebash joined #git
08:11 alcohol the origin is my fork, the upstream is the main repo
08:11 alcohol (upstream is just a name i use, but its common i think)
08:12 chardan joined #git
08:12 a_thakur joined #git
08:12 alcohol oh, rsv already left :<
08:14 j08nY joined #git
08:17 roelmonnens joined #git
08:17 DaGoaty joined #git
08:17 JeroenT joined #git
08:17 metalraiden34 joined #git
08:18 DaGoaty joined #git
08:18 acetakwas joined #git
08:19 Marumarsu joined #git
08:19 DaGoaty joined #git
08:19 chachasmooth joined #git
08:19 DaGoaty joined #git
08:20 synthmeat joined #git
08:20 DaGoaty joined #git
08:20 Gloomy joined #git
08:21 mdw joined #git
08:22 jameser joined #git
08:23 ferr joined #git
08:24 Anja_ joined #git
08:25 skunkz joined #git
08:26 JeroenT joined #git
08:28 theoceaniscool joined #git
08:30 Acerific joined #git
08:30 Levex joined #git
08:30 raijin joined #git
08:31 D4R5C0D3 joined #git
08:33 MattMaker joined #git
08:35 a_thakur joined #git
08:36 bark4mark joined #git
08:36 cstratak joined #git
08:38 slidercrank joined #git
08:38 _ADN_ joined #git
08:40 Snugglebash joined #git
08:42 strk joined #git
08:42 cstratak joined #git
08:42 floppydh joined #git
08:42 marcogmonteiro joined #git
08:42 strk (how) can I specify a --reference for git init or git fetch operations ? (or via git config?)
08:46 grawity strk: list the paths in .git/objects/info/alternates
08:46 canton7 strk, iirc, .git/info/alternates is a file which contains paths to other git repository's 'objects' directories, one per line
08:46 canton7 damnit, you're right: .git/objects/info/alternates
08:46 strk thanks! no wrapper command to manage that ?
08:47 canton7 git clone --reference and friends :P
08:47 strk I'm looking for "friends", as I'm using init + fetch :)
08:47 strk (ie: not clone)
08:48 canton7 I think it might just be clone
08:48 karols146 joined #git
08:48 stepho joined #git
08:50 Darcidride joined #git
08:52 t3d joined #git
08:53 strk will do manually, thanks :)
08:55 manuelschneid3r I have a repo2 in my repo1. Both have remotes. How do I make repo2 submodule of repo1.
08:55 notebox joined #git
08:55 synthmeat joined #git
08:56 strk manuelschneid3r: I suggest (for simplicity) that you move your subdirectory somewhere else and use `git submodule init --reference <somewhereelse> ...
08:56 aidalgol joined #git
08:56 ams__ joined #git
08:56 strk so you also have a backup in case anything goes wrong
08:57 Sandlayth joined #git
08:57 Sandlayth hello guys
08:57 manuelschneid3r are submodules even intended to be nested on a development machine?
08:58 TbobbyZ joined #git
08:59 Sandlayth i'm ofter facing a problem, and i would like to know if there is a clean manner to resolve it. I explain to you:
08:59 strk manuelschneid3r: submodules are only for nesting (or I'm missing what you mean)
08:59 Murii joined #git
09:01 xall joined #git
09:01 manuelschneid3r nested verisoning yes. but I could also clone them all into the top level directory and work in that flat directory structure. what is common practice?
09:02 strk manuelschneid3r: you use a submodule if you want to track an *exact* version of a dependency
09:02 xall joined #git
09:03 sbasso joined #git
09:03 strk or, that's a way to deal with them
09:04 gunnaro joined #git
09:05 xall i had unstaged and unstaged changes and i just fucked up by doing `git stash save --keep-index && git stash pop`. now all the changes are unstaged and i cannot differentiate between the two
09:05 xall can i get back to that state (unstaged and staged) with reflog or something?
09:06 Sandlayth I've 2 branches, master and bug. Bug comes from a precedent state of master, and now both of them are updated with a distant repo. Now, I rebase bug onto master, and bug is supposed to still be up to date, isn't it? That's what i thought until i see "Your branch and bug have diverged, and and have 24 and 12 different commits each, respectively."
09:07 Sandlayth Obviously, master have evolved when I was working on bug
09:11 xall_ joined #git
09:12 TheFuzzball joined #git
09:13 mar77i_ joined #git
09:14 nineg joined #git
09:15 moritz rebasing was a mistake
09:15 moritz after you've pulled in changes from a remote repo, you rebase those changes onto your local master
09:16 moritz which changes the identity of the commits that came from the remote
09:16 moritz hence the message about divergence
09:16 * moritz merges instead
09:17 cagomez joined #git
09:18 cbreak moritz: typically, you'd rebase your changes onto remote history
09:18 cbreak rewrite private history only
09:19 cbreak unless you knowwhat you're doing :)
09:20 Sandlayth i see
09:20 Sandlayth thanks, moritz
09:21 TheFuzzball joined #git
09:22 * moritz knows what he's doing, and still avoids rewrites of public history :)
09:22 jikz joined #git
09:24 Gurkenglas joined #git
09:26 freddy_ joined #git
09:28 ppang joined #git
09:30 jiku joined #git
09:31 MillerBoss joined #git
09:31 jameser joined #git
09:34 xall joined #git
09:37 JeroenT joined #git
09:38 bdeferme joined #git
09:39 rudrab joined #git
09:39 PHPanos joined #git
09:40 ToBeCloud joined #git
09:40 TheFuzzball joined #git
09:41 jost joined #git
09:42 romank joined #git
09:42 h12o joined #git
09:42 tvw joined #git
09:43 Kaisyu joined #git
09:46 Doqnach joined #git
09:46 Doqnach hey everyone. question I haven't been able to google my way out of yet:
09:48 Doqnach I have a git repo, with a submodule. that same submodule is used in more local git repo's of other projects. I know you can push to a different local git repo, but I can't really seem to find out how to config my submodule to be able to push to other 'instances' of it in other local git repo's
09:48 Doqnach any pointers?
09:49 kmt joined #git
09:49 Gabemo joined #git
09:50 YuGiOhJCJ joined #git
09:51 cqi joined #git
09:53 imrg joined #git
09:53 marcogmonteiro joined #git
09:54 lordjancso joined #git
09:56 grift joined #git
09:57 oskarkv joined #git
09:57 xall_ joined #git
09:58 imrg joined #git
10:01 freddy_ joined #git
10:02 TheFuzzball joined #git
10:03 tymczenko joined #git
10:03 LTRand joined #git
10:03 freddy__ joined #git
10:04 borkr joined #git
10:06 MineCoins joined #git
10:06 h12o joined #git
10:08 kelvah joined #git
10:10 gunnaro joined #git
10:11 Hunter1 joined #git
10:11 Ploppz If I'm checkout out on branch B, and want to push local branch A to remote branch A (A has never been pushed before and is not known by remote), and I do `git push origin A`, will it create a branch A that points to the commit of B, or will it push the commit A and make the corresponding branch?
10:14 xall joined #git
10:17 de-vri-es joined #git
10:18 xall joined #git
10:20 Doqnach left #git
10:20 marcogmonteiro joined #git
10:21 a_thakur joined #git
10:25 Bhootrk_ joined #git
10:25 livingstn joined #git
10:25 romank joined #git
10:28 moritz Ploppz: if I remember correctly, that depends on value of the push.default configuration
10:29 moritz if you want to be sure, you can qualify your pushes as git push A A:A
10:30 Cabanossi joined #git
10:34 a_thakur_ joined #git
10:34 MattMaker joined #git
10:37 DBag joined #git
10:38 livingstn joined #git
10:38 manuelschneid3r joined #git
10:41 a_thakur joined #git
10:41 LTRand joined #git
10:41 xall_ joined #git
10:44 m4sk1n joined #git
10:50 xall joined #git
10:50 cstratak_ joined #git
10:51 ruxu joined #git
10:51 shinnya joined #git
10:54 xall joined #git
10:55 rchavik joined #git
10:55 rchavik joined #git
10:56 MineCoins joined #git
10:58 bilal joined #git
10:59 cstratak joined #git
11:00 stamina joined #git
11:01 TbobbyZ joined #git
11:02 Gsham joined #git
11:02 svisz joined #git
11:03 xall joined #git
11:04 bilal joined #git
11:05 rchavik joined #git
11:05 roelmonn_ joined #git
11:05 JeroenT joined #git
11:09 raspado joined #git
11:10 theoceaniscool joined #git
11:11 xall joined #git
11:11 bilal joined #git
11:12 JeroenT joined #git
11:14 User458764 joined #git
11:15 User458764 joined #git
11:17 t3d joined #git
11:20 sarri joined #git
11:20 sarri joined #git
11:20 JeroenT joined #git
11:21 j08nY joined #git
11:22 nowhere_man joined #git
11:24 SkyPatrol joined #git
11:31 marcogmonteiro joined #git
11:31 kurkale6ka joined #git
11:32 robattila256 joined #git
11:33 cagomez joined #git
11:34 bilal joined #git
11:35 xall joined #git
11:36 User458764 joined #git
11:37 JeroenT joined #git
11:39 fmcgeough joined #git
11:39 kurkale61 joined #git
11:41 Gianormagantrous joined #git
11:47 VladGh joined #git
11:49 theoceaniscool joined #git
11:50 xall_ joined #git
11:50 theoceaniscool joined #git
11:51 theoceaniscool joined #git
11:52 achadwick joined #git
11:54 skunkz joined #git
11:54 Levex joined #git
11:55 Gsham joined #git
11:55 xall joined #git
11:56 ferr joined #git
11:57 Masber_080 joined #git
11:57 lindenle joined #git
11:59 Gloomy joined #git
12:00 kelvah joined #git
12:00 TheWild joined #git
12:00 TheWild hello
12:00 Cabanossi joined #git
12:01 TheWild I want to just do usual "git stash save" but without resetting my current working tree.
12:02 TheWild do I have to use update-ref?
12:02 boombatower joined #git
12:04 jeffreylevesque joined #git
12:04 LTRand joined #git
12:05 ZyX-I joined #git
12:06 Cavallari joined #git
12:07 str joined #git
12:07 j08nY joined #git
12:08 kbeflo joined #git
12:09 Levex joined #git
12:09 t3d joined #git
12:15 gechr joined #git
12:16 gechr joined #git
12:17 xall_ joined #git
12:18 tvw joined #git
12:18 gechr joined #git
12:18 bilal joined #git
12:19 synthroid joined #git
12:19 gechr joined #git
12:22 DaGoaty joined #git
12:23 QwertyDragon joined #git
12:24 Guest56756 joined #git
12:25 QwertyDragon_ joined #git
12:26 caper joined #git
12:27 MrMojit0 joined #git
12:32 guardianx joined #git
12:32 _ADN_ joined #git
12:33 ayogi joined #git
12:35 MattMaker joined #git
12:36 MineCoins joined #git
12:36 ogny joined #git
12:38 xall joined #git
12:39 cioran89 joined #git
12:39 BSaboia joined #git
12:40 foodSurprise joined #git
12:42 PioneerAxon joined #git
12:43 tlaxkit joined #git
12:44 Tobbi joined #git
12:45 guampa joined #git
12:45 Cabanossi joined #git
12:45 wxg joined #git
12:46 sbasso joined #git
12:46 livingstn joined #git
12:46 sbasso joined #git
12:48 bilal joined #git
12:51 D4R5C0D3 joined #git
12:54 bauruine joined #git
12:56 kexmex joined #git
12:56 skalpin1 joined #git
12:57 xall joined #git
12:57 ruxu joined #git
12:58 sarri joined #git
12:58 sarri joined #git
12:59 skalpin1 joined #git
13:00 skalpin1 joined #git
13:01 livingst_ joined #git
13:01 Stumbler joined #git
13:02 ExpiredDev joined #git
13:03 cdg joined #git
13:03 TbobbyZ joined #git
13:03 theoceaniscool joined #git
13:05 skalpin_ joined #git
13:05 marcogmonteiro joined #git
13:06 fission6 joined #git
13:06 malmalmal joined #git
13:08 nadley joined #git
13:09 YuGiOhJCJ joined #git
13:12 skalpin joined #git
13:13 alexandre9099 joined #git
13:14 dsdeiz joined #git
13:14 dsdeiz joined #git
13:16 xall_ joined #git
13:16 relipse joined #git
13:17 TheCycoONE joined #git
13:18 Tobbi joined #git
13:21 roelmonnens joined #git
13:25 cahoots joined #git
13:26 GGMethos joined #git
13:27 tribly joined #git
13:28 JeroenT_ joined #git
13:29 ij left #git
13:31 xall joined #git
13:33 TheFuzzball joined #git
13:34 ryoshu joined #git
13:34 ryoshu hi
13:34 ryoshu how to send a mail with [RESEND] tag?
13:34 ryoshu with git send-email
13:35 ryoshu I tried to add --compose and --subject "[PATCH v2] [RESEND] commit description"
13:35 christian1 joined #git
13:35 ryoshu but git keeps stripping this subject and generates new one
13:35 ryoshu without "[RESEND]"
13:36 bremner ryoshu: --subject-prefix
13:37 ryoshu I don't see it in documentation
13:37 permalac joined #git
13:37 bremner it might be a git-format-patch option, dunno
13:37 cbreak joined #git
13:37 ryoshu oops, it generated: Subject: [[RESEND] v2]
13:38 ryoshu --subject-prefix="RESEND][PATCH" this works better... is it correct syntax?
13:39 bremner if you insist on multiple [], I guess
13:39 jakew_ joined #git
13:39 ryoshu "Subject: [RESEND][PATCH v2] Fix ..."
13:39 ryoshu looks better
13:40 rafaz joined #git
13:40 bremner or do something like RESEND/PATCH v2 or RESEND,PATCH v2
13:40 bremner the possibilities are endless.
13:41 zxd do I need to specify full path when deleting a remote tag git push origin :refs/tags/12345  ?
13:41 zxd refs/tags/
13:41 griffindy joined #git
13:41 zxd git push origin :12345  deleted for me
13:41 fission6 joined #git
13:42 permalac joined #git
13:43 permalac joined #git
13:44 Yotta92 joined #git
13:44 permalac joined #git
13:45 dendazen joined #git
13:46 Cabanossi joined #git
13:47 ruxu joined #git
13:47 xall joined #git
13:48 cstratak joined #git
13:49 notebox joined #git
13:51 Dougie187 joined #git
13:53 xall_ joined #git
13:53 LTRand joined #git
13:54 clickjack joined #git
13:55 clickjack left #git
13:56 TheFuzzball joined #git
14:02 Starky joined #git
14:02 n3wborn_ joined #git
14:04 re1 joined #git
14:04 n3wborn_ Hi ! Is it a good thing to do this ? I write a new file, commit it, then write another file, commit it too, and then push the twice (if it's possible obv.) ?
14:05 _ikke_ n3wborn_: You push only once
14:05 _ikke_ When you push, bot commits will be sent
14:05 n3wborn_ _ikke_: ok, perfect, I wasn't sure about that
14:06 Marquisk2 joined #git
14:07 SkyPatrol_ joined #git
14:07 freddieptf joined #git
14:07 leeN joined #git
14:08 n3wborn_ _ikke_: So now I'll be able to have more precise comit messages. I just work on my own "project" and the files I create won't change and this way of doing seemed better for me so that's cool. Thanks !
14:08 _ikke_ right
14:08 _ikke_ you can even select parts of files to be comitted if you want
14:08 crose joined #git
14:08 acetakwas joined #git
14:09 n3wborn_ ok, I didn't know, and will remember
14:11 LeBlaaanc joined #git
14:11 clickjac_ joined #git
14:12 GothAlice I have a global .gitconfig with user signing key, and [commit] section with gpgsign = true by default.  I also have a ton of pre-commit hooks to run tests, verify ASTs, markup syntax, security vulns., etc.  Is there a mechanism I can use when committing that if I skip pre-commits, the commit is not signed?  (Or just a flag to disable the global enabling?)
14:12 Eryn_1983_FL joined #git
14:13 GothAlice (The goal being to far more obviously mark untrusted—untested—commits as untrustworthy.)
14:13 meLon joined #git
14:13 livingstn joined #git
14:14 ResidentBiscuit joined #git
14:14 jast GothAlice: git -c commit.gpgsign=false commit ...
14:14 ResidentBiscuit joined #git
14:14 ResidentBiscuit joined #git
14:14 GothAlice jast: Awesome, I can totally alias that and include --no-verify.  Thanks!  :D
14:15 cstratak joined #git
14:15 ResidentBiscuit joined #git
14:15 GothAlice n3wborn_: "Chunk staging" (committing subsets of a file's changes) is incredibly awesome.  Far too often I… get distracted by other things to fix/add and forget to commit work in progress.  Chunk staging rescues me from that situation, letting me pick apart the actual separate changes into different commits, even if I screw up like that.
14:15 xall joined #git
14:15 Rodya_ joined #git
14:17 TbobbyZ joined #git
14:17 GothAlice jast: Signing support seems to be a bit of an afterthought, given things like --no-verify (instead of -c config directives) for certain options.  Guess it's not popular enough to get a shortcut?  :/
14:18 AaronMT joined #git
14:19 cjohnson yep commit often, separate your changes, stage in hunks
14:19 GothAlice Also the config directive inconsistency between commit (gpgsign) and tag (sign) is odd.
14:19 cjohnson My #1 git tip of the day is, if you are both refactoring and fixing indentation/whitespace, make the whitespace change first and commit that
14:19 cjohnson And/or stage the whitespace hunk separate
14:19 GothAlice cjohnson: +9001 (that's over nine thousand)
14:19 jast commit signing came much later than tag signing, at any rate
14:20 GothAlice Your coworkers will hate you if you make whitespace changes piecemeal.
14:20 cjohnson Such a nightmare trying to track history when the change is conflated with whitespace
14:20 jast well, you can view diffs with whitespace changes ignored (-w/-b), at least
14:20 jast but still, good general advice
14:20 * GothAlice is glad she's standardized on tabs.  Then everyone can be happy without uglifying history.
14:21 Es0teric joined #git
14:21 rkazak joined #git
14:21 GothAlice There's still strong internal debate as to weather whitespace matching the indentation level of surrounding code technically classifies as "trailing" whitespace, though.  ;)
14:21 cam27 joined #git
14:21 ddavidd left #git
14:21 jast I guess if you don't have any real problems, all that time needs spending... :}
14:22 Tobbi joined #git
14:22 jnewt joined #git
14:23 robattila256 joined #git
14:23 Jitta joined #git
14:24 GothAlice jast: It's the last source of commit flapping.  People's editors love to automatically strip such things without regard for context.  ;^P
14:24 wandering_vagran joined #git
14:25 jast personally I eliminate all whitespace from line endings, no matter what role it fulfils (or not)
14:25 GothAlice (But if you use an editor which shows invisibles and indentation levels visually, many use contiguous indentation to detect those boundaries.  Truly blank lines break up that visual.)
14:25 GothAlice Er, apologies for the mention.  So many people have simple words for names.  XD
14:26 Masber joined #git
14:26 jast their own darn problem if you ask me :)
14:26 jast yeah, I do have indentation levels visualized but I still prefer having the breaks
14:27 Sythrik I have a website finished without a git repo.  Now I want to create one on my hosting.  Should I just create a repo on the server, copy my website there, remove it on my local dev computer and do a checkout?
14:28 _ikke_ Sythrik: What is the reason you want the repo on the server?
14:28 jast no need, you can push to an empty repository, too
14:30 menip joined #git
14:30 Gloomy joined #git
14:31 cjohnson jast: it's not just ignoring it in diffs, it's hard to track changes when you for instance use git blame
14:31 cjohnson the change gets muddied in with a ton of unchanged lines
14:31 dave_uy joined #git
14:31 GothAlice Git blame ends up zebra-striped.
14:31 Gsham joined #git
14:32 caper joined #git
14:32 mkillebrew left #git
14:32 GothAlice I've got one file that even after two years literally every second line is an ancient "whitespace change" commit, and the others are more recent.  It's silly.
14:32 Tobbi joined #git
14:33 manuelschneid3r joined #git
14:33 Cavallari1 joined #git
14:33 jast cjohnson: sure, no argument there
14:34 MuffinMedic joined #git
14:34 madduck what web viewer/frontend to Git would you set up if you could start from scratch today? gitweb, or is there something better out there?
14:35 freimatz joined #git
14:35 cjohnson I haven't found anything I like more than github
14:35 cjohnson gitlab isn't bad
14:35 cjohnson Not sure if that's exactly what you mean
14:36 madduck those two are a lot more than simple frontends. they are collab platforms, aren't they?
14:36 MattMaker joined #git
14:36 madduck github is non-free, gitlab is already, but we don't need all this functionality right now
14:36 strk cjohnson: try.gitea.io
14:36 livingst_ joined #git
14:36 TbobbyZ joined #git
14:37 strk simple, single binary, fast
14:37 jast gitweb and cgit are the only ones I know that are actually used, except for the ones that provide the whole hosting package (gogs, gitea, gitlab etc.)
14:37 cjohnson madduck: what's wrong with just using your git client then? what specifically are you looking for?
14:37 bilal joined #git
14:37 madduck mainly the ability to share a link to a commitdiff, like gitweb had
14:38 madduck and gitweb would be just fine, but I was wondering if there was a new kid on the block I should check out
14:38 cjohnson gotchya. Personally I'd rather just set up like gitlab and then if you don't use some of the features, so be it
14:38 cjohnson but if you decide later you want them
14:38 cjohnson easy peasy
14:38 strk madduck: do you think gitea is overkill for you ?
14:38 madduck gitlab is a behemoth of ruby
14:38 strk we opted to setup gitea over gitlab because of the bloat gitlab brings with it, while gitea (or gogs) could be deployed as a single binary, easy peasy
14:38 TbobbyZ_ joined #git
14:39 cjohnson I guess we have differing opinions of bloat haha it's really not very big. *shrug*
14:39 jast feature bloat, in this case, relative to the requirements :)
14:39 nedbat madduck: you don't need to run gitlab yourself.
14:39 madduck cjohnson: I also have a somewhat irrational aversion to ruby
14:39 cjohnson madduck: lol fair
14:39 jast but yeah, gitweb or cgit I guess
14:39 madduck nedbat: we do. company policy.
14:40 cjohnson Seems like gitea is just a "bloated" as gitlab/github strk unless I'm missing something
14:40 cjohnson looks like a full project tool like the others
14:40 jast I used gitweb the last time I set up private hosting, until management decided gitlab was much better ("we can use merge requests!" [proceeds to never actually use merge requests])
14:40 cjohnson haha
14:41 cjohnson love IT decisions coming from non-IT
14:41 strk cjohnson: featurewise yes, it has more features than just read-only access to git repos
14:41 madduck it's how I earn my living so please don't change anything cjohnson ;)
14:41 strk gitweb/gitolite is probably the easiest for still controlling accesses
14:41 mizu_no_oto joined #git
14:41 madduck yeah, it's what I have personally too
14:42 duderonomy joined #git
14:42 MuffinMedic joined #git
14:42 strk but yes, pull-requests (tracked patchsets) are very handy
14:42 Cavallari1 joined #git
14:42 strk IFF you can open your infra to contributions like that
14:42 madduck unless you have a git-send-email workflow
14:42 eehackr joined #git
14:42 jast in that case changes were distributed across a ton of different repositories
14:43 jast guess how many existing tools support merge/pull requests across multiple repositories
14:43 jast (spoiler: zero)
14:43 strk madduck: the difference is that a PR is at the same time "tracked"
14:43 madduck indeed
14:43 MuffinMedic joined #git
14:44 Timvde How can I rebase all changes since branching onto another branch? I know the --onto part, but I'm looking for a generic way of defining the fork commit instead of using git log to get the commit hash. (Use case: branch A was based on branch B, branch B got rebased on master, I want to rebase the commits in A which aren't yet in B. Extra hard point: apart from rebasing, I also did some fixups in
14:44 Timvde B. I can still refer to the old B as origin/B)
14:44 jast git rebase origin/B?
14:44 Timvde Hmm, now I'm wondering whether that would work
14:45 Timvde I was just typing that, would it be that easy? :P
14:45 MarioBranco joined #git
14:45 jast if I understand your situation correctly, yes, absolutely :P
14:45 Timvde Since origin/B has commits that aren't in A and vice versa
14:45 jast after rebasing, A will have all commits from origin/B
14:45 Timvde But git rebase probably already finds an ancestor commit
14:46 Timvde jast: But I want A to have the commits from B, not origin/B
14:46 jast all of them?
14:46 Timvde so git rebase origin/B --onto B
14:46 Timvde is what I think would work
14:46 jast because if you want all commits from B, just 'git rebase B'
14:47 jast oh wait, fixups, forgot about those
14:47 Timvde Yes, B's history diverts from origin/B
14:47 jast your suggestion might work, then
14:48 dmcampos_ joined #git
14:49 lordjancso joined #git
14:50 Timvde Something like this: https://pastebin.com/dxd7XdV4
14:50 Timvde with the commits in B being slightly different from the commits in A
14:50 h12o joined #git
14:51 atrigent joined #git
14:51 trobotham joined #git
14:51 Timvde Oooh, damn, it's even harder
14:51 aredpanda`w joined #git
14:51 Timvde Well, never mind, I'm just going to use the commit message, lol
14:51 inovas joined #git
14:51 Timvde eh, s/message/hash/
14:52 aredpanda`w In what cases does git not checkout/fetch all branches from a remote?
14:52 kelvah joined #git
14:52 n3wborn_ a bit late but thanks GothAlice
14:52 _ikke_ aredpanda`w: When the refspec is changed to not do that
14:53 aredpanda`w _ikke_, I haven't changed anything related to refspecs, I believe. I created a new feature branch, published it to the remote repo, deleted my local copy(trying to re-index after adding a forcefull .gitattributes). Proceeded to clone the repo again, followed by `git fetch` but I can't checkout the bloody branch.
14:54 King_Hual joined #git
14:54 King_Hual joined #git
14:54 _ikke_ aredpanda`w: does git branch -r show it?
14:54 cjohnson "I can't checkout" means what?
14:54 cjohnson what message do you get? "it doesn't work" should be removed from your vocabulary when debugging :P
14:55 aredpanda`w _ikke_, doesn't show me the remote branch
14:56 aredpanda`w cjohnson, any operation I try doing on the said remote branch, like `checkout` returns a pathspec error saying the file wasn't found.
14:56 GothAlice n3wborn: It never hurts to help.  :)
14:56 _ikke_ aredpanda`w: git ls-remote <remote> name, does it return that branch?
14:56 MarioBranco joined #git
14:57 zivester joined #git
14:58 fees joined #git
14:58 aredpanda`w _ikke_, nope, just HEAD and refs/heads/{master,develop}
14:58 aredpanda`w not event the project tags which should be plenty
14:58 _ikke_ So that means that remote does not have that branch
14:58 _ikke_ Are you talking to the correct remote?
14:58 aredpanda`w yes, I've triple checked that and a colleague managed to checkout the said branch without a problem.
14:59 _ikke_ Have you checked the remote url?
14:59 zivester joined #git
14:59 clickjack left #git
15:01 zivester joined #git
15:01 roelmonn_ joined #git
15:02 Rodya_ joined #git
15:02 MuffinMedic joined #git
15:03 khusseini joined #git
15:04 hashpuppy joined #git
15:05 a_thakur joined #git
15:05 Gloomy joined #git
15:05 bilal joined #git
15:05 acetakwas joined #git
15:05 tymczenko joined #git
15:06 dmcampos_ left #git
15:06 invisbl joined #git
15:07 Gloomy joined #git
15:08 dsdeiz joined #git
15:11 bilal joined #git
15:14 nicoulaj joined #git
15:14 johnny56 joined #git
15:14 chachasmooth joined #git
15:15 dfaught joined #git
15:18 phinxy joined #git
15:19 dcpc007 joined #git
15:19 lindenle joined #git
15:19 Gloomy joined #git
15:19 dfaught joined #git
15:19 Introoter joined #git
15:20 Gurkenglas joined #git
15:20 roelmonnens joined #git
15:20 plos joined #git
15:20 chachasmooth joined #git
15:21 dfaught joined #git
15:23 raynold joined #git
15:23 fission6 joined #git
15:26 kurkale6ka joined #git
15:26 cstratak joined #git
15:26 LTRand joined #git
15:28 jagob joined #git
15:29 kurkale6ka joined #git
15:30 thiago joined #git
15:30 kurkale6ka joined #git
15:33 brent__ joined #git
15:33 brent__ joined #git
15:33 dglambert joined #git
15:33 a_thakur joined #git
15:35 chitopunk joined #git
15:36 dreiss joined #git
15:36 Murii joined #git
15:36 overlord_tm joined #git
15:38 borkr joined #git
15:39 NeXTSUN joined #git
15:40 sz0 joined #git
15:40 fatalhalt joined #git
15:40 SteffanW joined #git
15:42 TomyLobo joined #git
15:42 ogny joined #git
15:44 chardan joined #git
15:44 Guest55 joined #git
15:45 theiostream joined #git
15:45 jt joined #git
15:46 xall joined #git
15:47 scarabx joined #git
15:47 a_thakur joined #git
15:47 jakew_ joined #git
15:48 Phylock joined #git
15:49 mel00010 joined #git
15:49 Darcidride joined #git
15:50 milki_ joined #git
15:50 jt joined #git
15:51 milki_ hey gits, git 2.13 added a new feature to prevent ref updates in hooks https://github.com/git/git/commit/d8f4481c4f03132174b514f428cd67d2cc0dc997
15:51 mel00010 joined #git
15:51 milki_ this breaks some of my hooks that do git clones/git checkouts in pre/post receive
15:51 sebboh joined #git
15:51 milki_ is the correct workaround to unset GIT_QUARANTINE_ENVIRONMENT?
15:53 Lco joined #git
15:53 madewokherd joined #git
15:58 tgragnato joined #git
15:58 t3d left #git
15:59 synthroi_ joined #git
15:59 zivester joined #git
16:00 Cabanossi joined #git
16:02 __builtin joined #git
16:03 Rodya_ joined #git
16:03 svm_invictvs joined #git
16:05 itseris joined #git
16:06 jt joined #git
16:07 _ikke_ milki_: I don't think it's a good idea to unset that variable
16:08 ResidentBiscuit joined #git
16:10 ych joined #git
16:10 prg3 joined #git
16:10 k0nichiwa joined #git
16:11 theiostream joined #git
16:11 orbyt_ joined #git
16:12 ki0 joined #git
16:14 caper joined #git
16:17 h12o joined #git
16:19 sebboh Port 9418 outgoing is blocked here.  So, I can't access git:// generally speaking.  I have a server and I've set up a socks proxy and I can do ssh port forwarding, etc.  However, I don't know how to tell git to use those options for git:// remotes but not https:// or ssh:// remotes.
16:21 sebboh Whoops, I left out the question part.. :)  is there a per-protocol proxy setting for remotes?  I see the core.gitProxy setting, bit it is per domain..
16:21 sebboh wait.. maybe that config item is exactly what I need.  Is it not used for ssh:// and user@host.com:/foo.git remotes?
16:22 kristofferR joined #git
16:26 matsaman joined #git
16:28 ResidentBiscuit joined #git
16:28 Gustavo6046 joined #git
16:30 Forlorn joined #git
16:30 LTRand joined #git
16:30 azerus joined #git
16:30 tyreld joined #git
16:34 peacememories joined #git
16:34 metalraiden34 joined #git
16:35 Masber joined #git
16:37 Oaua1 joined #git
16:37 MattMaker joined #git
16:38 chachasmooth joined #git
16:39 ki0 joined #git
16:40 DBag joined #git
16:41 LTRand joined #git
16:41 nixjdm joined #git
16:43 scoobertron joined #git
16:43 Es0teric joined #git
16:43 h12o joined #git
16:43 roelmonnens joined #git
16:45 thebope joined #git
16:45 Darcidride joined #git
16:46 nitric joined #git
16:46 Adylas Hello, is there a way to use the currently logged-in user for authentication purpose ? They way, no need to put something https://HERE@domain.com ?
16:47 chachasmooth joined #git
16:48 jackrandom joined #git
16:49 chachasmooth_ joined #git
16:49 griffindy joined #git
16:50 griffindy joined #git
16:51 svm_invictvs joined #git
16:53 Masber joined #git
16:55 gatoher joined #git
16:57 dave0x6d joined #git
17:01 kradnl joined #git
17:02 Seveas Adylas: you could kerberize your entire environment
17:03 Adylas Seveas, its funny you say that Seveas ... We are fully Kerberos. Even with a ticket, clone _still_ ask for username ..
17:03 Seveas git version?
17:04 Adylas 2.11 or 2.13
17:04 Seveas there were some fixes in this area rather recently
17:04 Seveas does https://:@domain.com force it to use kerberos auth?
17:04 Adylas I also have quite a big issue with my https + kerberos and git submodule update
17:04 Adylas nope
17:04 duderonomy joined #git
17:04 Adylas just ask for username
17:04 Seveas k, that's the limit of my git+kerberos skills I'm afraid
17:06 MarioBranco joined #git
17:06 User458764 joined #git
17:06 Seveas I'm gonna throw some git.git commit id's at you for inspiration
17:06 Seveas 26a7b2342980f2eb46b47122d1d6dfbf13ed4ccb
17:06 Adylas hehe, also, I'm looking for a way to get git to print the internal curl authentication method
17:06 Seveas 8f3d03d81e124b102a29a4adeeec4b3473bfa8d6
17:07 Seveas 4dbe66464b4fd695c5989cc272fa0edd6475037c
17:07 sebboh Adylas: Is the config variable named http.delegation helpful?
17:07 Vampire0_ joined #git
17:08 sebboh Three possible balues: none, policy, and always.
17:08 Adylas sebboh, Never look at it. Let me check that
17:08 Seveas d880bfd947f5d5e2b5bcc510d6dee01101ce64a3
17:08 livingstn joined #git
17:08 Seveas http.emptyauth seems relevant according to that commit
17:09 sebboh it happened to scroll by just now when I was looking for something else and it has the word 'kerberos' on it, that's why I suggested it.  Sorry to waste your time if that's what happened...
17:09 Adylas Seveas, Yeah, I tried http.emtpyauth with no success ;-(
17:09 Adylas Hehe, as soon as I say that word, everyone freakout ;-)
17:09 Seveas Adylas: GIT_CURL_VERBOSE
17:10 mizu_no_oto joined #git
17:10 Adylas curl just need to be in "anyauth" mode and everything is taking care of
17:10 Seveas setting that envvar will make curl spew details
17:10 Adylas Yeah I know this guy very well ;-)
17:10 caper joined #git
17:10 Seveas anyauth: ef976395e26a25fb6d048d859a1c8cddb2640b9a
17:10 Seveas oh wait, that's for proxies
17:11 Guest7972 joined #git
17:12 Seveas is your libcurl new enough to handle CURLAUTH_ANY? A quick glance at the code says it should work
17:12 Adylas Seveas, yeah ;-) And it work very well when I do a clone
17:12 Adylas However, when I do submodule update, fail ;-(
17:13 eloquenza joined #git
17:13 navidr joined #git
17:13 Seveas just to check: the submodules are all https://same host as main repo/some path ?
17:13 Adylas Seveas, Yeah. its in .git/config
17:14 Seveas any kerberos-y things in there as well? They may need to be propagated to .git/config in the submodules
17:14 Es0teric joined #git
17:15 Seveas git operations in a submodule do not look at the configuration of the outer repo
17:15 dreiss joined #git
17:19 freddieptf joined #git
17:19 manuelschneid3r joined #git
17:19 Adylas Seveas, Yeah, its the initial "update" right after the init
17:20 gatoher hi
17:20 gitinfo gatoher: 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.
17:20 Seveas Adylas: would you mind sharing .git/config and ~/.gitconfig, anonymizing urls if needed
17:22 Adylas Seveas, regarding my 2 issues, they are empty. And those 2 issues are experienced by many person in our enterprise. First issue : git do not use the logged username when cloning Second : git/cURL act differently with clone and submodule update
17:23 str joined #git
17:23 Seveas Adylas: the first one I can't add much more to, but the clone/update difference doesn't make sense to me, we should be able to figure out why
17:24 jnavila joined #git
17:25 Adylas Thats why I'd like to add a printf somewhere in remote-curl.c so I can have a proof that curl act differently. They only way I can get the submodule update to work is to put GIT_HTTP_PROXY_AUTHMETHOD=anyauth in my env
17:26 sunrunner20 I'm assuming not, but is it possible to remove a file retroactively from a repository? For security purposes.
17:26 xall joined #git
17:26 _ikke_ Adylas: Did you write the e-mail in the mailing list regarding this?
17:26 Seveas sunrunner20: not without rewriting history
17:26 fission6 joined #git
17:26 hashtagstrashtag joined #git
17:27 Adylas _ikke_, You're right ;-)
17:29 Atm0spher1c joined #git
17:29 _ikke_ Adylas: did you see the response from AEvar?
17:29 Adylas _ikke_, Yeah, I did answer. I just forgot to put the e-mail in plain text so the list did not get it
17:30 _ikke_ Ah ok
17:30 GGMethos joined #git
17:30 Adylas If you guys want to see what happen with HTTPS + Kerberos. clone VS submodule update : https://www.diffchecker.com/P02uQH1t
17:30 kradnl joined #git
17:30 gatoher gatoher /msg NickServ identify 987654321abc
17:30 sbasso joined #git
17:31 _ikke_ gatoher: time to change your password
17:31 gatoher yes yes
17:31 TheWild joined #git
17:32 relipse joined #git
17:32 _ikke_ gatoher: and perhaps look into using sasl
17:32 al-damiri joined #git
17:33 thiago joined #git
17:33 kadoban Also, that's a horrible password.
17:34 gatoher i never use that
17:34 _ikke_ You used it at least once :P
17:34 gatoher i know i know
17:34 kadoban :)
17:34 Gsham joined #git
17:34 Adylas Haha ;-)
17:34 prg3 joined #git
17:34 gatoher /msg NickServ identify 987654321abc
17:35 _ikke_ lol
17:35 gatoher upps
17:35 Seveas /msg nickserv identify gatotherisanidiot
17:35 _ikke_ gatoher: /query nickserv
17:35 Adylas thats the story of your life.
17:35 selckin oops
17:35 _ikke_ lol!
17:35 _ikke_ did someone ghost him?
17:35 Adylas What i'd like to do is the use the server tab to identify
17:35 _ikke_ Adylas: sasl is much better
17:36 kadoban Yeah, back before I set up SASL I used to do that, after one time I almost pulled a gatoher
17:36 Adylas Hehe i'm not as IRC lover as that ;-)
17:36 _ikke_ Adylas: it identifies you already when you connect to the server
17:36 dmc joined #git
17:36 _ikke_ it's not hard to setup
17:37 sbasso_ joined #git
17:37 gatoher joined #git
17:37 _ikke_ lol
17:38 mdk lol
17:38 Adylas left in shame ;-)
17:38 gatoher joined #git
17:38 _ikke_ wb
17:38 chardan_ joined #git
17:39 thebope joined #git
17:39 Adylas So, to get some "real" debug .. What I could add to https://github.com/git/git/blob/master/remote-curl.c so I get insight into the authentication cURL will use ?
17:40 griffindy joined #git
17:41 chardan__ joined #git
17:43 micah joined #git
17:43 gatoher /msg NickServ identify 987654321abc
17:43 gatoher left #git
17:44 micah o_O
17:44 prg3 joined #git
17:45 micah i've done a ton of commits on this branch, and I want to keep all the changes, but I want to have just one commit in the end, do I need to squash everything to do that, or is there an easier way?
17:45 micah in particular, there is a commit in the middle that I dont want in the index at all (passwords)
17:45 cbreak micah: one commit total?
17:46 cbreak or one commit since branching off some other branch?
17:46 micah cbreak: i just want the current state of the directory as one commit
17:46 cbreak micah: git checkout --orphan newmaster
17:46 cbreak micah: then make a commit
17:47 cbreak it will be the first commit in history of that branch
17:47 micah --orphan interesting!
17:47 cbreak you can then rename the old master away, and move the new one into its place
17:47 cbreak or just delete old master
17:47 kradnl joined #git
17:47 cbreak if you have remotes with the old history, you will have to force push, since this is history rewriting.
17:47 micah oh i see now what you were asking, I think I want to have the second one - which is one commit since branching off :o
17:47 Rodya_ joined #git
17:48 netj joined #git
17:48 Logicgate joined #git
17:48 cbreak micah: then switch to the branch you branched off of
17:48 cbreak and git merge --squash theotherbranch
17:48 Logicgate hey guys, so I forked this repo so I can create a pull request
17:48 Logicgate since my pull request there has been some changes in the origin branch
17:48 cbreak the squash merging will create a single commit that has the state a normal merge would give you, but without any of the merged history
17:48 Logicgate how can I pull the changes from the originating branch?
17:49 visual git fetch && git checkout (new local branch that was available in remote) && git pull
17:49 Logicgate so I can rebase and fix the conflicts
17:49 cbreak Logicgate: git remote add the original repository, fetch from it, merge it or rebase onto it
17:49 visual scratch that, no git pull at the end.. why did it copy the files from remote without me doing pull?
17:49 Logicgate cbrek how do you rebase?
17:49 cbreak Logicgate: man git-rebase has details
17:49 gitinfo Logicgate: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html
17:50 cbreak it's not trivial :)
17:50 gnixev joined #git
17:50 LTRand joined #git
17:50 cbreak visual: git checkout checks out a branch
17:50 Levex joined #git
17:50 cbreak visual: once it is done, you will be on that branch
17:50 peacememories joined #git
17:50 cbreak its current state will be reflected in the working directory, barring local changes.
17:51 visual but the branch didnt exist locally, i checked out the remote one (by doing git checkout {branch_name} )
17:51 visual not origin/remote/branch_name
17:51 cbreak a local branch will be created to match the remote tracking branch
17:51 _ikke_ Adylas: Sorry, I know too little about it to advise something
17:51 cbreak visual: it shows up in git branch
17:51 visual thanks a bunch
17:51 Adylas _ikke_, ;-)
17:51 cbreak visual: git has told you when you checked out
17:52 visual so.. the only reason to do /git pull/ is when you're already on the branch that you need?
17:52 cbreak something like "creating new branch blah, tracking origin/blah" or something
17:52 _ikke_ visual: git pull = git fetch + git (merge | rebase)
17:52 micah hm, my git seems confused. I'm trying to checkout another branch, but it thinks i have untracked files in a submodule (error: Updating the following directories would lose untracked files in it: modules/check_mk), but if I look in modules/check_mk there are no untracked files :o
17:52 rockfruit joined #git
17:52 cbreak visual: git pull is a fetch & merge
17:52 visual cbreak: with all due respecti, yeah you're right, but git left it ambigious whether it _pulled_ the branch
17:52 cbreak its purpose is to merge new history from the remote into the current branch
17:52 visual it did say "Branch purchase_order set up to track remote branch purchase_order from origin.
17:52 _ikke_ micah: to the parent repo, the files in the submodule are untracked
17:53 cbreak visual: it used the most recent state you fetched
17:53 Masber joined #git
17:53 cbreak visual: if someone had pushed something between your fetch and your pull, that new history would have been fetched and merged by the pull
17:53 cbreak since no one did, nothing happened.
17:53 visual but.. if git pull = git fetch + git merge | rebase.. then git merge = girt pull - git merge, adn the merge part is actually the part that downloads the changes and applies them, right?
17:54 cbreak no
17:54 cbreak merging is a purely local operation
17:54 albel727 joined #git
17:54 micah _ikke_: git status doesn't show it :o
17:54 visual alright, sounds ok
17:54 cbreak fetching on the other hand fetches changes from other remotes into local remote-tracking branches
17:54 MattMaker joined #git
17:54 visual thx cbreak
17:55 _ikke_ visual: git pull is just a shortcut function
17:55 visual shit i always thought git fetch would allow me to see the diffs. like i did git fetch; git status; and see what remote changes are not applied locally; and if i liked the changes, i did git pull
17:55 cbreak micah: maybe they are ignored
17:55 _ikke_ visual: well, it kind of does
17:55 cbreak visual: git diff allows you to see diffs
17:56 cbreak but only between local state
17:56 _ikke_ visual: git fetch downlodas the changes, but it's not merged in your local history yet
17:56 visual shit that's what i've been asking
17:56 visual but cbreak said the opposite
17:56 micah _ikke_: cbreak this is what I see: https://share.riseup.net/#MI8ESg68FJscnY0bMUGlsw
17:56 cbreak as I said, it's put into the local remote-tracking branches
17:56 cbreak visual: they are shown when you do git branch -r
17:56 bigjazzsound joined #git
17:56 DDBag joined #git
17:57 visual oh my bad, he was talking about checkout
17:57 _ikke_ micah: cd modules/check_mk && git ls-files -o -i --exclude-standard
17:57 visual bottom line, once you do a fetch, the changes are applied locally, right?
17:58 micah _ikke_: nothing printed
17:58 _ikke_ visual: no, not applied
17:58 _ikke_ visual: only remote tracking branches are updated, your local branchces are not touched
17:58 nixjdm joined #git
17:58 micah _ikke_: ah, i was in the wrong parent!
17:58 visual dang i already pulled so can't step-by-step it
17:58 Es0teric joined #git
17:59 visual alright well, thankx )
17:59 ki0 joined #git
17:59 eindoofus joined #git
18:01 eindoofus hi, is there a way to merge in updates in the master branch into my feature branch without having it look like a commit? and if so, is this bad practice? i'd like to merge in master constantly but that's going to flood the log with unnecessary commits
18:02 sbasso joined #git
18:03 eindoofus one of those horrible cases where i should know more about git but i just need a breadcrumb of information to continue with what i'm working on
18:03 kadoban eindoofus: Only by changing history. The two obvious solutions to that would be merging master inter feature occasionally, or rebasing feature onto master occasionally.
18:03 kadoban It sounds a bit like you're asking for rebase instead of merge. But again, it changes history, so it's not a great idea if the feature branch is something you're working on with anyone (or sharing with anyone)
18:04 robotroll joined #git
18:05 fission6 joined #git
18:05 TheSimonator joined #git
18:07 Rodya_ joined #git
18:07 hahuang65 joined #git
18:09 SkyPatrol joined #git
18:09 Es0teric joined #git
18:09 bilal joined #git
18:09 jackrandom joined #git
18:10 micah i've got a branch which has some pretty significant changes in file paths and structure that I've been working on for a few months. The branch it came from has continued to add commits to it, and now I need to rebase my branch with that one. I'm going to be in a lot of pain because of these renames and structure changes, is there a way I can manage this without going insane?
18:11 orbyt_ joined #git
18:12 sunri5e joined #git
18:14 nothingnew joined #git
18:14 theiostream joined #git
18:15 Sasazuka joined #git
18:15 miczac joined #git
18:15 robattila256 joined #git
18:16 kbeflo joined #git
18:17 ki0 joined #git
18:17 gnixev joined #git
18:18 Rodya_ joined #git
18:21 Levex joined #git
18:22 rominronin joined #git
18:23 ChiLL_SurF joined #git
18:24 Gloomy joined #git
18:24 theiostream joined #git
18:25 bpna joined #git
18:26 fahadash joined #git
18:27 rominronin joined #git
18:32 milki_ _ikke_: i agree that its nnot a good idea to unset the quarantine variables. i havent seen any workarounds for this quarantine feature yet. its probably too new for people to complain about it
18:33 _ikke_ But understand I correctly that it 'leaks' to git command on unrelated repositories?
18:33 milki_ _ikke_: in gitolite, hooks would need to unset GIT_DIR in order to manipulate other repos. it might be the same situation with QUARANTINE_PATH
18:34 _ikke_ milki_: That's not limited to gitolite
18:34 _ikke_ But might be a good idea to hit the mailing list if it has unintended consequences
18:34 misosoup joined #git
18:35 JanC joined #git
18:35 cwre joined #git
18:35 Ploppz `git submodule update` should check out the correct commit in each submodule right?
18:35 _ikke_ Ploppz: Right
18:36 Ploppz thanks
18:36 scoobert1on joined #git
18:36 Logicgate left #git
18:38 iatkotep joined #git
18:39 LTRand joined #git
18:39 tristanp joined #git
18:40 OptimusMKD joined #git
18:40 PioneerAxon joined #git
18:40 furrykef joined #git
18:41 cam27 joined #git
18:43 bilal_ joined #git
18:43 furrykef I followed this guide to take a directory from another repo and put it into my repo: https://jrsmith3.github.io/merging-a-subdirectory-from-another-repo-via-git-subtree.html
18:43 furrykef I did this thinking it would preserve the files' history from the old repo, but instead I find that all the files have "* Add 'lib/Target/WDC65816/' from commit 'af2bb7b1f77e6d97c71ba359a75ea716299af374'" as their sole log entry.
18:44 furrykef That hardly seems better than just copy/pasting the files.
18:44 furrykef How can I copy the directory in a way that preserves history, if it's possible?
18:45 NeXTSUN joined #git
18:45 Cabanossi joined #git
18:47 _ikke_ furrykef: git does not record renames
18:47 furrykef oh, I see. The info is still there, just not visible in an obvious way
18:47 jmesmon furrykef: you can use --follow or -C to get history when a file is copyied/renamed
18:47 jmesmon but they are limited.
18:47 pks joined #git
18:47 jmesmon furrykef: the alternative is to use rebase to re-write history for the subtree such that "it was always in that subdir"
18:49 zzz joined #git
18:50 furrykef OK, how do I do that?
18:50 notebox joined #git
18:52 jt joined #git
18:54 jmesmon furrykef: `git filter-branch` is the typical tool. I'm trying to find a command line example
18:54 rkazak joined #git
18:54 furrykef OK
18:54 jmesmon ah, the man page actually has an example of using it for this.
18:55 jmesmon furrykef: https://git-scm.com/docs/git-filter-branch , in "To move the whole tree into a subdirectory, or remove it from there:"
18:56 gopar joined #git
18:56 jmesmon please be sure to note the other caveats around filter-branch if you're not already familiar with it.
18:57 nixjdm joined #git
18:57 Cassiopaya joined #git
18:57 ShekharReddy joined #git
18:58 dreiss joined #git
18:59 furrykef yeah, seems scary...
19:00 peacememories joined #git
19:01 Gurkenglas joined #git
19:01 nowhere_man joined #git
19:02 furrykef thanks'
19:02 mikecmpbll joined #git
19:02 Starky joined #git
19:03 dviola joined #git
19:03 jmesmon the reflog allows recovery from practically all mistakes in using it though. Not really scary. Just have to be ok with new commits not being the "same" as old commits.
19:05 kadoban !backup is a good idea too, mostly just to avoid having to figure out how to recover
19:05 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
19:05 WaReZ joined #git
19:05 ki0 joined #git
19:08 Gloomy joined #git
19:08 finalbeta joined #git
19:09 crose joined #git
19:10 cioran89 joined #git
19:10 Acerific joined #git
19:10 Acerific joined #git
19:13 furrykef OK.
19:16 bilal joined #git
19:18 jstein_ joined #git
19:19 sq-one joined #git
19:25 Murr joined #git
19:27 thebope joined #git
19:29 rpi joined #git
19:31 Gsham joined #git
19:31 bilal_ joined #git
19:31 d1zzle joined #git
19:33 d1zzle hello. I got a confession to make. I've never done a merge  between two repos
19:33 tgragnato joined #git
19:34 jmesmon ok. you're forgiven
19:34 thiago it's the same as doing a merge in the same repo
19:34 thiago in fact, they are the same repo at the time you type "git merge"
19:34 bilal joined #git
19:34 gopar joined #git
19:37 kadoban Yeah, it's just a fetch first and then a normal merge. Not really different at all.
19:40 trobotham joined #git
19:44 yqt joined #git
19:45 d1zzle I don't understand how the merge works really. Like for instance, in this case, I made a library for a client, he modded it a bit, and changed some import names and aliased others, so now I kept doing work on my version, but would like to rather add my work to his repo instead of him fetching from mine. From what I understand I have to merge his repo with mine, and then work on that new repo, but I'm afraid I
19:45 d1zzle don't know what will happen automatically and what not. There are some changes in his version that didn't make it to mine in time, and in my version have already changed in other directions. What kind of control do I have over what's being changed and whatnot
19:47 User458764 joined #git
19:51 d1zzle I mean I've merged two branches of the same repo, but never merged an actual separate repo
19:52 lordjancso joined #git
19:52 Johnson1977 Could someone help me with using git and ssh keys
19:52 Johnson1977 im able to pull on some repo's
19:52 _ikke_ Johnson1977: !just_ask
19:52 gitinfo Johnson1977: You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
19:52 User4587_ joined #git
19:52 Johnson1977 I am not able to git clone from one location
19:53 Johnson1977 all others work
19:53 Johnson1977 my ssh-add -l is empty
19:53 Johnson1977 but i can still pull
19:53 cioran89 joined #git
19:53 _ikke_ How are you cloning, and what is not working?
19:53 Johnson1977 Inside a bash script
19:54 Johnson1977 git clone git@bitbucket.org:user/firmware.git /home/username/folder
19:54 Johnson1977 i keep getting public key error
19:54 Johnson1977 but I setup known hosts
19:54 Johnson1977 and on all existing repo's I am able to git pull
19:55 xall joined #git
19:55 _ADN_ joined #git
19:55 Johnson1977 When I do git-add key
19:55 Johnson1977 it works
19:56 Johnson1977 but why does it all work then on other repo's
19:56 Johnson1977 without any git-add?
19:56 Cassiopaya joined #git
19:58 gopar joined #git
19:58 nixjdm joined #git
20:00 cioran89 joined #git
20:01 jrahmy_ joined #git
20:06 Tobbi joined #git
20:08 sbasso joined #git
20:11 ogny joined #git
20:13 cdg joined #git
20:16 shinnya joined #git
20:16 cioran89 joined #git
20:17 LeBlaaanc joined #git
20:18 Goyo joined #git
20:18 m0viefreak joined #git
20:19 Silox| joined #git
20:19 Darren_ joined #git
20:19 fknwombat joined #git
20:20 peepsalot joined #git
20:20 NeXTSUN joined #git
20:21 D630 joined #git
20:22 ertes joined #git
20:25 kurkale6ka joined #git
20:25 dfaught joined #git
20:26 kurkale6ka joined #git
20:26 micah left #git
20:27 cioran89 joined #git
20:30 kurkale6ka joined #git
20:30 ForeignBiscuit joined #git
20:30 kurkale6ka joined #git
20:30 bpna joined #git
20:31 aerlindir joined #git
20:32 cioran89 joined #git
20:35 cagomez joined #git
20:38 berndj joined #git
20:43 hahuang65 joined #git
20:43 raspado joined #git
20:45 metalraiden34 joined #git
20:45 tgragnato joined #git
20:45 Tobbi joined #git
20:46 Cabanossi joined #git
20:47 duderonomy joined #git
20:47 aerlindir joined #git
20:49 CDanU joined #git
20:55 CDanU Lets suppose that inside a script I call 'git stash pop'. This will generate either return code 0 or something else. How do I check if a failure is caused by a merge conflict?
20:56 tgragnato joined #git
20:56 jast check the index for unmerged entries afterwards
20:57 jast (git ls-files -u has non-empty output)
20:58 CDanU jast: Ok, thanks.
20:58 nixjdm joined #git
20:58 mizu_no_oto joined #git
21:00 aidalgol joined #git
21:01 jstein_ joined #git
21:02 dfaught joined #git
21:04 ertes joined #git
21:05 jrahmy_ joined #git
21:06 preyalone joined #git
21:11 Rodya_ joined #git
21:13 MacWinner joined #git
21:17 dave0x6d joined #git
21:17 meliora joined #git
21:17 LaptopBrain joined #git
21:18 Marumarsu joined #git
21:18 pbandark joined #git
21:20 LTRand joined #git
21:20 tourdownunder joined #git
21:23 itseris joined #git
21:25 _xor joined #git
21:26 tgragnato joined #git
21:29 kadoban joined #git
21:29 askb joined #git
21:31 pwnz0r joined #git
21:31 VladGh joined #git
21:33 cagomez joined #git
21:34 cagomez joined #git
21:37 Phylock joined #git
21:42 kadoban joined #git
21:44 quizzi joined #git
21:47 acidvegas joined #git
21:51 meLon joined #git
21:52 robertparkerx joined #git
21:53 gopar joined #git
21:54 gopar joined #git
21:58 rxc joined #git
21:58 nixjdm joined #git
22:01 Anja_ joined #git
22:04 m0viefreak joined #git
22:05 Anja_ joined #git
22:06 cioran89 joined #git
22:08 timthowtdi joined #git
22:09 Hello71 assuming you weren't doing a merge before you started.
22:12 SkyPatrol_ joined #git
22:13 h12o joined #git
22:13 gunnaro joined #git
22:13 kadoban joined #git
22:14 hahuang65 joined #git
22:18 sbasso joined #git
22:18 gopar joined #git
22:19 bilal joined #git
22:19 SCHAPiE joined #git
22:20 dsdeiz joined #git
22:20 dsdeiz joined #git
22:23 anuxivm joined #git
22:29 ssarah joined #git
22:30 gnixev joined #git
22:30 Cabanossi joined #git
22:31 lagothrix joined #git
22:32 LeBlaaanc joined #git
22:35 stepho joined #git
22:37 jon-mac joined #git
22:38 tgragnato joined #git
22:38 hashtagstrashtag joined #git
22:41 Rodya_ joined #git
22:43 milki_ _ikke_: i realized unsetting QUARANTINE_PATH isn't going to work. since the objects are quarantined, the new objects aren't available to git clone/git checkout.
22:44 cam27 joined #git
22:45 wxg joined #git
22:45 cliluw joined #git
22:46 Kaisyu joined #git
22:47 stepho joined #git
22:49 zzz joined #git
22:49 Anja__ joined #git
22:50 k0nichiwa joined #git
22:52 stepho joined #git
22:52 Levex joined #git
22:53 stepho joined #git
22:57 dermoth joined #git
22:57 Hello71 joined #git
22:58 nixjdm joined #git
22:58 jaziz joined #git
22:59 ogny joined #git
23:02 dsdeiz joined #git
23:02 tourdownunder joined #git
23:05 caper joined #git
23:06 tmsmith joined #git
23:11 nedbat joined #git
23:13 dsdeiz joined #git
23:13 dsdeiz joined #git
23:14 nevodka joined #git
23:14 nevodka joined #git
23:17 wxg joined #git
23:18 scoobertron joined #git
23:19 ki0 joined #git
23:20 lil__ joined #git
23:21 lil__ Hi there, I forgot to include a  file that makes sense to have been committed with my most recent commit. I know that amend is a thing, do I need to have my files staged before running git commit --amend?
23:22 nivag joined #git
23:22 kadoban lil__: Yes, you stage the changes you additionally want to include and then do commit --amend
23:23 lil__ kadoban, cool, I hope that's the easiest assist you have today!
23:23 kadoban Hehe, pretty close :)
23:25 disi i there a way to do `git checkout -b newbranch myremote/oldbranch` without having newbranch track myremote?
23:25 ixian joined #git
23:27 disi i can do `git checkout -b newbranch && git reset --hard myremote/oldbranch`, but is there a better way?
23:28 TbobbyZ joined #git
23:28 kadoban Does it even? I thought that didn't set up tracking by default.
23:29 kadoban disi: There's --no-track though if you want
23:29 disi kadoban: oo shiny, thanks!
23:29 kadoban Er that's to 'git branch', I wonder if checkout accepts it too
23:30 kadoban Oh it appears to, that's good. 'welcome
23:30 kadoban Wonder why the manpage doesn't say what the default is
23:34 gitinfo disi: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
23:38 madewokherd joined #git
23:38 Nicmavr joined #git
23:39 peepsalot joined #git
23:40 disi (think i did that already, lmk if it didnt click)
23:40 itseris joined #git
23:41 kadoban I don't know how the bot works either xD
23:42 Rodya_ joined #git
23:42 arch-nemesis thanks, arch-nemesis
23:43 arch-nemesis 9 to go
23:43 disi heh
23:45 Chillance joined #git
23:46 watabou joined #git
23:47 ilgix joined #git
23:49 Es0teric joined #git
23:49 Rotaerk joined #git
23:53 Kestrel-029 joined #git
23:53 mel00010 joined #git
23:54 om_henners joined #git
23:55 Vampire0 arch-nemesis, fooling the bot will not work. self-thanks are ignored afair. :-P
23:55 Vampire0 !botsnack
23:55 gitinfo Om nom nom
23:56 hugdru joined #git
23:57 SwiftMatt joined #git

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