Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-18

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

All times shown according to UTC.

Time Nick Message
00:01 JamesBaxter joined #git
00:04 kristofferR joined #git
00:09 anonymuse joined #git
00:09 qsx Eugene: POWER?
00:09 qsx why not SPARC?
00:10 Eugene https://www.youtube.com/watch?v=ygBP7MtT3Ac
00:12 durham_ joined #git
00:13 cworth joined #git
00:16 Derperperd joined #git
00:16 todder joined #git
00:16 devhoag joined #git
00:19 eycsigfy joined #git
00:19 cdown joined #git
00:20 ozymandias_ left #git
00:22 parsnip joined #git
00:24 m___ joined #git
00:25 cagedwisdom joined #git
00:27 rominronin joined #git
00:28 lolmac joined #git
00:28 JamesBaxter joined #git
00:32 sammyo joined #git
00:32 nettoweb joined #git
00:35 WoodLeg joined #git
00:35 shmuli joined #git
00:35 sammyo joined #git
00:36 dodobrain joined #git
00:36 mob1le joined #git
00:38 duvnell joined #git
00:38 fahadash joined #git
00:38 cdown_ joined #git
00:40 venmx joined #git
00:40 madewokherd joined #git
00:42 akurniawan joined #git
00:43 CubiK joined #git
00:43 Gsham joined #git
00:47 Shentino joined #git
00:50 crayon joined #git
00:53 BSab joined #git
00:54 jaguarmagenta joined #git
00:56 mischat joined #git
01:00 fstd_ joined #git
01:01 ashokrajar joined #git
01:05 ISmithers joined #git
01:06 aartist joined #git
01:07 ToBeCloud joined #git
01:07 axisys_ joined #git
01:08 jnewt joined #git
01:08 rchavik joined #git
01:10 axisys_ joined #git
01:15 azerus joined #git
01:18 ruby joined #git
01:18 hahuang65 joined #git
01:19 xall joined #git
01:21 aussie joined #git
01:23 jnewt_ joined #git
01:23 diogenese joined #git
01:23 txt joined #git
01:26 Rodya_ joined #git
01:27 r3c0d3x joined #git
01:31 Pyrogerg joined #git
01:32 Vangelis joined #git
01:33 Turner92 joined #git
01:34 pigeon joined #git
01:35 morenoh149 joined #git
01:36 geko joined #git
01:36 safe joined #git
01:36 nettoweb1 joined #git
01:40 r3c0d3x joined #git
01:43 xcesariox joined #git
01:44 mob1le joined #git
01:44 fiddlerwoaroof joined #git
01:45 jaguarmagenta joined #git
01:46 mdiehl left #git
01:47 anonymuse joined #git
01:49 venmx joined #git
01:50 BSaboia joined #git
01:51 kbs left #git
01:53 BSab joined #git
01:53 byte512 joined #git
01:54 mycyber joined #git
01:56 UniFreak joined #git
01:56 geko joined #git
01:57 Nilesh_ joined #git
01:57 cqi joined #git
01:57 mischat joined #git
01:58 BSaboia joined #git
01:58 rominronin joined #git
01:59 ISmithers joined #git
02:03 User458764 joined #git
02:04 jccn joined #git
02:04 nettoweb joined #git
02:06 jstimm joined #git
02:07 dreiss joined #git
02:10 hackel joined #git
02:12 anuxivm left #git
02:13 d^sh joined #git
02:14 polyrob joined #git
02:16 GavinMagnus joined #git
02:18 shmuli joined #git
02:22 geko joined #git
02:23 clemf joined #git
02:23 JamesBaxter joined #git
02:23 User458764 joined #git
02:24 Rodya_ joined #git
02:27 madebymarkca joined #git
02:28 King_DuckZ left #git
02:28 finalbeta joined #git
02:34 ashokrajar joined #git
02:34 mob1le joined #git
02:35 ashokrajar joined #git
02:35 Gsham joined #git
02:36 ashokrajar joined #git
02:38 geko joined #git
02:38 cagmz joined #git
02:39 GavinMagnus left #git
02:40 whitby joined #git
02:41 Dougie187 joined #git
02:46 pks joined #git
02:46 nicksloan joined #git
02:46 pwnz0r joined #git
02:46 porjo joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and The Grand Tour | 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 | POWERRRRRR
02:49 L4B In order to reuse my build system in multiple projects would it make sense to make it a submodule for them (and make slight changes before the first commit)?
02:49 porjo rudi_s, thanks!  git branch -d -- \-  worked for me
02:50 BenderRodriguez joined #git
02:51 Siegfried joined #git
02:56 fmcgeough joined #git
02:58 mischat joined #git
03:00 Corosus joined #git
03:02 robattila256 joined #git
03:03 lucasem joined #git
03:04 rudi_s np
03:08 jimi_ joined #git
03:08 ashokrajar joined #git
03:11 aavrug joined #git
03:13 papermachine joined #git
03:14 Siegfried joined #git
03:14 thierryp joined #git
03:15 sunri5e joined #git
03:16 done joined #git
03:18 ashokrajar joined #git
03:19 venmx joined #git
03:23 morenoh149 joined #git
03:24 pks joined #git
03:25 hexagoxel joined #git
03:25 rossome joined #git
03:28 b1tchcakes joined #git
03:28 chachasmooth joined #git
03:30 dsop joined #git
03:30 hhee joined #git
03:30 rominronin joined #git
03:32 romerocesar joined #git
03:37 Rodya_ joined #git
03:42 Lyqyd joined #git
03:45 railssmith joined #git
03:46 jaguarmagenta joined #git
03:48 BlueProtoman joined #git
03:48 fatalhalt joined #git
03:50 blunaxela joined #git
03:50 stevenspasbo joined #git
03:50 BlueProtoman I have a Git repo.  Its primary remote (origin) is on a machine at my university, but I want to manage it with GitHub so my team and I can do our primary work there (issue tracking, pull requests, etc.).  What's a good way to mirror it?
03:53 tannp joined #git
03:53 BlueProtoman In a fire-and-forget manner, preferably.  Whenever I push anything to GitHub, I want it pushed to origin as well (and vice versa).
03:53 shmuli joined #git
03:54 blunaxela wouldn't that require GitHub having access to your university machine? or at least some cron job on your uni machine checking GitHub and pulling changes?
03:56 BlueProtoman blunaxela: I don't believe so; Git's loaded with obscure-but-useful functionality, I'm sure there's something client-side that can help me.
03:57 a_thakur joined #git
03:59 mischat joined #git
04:00 blunaxela well, you could set up SSH access to your machine and then perhaps GitHub has some way of using it as a remote and pushing changes
04:01 Dougie187 BlueProtoman: !deploy
04:01 gitinfo BlueProtoman: 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
04:01 Dougie187 left #git
04:02 _leb joined #git
04:04 russ_za joined #git
04:04 _leb I am trying to checkout a specific branch from the bootstrap rep
04:04 _leb I clone and then do git-checkout -b v3-dev
04:04 _leb and I get this
04:04 _leb leb@hula:~/web/bootstrap % git checkout v3-dev
04:04 _leb Branch v3-dev set up to track remote branch v3-dev from origin.
04:04 _leb Switched to a new branch 'v3-dev'
04:04 _leb leb@hula:~/web/bootstrap %
04:04 _leb so why is it making a new branch instead of tracking the remote?
04:07 phanimahesh joined #git
04:08 duckinja joined #git
04:11 geko joined #git
04:12 Goplat joined #git
04:13 ayogi joined #git
04:13 leb joined #git
04:13 Atm0spher1c joined #git
04:15 Vortex34 joined #git
04:19 blunaxela i believe that's actually what you want, i believe git clone only grabs the commits
04:19 blunaxela git branch -a will show the remote branches
04:20 Andrew_K joined #git
04:20 blunaxela and you can do what you just did to create a local branch that tracks changes for that remote branch
04:20 blunaxela i'm still new to git, so take that with a grain of salt
04:21 blunaxela i think it actually helped you out too by recognizing that it was a remotely tracked branch, instead of just creating a new local branch
04:24 c1pher joined #git
04:24 Es0teric joined #git
04:25 jephsf joined #git
04:25 leb I don't think it's a tracking branch
04:31 blunaxela hmm, i'm reading https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches#Tracking-Branches and i think you have a tracking branch, let me know if i'm wrong though
04:31 jaafar joined #git
04:32 leeN joined #git
04:32 geko joined #git
04:37 L4B I'm not sure how submodules work. Would this be a legit use case for them? I'm thinking about putting my build system in a separate repo and everytime I start a new project, I make the build system a submodule and modify it slightly before the first commit (to add the specific project's files).
04:38 L4B I tend to use pretty much the same build system for everything, with small variations.
04:39 blunaxela are changes to the core of your build system in one repo something that you want to propagate to your other repos?
04:40 blunaxela i use subtrees to share core libraries across projects, but i don't recall the pros/cons of submodules vs subtrees
04:40 L4B blunaxela: Yes, although I'd probably have to review to changes to make sure they don't break anything.
04:40 blunaxela i think submodules are better supported and actually in mainline git
04:41 blunaxela to me it sounds like a good case
04:41 blunaxela ugh, now i've got to go read more about submodules and learn them too
04:41 L4B I haven't heard about subtrees before, I'll look them up.
04:41 L4B heh
04:41 L4B Also, what's "mainline"?
04:41 L4B I'm pretty new to git.
04:42 blunaxela so git is mostly a collection of simple tools to manage your repo
04:42 L4B Right, like all versioning tools.
04:42 blunaxela lots of commands in git were actually developed outside and eventually merged into it
04:42 L4B Ah, I see.
04:42 blunaxela well, i don't know how many, but i assume submodule wasn't originally part of it
04:43 dermoth joined #git
04:43 L4B And mainline is the official repo?
04:43 blunaxela there is a contrib directory in git that was popular git commands not part of mainline yet and not officially maintained
04:43 L4B Oh
04:43 blunaxela mainline is all the commands that will be supported in the future
04:43 blunaxela contrib are stuff that are neat, but not considered mature or ready for mainline
04:44 L4B So subtrees aren't mainline, I guess is what you meant.
04:44 blunaxela for example, subtree is written all in BASH, while i believe all of submodule is in C
04:44 L4B Yeah.
04:44 blunaxela yeah, subtrees aren't in mainline :P
04:45 robotroll joined #git
04:46 Hello71 what does BASH stand for
04:46 L4B I'd rather use things from mainline stuff, I guess, because if the maintainer of subtrees gives up on the project it will be a pain to get over it.
04:47 L4B Hello: It's just "sh" for "shell" and with a prefix that turns it into a funny word, I guess, although we could come up with theories.
04:48 L4B The B could stand for Brian (the original author) or Bourne (the original author of sh).
04:48 L4B Hello71: ^
04:48 blunaxela L4B: that's actually what i've been dealing with lately, subtree can get slow as the repo gets big
04:48 SanguineCholera joined #git
04:48 blunaxela I've always heard it as "Bourne Again SHell"
04:49 L4B Hah, that's too good to not be true.
04:50 venmx joined #git
04:50 kadoban It is true, AFAIK. 'sh' is/was also known an the Bourne shell. Thus bash is the Bourne Again SHell. It took from sh and others.
04:52 L4B Oh, and you can update submodules and handle merging in the usual way.
04:52 L4B Sounds like exactly what I need.
04:52 blunaxela btw, if you're new to bash/sh, ctrl+r has changed my life
04:53 L4B lol
04:53 blunaxela L4B: ah, subtree is interesting because you get the subtrees as part of the repo and history
04:54 blunaxela but you must use the subtree merge/push/pull commands to deal with the fact that you need to split the main tree commits from the subtree in order to do anything
04:54 blunaxela i think with submodule you have to clone, then update/fetch the submodules?
04:55 azerus joined #git
04:55 blunaxela which is fine, especially since it doesn't sound like submodules have issues with repos as they become enourmous
04:55 blunaxela i just don't know how clean the history looks with submodules
04:55 Hello71 git submodule init is a fancy way of cd; git clone
04:56 L4B I think it's something along those lines but I haven't read the documentation yet. I'm just going to do that now after I put the finishing touched on the build system itself.
04:57 SanguineCholera Git makes me want to cry. I've been using Perforce for 12 years for games and my new company won't pay for it, and we don't have an IT department to help people. I've been struggling. Anyone patient willing to help?
04:57 Hello71 do you have an actual question
04:57 SanguineCholera I do, I just didn't want to be rude. First time in the channel
04:58 Hello71 !ask
04:58 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
04:58 Hello71 !welcome
04:58 gitinfo Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
04:58 subhojit777 joined #git
04:59 blunaxela nooo don't cry, git is just too powerful for us mere mortals. hope you can find answers here :D
05:00 mischat joined #git
05:00 SanguineCholera Thanks. OK. So I'm migrating a giant depot (60GB) of mostly binary assets from Perforce to GitLab. I've enabled Git LFS to make it less painful. Unfortunately, about 6504 "desktop.ini" files made it into Git. I ran a script that deleted them locally. Now SourceTree is showing a ton of files with a little green plus that I assume means "there's a remote desktop.ini file that you need to download"
05:00 SanguineCholera (Sourcetree has no documentation about what the icons mean that I can find)
05:00 fstd joined #git
05:00 sssilver joined #git
05:00 preaction irc tech support has some social norms that include "just asking is not rude" and "asking to ask is noise, useless, and therefore rude"
05:00 SanguineCholera What I want to do is tell GitLab, just delete all the freaking desktop.ini files. But how?
05:00 navidr joined #git
05:01 preaction SanguineCholera: try .gitignore to just ignore the things so they don't appear as part of the repo
05:01 preaction i mean, also delete them from the repo. but .gitignore will prevent them from being added again
05:01 SanguineCholera I added "desktop.ini" to a .gitignore file that I put in the root, but that doesn't seem to activate the gitignore. What am I missing? Also, I'd really like the files gone in GitLab, not ignored
05:02 rominronin joined #git
05:02 preaction if you deleted them locally, you need to commit that delete
05:02 SanguineCholera Yes, but how?
05:02 preaction gitignore doesn't work on files that are already "tracked" by the repo
05:02 azerus joined #git
05:02 preaction if they show up in "git status" as "staged, but not committed": git commit; otherwise, if they show up as "changed but not staged", you need "git commit -a"
05:02 SanguineCholera Rephrasing: how do you commit 6504 deleted local files?
05:03 preaction git status should say this, in fact
05:03 ayjay_t joined #git
05:04 Hello71 !gui
05:04 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
05:04 Hello71 !sens
05:04 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
05:04 Hello71 !gui should add 4) most of them suck
05:04 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
05:04 SanguineCholera understood. I'm firing up the command line to see what git status says
05:04 preaction is that what SourceTree is?
05:04 SanguineCholera yep. It's a GUI. But I'm not wedded to GUIs. I used the CLI for both P4 and Git, just GUIs save time usually
05:04 preaction i've never used a git gui, so i don't know them, sorry. git is... not exactly user friendly to be fair, but...
05:05 preaction i can say it's come a long way? but still?
05:06 SanguineCholera OK, git says these 6504 files are "changes not staged for commit" scrolling up to read what you said about that
05:06 preaction right
05:06 preaction depending on how recent your git is, those comments in that command should say "git checkout to restore, git add to stage"
05:06 preaction "restore" being the opposite of what you want, of course
05:06 SanguineCholera It says "git add/rm <file>... to update what will be committed"
05:07 SanguineCholera I guess that means I need to output git status to a file so I can feed 6504 files to the command line?
05:07 preaction oh. right. technically it's "rm"
05:07 preaction but nah. just "git commit -a"
05:07 preaction "-a" for "all"
05:07 SanguineCholera oh thank god
05:07 Hello71 git *add* -A
05:07 Hello71 !index
05:07 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
05:07 mycyber joined #git
05:07 SanguineCholera oh shoot. wait. -a will do both the deletes and add other stuff.
05:08 preaction if you've got other changed things, yes. untracked things, no
05:08 ruby joined #git
05:08 SanguineCholera There are also about 14000 binary files that still need to get added. I'm doing them in small batches because Git can't handle this much data and barfs. Perforce can just run overnight
05:09 preaction otherwise, if you've got something resembling a gnu system: "find . -name desktop.ini | xargs git rm"
05:09 JanC_ joined #git
05:09 SanguineCholera I guess I can move them out of the directory for now? Or... darn. Is there a way to just commit and push 6500 deleted files? And leave the 14000 new files uncommitted?
05:10 shmuli joined #git
05:10 preaction new as in untracked? or new as in added?
05:10 preaction where do they show up in "git status"?
05:10 SanguineCholera Not sure what untracked vs. added means?
05:10 SanguineCholera Ah, 1 sec
05:10 Hello71 !xargs
05:10 Hello71 is not safe to use without -0.
05:10 SanguineCholera Too many files. Git Status scrolled off the top. Let me pipe it to a text file...
05:11 SanguineCholera They're all "new file: <file>"
05:11 preaction that's... added i think
05:11 preaction which is weird unless you added them
05:12 preaction but anyway, sorry. like Hello71 said: "find . -name desktop.ini -print0 | xargs -0 git rm"
05:12 Random832 find . -name desktop.ini -exec git rm {} +
05:12 preaction or that
05:12 morenoh149 joined #git
05:12 preaction i mean, Random832 is better really
05:15 SanguineCholera I'm not really familiar enough with GNU to do that. Darn it. I'll try again later. It's very late and my wife is like, "Why are you staying so late at work? Come home." very unhappy. talk to you guys later, I guess
05:16 jimi_ joined #git
05:17 dodobrain joined #git
05:19 Cabanossi joined #git
05:22 infernix joined #git
05:22 arescorpio joined #git
05:22 Rodya_ joined #git
05:22 Paul5 joined #git
05:23 Paul5 left #git
05:26 overlord_tm joined #git
05:27 ochorocho__ joined #git
05:28 dsantiago joined #git
05:35 ShapeShifter499 joined #git
05:36 brillenfux joined #git
05:38 brillenfux_ joined #git
05:38 cyan__ joined #git
05:40 mycyber joined #git
05:43 smithbone joined #git
05:43 stogov joined #git
05:43 stogov left #git
05:50 done joined #git
05:50 bmahe joined #git
05:52 BSab joined #git
05:53 jozwior joined #git
05:55 romerocesar joined #git
05:55 BSaboia joined #git
05:58 daey_ joined #git
06:01 mischat joined #git
06:01 WayToDoor joined #git
06:03 brillenfux_ joined #git
06:03 msonntag joined #git
06:04 themill joined #git
06:04 sssilver joined #git
06:05 a_thakur_ joined #git
06:06 rivarun joined #git
06:07 NimeshNeema joined #git
06:07 the_cybersphinx joined #git
06:08 trondth joined #git
06:08 ruby joined #git
06:08 a_thakur joined #git
06:09 rscata joined #git
06:10 msonntag joined #git
06:10 brillenfux__ joined #git
06:11 _flow__ joined #git
06:12 cebor joined #git
06:13 jokester joined #git
06:15 MrWoohoo joined #git
06:18 Siegfried joined #git
06:20 cqi joined #git
06:20 venmx joined #git
06:20 HedgeMage joined #git
06:21 moop joined #git
06:21 dpower joined #git
06:21 bluezone joined #git
06:21 KnownSyntax joined #git
06:22 arooni joined #git
06:22 NimeshNeema joined #git
06:22 qt-x joined #git
06:27 svm_invictvs joined #git
06:27 pks joined #git
06:29 Jameser joined #git
06:30 Siegfried joined #git
06:31 thiago joined #git
06:31 overlord_tm joined #git
06:32 brillenfux_ joined #git
06:33 rominronin joined #git
06:35 dreiss joined #git
06:35 shmuli_ joined #git
06:37 aidalgol joined #git
06:37 danimal2 joined #git
06:39 overlord_tm joined #git
06:44 pks joined #git
06:45 fragMental joined #git
06:47 stylus joined #git
06:48 lightstalker joined #git
06:48 Raging_Hog joined #git
06:54 thierryp joined #git
06:54 c1pher joined #git
06:55 c1pher joined #git
06:56 c1pher joined #git
06:56 lindenle joined #git
06:57 c1pher joined #git
06:58 ThomasLocke joined #git
06:58 LucaTM joined #git
06:59 sssilver joined #git
07:00 Rodya_ joined #git
07:00 dermoth joined #git
07:01 rominronin joined #git
07:01 morenoh149 joined #git
07:01 venmx joined #git
07:01 mischat joined #git
07:02 ronskisika joined #git
07:07 User458764 joined #git
07:09 xall joined #git
07:09 WayToDoor joined #git
07:12 sssilver joined #git
07:12 jknetl joined #git
07:17 Kodax joined #git
07:18 grawity if your find has -print0, it probably has -delete as well
07:18 grawity if it doesn't have -print0, who cares, Windows does not allow \n in filenames anyway
07:19 zeroed joined #git
07:20 Puffball joined #git
07:20 iamnotarobot joined #git
07:21 chele joined #git
07:22 JeroenT joined #git
07:22 freimatz joined #git
07:24 sssilver joined #git
07:27 gfixler joined #git
07:31 Puffball_ joined #git
07:32 rominronin joined #git
07:32 sssilver_ joined #git
07:32 subhojit777 joined #git
07:34 PCatinean joined #git
07:35 nd_ joined #git
07:36 jnavila joined #git
07:40 jaguarmagenta joined #git
07:42 Sceorem joined #git
07:44 Ice_Strike2 joined #git
07:45 thierryp joined #git
07:46 marlun joined #git
07:46 sssilver joined #git
07:46 c1pher joined #git
07:47 c1pher joined #git
07:48 c1pher joined #git
07:49 c1pher joined #git
07:49 Kodax joined #git
07:49 c1pher joined #git
07:53 xall joined #git
07:53 encod3 joined #git
08:00 Ice_Strike2 joined #git
08:01 byte512 joined #git
08:01 Rodya_ joined #git
08:02 fragMental joined #git
08:02 a_thakur joined #git
08:02 mischat joined #git
08:03 venmx joined #git
08:04 Kodax joined #git
08:06 adac joined #git
08:09 svm_invictvs joined #git
08:11 danslo joined #git
08:13 gusnan_ left #git
08:14 gusnan joined #git
08:17 howitdo joined #git
08:18 rominronin joined #git
08:20 mycyber joined #git
08:22 Alienpruts joined #git
08:23 Mir4g3 joined #git
08:23 bocaneri joined #git
08:26 hahuang65 joined #git
08:26 a_thakur joined #git
08:26 mischat joined #git
08:27 sbulage joined #git
08:31 xall joined #git
08:33 InfoTest joined #git
08:34 done joined #git
08:35 rominronin joined #git
08:37 bob14 joined #git
08:38 yupvr joined #git
08:40 a_thakur_ joined #git
08:42 diogenese joined #git
08:43 xall joined #git
08:43 tvw joined #git
08:44 Macaveli joined #git
08:44 t0by joined #git
08:48 JeroenT_ joined #git
08:49 hyperair joined #git
08:50 morenoh149 joined #git
08:50 sns joined #git
08:52 preilly joined #git
08:54 zeroed joined #git
08:57 mindriot101 joined #git
08:58 shmuli joined #git
08:59 leehambley joined #git
08:59 lb1c joined #git
09:00 JeroenT joined #git
09:00 Macaveli joined #git
09:01 djb-irc joined #git
09:01 Shentino joined #git
09:03 JeroenT_ joined #git
09:03 mikecmpbll joined #git
09:03 JeroenT_ joined #git
09:04 venmx joined #git
09:07 p4trix joined #git
09:09 djb-irc joined #git
09:09 ahmedelgabri joined #git
09:10 bongjovi joined #git
09:12 halbomin joined #git
09:14 kurkale6ka joined #git
09:15 djb-irc joined #git
09:15 romerocesar joined #git
09:16 marcogmonteiro joined #git
09:17 padde joined #git
09:17 shmuli joined #git
09:18 lss8 joined #git
09:18 lss8 joined #git
09:19 padde hi! I'm in the process of converting a few mercurial repositories to git. I thought I was done, when I discovered that my shiny new git repos can't be cloned with git 2.10.0 and later
09:19 clmsy joined #git
09:20 canton7 hmm? I'm not aware of any breaking stuff in 2.10.0...
09:20 canton7 !repro ?
09:20 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
09:20 zeroed joined #git
09:21 padde canton7: let me paste the terminal output...
09:21 shmuli joined #git
09:21 shmuli joined #git
09:21 elect joined #git
09:22 intellix joined #git
09:22 mycyber joined #git
09:23 padde https://gist.github.com/anonymous/9ccdf0adc685d1107628568e568557db
09:23 padde that's how it fails with git-2.10.0 and git-2.10.2
09:24 canton7 the "warning: templates not found /usr/local/share/git-core/templates" makes me suspect a botched git install
09:24 canton7 not sure what's causing line 8 though
09:24 mischat joined #git
09:25 canton7 my immediate guess is that you'ven got 1 and a half git installs on your machine, and it's getting confused, but that's a pure guess
09:25 padde https://gist.github.com/anonymous/007236a2372693758af2e37259713c64 - that's how it looks with older git versions
09:25 canton7 yeah, that's as it should be
09:26 padde canton7: I didn't install it, just built it from source and ran it from the build directory... worked with all git versions, except 2.10.x - i suspect the issue is not with the templates
09:26 canton7 is there a system git installation?
09:26 MaximusColourum joined #git
09:27 padde yes, 1.9.1 (default in Ubuntu Trusty - the distro I have to use...)
09:27 subhojit777 joined #git
09:27 canton7 I wonder whether your local git build of 2.10.0 is calling the system rev-list by mistake
09:28 padde canton7: let me try to get rid of the system installation and make install the 2.10.x
09:30 padde canton7: spot on! so I've been chasing a ghost... thanks for helping me find it :)
09:30 canton7 padde, no worries!
09:30 xwid joined #git
09:30 mischat joined #git
09:30 ochorocho__ joined #git
09:30 canton7 padde, for background, in a lot of cases, if you run 'git foo', then git looks for an executable called 'git-foo' in the git exec path (normally /usr/lib/git-core)
09:31 padde canton7: I see
09:31 canton7 padde, I'm not aware of any behaviour to make it look somewhere relative to the location of the git executable, and I couldn't find mention in the docs, so my guess was that it was looking in your system git exec path, and pickup up on 'git-rev-list' from your system install
09:32 canton7 you can pass --exec-path to make it look somewhere else
09:32 canton7 or set GIT_EXEC_PATH
09:32 padde canton7: yes, that's probably it, and git-rev-list got new syntax in 2.10, I suppose
09:32 canton7 ah, 'git --exec-path' prints the current exec path - I should have just made you run that :P
09:32 canton7 yeah, there's no mention of anything new in the man page, but something must have changed
09:32 padde canton7: from 1.9.1 to 2.9.3 syntax must have been backwards compatible, that's why I didn't encouter the issue with these ;)
09:33 canton7 yeah
09:33 padde thanks again! I have to finish up some stuff, so got to go. have a good day :)
09:33 canton7 no worries, you too!
09:33 a_thakur joined #git
09:34 djb-irc joined #git
09:34 omegak joined #git
09:35 aspiers joined #git
09:36 rorro joined #git
09:36 rominronin joined #git
09:37 WayToDoor joined #git
09:39 grayjoc joined #git
09:40 ocbtec joined #git
09:40 brk_ joined #git
09:40 rominron_ joined #git
09:41 STOP_nwo joined #git
09:45 ramsub07 joined #git
09:48 g_zen joined #git
09:50 heftig joined #git
09:50 chll_ joined #git
09:51 rominronin joined #git
09:52 ayjay_t joined #git
09:53 ldlework I had a branch A, from which I made branch B. I made a bunch of unstaged changes on B. Including one that was really relevant to A. So I stashed everything, checked out A, then popped the stash, hoping to commit just that one change.
09:53 ldlework But now there's tons of conflicts including files that are "deleted by us"
09:53 ldlework Not sure how to proceed.
09:53 ldlework I kinda want to pretend I never did that and just move everything back to B
09:54 ldlework Anyone got any advice?
09:54 ldlework (lol why do I always get myself into these problems at 2 AM)
09:55 Asenar joined #git
09:56 mischat_ joined #git
09:58 Serpent7776 joined #git
09:59 Darcidride joined #git
10:00 mindriot_ joined #git
10:00 canton7 ldlework, if the 'stash pop' conflicts, then it doesn't actually drop the stash - so it's still there
10:00 dan2k3k4 joined #git
10:00 canton7 so you can remove all changes, and hop back to B
10:01 GavinMagnus joined #git
10:01 ldlework canton7: this is my status https://gist.github.com/dustinlacewell/d1999c2c24215346e687dc8303453a6e
10:01 ldlework what should I do?
10:02 canton7 did you understand what I just said?
10:02 ldlework Not really.
10:02 ldlework You're telling me to revert, but I'm not exactly sure how to revert in this case.
10:02 canton7 ok, so ask for clarification on the bits you didn't understand, rather than ignoring it
10:02 canton7 I'm saying you can remove all changes, if you want to
10:02 canton7 the link you sent me describes how to remove the changes
10:03 ldlework how do I deal with the "unmerged paths" bits
10:03 ldlework reset and rm?
10:03 canton7 the reset is suggests will deal with those
10:03 canton7 *it suggests
10:03 ldlework this is scary :O
10:03 Darcidride joined #git
10:03 canton7 !backup
10:03 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
10:04 rominronin joined #git
10:04 venmx joined #git
10:06 ozymandias_ joined #git
10:07 ldlework canton7: ok so after applying all the resets my status looks like this, https://gist.github.com/dustinlacewell/df4a60c2c141a6b172fc04550450f6f0
10:07 ldlework do I just checkout branch B now?
10:07 canton7 see line 5
10:07 ldlework okay
10:07 mindriot101 joined #git
10:09 ldlework canton7: thanks a bunch
10:09 mischat joined #git
10:11 venmx joined #git
10:13 shmuli joined #git
10:14 dhollinger joined #git
10:14 done joined #git
10:21 elsevero joined #git
10:22 mablae joined #git
10:22 subhojit777 joined #git
10:23 rnsanchez joined #git
10:23 nikivi joined #git
10:24 XVar joined #git
10:27 bluepixe1 joined #git
10:27 p1ngarn joined #git
10:31 King_Hual joined #git
10:31 ochorocho__ joined #git
10:32 mischat joined #git
10:33 Macaveli joined #git
10:35 mischat joined #git
10:38 irco joined #git
10:39 ferr joined #git
10:39 morenoh149 joined #git
10:39 oskarkv joined #git
10:41 daurnimator huh
10:41 daurnimator I think I found a bug in git's diffing
10:41 daurnimator it kept telling me that there was changes when there wasn't
10:42 canton7 sure it wasn't picking up on something like line endings?
10:42 canton7 that's the most common cause of whole-file diffs with no apparent changes
10:42 daurnimator canton7: yep. I commited all changes. then did a diff *again*, and it went the other way
10:42 daurnimator canton7: no, it was two lines that were the same, that kept swapping
10:43 _ADN_ joined #git
10:43 canton7 I'm still putting my money on some difference in whitespace, etc, which isn't immediately visible
10:43 brk_ joined #git
10:44 a_thakur joined #git
10:44 jfr_ joined #git
10:44 daurnimator managed to get myself out of the loop via `git add -p`.... not sure if I can replicate now
10:45 jfr_ joined #git
10:49 jfr_ joined #git
10:49 sbulage joined #git
10:50 PCatinean hey guys
10:50 daurnimator okay... managed to replicate
10:50 PCatinean If I have two commits pushe two github, how can I remove the first?
10:50 [ADN] joined #git
10:52 tobiasvl PCatinean: !revert
10:52 gitinfo PCatinean: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
10:52 daurnimator hrm. how can I show this to you?
10:52 PCatinean if I do hard reset I it does not help because I want only the second commit not the first
10:53 tobiasvl PCatinean: also keep in mind that removing commits that have already been committed from the actual history (as in point e) above) is a !rewrite of history
10:53 gitinfo PCatinean: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:53 NeverDie joined #git
10:53 tobiasvl PCatinean: then go an !interactive_rebase
10:53 gitinfo PCatinean: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
10:53 PCatinean in short I did a intital commit with a user that turned into a organization and then with my user
10:53 PCatinean and it's a duplicate commit basically
10:53 PCatinean actually not, the first commit was with just .gitignore and such then my stuff
10:53 PCatinean I should just squash them both in one single commit made by me
10:54 tobiasvl then interactive rebase is still the way to go
10:54 tobiasvl just remember that you will have to force push afterwards to rewrite history, see caveats above
10:54 GavinMagnus left #git
10:55 _ADN_ joined #git
10:55 PCatinean yeah I know, it's a fresh push that's not anounced
10:55 PCatinean I do git rebase -i and I get just noop
10:56 phanimahesh joined #git
10:57 tobiasvl PCatinean: git rebase -i HEAD~2
10:57 tobiasvl to rebase on the parent of the two most recent commits that you want to squash
10:57 tobiasvl then follow the instructions
10:57 tobiasvl ie. edit the word "pick" in front of the newest commit to "squash"
10:57 lindenle joined #git
10:58 PCatinean fatal: Needed a single revision
10:59 PCatinean maybe because it's on a different branch the first commit
11:00 daurnimator uploaded this: https://asciinema.org/a/7y9qhr0837a7t96m8w14mupnk
11:00 daurnimator ^^ look at weird behaviour
11:00 tobiasvl PCatinean: that's a relevant piece of information, yes. you still shouldn't get that error unless the branch you're trying to rebase doesn't have at least three commits though?
11:01 phanimahesh joined #git
11:01 PCatinean One commit on master, one on branch 10
11:01 tobiasvl then you need to merge the branches first obviously
11:02 tobiasvl then you can squash afterwards
11:02 daurnimator canton7: ^^ see screencast
11:04 dodobrain joined #git
11:06 canton7 daurnimator, what's your full commit command? it got chopped
11:06 daurnimator canton7: I can see it there in the screencast...
11:06 daurnimator canton7: git -c commit.gpgSign=no commit --amend --no-edit
11:07 canton7 it says "--no-" here :P righty, wanted to make sure you weren't passing a filename
11:07 canton7 ok, weird
11:07 canton7 what actually got committed?
11:08 daurnimator there was a 'git show -p' in the middle there
11:08 canton7 this is why pastebins are easier to interpret :P
11:09 daurnimator canton7: overflowed my scrollback. couldn't get it all :P
11:09 daurnimator also I constantly resize my terminal window... which made it useless to copy out of
11:09 jumpman joined #git
11:09 canton7 right, so the issue is that those stages aren't getting committed
11:10 canton7 or, rather, hunks aren't getting committed
11:10 daurnimator more exactly, the issue is that when it applies the staged hunks, it applies them in a *different* location
11:10 daurnimator I assume because the big unstaged hunk I have at the top is skewing the line numbers enough that it *thinks* it's applying them at correct location
11:10 canton7 wait, let me get this straight
11:11 jozwior joined #git
11:11 daurnimator canton7: I stash a change from `lua_pushboolean()` to `lua_pushinteger()` ==> it changes the wrong callsite
11:11 NET||abuse joined #git
11:12 dodobrain joined #git
11:12 InfoTest joined #git
11:12 mischat joined #git
11:13 nettoweb joined #git
11:13 canton7 you stage hunks at -243,7 +297,7 in lunistring_casecoll and at -288,7 +342,7 in lunistring_is_titlecase. the 'show' shows a change at -270,7 +288,7 in lunistring_is_titlecase. In the next add, you stage junks at -243,7 +297,7 in lunistring_Cascoll and -288,7 +342,7 in lunistring_is_titlecase
11:14 NeverDie_ joined #git
11:15 canton7 the changed position of the hunk in lunistring_is_titlecase is fine - you didn't stage the hunks above it. The concerning bit is that it crops up in the add -p after
11:15 canton7 what does 'diff' show? does it match with what add -p is offering?
11:15 daurnimator canton7: yes it does.
11:16 canton7 ah, no, the last add -p replaces pushinteger with pushboolean, I see
11:16 cyberz joined #git
11:17 canton7 so the show doesn't match what you staged
11:17 brillenfux joined #git
11:17 * canton7 needs to finish his timesheet, back in a bit
11:18 daurnimator canton7: was easy enough for me to get out of the loop manually
11:18 daurnimator just something to beware of I guess
11:18 canton7 looks like a problem with add -p, rather than diff?
11:19 daurnimator canton7: yes I think so: I guess when 'add -p' creates a patch for the index, it doesn't fix up the line numbers
11:20 daurnimator so that when the hunk is 'patched' onto the index, it ends up applying to wrong spot
11:20 canton7 where does it apply to the wrong spot? I missed that
11:20 Rickmasta joined #git
11:22 daurnimator canton7: ah. here is simpler replication in pastebin form: http://sprunge.us/GOZA
11:23 rominronin joined #git
11:24 daurnimator notice I stage the chunk in 'lunistring_is_titlecase', but it gets staged in 'lunistring_is_cased' instead.
11:24 t0by joined #git
11:25 canton7 hmm, git version? if it's recent, send a mail to the list
11:26 daurnimator git version 2.10.2
11:28 Cicero-MF joined #git
11:28 ntnn joined #git
11:29 ramsub07 joined #git
11:29 daurnimator canton7: sent.
11:29 ieee joined #git
11:29 canton7 cool
11:30 daurnimator sigh; of course my mail got hard wrapped when I sent it
11:30 daurnimator luckily I included the asciinema link in there as well
11:31 stoned joined #git
11:32 Cicero-MF hi there, hoping someone can help me with using a remote connection issue I can't seem to find an answer on StackOverflow
11:32 Cicero-MF I have a private repo on bitbucket with 2 branches, master and linux-port
11:34 re1 joined #git
11:35 Cicero-MF I decided I want to start again in the linux port branch, so I removed most of the files in the branch, and I'm trying to then pull from the original remote repo into my linux-port branch only.
11:35 tobiasvl Cicero-MF: you removed the files? sounds like you wanted to remove the history instead perhaps?
11:35 tobiasvl how do you want to start again
11:36 Cicero-MF I am new to git, been using VSS and SVN for years.  Except I can't get the pull to actually copy any of the files at all
11:36 tobiasvl well, what does the pull say?
11:36 tobiasvl pull doesn't copy files, it copies history
11:36 tobiasvl which results in a working directory of files, of course
11:37 tobiasvl but it sounds like you changed the local history or the working directory by removing the files, but that you really wanted to remove them from the history?
11:37 venmx joined #git
11:37 Cicero-MF Hmm, yeah, I clearly dont know wtf I'm doing
11:37 Cicero-MF I basically want to do a fork into my linux-port branch
11:38 Cicero-MF Kind of thing
11:38 tobiasvl fork? fork how
11:38 tobiasvl I don't understand what you want here
11:38 tobiasvl but perhaps !revert can help
11:38 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
11:39 tobiasvl possibly you want to throw away the history of linux-port and go back to a previous state, ie. point e) above, and then pull?
11:40 Cicero-MF Ok, I'm kinda following you.  Apologies, I'll try explain better but bear with me.
11:44 dan2k3k4 joined #git
11:45 Cicero-MF So the original repo I want to base my work on is located here http://git.spritesserver.nl/esphttpd.git/
11:45 achadwick joined #git
11:45 Cicero-MF I have my private repo on bitbucket with work I've done based on that which is HORRIBLY out of date now.
11:47 mischat joined #git
11:48 Cicero-MF What I want to do is essentially pretend I'm starting from scratch, delete ALL my work in linux-port, re-clone/fork(I know thats a github thing only) or whatever from spritesserver into linux-port, add in my updates.
11:49 Cicero-MF Then once its all working, fully replace the master branch with my linux-port branch.  Merging would just make too much mess.
11:49 brk_ joined #git
11:49 Cicero-MF God, fml, hope that makes sense.
11:50 stalk joined #git
11:51 stalk hello
11:51 done joined #git
11:51 stalk So, I tried to get to the same state as `git clone` from a `git init` in an empty folder using https://stackoverflow.com/questions/3620633/what-is-the-difference-between-pull-and-clone-in-git
11:52 stalk The thing is, the `git init` way gives me the error "[remote rejected] master -> master (branch is currently checked out)"
11:52 stalk and the `git clone` way doesn't
11:53 LiohAu joined #git
11:53 LiohAu is there a way to find in the log a push that was forced ?
11:55 danslo joined #git
11:56 mindriot101 joined #git
11:56 Zarthus I think the git-reflog shows that, but I'm not confident.
11:56 xall joined #git
11:57 stalk I've seen answers on why this error can come up, but don't see why it wouldn't for clone if it does for init and co case?
11:59 eivarv joined #git
12:02 cagedwisdom joined #git
12:08 rnsanchez joined #git
12:12 WayToDoor joined #git
12:13 sab3r joined #git
12:18 stalk (mmh, actually, cloning gives me the same issue)
12:18 stalk I *think*
12:18 done joined #git
12:19 stalk Are github repositories always "bare" ?
12:19 grawity yes
12:20 grawity your "remote rejected" error is a bit weird though
12:20 stalk and that's why you can push to them without having the issue mentioned above?
12:21 grawity oh you actually tried to push
12:21 stalk grawity: note that I get this error when trying to push to a local repo
12:21 grawity yes, you can push to github repos because of that
12:21 grawity (you *can* push to non-bare repos, but only to other branches, not the current one)
12:22 stalk "bare" means that there is no actual files, right?
12:22 grawity "bare" means there is no working tree
12:22 grawity just the Git database
12:22 stalk the working tree is the actual files I'm working on?
12:22 grawity yes
12:23 grawity and Git rejects pushes precisely because it doesn't want to accidentally overwrite your edits
12:23 stalk and pushing to a non bare repo would modify say "master" but not the actual files?
12:23 grawity right
12:23 grawity well
12:23 grawity that's the same regardless of the type of repo
12:24 grawity in either case, it'd modify just the branch
12:24 rominronin joined #git
12:24 stalk and that would create a contradiction between the actual files and what git thinks there is
12:25 stalk There is something that still confuses me; I should look at the documentation
12:25 stalk anyway, thanks grawity
12:25 grawity stalk: well, that's if you push to the *current* branch
12:27 wrouesnel1 joined #git
12:28 morenoh149 joined #git
12:29 stalk yeah, hence pushing to another branch can still be done
12:29 f3r70rr35f joined #git
12:30 mjuszczak joined #git
12:30 anonymuse joined #git
12:31 Macaveli joined #git
12:32 mischat joined #git
12:33 ochorocho__ joined #git
12:34 lvns joined #git
12:42 WayToDoor joined #git
12:43 JSharpe joined #git
12:45 JSharpe joined #git
12:46 sdothum joined #git
12:49 akurniawan joined #git
12:52 paladinn joined #git
12:52 paladinn joined #git
12:57 synthroid joined #git
13:03 danslo joined #git
13:03 cydrobolt joined #git
13:03 cydrobolt joined #git
13:03 plouescat joined #git
13:04 bongjovi joined #git
13:06 cdown joined #git
13:06 madewokherd joined #git
13:07 p4trix joined #git
13:12 zacts joined #git
13:14 lvns joined #git
13:17 mindriot101 joined #git
13:17 romerocesar joined #git
13:18 mischat joined #git
13:21 Rickmasta joined #git
13:25 rominronin joined #git
13:26 brandonw joined #git
13:30 lvns joined #git
13:31 Zamerick joined #git
13:33 venmx joined #git
13:34 ramsub07 joined #git
13:34 ramsub07 hello, how do i see difference between a file on two different branches
13:34 ramsub07 ?
13:35 osse ramsub07: git diff branch1 branch2 -- file
13:35 ramsub07 osse: thakns
13:35 ramsub07 thanks*
13:36 jeffreylevesque joined #git
13:36 Starky joined #git
13:37 lvns joined #git
13:38 anonymuse joined #git
13:38 d0nn1e joined #git
13:39 grayjoc joined #git
13:39 NeverDie joined #git
13:43 JamesBaxter joined #git
13:47 jozwior joined #git
13:48 griffindy joined #git
13:48 Starky joined #git
13:49 sab3r which git commands I could use to safely merge part of branchA to the master branch
13:50 sab3r basically I would like to merge frontend javascript code to our master branch and leave the experimental backend code to branchA.. I was thinking of using git rebase but it seems like a very powerful and scary tool... any tips for doing that?
13:51 dreiss joined #git
13:51 mindriot101 joined #git
13:53 ramsub07 Hi, i did a checkout to a particular commit. How do i come back to HEAD?
13:54 anonymuse joined #git
13:54 tobiasvl ramsub07: !detached
13:54 gitinfo ramsub07: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
13:54 tobiasvl oh
13:54 tobiasvl ramsub07: !reattach
13:54 gitinfo ramsub07: Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
13:55 sab3r Many answers in stackoverflow recommend git checkout but if I use git checkout it will just "replace" other branch's files and not merge them together. AmI correct?
13:55 griffindy joined #git
13:55 ramsub07 tobiasvl: can i do, git checkout <original branch name> to come back?
13:55 tobiasvl ramsub07: yes, that's what you do
13:55 hahuang65 joined #git
13:55 leeN joined #git
13:55 tobiasvl sab3r: I don't really understand what you mean, but yes, checkout checks out a specific version of the file in that case. perhaps you want man git cherry-pick?
13:55 gitinfo sab3r: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
13:56 cdown joined #git
13:56 Starky joined #git
13:56 JeroenT joined #git
13:56 isysd joined #git
13:57 rnsanchez_ joined #git
13:57 sab3r tobiasvl: cherry-pick looks like a good option but it merges a whole commit.. In that commit I have edited files from multiple directories and I want only files from one of those directories to be merged..
13:58 mischat joined #git
13:59 JeroenT_ joined #git
13:59 lindenle joined #git
13:59 lvns joined #git
13:59 masak is there a sensible way in Git to state "branch A has the same content as branch A-rebased, but different parents"?
13:59 mischat_ joined #git
13:59 Ozymandy joined #git
14:00 tobiasvl masak: !xy ?
14:00 gitinfo masak: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
14:00 masak more concretely, is there a way given two commits to see that they are "the same commit" in terms of the patch, but maybe not in terms of parents?
14:00 dsdeiz joined #git
14:00 dsdeiz joined #git
14:00 tobiasvl masak: that should already be the case. but what are you trying to do?
14:00 masak tobiasvl: ok, let me take a step back and explain my use case
14:00 tobiasvl yeah
14:01 masak tobiasvl: I created a custom script to display all my branches -- very happy with it. a bit like Github, it shows how many commits ahead/behind each branch is compared to master
14:01 masak tobiasvl: now I'm already thinking ahead about the other things I'd like this script to visualize for me
14:02 masak for example, I often work in "branch sequences" (don't know if there's an established term for this)
14:02 masak but branch C based on the work of branch B based on branch A, etc
14:02 masak in order to then push them up successively and turn them into pull requests
14:03 masak because things change in the meantime, I also end up rebasing each of those branches
14:03 JeroenT joined #git
14:03 masak let's say branch A has 2 commits and branch B (based on A) has 2 more commits
14:03 masak my tool currently shows A as 2-ahead-of-master and B as 4-ahead-of-master
14:03 _rnsanchez_ joined #git
14:04 Phothrism joined #git
14:04 masak a simple thing to do would be to show A, B, C nested under each other, with commits-ahead based not on master but on the (inferred) parent branch
14:04 masak *but* this won't work if I've already rebased A but not B
14:04 masak then B will again show up as having 4 commits
14:04 leehambley joined #git
14:04 LiohAu joined #git
14:04 masak 2 of those would still be uninteresting, though. they would just be the original commits still in A.
14:05 intellix joined #git
14:06 warrantyvoid joined #git
14:06 JeroenT joined #git
14:06 Gsham joined #git
14:06 intellix joined #git
14:06 masak which takes me to my original question: how can I detect that the 2 commits at the start of B are actually (stale versions of) the 2 rebased commits in A?
14:07 ericP joined #git
14:08 Starky joined #git
14:08 intellix joined #git
14:09 canton7 masak, you can compare the trees, see if they're the same
14:09 canton7 but if A has actually changed, of course that won't work
14:10 masak canton7: they probably have, since the difference is a rebase
14:10 canton7 cool, compare the trees then
14:10 jimi_ joined #git
14:10 rominronin joined #git
14:10 ericP i want to split some features out of a tracked branch (call it A, with tracking branches B and C) and create a branch to house them (D)
14:11 re1_ joined #git
14:11 Phothrism Hi, I'm not sure what I'm doing wrong, I'm trying to overwrite my git folder with the one on the server using "git svn rebase" but it's saying it's up to date even though it doesn't undo some changes
14:11 JeroenT joined #git
14:11 masak canton7: will try that. I think I will have to try it out in practice to get a feel for it. not sure comparing the trees will be enough, since the new parent may well contain new unrelated upstream changes.
14:11 Phothrism I just want the current version without deleting everything and running clone again
14:12 canton7 masak, right, in which case the trees aren't going to match
14:12 masak I guess hashing message + patch *almost* works, except line numbers might have been automatically adjusted
14:12 ericP what's the graceful choreography to create D and mv (files and chunks) to it, ideally preserving history on the files?
14:13 lindenle joined #git
14:13 grawity history is tracked per-commit, not per-file
14:13 grawity so Git doesn't care much
14:13 grawity but it would be most reliable if you didn't move and edit the same files in the same commit
14:14 grawity oh, you want to move them to a separate branch instead?
14:14 ericP yep
14:14 grawity hmm
14:14 grawity I'd say start with branching D off A, so that they start off identical
14:15 grawity then removing D-only stuff from A, and vice versa, e.g. using rebase
14:15 ericP ahh, my rebase-fu is nonexistent. can you give me an example?
14:16 ramsub07 joined #git
14:16 danslo joined #git
14:16 anonymuse joined #git
14:16 Phothrism Hmm does anyone have any idea why "git svn rebase" doesn't overwrite all changes or if it's the right command?
14:17 morenoh149 joined #git
14:17 SteffanW joined #git
14:17 JeroenT joined #git
14:18 ericP grawity, i was going to delete from A, stash without reverting, commit, checkout D, merge A, and try to reverse the stash somehow, but that seems tenuous. rebase seems to do *everything* so i'm trying to grok how to keep A as D's upstream without nuking the stuff removed from A.
14:18 bernardio joined #git
14:20 Yuzi joined #git
14:21 ExoUNX joined #git
14:21 johnmilton joined #git
14:23 re1 joined #git
14:24 al-damiri joined #git
14:25 fmcgeough joined #git
14:25 Learath2 joined #git
14:27 lindenle joined #git
14:27 Phothrism nvm figured it out
14:30 todd_dsm joined #git
14:30 Murii joined #git
14:30 Phothrism left #git
14:31 xall joined #git
14:32 AaronMT joined #git
14:33 re1_ joined #git
14:35 khupwd joined #git
14:36 InfoTest joined #git
14:40 WayToDoor joined #git
14:40 nettoweb joined #git
14:41 boombatower joined #git
14:41 exospecies left #git
14:45 Es0teric joined #git
14:47 Dougie187 joined #git
14:48 axisys joined #git
14:49 maucar joined #git
14:50 lindenle joined #git
14:51 maucar joined #git
14:53 Macaveli joined #git
14:53 danslo joined #git
14:53 JeroenT joined #git
14:54 alex1a joined #git
14:54 cdg joined #git
14:55 mischat joined #git
14:56 jozwior joined #git
14:56 hahuang65 joined #git
14:56 JeroenT_ joined #git
14:57 User458764 joined #git
14:58 danslo_ joined #git
14:59 lindenle_ joined #git
14:59 diego2 joined #git
14:59 porsche944 joined #git
15:00 EricPoe_ joined #git
15:01 ruby joined #git
15:01 mizu_no_oto joined #git
15:02 achadwick joined #git
15:03 anjen joined #git
15:03 mjuszczak joined #git
15:04 mizu_no_oto joined #git
15:04 mjuszczak joined #git
15:06 mischat_ joined #git
15:07 Starky joined #git
15:07 brk_ joined #git
15:08 ki0 joined #git
15:08 lvns joined #git
15:12 anonymuse joined #git
15:12 Ryanar joined #git
15:12 shinnya joined #git
15:14 hashpuppy joined #git
15:14 jzvf joined #git
15:14 lvns joined #git
15:17 JeroenT joined #git
15:19 Derperperd joined #git
15:19 GrandPa-G joined #git
15:20 mindriot101 joined #git
15:20 GrandPa-G I have a raspberry pi linux flavor system. I am using git to just get updated downloads from a main repository. It looks like my .git folder is huge. Is there a way to make it smaller?
15:21 moritz GrandPa-G: don't use git for binary files that don't diff/compress well
15:21 cjohnson git gc will do what can be done
15:21 moritz also, clone with --depth 1 exists
15:23 Rickmasta joined #git
15:23 GrandPa-G I am just doing a git reset --hard HEAD  then git pull. All I want to really do is have a way to get the latest version of several files from a respository. Is there a better way?
15:23 thebope joined #git
15:24 cjohnson clone --depth 1 will limit your .git to only the latest commit
15:24 ResidentBiscuit joined #git
15:24 lindenle joined #git
15:24 cjohnson I'm not sure if you can continue to pull beyond that and have it retain a truncated history or if you have to reclone each time
15:25 cjohnson failing that, you can always just go back to teh website and download the latest .zip each time
15:25 lss8 joined #git
15:25 lss8 joined #git
15:25 lindenle joined #git
15:25 cdg_ joined #git
15:25 jstimm joined #git
15:26 JelmerD joined #git
15:26 lvns joined #git
15:26 cjohnson or store the git repo on another machine
15:26 GrandPa-G how do I use clone --depth 1?
15:26 lindenle joined #git
15:27 GrandPa-G The whole point is not to download each time until there is a change.
15:27 re1 joined #git
15:27 danslo joined #git
15:28 sagerdearia joined #git
15:28 mischat joined #git
15:28 GrandPa-G the repo is on github.
15:29 rominronin joined #git
15:29 cjohnson that's why I said "I'm not sure if you can continue to pull beyond that and have it retain a truncated history or if you have to reclone each time"
15:29 cjohnson you use clone --depth 1 by blowing away your existing one, taking a fresh clone
15:29 cjohnson that will at least give you a truncated history to start with
15:30 cjohnson then you can test and see if pull continues to work fine after that or if it will pull the whole history down
15:31 rorro joined #git
15:31 cjohnson looks like you can supply --depth 1 to git pull as well
15:31 JeroenT joined #git
15:31 GrandPa-G to be sure I do it correctly, if foo is my repo, then the command would be git clone --depth 1 https://github.com/foo/foo.git foo
15:31 morenoh149 joined #git
15:31 cjohnson the foo is redundant there but yes
15:32 cjohnson (it will use the repo name, minus the .git, as the folder name)
15:32 sssilver joined #git
15:33 WoodLeg joined #git
15:33 cjohnson ok reading into it more, looks like you used to not be able to push/pull in your shallow clone, but now you can
15:33 cjohnson so I think that will work for you
15:33 cjohnson http://stackoverflow.com/questions/6941889/is-it-safe-to-shallow-clone-with-depth-1-create-commits-and-pull-updates-aga
15:33 Oatmeal joined #git
15:33 GrandPa-G how is the best way to "truncate" my current git folder ?
15:34 Vaelatern joined #git
15:34 madewokherd joined #git
15:35 Es0teric joined #git
15:36 LionsMane joined #git
15:36 raspado joined #git
15:37 Oatmeal joined #git
15:39 cjohnson as I said I would just blow it away and take a fresh clone
15:39 cjohnson with --depth 1
15:39 moritz you can also clone from the local repo with --depth 1
15:40 GrandPa-G I just don't remember how I originally set it up since it is just pulling the changes.
15:40 GrandPa-G I really appreciate your help. I just don't git much.
15:41 hussam joined #git
15:41 cjohnson moritz: how do you do that? git clone /path --depth 1  ?
15:42 cjohnson I guess that makes sense I've never actually cloned from a path just http/ssh
15:42 pflanze joined #git
15:43 lvns joined #git
15:45 rmbeer joined #git
15:45 rmbeer hello
15:45 rmbeer How to search all in the log for a file changed? also in all branch.
15:46 LionsMane Anyone in here used svn-remote in git?
15:46 rmbeer i try with this, but not show nothing 'git log --branches --all-match -- Document.txt'
15:47 cjohnson rmbeer: have you tried that command with a recent file change that you know for sure exists?
15:47 danslo joined #git
15:47 pflanze I'm looking for a script to automatically add all "forks" of a project on Github as remotes to the local repo.
15:47 Dougie187 rmbeer: I think you want --all, not --all-match
15:47 moritz cjohnson: you can use file:///absolute/path URLs
15:47 rmbeer cjohnson, i known that have the changed in the file. but unknown what command must i use.
15:48 Dougie187 rmbeer: try: `git log --all -- Document.txt`
15:50 Dougie187 LionsMane: You'd need to use man git-svn
15:50 gitinfo LionsMane: the git-svn manpage is available at http://jk.gs/git-svn.html
15:51 lindenle joined #git
15:52 rmbeer i try with 'git log --all --full-diff -- **/Document.txt' and now show the list of the log, but can't show the diff commits for each commit
15:52 zivester joined #git
15:53 Dougie187 rmbeer: The diff commits for each commit?
15:53 moritz rmbeer: git log --all -p -- path
15:53 rmbeer Dougie187, yes, i want all diff for each commit in all branch
15:53 Dougie187 See what moritz said then. You want -p
15:55 bambams Grrrrr. "Unmerged paths: ..." git mergetool "No files need merging" LIES.
15:56 rmbeer i try with 'git log --all -p -- **/Document.txt' but seem that work only in one branch, not for all branchs
15:57 bambams Ah, it was automatically resolved by rerere. :-/ I feel like it would be useful to separate those files in the status.
15:57 rmbeer not found the change that i search
15:57 jccn joined #git
15:58 bambams rmbeer: What shell are you using? A Unix shell might try to expand the glob for you. Depends if you want that or want Git to do the globbing.
15:58 bambams rmbeer: A full path might be preferrable if the file wasn't moved (sorry, just got here).
15:59 a_thakur joined #git
16:00 yupvr joined #git
16:00 eivarv joined #git
16:00 rmbeer bambams, i want search by all the changes for a file in all the branchs
16:00 hhee joined #git
16:00 LionsMane Dougie187: I have read the manual and I had it working for a time, but it seems broken at this point.  I am getting the "Unable to determine upstream SVN information form working tree history."  I was hoping to get some debug help or a good web page walking thru some of the problems
16:00 bambams rmbeer: Yes, the suggestions made are what I would suggest too: git log --all -p -- path/to/file
16:00 Ryanar joined #git
16:01 bambams (I would include --graph and --decorate to make better sense of the history)
16:01 LionsMane Dougie187: I found a number of solution with answers both "Worked for me" and "didn't work for me" in the same solution.
16:01 Nilesh_ joined #git
16:02 Dougie187 LionsMane: Can you `svn co` the upstream svn repo?
16:02 jimi_ joined #git
16:03 rmbeer with 'git log --all -p --branches=master -- **/Document.txt' can i view in the other branch like a master?
16:03 Ryanar joined #git
16:03 rmbeer this not show if really view in other branch or not
16:03 LionsMane Dougie187: I can in a pure svn client repo., but not in the git repo.  I litereally used 'svn co' on the command line.
16:04 Dougie187 LionsMane: That's about the best I can do as far as debugging. I haven't used git-svn much at all. :/
16:04 a_thakur_ joined #git
16:04 clemf joined #git
16:04 bambams rmbeer: --branches=master will limit the search to ancestors of master.
16:05 Dougie187 rmbeer: The --all flag we gave you before is all branches. You should read man git log to see what --all and --branches do.
16:05 gitinfo rmbeer: the git-log manpage is available at http://jk.gs/git-log.html
16:06 Noldorin joined #git
16:06 LionsMane Dougie187: Thanks for your help.  Do you know of anyone that visits here that does use it?  I tested a fair amount before and it seemed to obviously work.  And now it seems just broken.  I now realize I have no idea how the internals of it work.
16:06 HedgeMage joined #git
16:07 matumbo joined #git
16:07 Dougie187 LionsMane: Nope. But I don't really follow what people in here do with git / git-svn.
16:07 rmbeer ok, if --all show all branches, i can't view what branch is a commit. also can't found the change in the file...
16:07 GrandPa-G cjohnson: do you have time/interest to help a bit more?
16:07 cjohnson GrandPa-G: sorry got meetings
16:07 lvns joined #git
16:08 romerocesar joined #git
16:08 GrandPa-G cjohnson: understood, thanks
16:08 Dougie187 rmbeer: If you want to see both diffs from a commit, and what branch commits are in, it's going to get messy and difficult to read.
16:08 Dougie187 rmbeer: I'd suggest looking at one or the other.
16:09 Dougie187 rmbeer: Something like `git log --oneline --decorate --graph --all -- **/Document.txt` to see the branches
16:09 Dougie187 rmbeer: And then something like `git log <branch> -p -- **/Documents.txt` when you want to look at the changes from a specific branch
16:11 rmbeer ok, now are confused. is like if i never created this change....
16:11 ojdo joined #git
16:12 subhojit777 joined #git
16:12 interrobangd joined #git
16:13 Dougie187 rmbeer: Is this repo open?
16:13 a_thakur joined #git
16:13 f3r70rr35f joined #git
16:13 rmbeer Dougie187, repo open?
16:13 jbeeze joined #git
16:13 manuels joined #git
16:13 Dougie187 rmbeer: public? can I clone it?
16:14 GrandPa-G anyone want to help me with a remote repo setup (I guess I am a newbie on git)?
16:14 manuels joined #git
16:14 bambams LionsMane: I'm almost certain I used to know what that meant, but I haven't used git-svn in probably 4 or 5 years... I've lost it.
16:14 rmbeer Dougie187, ah, no. sorry. this is a closed repo.
16:14 nicksloan joined #git
16:14 shgysk8zer0 joined #git
16:15 a_thakur joined #git
16:15 rmbeer i found the change, is in another file.
16:15 infernix joined #git
16:15 rmbeer thank for helpme.
16:18 GavinMagnus joined #git
16:18 mizu_no_oto joined #git
16:21 jbeeze What's the best way to move one branch from one repo to another repo's branch?
16:22 jbeeze eg. development branch on repo1, to development branch on repo2
16:22 User458764 joined #git
16:23 rmbeer jbeeze, repo2 is a copy of repo1?
16:23 jbeeze rmbeer: yes for the most part
16:25 jbeeze but there are some new commits on the new repo, so i dont wanna just move everything over
16:25 rmbeer jbeeze, thinking that is best work with add remote to local dir
16:26 zeroed joined #git
16:26 zeroed joined #git
16:26 rmbeer jbeeze, and later use push and pull for move branchs
16:27 jbeeze gotcha, gonna give it a go
16:28 durham joined #git
16:29 rominronin joined #git
16:30 tonyj joined #git
16:30 subhojit_ joined #git
16:30 Sonderblade joined #git
16:31 a_thakur joined #git
16:36 ochorocho__ joined #git
16:37 davimore_ joined #git
16:37 svm_invictvs joined #git
16:37 dreiss joined #git
16:38 subhojit__ joined #git
16:38 gargola joined #git
16:39 Es0teric joined #git
16:40 CheckDavid joined #git
16:42 porsche944 what's the difference between git add -A vs git add .
16:43 NwS joined #git
16:43 Learath2 joined #git
16:43 davimore__ joined #git
16:43 crayon joined #git
16:43 _ikke_ git add -A also deals with removed files
16:43 p0wn3d joined #git
16:44 porsche944 it seems like it also adds all files not just the ones in the current directory?
16:44 porsche944 I run git add . and not all of my files get added
16:44 meauses joined #git
16:44 porsche944 I'm speaking anecdotally, I don't remember the exact circumstances
16:44 porsche944 but it's had a few times
16:44 porsche944 and I'm not talking about removing files
16:44 _ikke_ Behaviour also changed between git versions
16:45 robotroll joined #git
16:46 subhojit_ joined #git
16:47 jrm joined #git
16:47 cjohnson git add . seems to handle deleted files for me
16:48 robotroll joined #git
16:48 rominronin joined #git
16:49 canton7 yeah, 'add .' didn't use to stage deletions, iirc
16:50 joki- joined #git
16:50 crayon joined #git
16:52 subhojit_ joined #git
16:55 shubhnik joined #git
16:56 lvns joined #git
16:57 ochorocho__ joined #git
16:57 User458764 joined #git
16:58 User458764 joined #git
16:59 rominronin joined #git
17:02 mustmodify joined #git
17:03 kyan joined #git
17:03 nicksloan joined #git
17:03 mustmodify so if I want to "unmerge" I should `git reset --hard hash_from_commit_before_merge` right?
17:03 raspado joined #git
17:13 sssilver joined #git
17:14 kulelu88 joined #git
17:15 meauses joined #git
17:15 edaught joined #git
17:16 _ikke_ correcty
17:16 jrm joined #git
17:17 crayon joined #git
17:17 rmbeer left #git
17:18 nidr0x joined #git
17:20 joki- joined #git
17:21 Mobutils joined #git
17:21 lvns joined #git
17:23 jrm joined #git
17:23 ramsub07 joined #git
17:24 Rickmasta joined #git
17:24 thierryp joined #git
17:24 ruby joined #git
17:24 shgysk8zer0 joined #git
17:25 lordjancso joined #git
17:27 BrianBlaze420 joined #git
17:28 mindriot101 joined #git
17:28 acetakwas joined #git
17:29 jrm joined #git
17:32 grayjoc joined #git
17:32 Electrometro joined #git
17:35 Electrometro joined #git
17:35 Mobutils joined #git
17:35 puff joined #git
17:36 djb-irc joined #git
17:36 porsche944 joined #git
17:39 moestevens joined #git
17:40 Derperperd joined #git
17:41 nicksloan joined #git
17:41 e14 joined #git
17:42 tang^ joined #git
17:43 adac joined #git
17:43 salamanderrake joined #git
17:44 Gsham joined #git
17:44 venmx joined #git
17:45 grayjoc joined #git
17:46 kyan joined #git
17:46 grayjoc joined #git
17:46 zeroed joined #git
17:47 grayjoc joined #git
17:48 grayjoc joined #git
17:48 meauses joined #git
17:49 grayjoc joined #git
17:49 Log1x joined #git
17:50 flavius joined #git
17:50 tyreld joined #git
17:50 durham joined #git
17:50 Rens joined #git
17:50 GavinMagnus joined #git
17:52 e14 joined #git
17:53 BSab joined #git
17:53 dsop joined #git
17:54 SwiftMatt joined #git
17:55 djb-irc joined #git
17:57 xall joined #git
17:57 rnsanchez joined #git
17:58 porsche944 joined #git
17:58 hahuang65 joined #git
17:58 beastd joined #git
18:00 rominronin joined #git
18:01 overlord_tm joined #git
18:01 Discovery joined #git
18:01 fahadash joined #git
18:02 mikecmpbll joined #git
18:02 subhojit__ joined #git
18:04 IlNominePatre joined #git
18:04 cjohnson or revert the merge if you've pushed already
18:05 nicksloan joined #git
18:09 leb joined #git
18:10 nicksloan joined #git
18:13 Oatmeal joined #git
18:14 Synthead joined #git
18:16 GavinMagnus left #git
18:18 ahmedelgabri joined #git
18:19 Groscheri joined #git
18:20 Starky joined #git
18:21 dhollinger joined #git
18:22 User458764 joined #git
18:23 SwiftMatt joined #git
18:24 subhojit_ joined #git
18:27 thiago_ joined #git
18:28 Es0teric joined #git
18:30 shmuli joined #git
18:31 Learath2 joined #git
18:32 zeroed joined #git
18:37 Mobutils joined #git
18:37 p0wn3d joined #git
18:41 jstein_ joined #git
18:43 blackwind_123 joined #git
18:43 nicoulaj joined #git
18:44 johnny56 joined #git
18:45 thiago_ joined #git
18:46 sangy joined #git
18:46 leehambley joined #git
18:47 svm_invictvs joined #git
18:48 Mobutils joined #git
18:50 LaptopBrain joined #git
18:50 Mobutils left #git
18:52 blahdodo joined #git
18:52 dreiss joined #git
18:53 jstimm joined #git
18:54 hahuang65 joined #git
18:56 thiago joined #git
18:58 nicksloan joined #git
18:58 Darren_ joined #git
18:59 Sasazuka joined #git
18:59 leehambley joined #git
18:59 mjuszczak joined #git
19:00 railssmith joined #git
19:01 kpease_ joined #git
19:01 cdown joined #git
19:01 rominronin joined #git
19:03 jstimm joined #git
19:04 Gsham joined #git
19:04 kyan joined #git
19:07 Log1x joined #git
19:07 Log1x joined #git
19:09 acetakwas joined #git
19:09 ki0 joined #git
19:10 kpease joined #git
19:10 joki joined #git
19:11 cagedwisdom joined #git
19:11 leb joined #git
19:11 xall joined #git
19:13 leehambley joined #git
19:14 mindriot101 joined #git
19:15 Domhack joined #git
19:16 Gsham joined #git
19:19 crayon joined #git
19:19 qswz joined #git
19:20 qswz I already asked it few days ago, but could find it out
19:21 leb joined #git
19:21 qswz branch test: a--b--c--d--e--f  , branch master: a--x where x is a squash of b--c--d--e,  if I do git rebase mater from test, I get conflicts. my only solution, is to go on master, then git co -b test2, then git cherry-pick f, but that sucks if I had more commits
19:21 qswz couldn't*
19:22 Karazhan joined #git
19:23 Karazhan joined #git
19:24 crayon joined #git
19:25 Rickmasta joined #git
19:26 mustmodify _ikke_: thanks for the confirmation.
19:26 mustmodify left #git
19:26 chris2 joined #git
19:27 mindriot101 joined #git
19:27 ShalokShalom joined #git
19:27 ShalokShalom hi there
19:27 ShalokShalom i like to send my note editor the output from git log
19:27 ShalokShalom git log | kate wont work
19:27 crayon joined #git
19:29 moritz ShalokShalom: then figure out how to make kate read from stdin
19:29 madebymarkca joined #git
19:29 moritz other editors do it with - as an argument
19:29 qswz I wish I could understand git rebase --onto
19:29 qswz but that's far ahead my head
19:31 moritz qswz: shall I try an explanation?
19:31 qswz well, if you can illustrate with my example above?
19:32 qswz hmm I think it doesn't work there
19:32 moritz qswz: I won't, because considering squashed commits makes it unncessarily complicated for understanding the feature
19:32 qswz my goal is to have a--x--f actually
19:32 qswz moritz: yea, it's not me that is squashing
19:32 moritz the just cherry-pick f
19:33 qswz :(
19:33 moritz *then
19:33 qswz imagine I did 10 commit more
19:33 qswz I'd cherry-pick each?
19:33 moritz probably not
19:33 overlord_tm joined #git
19:33 moritz (though you *can* cherry-pick a range of commits)
19:34 qswz ohh
19:34 qswz good point, thanks
19:34 moritz in the end, rebase doesn't do much more than a reset + a cherry pick with a range of commits
19:34 qswz indeed
19:38 alhariel joined #git
19:39 Ozymandy joined #git
19:40 jozwior joined #git
19:43 Shakeel__ joined #git
19:43 anonymuse joined #git
19:44 qswz git config --global alias.cp cherry-pick
19:44 qswz cos i'm lazy
19:44 publio joined #git
19:44 qswz maybe confusing with 'copy' but that's not a git command
19:46 hackel joined #git
19:47 Derperperd joined #git
19:47 jstimm joined #git
19:48 morenoh149 joined #git
19:50 WoodLeg joined #git
19:50 dreiss joined #git
19:51 Mixologi- joined #git
19:53 OnBrokenWings joined #git
19:54 thebope joined #git
19:55 Es0teric joined #git
19:56 jave joined #git
19:56 Cabanossi joined #git
19:57 vuoto joined #git
19:57 ShalokShalom hi there
19:57 ShalokShalom i can view the changes of a commit with git show commit
19:58 ShalokShalom how to view the whole file at this specific state?
19:58 moritz ShalokShalom: git show commit:file
19:58 qswz git diff
19:58 qswz gitk
20:00 kpease joined #git
20:00 rominronin joined #git
20:00 ShalokShalom moritz: file=?
20:00 ShalokShalom commit=commit number, so SHA1
20:00 ShalokShalom what is file?
20:00 ShalokShalom ah..
20:01 ShalokShalom doesnt work
20:01 moritz ShalokShalom: the path to and name of the file you want
20:01 moritz ShalokShalom: "doesn't work" is the worst error report ever
20:02 moritz what happens instead?
20:03 ShalokShalom shalokshalom@linux-yyg5:~/kaos-frankfurt.tk/Git/apps> git show 59910a5da74067f7debd7e696321ec2a0201407a:~/kaos-frankfurt.tk/Git/apps/0ad/PKGBUILD
20:03 ShalokShalom fatal: Path '~/kaos-frankfurt.tk/Git/apps/0ad/PKGBUILD' does not exist in '59910a5da74067f7debd7e696321ec2a0201407a'
20:03 ShalokShalom which path?
20:03 ShalokShalom internal? from git clone dir?
20:03 moritz ShalokShalom: yes
20:03 ShalokShalom k
20:03 ShalokShalom dosnt work xD
20:03 moritz like everywhere in git
20:04 ShalokShalom Path does not exist
20:04 ShalokShalom hnn wait
20:04 ShalokShalom full path
20:04 moritz 0ad/PKGBUIL
20:04 ShalokShalom thats enough?
20:04 moritz !tias
20:04 gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
20:04 leb joined #git
20:05 ShalokShalom ah yes ^-^
20:05 ShalokShalom thanks a lot
20:05 sangy How do I make git submodule point to a specific commit? (I imagine it's some variation of git submodule update [commit-id])?
20:05 seishun joined #git
20:05 ShalokShalom so the path in the downloaded git repo
20:05 shampine joined #git
20:05 moritz sangy: in the submodule, git checkout <thecommit>; in the supermodule, 'git add path/to/submodule'
20:05 tobiasvl sangy: just checkout the commit you want?
20:05 _ikke_ ShalokShalom: cd to/submodule
20:05 moritz sangy: and then commit
20:05 sangy moritz: oh, I think that's what I want
20:06 ShalokShalom _ikke_: you mean sangy
20:06 seishun in a commit I deleted file A and renamed B into A. Which arguments should I use with `git show` to see that?
20:06 ShalokShalom thanks a lot
20:06 moritz you're welcome
20:06 SwiftMatt joined #git
20:06 _ikke_ ShalokShalom: yes
20:06 sangy tobiasvl: yeah, I want the tree objet of the parent project to hold it. I think moritz's answer applies
20:06 sangy _ikke_: thanks
20:06 sangy moritz: thanks!
20:06 glebihan joined #git
20:06 sangy tobiasvl: thanks!
20:06 moritz sangy: you're welcome
20:06 sangy sorry for the thanks spam, but I heard that a bot tracks karma?
20:06 ShalokShalom ^^
20:06 moritz there is :-)
20:06 tobiasvl there is?!
20:07 moritz tobiasvl: gitinfo does
20:07 moritz !karma
20:07 gitinfo 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" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
20:07 tobiasvl nice, wasn't aware
20:07 porsche944 never heard of that
20:07 porsche944 pretty cool
20:07 tobiasvl _ikke_: we're tied for second place past 30 days
20:07 * moritz knows it as tracking <nickname>++ mentions from other channels
20:08 _ikke_ moritz: It's tracking thanks per user
20:08 qswz shit++
20:08 bket joined #git
20:09 qswz .karma shit
20:09 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
20:09 moritz _ikke_: I know; ++ tracking is just how karma tracking works in other channels
20:09 _ikke_ I know :)
20:09 _ikke_ but ++ is more explicit
20:09 qswz thank you shit
20:09 qswz .karma shit
20:09 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
20:10 _ikke_ qswz: Please don't spam :)
20:10 qswz thanks you _ikke_
20:10 qswz .karma _ikke_
20:10 gitinfo the Genuine Real Life Karma™ REST API results are back! _‍ikke_: 221 (2 in past 30 days) (3 given out)
20:10 qswz wow
20:10 _ikke_ :)
20:10 dreiss joined #git
20:10 _ikke_ Used to be #1, but osse has since passed be
20:11 ShalokShalom ok
20:11 ShalokShalom how to send this text file to the desktop?
20:11 ShalokShalom i mean, how to create an actual text file :)
20:11 qswz with a malware
20:11 ShalokShalom haha
20:12 qswz make it downloadable
20:12 ShalokShalom i mean, instead show it in my konsole
20:12 ShalokShalom it is local?
20:12 ShalokShalom i see it with git show commit:file
20:12 ShalokShalom how to create a text file instead?
20:12 ShalokShalom with this content
20:12 _ikke_ git show commit:file >path/to/file
20:12 _ikke_ on linux type kernels
20:12 _ikke_ terminals*
20:13 ShalokShalom thanks a lot
20:14 qswz I wonder if .karma is smart enoug to make the link here
20:16 _ikke_ No, it doesn't
20:16 rominronin joined #git
20:17 Cabanossi joined #git
20:17 _ikke_ https://github.com/jast/gitinfo/blob/master/plugins/thanks.pm
20:17 gitinfo _ikke_: you're welcome, but please note that I'm a bot. I'm not programmed to care.
20:18 _ikke_ lol
20:18 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Submit today to help revive it! https://madeitwo
20:18 nanonyme left #git
20:19 _ikke_ Eugene: Topic has been truncated
20:19 ShalokShalom wohuu :D
20:19 ShalokShalom thanks a lot
20:19 Eugene Is the git survey still current?
20:19 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwo
20:19 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
20:19 Eugene was kicked by Eugene: incompetence
20:19 Eugene joined #git
20:20 ochorocho__1 joined #git
20:20 _ikke_ Eugene: Wondering, haven't heard about any results yet, or wheter it has ended
20:20 romerocesar joined #git
20:20 _ikke_ Eugene: Ah, the survey is closed
20:21 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
20:21 jmpp joined #git
20:22 qws-user-1228 joined #git
20:24 Mobutils joined #git
20:27 rominronin joined #git
20:27 garethdaine joined #git
20:28 Pazzaz joined #git
20:28 hariel joined #git
20:31 hhee1 joined #git
20:31 qws-user-1228 joined #git
20:32 fees joined #git
20:33 mischat joined #git
20:36 Cabanossi joined #git
20:37 thebope joined #git
20:40 mizu_no_oto joined #git
20:42 mischat joined #git
20:42 Starky joined #git
20:43 aarobc joined #git
20:43 apotry joined #git
20:45 rwb joined #git
20:45 rorro joined #git
20:46 nidr0x joined #git
20:46 WoodLeg joined #git
20:48 Jackneill joined #git
20:48 mrwat joined #git
20:48 Starkythefox joined #git
20:48 Ryanar joined #git
20:48 mrwat left #git
20:49 durham joined #git
20:50 adac joined #git
20:50 shmuli joined #git
20:51 shgysk8zer0 joined #git
20:52 Es0teric joined #git
20:53 snowkidind joined #git
20:54 satifant joined #git
20:56 paul424 joined #git
20:57 HoierM joined #git
20:57 Guest55 joined #git
20:59 edaught_ joined #git
21:00 mindriot101 joined #git
21:02 manuels joined #git
21:08 bket joined #git
21:09 thebope joined #git
21:11 bket joined #git
21:14 CubiK joined #git
21:16 tvw joined #git
21:17 cdg joined #git
21:20 shmuli joined #git
21:22 mweshi joined #git
21:25 Discovery joined #git
21:25 kpease joined #git
21:25 byte512 joined #git
21:26 Rickmasta joined #git
21:26 fmcgeough joined #git
21:27 rominronin joined #git
21:28 IlNominePatre joined #git
21:28 thebope joined #git
21:28 Milos joined #git
21:31 cagfernandes joined #git
21:31 bket joined #git
21:31 elsevero joined #git
21:31 Guest51276 joined #git
21:32 hahuang65 joined #git
21:32 moestevens joined #git
21:32 rorro joined #git
21:33 Electrometro joined #git
21:35 Guest93309 joined #git
21:35 moestevens joined #git
21:35 moestevens joined #git
21:35 bket joined #git
21:39 elsevero joined #git
21:39 ki0 joined #git
21:40 Satt joined #git
21:41 hhee joined #git
21:42 mischat joined #git
21:44 cdown joined #git
21:45 rwb1 joined #git
21:47 venmx joined #git
21:48 mindriot101 joined #git
21:49 Siegfried joined #git
21:49 moestevens joined #git
21:50 durham_ joined #git
21:51 kraut joined #git
21:51 mizu_no_oto joined #git
21:52 durham__ joined #git
21:52 LaptopBrain joined #git
21:53 Siegfried joined #git
21:53 thebope joined #git
21:54 invisbl_ joined #git
21:54 derk0pf joined #git
21:57 invisbl joined #git
21:58 leb joined #git
22:01 mindriot101 joined #git
22:02 salamanderrake joined #git
22:03 mweshi joined #git
22:03 elsevero joined #git
22:06 grayjoc joined #git
22:06 jaeckel joined #git
22:06 ramsub07 hello, how do i see all the files that has been changed in a branch wrt master/
22:06 ramsub07 ?*
22:07 emg joined #git
22:11 acetakwas joined #git
22:12 qswz gitk
22:12 qswz git diff branchName master
22:15 venmx joined #git
22:16 cj joined #git
22:16 cj o/
22:17 cj can someone help me figure out how to grab the date of the commit of the head of a branch of a repo without cloning the repo?
22:18 m0viefreak joined #git
22:18 cj I'm thinking at this time that I might just have to use curl against the cgit view of the repo
22:19 vuoto joined #git
22:19 Derperperd joined #git
22:19 mindriot101 joined #git
22:25 jimi_ joined #git
22:25 anuxivm joined #git
22:26 Starkythefox joined #git
22:26 kristofferR joined #git
22:27 jstimm joined #git
22:27 dsantiago joined #git
22:27 Guest55 joined #git
22:28 hhee joined #git
22:28 rominronin joined #git
22:28 mischat joined #git
22:30 lvns joined #git
22:30 shampine joined #git
22:30 avar There's no git native way to do it, but you might be able to scrape some web ui
22:30 davimore joined #git
22:31 shampine joined #git
22:32 eivarv joined #git
22:33 courrier joined #git
22:33 cdown joined #git
22:33 cj yeah, I was going to hack together some LWP
22:33 qswz left #git
22:34 jeffreylevesque joined #git
22:35 rwb joined #git
22:37 durham joined #git
22:38 elsevero joined #git
22:39 GrandPa-G joined #git
22:40 GrandPa-G I am pulling a simple small text file from github to my local linux box. I am getting extra lines in the file (on seperate lines) like <<<<<<< HEAD
22:41 GrandPa-G later >>>>>>> 98161511c7fd05f723d3e656c1950ff53bbceef3 ... Any ideas why it appears in my file?
22:41 GrandPa-G there are 2 more like the last one above.
22:42 nettoweb joined #git
22:43 mindriot101 joined #git
22:45 hahuang65 joined #git
22:45 WaReZ joined #git
22:47 sentriz how to you --amend a github pull request with one commit? after amending, i end up with 3 commits instead of one. two with the same message and one merge
22:49 ramsub07 joined #git
22:50 canton7 sentriz, you tried to push, it failed, you pulled (merging together the old and new histories), then pushed that
22:50 canton7 so you have the 2 version of the commit, and a merge commit
22:50 canton7 !lol, find the commit you want to use, reset --hard to it, push -f it
22:50 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
22:51 rossome joined #git
22:54 acetakwas joined #git
22:55 Dougie187 left #git
22:55 SwiftMatt joined #git
22:59 vuoto joined #git
23:00 cdown_ joined #git
23:00 vuoto joined #git
23:01 vuoto joined #git
23:02 shmuli joined #git
23:04 p0wn3d joined #git
23:05 thebope joined #git
23:08 jstimm joined #git
23:09 hahuang65 joined #git
23:09 eivarv joined #git
23:13 thiago joined #git
23:13 shmuli joined #git
23:14 ramsub07 joined #git
23:14 pbrewczynski joined #git
23:16 jccn joined #git
23:16 russo joined #git
23:18 realz joined #git
23:20 cdown joined #git
23:24 Shentino joined #git
23:26 malber joined #git
23:27 Rickmasta joined #git
23:27 rominronin joined #git
23:33 pks joined #git
23:34 acetakwas joined #git
23:37 durham_ joined #git
23:40 tobiasvl GrandPa-G: !eek
23:40 gitinfo GrandPa-G: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
23:40 durham__ joined #git
23:40 durham__ joined #git
23:41 durham joined #git
23:46 OODani left #git
23:48 MaximusColourum joined #git
23:50 hahuang65 joined #git
23:51 durham_ joined #git
23:51 anuxivm joined #git
23:53 boombatower_ joined #git
23:56 inflames joined #git

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