Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-13

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

All times shown according to UTC.

Time Nick Message
00:02 roelmonnens joined #git
00:03 menip joined #git
00:05 cliluw Has anyone here used Git LFS? What are your opinions of it?
00:05 NonParity joined #git
00:05 snowalpaca joined #git
00:06 oghamb joined #git
00:07 shgysk8zer0 joined #git
00:07 war_pigs joined #git
00:10 digidog joined #git
00:10 snowalpaca joined #git
00:12 dave0x6d joined #git
00:17 durham_ joined #git
00:21 cagomez joined #git
00:22 _28_ria joined #git
00:23 cqi joined #git
00:24 telephone joined #git
00:24 telephone joined #git
00:24 svm_invictvs joined #git
00:26 war_pigs joined #git
00:27 bronson joined #git
00:32 _28_ria joined #git
00:33 TheSimonator joined #git
00:35 war_pigs joined #git
00:36 jargonjunkie joined #git
00:37 jargonjunkie joined #git
00:41 midnightmagic joined #git
00:43 dstw joined #git
00:44 brent__ joined #git
00:44 thebope joined #git
00:44 jimi_ joined #git
00:47 Puffball joined #git
00:47 jargonjunkie joined #git
00:50 cagomez joined #git
00:50 Goplat joined #git
00:52 re1_ joined #git
00:53 tanga joined #git
00:53 Cabanossi joined #git
00:55 TbobbyZ joined #git
00:58 karols146 joined #git
00:59 basdb joined #git
01:00 war_pigs joined #git
01:00 nebodka joined #git
01:04 fstd_ joined #git
01:05 durham joined #git
01:08 ivo_ joined #git
01:09 basdb joined #git
01:09 nick123 joined #git
01:10 DolpheenDream joined #git
01:17 theiostream joined #git
01:18 Nugget joined #git
01:19 pks joined #git
01:25 jameser joined #git
01:25 cagedwisdom joined #git
01:27 Jonuz joined #git
01:28 peterbec` joined #git
01:28 Ratler joined #git
01:28 tilpner joined #git
01:28 Werring joined #git
01:28 Matsv joined #git
01:28 MikeChernev joined #git
01:28 sysanthrope joined #git
01:28 Xarodon joined #git
01:29 Arguggi joined #git
01:29 pitastrudl joined #git
01:29 iron_houzi joined #git
01:30 theiostream joined #git
01:31 Darren_ joined #git
01:31 Mathiasdm joined #git
01:32 harv joined #git
01:35 basdb joined #git
01:37 nevodka joined #git
01:37 nevodka joined #git
01:38 thebope joined #git
01:38 Cabanossi joined #git
01:46 anuxivm left #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 http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 roelmonnens joined #git
01:53 Jaggz my "git branch" shows me "enforce-supports-logic \n jaggz--enforce-supports-logic"
01:53 lagothrix joined #git
01:53 Jaggz I think I somehow lost master.  this is a fork of a repo I worked on and was trying to learn how to submit a pull request...
01:54 Jaggz I originally called the branch "enforce-supports-logic" but tried to rename it so it would have my name on it (similar to another contributor head of the project)
01:57 telephone joined #git
01:57 telephone joined #git
01:59 druonysus joined #git
02:00 Vampire0 joined #git
02:00 ti2_ joined #git
02:00 pbandark joined #git
02:00 dermoth joined #git
02:00 Atm0spher1c joined #git
02:00 Jaggz how can I fix that I don't have a master anymore?
02:00 peepsalot joined #git
02:01 _28_ria joined #git
02:02 lagothri1 joined #git
02:03 Darren_ joined #git
02:06 rewt Jaggz, same way as you create any other branch; git branch master
02:07 rewt there's nothing really special about master other than it's the default branch that's created in a brand new repo
02:08 rewt Jaggz, maybe first try: git checkout master
02:08 rewt that will make it in the same place as the remote, and also set up tracking
02:09 chachasmooth joined #git
02:09 Jaggz error: pathspec 'master' did not match any file(s) known to git.
02:10 tbrow joined #git
02:11 nick123 joined #git
02:11 Jaggz rewt, I only made a few changes, and have copies of the files.  i could do the whole fork or whatever, again, if I made a mess of this (I've only modified two files).
02:11 rewt what gave that pathspec error?
02:11 Jaggz the checkout master
02:11 hexagoxel joined #git
02:12 rewt what was the command you used exactly?
02:12 Jaggz "git checkout master"
02:13 rewt do you have a remote configured, or is this just local?
02:13 Jaggz yeah I added the original repo as remote.. after I did other changes
02:13 Jaggz http://paste.debian.net/927351/
02:14 Jaggz that's from history | grep git
02:14 Jaggz (cleaned up a bit -- like removing some git show commands and such)
02:14 Arguggi joined #git
02:15 iron_houzi joined #git
02:15 thebope joined #git
02:15 Jaggz might be kinda irritating to just see a bunch of git commands, I understand though.
02:15 rewt can you "git checkout upstream/master"
02:15 Mathiasdm joined #git
02:15 Jaggz Previous HEAD position was 5cc2d34... Wrong logic on detecting use of % for support threshold. Fixes #3842.
02:15 Jaggz HEAD is now at 5c2a05c... Accept and ignore --no-plater and --gui-mode. #3876
02:16 rewt ok, and "git checkout origin/master" gives an error?
02:16 Jaggz oh.. thought that "wrong logic" was an error.  So, yes.  checkout upstream/master worked.
02:16 Jaggz no that works too
02:17 Xarodon joined #git
02:17 ToBeCloud joined #git
02:17 rewt ok, do you want your master to match origin or upstream?
02:18 Jaggz probably upstream
02:18 Jaggz origin is my original fork right?
02:18 rewt git branch -u upstream/master master
02:18 rewt yeah, upstream is alexrj's repo
02:19 Jaggz fatal: branch 'master' does not exist
02:19 tbrow joined #git
02:19 Jaggz thanks for the hlp, by the way -- I'm trying to contribute to the opensource community (of 3d printing people in this case)
02:20 aartist joined #git
02:20 Jaggz but I'm completely new to using git for public projects -- just for my own repos
02:21 rchavik joined #git
02:21 rewt ugh, let's try:  git branch -f master upstream/master
02:21 Jaggz Branch master set up to track remote branch master from upstream.
02:22 rewt ah there we go :)
02:22 aartist How git knows to invoke what is the path for git-checkout from "git checkout" command ?
02:22 phase2 joined #git
02:23 Jaggz rewt, status shows: HEAD detached at origin/master
02:23 rewt Jaggz, i like to use `gitk --all` to see where all the branches are (or pretty much any other gui that shows the git history)
02:24 Jaggz I did install gitk.. haven't learned how to use it yet though
02:24 rewt Jaggz, now try "git checkout master"
02:24 Jaggz yay
02:24 Jaggz I'm up to date
02:24 Jaggz I feel so modern
02:24 rewt lol
02:24 Jaggz con la moda they might say in spanish
02:24 Jaggz "in fashion"
02:25 Jaggz (or maybe that's old spanish from my classes in the 90's)
02:26 ojdo joined #git
02:27 Jaggz rewt, okay, I put my changes back in (sometime those were lost).. but .. I should do this in my own branch shouldn't I?
02:27 rewt depends on what you want to do
02:27 tapout joined #git
02:27 Jaggz I'd like to submit a pull request
02:28 Jaggz which I believe means updating my own fork with my changes
02:28 Jaggz my own branch of my fork
02:28 rewt i think githubians usually prefer you branch off of master, commit changes there, and pr that branch... or something... probably best to check with the maintainer
02:29 Jaggz <@LoH> fork, make a branch locally
02:29 Jaggz <@LoH> then push the branch
02:30 rewt right, ok, so do that
02:30 cwre joined #git
02:30 Jaggz rewt, I don't know what state my repo actually is in right now though
02:30 rewt that's where gitk really comes in handy ;)
02:31 freddy___ joined #git
02:33 Jaggz rewt, looks like I made a mess: http://pasteall.org/pic/show.php?id=114618
02:33 hhee joined #git
02:33 Jaggz like someone would say, "didn't your mom teach you how to git?"
02:33 aca20031 joined #git
02:33 rewt so you just want your 2 commits at the top in your pr?
02:33 Jaggz and I'd look at the ground, embarassed
02:34 Jaggz yes.. I tried squashing those into one, by marking the first with 's' before.. but it said I needed a prior commit
02:35 rewt ok, we can squash them too
02:35 Jaggz can I switch to my branch?
02:35 rewt and you want the branch name with your name, right?
02:35 Jaggz yeah jaggz--
02:35 NoOutlet joined #git
02:35 rewt ok, git checkout jaggz--...; git rebase -i upstream/master
02:36 Jaggz and just write that out without squashes?
02:36 rewt then leave the first commit ("Mostly addressed...") as "pick", and change the 2nd one ("Addressed...") to "squash"
02:37 Jaggz success
02:38 cagomez joined #git
02:39 rewt if you're happy with how that looks, you can git push it to origin, and submit the pr
02:39 darkbit joined #git
02:39 Jaggz I'm trying to understand what rebase does
02:40 rewt it rebases (moves) a series of commits, so they appear to start from a different point in the history
02:40 Hello71 !rebase
02:40 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
02:40 Hello71 !man
02:40 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
02:41 Jaggz yeah I was reading git-rebase (actually git help rebase.. same thing I think)
02:41 Jaggz the english of !git rebase makes more sense [to me]
02:41 brent__ joined #git
02:41 Jaggz I mean, of !rebase from gitinfo
02:41 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
02:41 Jaggz okay.. you lenient parser
02:42 rewt you may want to delete the 'enforce-support-logic' branch (w/o your name) to avoid confusion
02:42 Jaggz yes.. how do I do that?
02:42 rewt git branch -d enforce-support-logic; git push origin :enforce-support-logic
02:43 Jaggz the push pushes that deletion?
02:43 dodobrain joined #git
02:43 rewt the push deletes it from the remote
02:43 rewt that : is important
02:43 Jaggz yeah.. looking in manpage for the :
02:44 Rodya_ joined #git
02:44 inflames joined #git
02:44 rewt <src>:<dst>
02:45 Jaggz it doesn't exactly seem to say <src> is optional
02:45 cagomez joined #git
02:45 rewt "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository."
02:46 Jaggz there it is :)
02:46 rewt yeah, it's a bit hidden
02:46 * Jaggz checked the manpage for what you said to see if you were lying
02:46 rewt hah
02:46 duderonomy joined #git
02:46 Jaggz :)
02:46 rewt always a good practice
02:46 Jaggz on the branch command: error: branch 'enforce-support-logic' not found.
02:47 d4rkl0rd joined #git
02:47 rewt oh, missed a 's'
02:47 Jaggz oh.. thanks
02:47 rewt hard to see black on dark green
02:48 Jaggz okay.. deleted
02:48 Jaggz now git push jaggz--- ?
02:48 Jaggz now git push origin jaggz--- ?
02:50 rewt yeah, and if you want to set up tracking too (so you won't have to specify origin in the futre), you can do:  git push -u origin jaggz--...
02:50 * Jaggz deletes one line of his code before committing and pushing
02:50 Jaggz so because I did that, I should rebase and squash again?
02:50 rewt you can "git commit --ammend" add to HEAD
02:50 Jaggz so, add the file, rebase + squash, then push, ..
02:51 Jaggz ahh
02:51 Jaggz git commit -a --ammend ?
02:51 rewt --amend
02:51 meLon joined #git
02:52 Vortex34 joined #git
02:52 rewt um, sure... i usually "git add" separately, so it doesn't auto-add all changed files (which i may not want to include in the commit)
02:52 Jaggz right
02:52 Jaggz just the one though (I git diff'ed first to be sure)
02:52 Jaggz but yeah, probably a better practice
02:53 Jaggz done!
02:53 Jaggz submitted pull request too
02:54 Jaggz thank you so very much :)
02:54 rewt np :)
02:54 Jaggz now this slicing software [soon maybe] will have functioning enforcement of supports
02:55 Jaggz and a few other bug fixes
02:55 * Jaggz claps
02:55 Jaggz and.. now it's time to go get food for family!
02:55 Jaggz rewt, I'll see you around :)
02:55 Jaggz </irc-help-prostitution>
02:56 Jaggz irc is such an incredible phenomenon
02:57 Bock joined #git
02:58 TbobbyZ joined #git
03:00 lagothri1 joined #git
03:00 orbyt_ joined #git
03:04 blunaxela joined #git
03:06 ProblemChild joined #git
03:07 aavrug joined #git
03:07 Bock joined #git
03:07 _Patrick_ joined #git
03:07 PioneerAxon joined #git
03:08 aavrug joined #git
03:09 aavrug joined #git
03:10 hexagoxel joined #git
03:12 sunri5e joined #git
03:14 ProblemChild left #git
03:14 basdb joined #git
03:17 BSAlb joined #git
03:18 PioneerAxon joined #git
03:19 basdb joined #git
03:23 Xenophon1 joined #git
03:23 saboun_ joined #git
03:25 theiostream joined #git
03:28 dimi1947 joined #git
03:38 Cabanossi joined #git
03:40 safe joined #git
03:42 SJr joined #git
03:43 SJr If I have a bunch of repos in my working directory and I want to move from one git hosted provider to another, is there a way to do this and capture all of the commits and tags using my local copy, or do I need to clone a new one with --mirror that seems like a waste.
03:44 ZyX-I joined #git
03:46 mehola joined #git
03:47 dmarr joined #git
03:47 BSaboia joined #git
03:51 ojacobson The man pages are defeating me … is there a whitespace-safe way of listing modified files (like `git diff --name-only` but uses \0 or similar as a separator so that paths with spaces don't cause trouble)?
03:53 drodger joined #git
03:53 pks joined #git
03:55 hendry joined #git
03:55 axh joined #git
03:55 hendry I want to look throught the history of file changes occuring with *.svg in my repo... how do I go about that from the cli?
03:55 kadoban ojacobson: Aren't there newlines between them at least? Do any of your files potentially have newlines in them?
03:56 ojacobson in practice it's a rust source tree, the filenames are going to be whitespace-safe anyways and I could actually use `git diff --name-only`. :)
03:56 hendry a summary of added or removed files of *.svg would be fine, don't need to see details
03:56 ojacobson in theory, yes, there could be \ns
03:56 kadoban ojacobson: I would almost suspect that newlines are escaped, but ... I'm too lazy to check, heh.
03:56 ojacobson git status -z looks promising but I can't see how to parse it from a shell script
03:57 Lyqyd joined #git
04:01 SJr ojacobson, what are you trying to pipe it into?
04:01 ojacobson it's part of a really questionable pre-commit hook
04:01 ojacobson whose job is to run `cargo fmt` on the source tree, and re-stage any staged files
04:02 ojacobson I should teach my editor to run it, instead, I suspect
04:02 SJr Oh so it's not just spaces, it could be newlines in paths?
04:02 kadoban Oh is that like a linter?
04:04 SJr Well something very questionable might be --line-prefix , that may or may not work.
04:05 SJr The only other thing I was going to suggest was maybe pipe it into xargs if it was just one per line.
04:06 zt joined #git
04:06 ojacobson Yeah, that's what I'm doing now
04:07 ojacobson I'm going to switch it out for having pre-commit abort on formatting issues
04:07 ojacobson and require user intervention
04:07 kadoban Yeah, that sounds like a much more sane pre-commit
04:07 ojacobson It's annoying to fix it by hand, but pre-commit is the wrong place to automate it
04:08 Cabanossi joined #git
04:08 kadoban Though keep in mind how wacky pre-commit is. It doesn't actually automatically do anything to help you run your tests on that-which-will-be-commited
04:09 Wayne_Shephard joined #git
04:11 Wayne_Shephard joined #git
04:12 ojacobson yeah, I know
04:12 ojacobson I'm lucky, the only user I really have to worry about is me
04:12 ojacobson that won't be true indefinitely though
04:12 nick123 joined #git
04:12 druonysus left #git
04:12 kadoban That's always helpful, heh.
04:12 ojacobson I kind of feel like a toolkit for working with the exact tree in pre-commit might be useful
04:13 ojacobson maybe built on git-work-tree
04:13 kadoban I have a little thing I built myself, but it's not that professional. Works pretty well for my uses though
04:14 mizu_no_oto joined #git
04:15 _28_ria joined #git
04:16 reznord left #git
04:16 kadoban https://www.emptypath.com/git_pre_commit_testing#final this nonsense, mostly based on stash with some extra crap to handle weird cases
04:18 ojacobson I feel like dealing with stash's edge cases is harder than consing up a temporary tree to operate on
04:18 ojacobson maybe that's just me
04:18 ojacobson thanks for the code - there's a lot in here to digest :)
04:20 kadoban Heh, yeah it's pretty stream-of-conciousness when I was figuring out all this shit.
04:20 kadoban It's fairly reliable in practice, but I'm sure there's still edge cases that I'm not dealing with.
04:20 ojacobson stash may induce less IO than creating a fresh tree
04:21 kadoban Right, that's why I went with it. Even a moderate sized tree can cause noticeable lag when you try to copy the whole thing to a new place or whatever
04:21 kadoban Which gets annoying quickly, especially with git, since everything is so fast to start with you notice it.
04:25 kadoban worktree might be able to avoid that, I don't think that existed at the time I came up with this
04:25 kadoban Maybe you could have like, a private worktree somewhere as a cache that you just update when needed or something
04:27 _28_ria joined #git
04:29 mehola joined #git
04:31 ojacobson Just did a tiny shell mockup by hand… the biggest issue is replaying any changes in the isolated tree back into the project
04:31 ojacobson nothing fun like committing only to immediately have unstaged changes reversing the commit
04:32 _28_ria joined #git
04:33 JanC_ joined #git
04:34 _28_ria joined #git
04:35 nilg joined #git
04:35 _28_ria joined #git
04:36 New_visitor joined #git
04:36 New_visitor left #git
04:38 Saint_Isadore joined #git
04:38 Cabanossi joined #git
04:39 freddy___ joined #git
04:41 thebope joined #git
04:41 ayogi joined #git
04:42 fredd____ joined #git
04:45 _ikke_ hendry: git log --stat --no-merges \*.svg
04:45 _ikke_ something like that?
04:46 Rodya_ joined #git
04:48 pks joined #git
04:49 fakenerd joined #git
04:51 justan0theruser joined #git
05:00 MineCoins joined #git
05:00 TbobbyZ joined #git
05:01 finalbeta joined #git
05:04 toydestroyer_ joined #git
05:06 mattcen joined #git
05:08 Cabanossi joined #git
05:10 overlord_tm joined #git
05:13 nick123 joined #git
05:16 Raging_Hog joined #git
05:18 dec0n joined #git
05:20 marianina8 joined #git
05:28 lowercaseman joined #git
05:33 kent\n joined #git
05:37 nick123 joined #git
05:37 QwertyDragon joined #git
05:43 pks joined #git
05:44 brent__ joined #git
05:53 svm_invictvs joined #git
05:54 dave0x6d joined #git
05:56 sea-gull joined #git
05:56 freimatz joined #git
05:57 albel727 joined #git
05:59 freddy___ joined #git
06:00 cdown joined #git
06:03 usm4n joined #git
06:05 zeroed joined #git
06:07 TikityTik joined #git
06:07 grumble joined #git
06:07 Cabanossi joined #git
06:11 rscata joined #git
06:13 MineCoins joined #git
06:14 dodobrain joined #git
06:14 agusyc joined #git
06:14 Dazzyp joined #git
06:16 roelmonnens joined #git
06:16 jstimm joined #git
06:17 karols146 joined #git
06:18 Silmarilion joined #git
06:19 timvisher joined #git
06:23 zerow joined #git
06:23 zefferno joined #git
06:23 zeroed joined #git
06:23 zeroed joined #git
06:24 qt-x joined #git
06:24 kristofferR joined #git
06:27 cdown_ joined #git
06:28 BW^- joined #git
06:28 BW^- i'm in some directory, that's inside a git repo
06:28 BW^- how do I ask git to tell me what files in that directory are commited to it?
06:28 jagob joined #git
06:28 BW^- "git ls" doesn't work?
06:28 zt_ joined #git
06:28 BW^- ahh, "git ls-files", right.
06:28 ti2_ joined #git
06:32 dimi1947 joined #git
06:39 zt joined #git
06:41 thebope joined #git
06:41 zefferno joined #git
06:45 diogenese joined #git
06:45 zt_ joined #git
06:48 rokups joined #git
06:49 doubtful joined #git
06:49 doubtful hi
06:49 gitinfo doubtful: 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.
06:49 doubtful https://stackoverflow.com/questions/43385336/gitignore-for-subdirectories-not-ignoring-folders
06:49 Rodya_ joined #git
06:49 doubtful any idea?
06:50 kadoban doubtful: .gitignore and related mechanisms have no effect once content is being tracked.
06:50 kadoban They really only have any effect on how 'git add' works, and only when the file isn't already being tracked. (and they affect what 'git status' outputs and some other minor stuff)
06:51 kadoban So it certainly won't stop you from commiting changes to files that match a .gitignore rule, and definitely has no effect in the slightest on how 'git push' works.
06:51 dreiss joined #git
06:52 Cabanossi joined #git
06:53 adymitruk joined #git
06:54 doubtful kadoban, thanks
06:56 schleppel joined #git
06:58 eightg joined #git
07:00 overlord_tm joined #git
07:01 dersand joined #git
07:01 sbulage joined #git
07:01 t-mart joined #git
07:04 TbobbyZ joined #git
07:04 t0by joined #git
07:05 AciD` can you set a user gpg key in the git config?
07:05 kadoban For signing and etc?
07:06 zt__ joined #git
07:07 MrWoohoo joined #git
07:07 eroux joined #git
07:07 AciD` ah, got it `user.signingkey`
07:07 AciD` kadoban -> yep
07:09 kadoban Yep, that sounds right
07:09 rorro joined #git
07:09 lmatteis joined #git
07:10 diogenese joined #git
07:11 sea-gull joined #git
07:13 plexigras joined #git
07:13 xaa joined #git
07:16 griff joined #git
07:17 leeN joined #git
07:18 jfr joined #git
07:22 King_Hual joined #git
07:22 King_Hual joined #git
07:22 joe___ joined #git
07:23 oghamb joined #git
07:25 robattila256 joined #git
07:25 jonno112 joined #git
07:29 freddy___ joined #git
07:30 cqi joined #git
07:33 masuberu joined #git
07:35 thebope joined #git
07:36 tvw joined #git
07:37 ti2_ joined #git
07:37 Cabanossi joined #git
07:38 ti2_ joined #git
07:39 phase2 joined #git
07:39 dga joined #git
07:39 manuelschneid3r joined #git
07:40 JeroenT joined #git
07:40 govg joined #git
07:50 Rodya_ joined #git
07:52 clmsy joined #git
07:53 pbandark joined #git
07:56 Karthick joined #git
08:00 brent__ joined #git
08:02 sbasso joined #git
08:02 bongjovi joined #git
08:06 afuentes joined #git
08:11 nick123 joined #git
08:13 ti2_ joined #git
08:16 chll_ joined #git
08:22 atomi joined #git
08:23 marcogmonteiro joined #git
08:23 ti2_ joined #git
08:24 zeroed joined #git
08:26 Raging_Frog joined #git
08:27 ti2_ joined #git
08:27 ti2_ joined #git
08:31 rivarun joined #git
08:31 MineCoins joined #git
08:32 Introoter joined #git
08:33 mikecmpbll joined #git
08:34 thebope joined #git
08:35 ti2_ joined #git
08:37 ti2_ joined #git
08:37 Cabanossi joined #git
08:38 ti2_ joined #git
08:38 ti2_ joined #git
08:39 ti2_ joined #git
08:40 cqi joined #git
08:43 jfr joined #git
08:43 star_prone joined #git
08:44 ti2_ joined #git
08:44 dave0x6d joined #git
08:44 ti2_ joined #git
08:46 Snugglebash joined #git
08:46 mindfart joined #git
08:47 ti2_ joined #git
08:47 Snugglebash joined #git
08:48 Snugglebash joined #git
08:50 takwas joined #git
08:51 Rodya_ joined #git
08:51 Snugglebash joined #git
08:52 cagomez joined #git
08:56 Murii joined #git
08:56 griff joined #git
08:58 dsdeiz joined #git
08:58 dsdeiz joined #git
08:59 ti2_ joined #git
08:59 ti2_ joined #git
09:00 QwertyDragon joined #git
09:00 ti2_ joined #git
09:01 TbobbyZ joined #git
09:01 dhollin3 joined #git
09:02 marcogmonteiro joined #git
09:04 monq joined #git
09:07 ti2_ joined #git
09:08 ti2_ joined #git
09:08 ulfox joined #git
09:09 ti2_ joined #git
09:09 ti2_ joined #git
09:10 freddy___ joined #git
09:11 ti2_ joined #git
09:12 ti2_ joined #git
09:14 blackwind_123 joined #git
09:17 phase2 joined #git
09:18 jonno112 joined #git
09:19 fredd____ joined #git
09:21 nebodka joined #git
09:23 theoceaniscool joined #git
09:26 sbasso joined #git
09:33 g105b joined #git
09:34 Ice_Strike joined #git
09:35 thebope joined #git
09:41 cdown joined #git
09:41 scoobertron joined #git
09:43 ferr1 joined #git
09:45 mmh joined #git
09:50 fakenerd joined #git
09:50 psofa joined #git
09:51 cdown joined #git
09:51 psofa panic question: do changes in .gitignore take effect immediately?As in remove something from .ignore
09:51 Rodya_ joined #git
09:52 _ikke_ yes
09:52 QwertyDragon joined #git
09:52 Tobbi joined #git
09:52 _ikke_ git reads .gitignore on every operation that has something to do with it
09:52 _ikke_ (like git status and git add)
09:54 digidog joined #git
09:54 psofa _ikke_, thanks
09:54 earnestly joined #git
09:56 dsdeiz joined #git
10:02 sbasso joined #git
10:02 mnaqii joined #git
10:05 a_thakur joined #git
10:06 Darcidride joined #git
10:06 a_thakur joined #git
10:06 Raging_Hog joined #git
10:09 Acerific joined #git
10:09 Acerific joined #git
10:10 jimi_ joined #git
10:11 alexandre9099 joined #git
10:14 Neo joined #git
10:14 m0viefreak joined #git
10:15 zerow joined #git
10:15 plexigras when i want to have multiple versions of a repo should i use branches and git or something else?
10:16 bremner what do you mean "multiple versions of a repo"
10:17 borkr joined #git
10:18 takwas joined #git
10:19 plexigras i want to have features which are not in the default version but are addable
10:19 a_thakur joined #git
10:20 plexigras should i use git or some other version control tool?
10:21 ssarah joined #git
10:22 jimi_ joined #git
10:23 _ikke_ build them as plugins?
10:25 ethali joined #git
10:25 plexigras yeah
10:27 robotroll joined #git
10:29 dendazen joined #git
10:31 notebox joined #git
10:32 plexigras _ikke_ how would i best add plugins into a project?
10:34 YuGiOhJCJ joined #git
10:35 _ikke_ I think they can best be separate projects/repositories
10:37 plexigras yeah i thought its not really a good thing touse git for ut i dont know any better way
10:39 Gloomy joined #git
10:42 kexmex joined #git
10:50 shivam joined #git
10:51 rominronin joined #git
10:51 dsdeiz joined #git
10:51 dsdeiz joined #git
10:53 jozwior joined #git
10:55 RxMcDonald joined #git
10:55 RxMcDonald joined #git
10:56 RxMcDonald Hello, how do you join master with a different branch that has a lot of conflicts?
10:56 masuberu joined #git
10:56 izzakitteh joined #git
10:56 RxMcDonald I mean, merge
10:56 RxMcDonald Is there a merge tool for mac?
11:00 seni joined #git
11:01 RxMcDonald I need to merge a branch that has many changes with master but I dont want to replace the whole files
11:01 RxMcDonald Just the part that is changed in the other branch
11:02 izzakitteh Ok, I've got a LibreNMS install which has a git repo that's gotten into a….weird state. basically: https://gist.github.com/rucarrol/636a37b741e5dc9676c9e361e8ad34d0 . However if I do "git fetch ; git stash ; git clean -df; git clean -dn ; git merge", I can update the master branch.
11:06 RxMcDonald nvm i found a merge tool in intellij
11:07 mentazoom joined #git
11:08 Cabanossi joined #git
11:08 cagomez joined #git
11:08 ski7777 joined #git
11:09 manuelschneid3r joined #git
11:09 zefferno joined #git
11:13 thillux joined #git
11:13 alexandre9099 joined #git
11:14 Taikibansei joined #git
11:15 jozwior joined #git
11:16 sbasso joined #git
11:20 griff joined #git
11:22 thinkpad joined #git
11:22 rnsanchez joined #git
11:26 kpease joined #git
11:29 thebope joined #git
11:32 jimi_sanchez joined #git
11:32 kpease joined #git
11:34 User458764 joined #git
11:35 Raging_Hog joined #git
11:36 sparetire joined #git
11:38 Cabanossi joined #git
11:38 pgimeno joined #git
11:38 pgimeno How do I delete a remote branch locally?
11:39 jast git fetch --prune to clean up things removed remotely
11:39 jast otherwise, I think it's: git branch -r -d origin/foo
11:40 pgimeno thank you, --prune did the job
11:42 fakenerd joined #git
11:42 ExoUNX joined #git
11:47 izzakitteh Ok, I've got a LibreNMS install which has a git repo that's gotten into a….weird state. basically: https://gist.github.com/rucarrol/636a37b741e5dc9676c9e361e8ad34d0 . However if I do "git fetch ; git stash ; git clean -df; git clean -dn ; git merge", I can update the master branch.
11:48 dsdeiz joined #git
11:52 shinnya joined #git
11:53 sbasso joined #git
11:55 cagomez joined #git
11:55 rorro joined #git
11:56 alexandre9099_ joined #git
11:59 synthroid joined #git
12:03 freimatz3 joined #git
12:04 Gloomy joined #git
12:05 TbobbyZ joined #git
12:06 sarri joined #git
12:06 sarri joined #git
12:08 Cabanossi joined #git
12:10 dendazen joined #git
12:12 marianina8 joined #git
12:16 pgimeno left #git
12:16 peacememories joined #git
12:17 Snugglebash joined #git
12:17 jeffreylevesque joined #git
12:19 Kulrak joined #git
12:19 Kulrak joined #git
12:19 peacememories joined #git
12:22 bongjovi joined #git
12:22 achadwick joined #git
12:23 thebope joined #git
12:25 ziombelas joined #git
12:25 navidr joined #git
12:25 XenophonF joined #git
12:26 cagomez joined #git
12:28 thebope joined #git
12:29 King_Hual joined #git
12:32 treehug88 joined #git
12:32 Virox Hey guys. We've messed up merge commit like 20 commits ago and I was wondering how we could undo that?
12:33 Virox It seems there was a conflict and the wrong change was taken so we either want to go back and change that or remove that merge and try again
12:33 Virox When I git rebase -i it doesn't show me merge conflicts
12:34 finalbeta joined #git
12:35 dcpc007 joined #git
12:36 thebird joined #git
12:37 Xatenev_ joined #git
12:37 Xatenev_ Hi
12:37 gitinfo Xatenev_: 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.
12:37 Xatenev_ How can I provide a default password to all https requests?
12:37 Xatenev_ The credential manager seems to work only for one git repository.
12:37 Xatenev_ I want to have a default password for literally >everything<
12:38 izzakitteh left #git
12:38 seni joined #git
12:41 Xatenev_ osse
12:41 Hello71 that sounds like a bad idea
12:41 Xatenev_ No its ok
12:42 menip joined #git
12:43 dsdeiz joined #git
12:43 dsdeiz joined #git
12:43 sbasso joined #git
12:44 menip joined #git
12:46 sbasso_ joined #git
12:47 al-damiri joined #git
12:48 drodger joined #git
12:48 concerti__ joined #git
12:49 theiostream joined #git
12:49 gareppa joined #git
12:49 Snugglebash joined #git
12:51 nick123 joined #git
12:52 re1 joined #git
12:53 TheSimonator joined #git
12:53 Rodya_ joined #git
12:54 jeffreylevesque joined #git
12:55 netj joined #git
12:57 cagomez joined #git
12:57 sbasso joined #git
12:57 ecomaik joined #git
12:57 Daviey joined #git
13:02 ecomaikgolf joined #git
13:11 ecomaikgolf joined #git
13:12 ecomaikgolf joined #git
13:12 cyberz joined #git
13:18 ecomaikgolf joined #git
13:19 dsdeiz joined #git
13:19 dsdeiz joined #git
13:19 chipotle joined #git
13:22 thebope joined #git
13:22 User458764 joined #git
13:22 thebope joined #git
13:23 ulfox joined #git
13:23 nick123 joined #git
13:23 marcogmonteiro joined #git
13:26 jameser joined #git
13:27 TheSimonator joined #git
13:28 cagomez joined #git
13:29 menip joined #git
13:30 iju I have a feature branch, how do I list all the commit sha that branch is part of, I need to cherry-pick them elsewhere
13:31 synthroi_ joined #git
13:31 mindfart joined #git
13:32 synthro__ joined #git
13:32 jnewt joined #git
13:33 snowkidind joined #git
13:38 Cavallari joined #git
13:39 ethali joined #git
13:39 rewt iju: git log branch
13:40 jesst joined #git
13:40 rewt iju, but keep in mind that will include all commits from the very start of the repo up to the branch commit
13:40 jameser joined #git
13:40 maurer left #git
13:41 iju rewt: I only want those from the branch starting point, is that possible?
13:42 notebox joined #git
13:43 rewt you can do "git log otherbranch..branch" to list commits reachable from branch but not from otherbranch
13:44 cagomez joined #git
13:44 iju rewt: that branch was already merged
13:44 rewt yeah, so that's not going to work then
13:45 rewt maybe use a gui (like gitk) to visualize your history so you can select the first/last commit for the range you want to cherry pick
13:46 rewt then you can:  git cherry-pick <branch> ^<parent-of-first-commit>
13:46 rewt or:  git cherry-pick <branch> ^<first-commit>^
13:47 scoobertron joined #git
13:47 kexmex joined #git
13:48 blackbms joined #git
13:50 awc737 joined #git
13:51 AaronMT joined #git
13:51 drodger joined #git
13:51 Dougie187 joined #git
13:52 bannakaffalatta joined #git
13:52 peacememories joined #git
13:52 Cabanossi joined #git
13:53 blackbms joined #git
13:54 Rodya_ joined #git
13:54 Darren_ joined #git
13:56 lavalamp joined #git
13:57 blackbms joined #git
13:58 bannakaf_ joined #git
13:58 jozwior_ joined #git
13:59 zefferno joined #git
14:00 finalbeta joined #git
14:01 morenoh149 joined #git
14:01 zefferno joined #git
14:01 IndigoTiger joined #git
14:02 Starky joined #git
14:03 netroxen joined #git
14:03 Nicmavr joined #git
14:05 telephone joined #git
14:05 telephone joined #git
14:06 fakenerd joined #git
14:06 publio joined #git
14:07 TikityTik joined #git
14:07 TomyWork joined #git
14:08 menip joined #git
14:10 herzog_ernst joined #git
14:12 war_pigs joined #git
14:12 LeBlaaanc joined #git
14:12 chardan joined #git
14:16 hide joined #git
14:18 visual hheyyy
14:21 theiostream joined #git
14:22 visual how come git didnt flag my files as deleted, after i removed them?
14:22 visual now git add . fails with 'fatal: unable to stat {file}'
14:22 visual did any of you guys have this issue?
14:23 visual the only solution i see is to do "git add ." <-- get the name of file that it fails to stat; git rm {filename}; repeat 1000 times :I
14:24 Dougie187 visual: Do you use bash?
14:24 visual Dougie187: yeah
14:24 cjohnson works fine for me visual http://i.imgur.com/dzzcpNF.png
14:24 cjohnson need more context
14:25 anddam joined #git
14:25 Dougie187 Maybe it's an older version of git that he's using?
14:25 visual idk what other context to give you, i've removed and moved a lot of files, thought git would pick it up
14:25 anddam hello
14:25 visual apparently not
14:25 cqi joined #git
14:25 cjohnson visual: it does though, as I just demonstrated
14:25 visual http://prntscr.com/ew016g
14:25 cjohnson so there's some other piece you're not describing
14:25 visual git version 1.7.1
14:25 cjohnson looks like you might be in the middle of a merge?
14:25 Dougie187 Yeah, that's an old version.
14:26 mohan joined #git
14:26 anddam I just committed on master, I meant to commit on a different branch instead as I understand it's more appropriate to have a specifically-named branch when the change is going to be a PR
14:26 thebird joined #git
14:26 visual cjohnson: not that im aware of, i dont think i started any merges
14:26 cjohnson anddam: easiest way is git reset HEAD
14:26 cjohnson that will undo the commit without changing the working copy
14:26 anddam can I "move" the commit to another branch? should I revert the commit, and commit to a new one? should I re-clone and do from start?
14:26 Dougie187 anddam: You can either cherry-pick (man cherry-pick) or rebase (man rebase) to change the commit to a different branch
14:26 visual Dougie187: could the version be the problem? what's the current one? they didnt write on their site
14:26 cjohnson then switch to the intended branch and re-add and re-commit
14:26 Dougie187 anddam: Also, you can just make a new branch there, and reset your master back like cjohnson said
14:27 anddam ok I was still typing when you two replied so I had to make my questions anyway at that point
14:27 cqi joined #git
14:27 cjohnson oh good call I always do that backward
14:27 Dougie187 anddam: Something like `git branch <new_branch_name>; git reset --hard HEAD^`
14:27 visual sooo, what do i do :I
14:27 Dougie187 visual: What's the output of `git status` ?
14:28 anddam Dougie187: doing it in that order will keep the commit while cjohnson's order would lose it, right?
14:28 visual Dougie187: previe333@previewonly.com [~/public_html/ric]# git status
14:28 visual # On branch master_merge
14:28 visual # Changes to be committed:
14:28 visual #
14:28 visual #       deleted:    app/Address.php
14:28 visual #       deleted:    app/Contact.php
14:28 cjohnson yes anddam
14:28 visual #       deleted:    app/Costumer.php
14:28 visual #       deleted:    app/Employee.php
14:28 Dougie187 anddam: You won't lose the commit (if you have the hash) for like 30 days. but yes.
14:28 anddam thanks both
14:28 visual #       deleted:    app/Http/Controllers/ApiController.php
14:28 visual #
14:28 Dougie187 visual: Not pasted here....
14:28 visual # Unmerged paths:
14:28 visual #   (use "git add/rm <file>..." as appropriate to mark resolution)
14:28 visual #
14:28 visual #       both added:         .gitignore
14:28 sbasso joined #git
14:28 visual #       both added:         app/Http/Controllers/Auth/LoginController.php
14:28 visual #       both added:         app/Http/Controllers/Auth/RegisterController.php
14:28 cjohnson my suggestion was to rewind it, then re-commit it in the new branch, but that approach is pointless since you can just make the new branch from the commit and then rewind master
14:28 visual #       both added:         app/Http/Controllers/Auth/ResetPasswordController.php
14:28 visual #       both added:         app/Http/Controllers/BalanceController.php
14:28 visual #       both added:         app/Http/Controllers/EmpAuth/ForgotPasswordController.php
14:28 visual #       both added:         app/Http/Controllers/EmpAuth/LoginController.php
14:28 cjohnson my approach is required if the branch isn't new
14:28 visual #       both added:         app/Http/Controllers/EmpAuth/PasswordController.php
14:29 visual #       both added:         app/Http/Controllers/EmpAuth/ResetController.php
14:29 cjohnson thanks visual.
14:29 visual #       both added:         app/Http/Controllers/Employee/CalendarController.php
14:29 visual FUCK
14:29 visual sorry
14:29 cjohnson :P
14:29 visual https://kopy.io/9KpLZ
14:29 cqi joined #git
14:29 visual i know, the fucking link didnt copy
14:29 visual so i had the thing in the clipboard
14:29 Dougie187 Careful with your language.
14:29 cjohnson your irc client should have a setting somewhere to prevent you pasting big things
14:29 anddam visual: use a client that warns before pasting that many lines
14:29 Dougie187 Sometimes you'll get kicked / banned for talking like that. Just FYI.
14:29 visual anddam: it notifies after 10-15 lines, it's configurable, but you dont know you need to configure something before you step in shit, right?
14:29 cjohnson visual: anyway I think you are in the middle of a merge
14:30 Dougie187 You are in the middle of a merge.
14:30 Dougie187 That's what the ~30 lines that say "both added" mean
14:30 cjohnson Sure but now is the prime time to configure it correctly, now that you know the config you have now is bad :P
14:30 visual wew, i dont remember starting one :I
14:30 anddam visual: weechat asks even for 2 lines
14:30 visual alright, so what are my options?
14:30 blackbms left #git
14:30 Dougie187 visual: You're even on a branch named "master_merge"
14:31 visual oh man that was from like 2 weeks ago what the hell
14:31 cjohnson visual: well, stop merging
14:31 marcogmonteiro joined #git
14:31 cjohnson oof
14:31 visual i thought i rm-fd it, and created a new one
14:31 anddam and then git checkout my-new-branch to have the changes, I figure
14:31 Dougie187 So, I guess I'm very unclear what you're trying to do right now.
14:31 anddam how do I compare master tip with my-new-branch?
14:31 Dougie187 anddam: Yeah, that's correct.
14:31 cjohnson git diff master..my-new-branch
14:31 visual anddam: no, and what you're suggesting *will* make my working copy lose all changes
14:32 anddam is latest commit even called tip or is that mercurial?
14:32 Dougie187 visual: He's asking for help, not giving help.
14:32 anddam visual: what?
14:32 visual oh, sorry ))
14:32 cjohnson visual: anddam isn't talking to you, other people have their own questions ;)
14:32 cjohnson hah
14:32 zivester joined #git
14:32 cjohnson anddam: I think tip could be used yeah
14:32 Dougie187 anddam: It's usually called HAED
14:32 Dougie187 HEAD*
14:32 Dougie187 But it doesn't matter. People understand tip as well
14:32 cjohnson git diff master..my-new-branch and master...my-new-branch
14:32 visual Dougie187: alright, what im trying to do is fairly simple, im trying to push some changes to the master branch
14:32 anddam everybody loves a tip
14:33 cjohnson the latter I believe will show only differences introduced from my-new-branch
14:33 cjohnson the former will show differences from both ends
14:33 visual Dougie187: lemme rephrase that, i wanna push ALL changes to the master branch
14:33 visual how do i go about it
14:33 cjohnson First you need to take a stpe back and figure out what you are doing right now, which branch you are/should be in, why you are in the middle of a merge, etc
14:33 cjohnson so you need to get all that sorted out before going back to your problem
14:34 moop joined #git
14:34 cjohnson @visual
14:34 visual god damn i hate git so much
14:34 cjohnson seems like a case of not really paying attention more than git being bad ha
14:34 visual but you're right, wait lemme think
14:34 anddam boy I'm confused about git, is https://git-scm.com/book/en/v2 a good start?
14:34 cjohnson yes anddam. and my personal favorite: !parable
14:34 gitinfo 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
14:34 cjohnson I would start with the parable personally
14:34 anddam will have a read thanks
14:35 anddam I do know some DVCS but git confuses me
14:35 ZyX-I joined #git
14:35 visual ++, will read it as well, clearly it's more needleslly complicated than initially assumed
14:35 cjohnson not paying attention isn't the fault of the tool
14:36 anddam I think it's a matter of glossary, not knowing what each term exactly means in the tool is like wandering without a map
14:36 visual do you think i started this merge while looking at a different monitor or what are you implying?
14:36 visual it's a shit tool
14:36 visual it's always been shitty
14:36 anddam "but the Git commands will still feel like magical incantations" SOLD
14:36 anddam visual: how do you think such remarks are going to be taken on #git?
14:36 cjohnson I have no idea, but you didn't even know which branch you were in or that you were in a merge, and git certainly never just randomly starts merges on your behalf
14:37 cjohnson so clearly you did something here, weren't paying attention, and lost your way. It's ok, it happens to all of us
14:37 cjohnson rather than get mad and blame the tool just work backward to get back to a clean slate. then we can approach your problem again
14:37 visual anddam: maybe some smarter guy will rewrite git if i complain about it enough :^)
14:37 bremner anddam: as weak trolling
14:38 cqi joined #git
14:38 Dougie187 visual: Is that smarter guy you?
14:38 visual cjohnson: alright, ill give the parable a read today, it seems achievable in a few hours
14:38 visual Dougie187: maybe, man, everybody has a melting point
14:38 visual BUT
14:38 Dougie187 visual: Or a learning point? :P
14:38 jast the parable is my personal least favourite thing that tries to explain git :P
14:38 visual or that, yeah )
14:38 Dougie187 Honestly, git sucks until it clicks.
14:39 Dougie187 And once it clicks, it's awesome
14:39 visual tell me about it, the number of times i had to rm-f the thing and lose changes because of a merge/checkout/what-have-you gone wrong..
14:39 Dougie187 Personally, the thing that made it click for me was visualizing the graph, and how different operations manipulate the graph.
14:39 jast I can definitely see how not everyone appreciates having to get familiar with as many concepts as git introduces
14:40 jast but what can I say, I use vim, too :}
14:40 Dougie187 Lots of people who use VCS don't know what a graph is at all, and don't care about graphs.
14:40 jast maybe I like pain
14:40 visual wew
14:40 visual Dougie187: can you link the graph?
14:40 visual are you talking about the way "branching" is visualized?
14:40 jast for the graph stuff, skim this: !gcs
14:40 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
14:40 Dougie187 visual: The graph is the underlying data structure of your repo.
14:40 visual with the _-_ thing
14:41 jast basically how all the objects and ref thingies and such interact
14:41 visual yeah i got that part, just never saw it :^)
14:41 Dougie187 visual: Every repo has it's own similar, but unique, graph. You can use `git log --graph --oneline --decorate` in your repo to see it's graph.
14:41 jast that's really only part of the full object graph, it's only the commit relationships
14:41 Dougie187 Sure, but that helps make things click quite a lot.
14:42 Dougie187 At least for me it did... but that was a long time ago.
14:42 jast but yeah, it's worth having a bit of an understanding of what you've got
14:42 visual http://prntscr.com/ew09yg
14:42 visual lol, this isnt what i expected
14:42 visual thought it was like a 2D thing
14:42 Dougie187 visual: So, you have 2 commits.
14:42 visual and the gitolite.. oh man, who designed that thing, with the clicks
14:42 jast honestly I think GitHub is doing people a disservice hiding the structure of the history in the web interface. that's nice as long as you don't do anything non-trivial, but once you do, what GitHub shows you is pretty much a dirty lie
14:43 Dougie187 jast: I agree.
14:43 visual Dougie187: right, back to the issue on hand..
14:43 visual Dougie187: btw i have like 20 commits on the repo
14:43 Dougie187 visual: `git log --graph --decorate --oneline --all`
14:43 jast gitolite is for admins first and foremost, and of course designed for the author's preferences :)
14:43 ulfox joined #git
14:43 visual yeah, that showed a few more commits
14:44 Dougie187 I also love this command: https://gist.github.com/tlberglund/3714970
14:44 Dougie187 It's really useful when playing around with a repo, to have it up in a separate screen.
14:44 Dougie187 You can see what's going on as you type commands, and see how it changes the commit graph.
14:44 jast in this internet: people who have never heard of the 'watch' utility :P
14:44 Dougie187 Yeah, true.
14:45 Dougie187 I don't know why this isn't using watch, but oh well...
14:45 visual if you mean the "watch" on github/online repo, i dont see what that has to do with this conversation :I
14:45 Dougie187 visual: no, watch the command line tool
14:45 jast no, it's a command line tool to periodically run a command and show its output
14:46 Dougie187 It'd be `watch -n 1 git --no-pager log --graph --pretty=oneline --abbrev-commit --decorate --all $*`
14:46 visual ooh, sounds kinda useful to learn about how git works
14:46 jast in reference to Dougie187's link which is a small shell script that keeps redrawing the git history
14:46 jast and you can do the same thing with just watch, which is all I wanted to point out :)
14:46 cdg joined #git
14:47 lewix joined #git
14:47 visual Okay so the parable seems too small compared to https://git-scm.com/book/en/v2
14:47 jast I've used watch many times to watch the directory listing for lengthy operations that create/grow files
14:47 herzog_ernst joined #git
14:47 visual so either it misses a lot of essential information, or the book is too verbose, but the truth is likely somewehre in the middle
14:48 visual soo, what would you recommend in terms of a good learning source for git?
14:48 freddy___ joined #git
14:48 jast the parable is an intro to git's data structures and bird's eye design principles, nothing else
14:48 jast and it assumes you have never heard of versioning things, nor why that would be a good idea
14:49 bremner which describes lots of people who arrive here wanting to deployment ;)
14:49 jast I always found it a little too cute in that sense... kind of "here, let me tell you what great things computers can do"
14:49 visual oh, thanks :^)
14:50 visual bremner: eh, there's a difference between versioning things, like svn does for example, and the complex git nuances and how they work imo
14:50 shennyg joined #git
14:50 jast yeah, but what bremner was a dig at people who are trying to use git for something it's not even designed for, we get that a lot here :)
14:50 jast *said
14:51 jast those are the two ends of the spectrum: people who find git too complicated, and people who love git so much they'll use it for absolutely anything, no matter how pointless it is
14:52 dreiss joined #git
14:53 jast anyway, I can't recommend any general thing to read simply because I learned git from the official documentation and even though people usually overlook the tutorial and the "everyday git" manpage thingy, I can see how getting the rest of the details from the manpages is not something everyone will enjoy
14:54 govg joined #git
14:54 jast but for any given specific thing that you find baffling, I can try and find something suitable that explains it
14:54 blackwind_123 joined #git
14:55 Rodya_ joined #git
14:56 cam27 joined #git
14:56 brennz joined #git
14:56 Murii joined #git
14:56 puff joined #git
15:01 TheSimonator joined #git
15:02 mozzarel1 joined #git
15:02 a3Dman joined #git
15:02 MajorPayne joined #git
15:02 boombatower joined #git
15:03 aendrew_ joined #git
15:03 Tyklol joined #git
15:03 FF0033_ joined #git
15:03 phtes_ joined #git
15:04 suy_ joined #git
15:04 yena_ joined #git
15:04 ams___ joined #git
15:04 zifnab_ joined #git
15:04 yanope joined #git
15:04 stux|RC joined #git
15:04 spm_draget joined #git
15:04 a_thakur joined #git
15:04 berndj-blackout joined #git
15:05 KG4PEQ___ joined #git
15:05 ec_ joined #git
15:05 tobie_ joined #git
15:05 DelTree_ joined #git
15:05 hakzsam_ joined #git
15:05 pasky joined #git
15:05 bakabakabaka joined #git
15:06 tier2vil1ain_ joined #git
15:06 topi`_ joined #git
15:06 BinGOs_ joined #git
15:06 ezzieygu1wuf joined #git
15:06 ejnahc_ joined #git
15:06 jesst joined #git
15:06 PaulePan1er joined #git
15:06 iveqy_ joined #git
15:07 RichiH_ joined #git
15:07 tg` joined #git
15:07 beuker_ joined #git
15:07 IndigoTiger_ joined #git
15:07 Orphis_ joined #git
15:07 tjbp_ joined #git
15:07 selckin1 joined #git
15:08 timwis_ joined #git
15:08 GameGamer43 joined #git
15:08 xall joined #git
15:09 dwmw2_gone joined #git
15:09 guardian` joined #git
15:09 kisonecat_ joined #git
15:09 spacemud_ joined #git
15:09 sns joined #git
15:09 lukky513_ joined #git
15:09 reality404_ joined #git
15:09 Groscheri joined #git
15:09 Hink_ joined #git
15:09 troyt_ joined #git
15:09 MuffinMe- joined #git
15:09 grift_ joined #git
15:09 Hogofwar_ joined #git
15:09 tmz_ joined #git
15:10 lus_ joined #git
15:10 crater2160 joined #git
15:10 as_g5pw joined #git
15:10 dmod__ joined #git
15:10 synthroid joined #git
15:10 zapb_ joined #git
15:11 murr4y joined #git
15:11 choki joined #git
15:11 addshore_ joined #git
15:11 ZeroZeroZeroZero joined #git
15:11 FuraiTHD joined #git
15:11 sparr joined #git
15:11 Pursuit joined #git
15:11 CalimeroTeknik_ joined #git
15:11 Lowell joined #git
15:11 gitinfo joined #git
15:11 Joost joined #git
15:11 Sleepy63 joined #git
15:11 rschneberger joined #git
15:11 tharuin joined #git
15:12 Random832 joined #git
15:12 mjuhl joined #git
15:12 McKraken_zzzzz joined #git
15:12 cookra joined #git
15:12 boxrick1 joined #git
15:12 ensign joined #git
15:13 chrysa joined #git
15:14 theiostream joined #git
15:14 fhackdroid joined #git
15:14 fhackdroid joined #git
15:14 nsh joined #git
15:14 dilijev joined #git
15:14 hussam joined #git
15:14 HalfEatenPie joined #git
15:14 cfoch-always joined #git
15:15 al-damiri joined #git
15:16 mda1 joined #git
15:16 SpeakerToMeat joined #git
15:17 addshore_ left #git
15:18 marlinc joined #git
15:18 XenophonF does the windows installer no longer bundle openssh?
15:18 TbobbyZ joined #git
15:18 XenophonF hm, let me make sure i installed a recent-ish version, just a sec
15:19 XenophonF yeah, 2.12.2.windows.1
15:19 ec_ joined #git
15:20 ahf joined #git
15:20 TbobbyZ joined #git
15:20 stealthii joined #git
15:22 XenophonF Looks like I hit this one - https://github.com/git-for-windows/git/issues/1135
15:22 peepsalot joined #git
15:22 Cabanossi joined #git
15:23 albel727 joined #git
15:24 spm_draget joined #git
15:25 juandpineiro joined #git
15:26 ec_ joined #git
15:26 XenophonF hm, maybe I need to alter the system-wide PATH
15:28 cqi joined #git
15:29 selckin joined #git
15:30 HalfEatenPie joined #git
15:30 VladGh joined #git
15:30 BinGOs_ left #git
15:31 snowalpaca joined #git
15:31 t-mart_ joined #git
15:31 BinGOs joined #git
15:32 XenophonF or maybe set GIT_SSH to C:\Program Files\Git\usr\bin\ssh.exe?
15:32 unbalancedparen joined #git
15:33 exotime joined #git
15:33 alexandre9099 joined #git
15:33 Murr joined #git
15:34 cam27 joined #git
15:34 jast XenophonF: if that issue you linked to is the same issue you're having, paths don't really have anything to do with it
15:35 bjoe2k4 joined #git
15:35 jast that one is related to having git run from Windows accounts of unusual type (e.g. local service accounts)
15:35 XenophonF I know.
15:35 XenophonF That's what's happening in my case.
15:36 jast then I don't see how the PATH could change anything
15:36 XenophonF I'm calling Git from a service (namely, salt-minion).
15:36 jast though I suppose you could try setting GIT_SSH to a different SSH client that possibly doesn't have that issue
15:36 svm_invictvs joined #git
15:36 cagomez joined #git
15:36 XenophonF actually setting GIT_SSH worked
15:37 QwertyDragon joined #git
15:37 XenophonF well, not worked - changed the error message
15:37 XenophonF now Git claims that my SSH key is encrypted :-/
15:37 cagomez joined #git
15:38 XenophonF oh no that's a Salt error
15:38 XenophonF hm
15:38 HalfEatenPie joined #git
15:38 cagomez joined #git
15:38 elmcrest joined #git
15:39 Darcidride joined #git
15:39 nd_ joined #git
15:40 WizJin joined #git
15:40 brent__ joined #git
15:41 User458764 joined #git
15:43 blackwind_123 joined #git
15:44 sbasso joined #git
15:45 meZee joined #git
15:46 brent__ joined #git
15:47 tyreld joined #git
15:48 tnecniv joined #git
15:48 Rodya_ joined #git
15:48 nowhere_man joined #git
15:50 crose joined #git
15:51 Gustavo6046 joined #git
15:51 synthroid joined #git
15:54 mindfart joined #git
15:54 re1_ joined #git
15:55 nowhere_man joined #git
15:57 rosiu joined #git
15:57 oleo joined #git
16:00 thiago joined #git
16:00 dhollinger joined #git
16:05 nettoweb joined #git
16:06 sitaram visual: you don't need to click; the spacebar should also work.  And it's using a web-based presentation framework called Slidy.  It's meant to be a slide show.
16:06 manuelschneid3r joined #git
16:07 madewokherd joined #git
16:08 Teny joined #git
16:09 peacememories joined #git
16:09 rts-sander I did git checkout -p some_branch -- some/path
16:10 rts-sander then I answered y/n
16:10 rts-sander and now all it did was stage ONE file
16:10 rts-sander ONE FILE! I was doing this shit for 20 minutes
16:10 rts-sander git screwed me
16:11 TomyLobo joined #git
16:12 tg joined #git
16:12 dreiss joined #git
16:12 tnecniv joined #git
16:14 marianina8 joined #git
16:15 User458764 joined #git
16:16 nexemacs joined #git
16:17 Rodya_ joined #git
16:18 whitby The real issue is that git checkout staged a file
16:18 whitby What?
16:18 qqx whitby: That would be expected when both a commitish and path are given.
16:19 qqx It will stage the version of the path from the given commitish and then update the working tree to match.
16:19 ecomaikgolf joined #git
16:19 marianina8 joined #git
16:20 theoceaniscool joined #git
16:20 rts-sander it will ask you: "Apply this hunk to index and worktree" and then complete ignore everything when you say y
16:21 YuGiOhJCJ joined #git
16:22 whitby qqx: it might not be the question at hand, but the man git-checkout makes no mention of staging anything
16:22 gitinfo qqx: the git-checkout manpage is available at http://jk.gs/git-checkout.html
16:23 rts-sander probably not there because it doesn't work for shit
16:23 rts-sander it's ok, I'm using a gui now
16:23 whitby I'm not sure I follow what you're on about. Did you give it the same branch that you're on?
16:24 whitby (Though maybe I don't know what git-checkout does when given both treeish and a path.)
16:24 rts-sander no I gave another branch
16:24 rts-sander I wanted to make my current branch equal to some other branch, parts of it anyway
16:24 rts-sander they have diverged too much to cherry-pick / whatever
16:25 __rgn joined #git
16:25 TikityTik how can i get git log to search this? the command doesn't end git log -S"H.getorgan(/obj/item/organ/eyes)"
16:25 navidr joined #git
16:25 Es0teric joined #git
16:26 webdev007 joined #git
16:27 whitby rts-sander: and it "staged" things? What do you mean by staged?
16:32 orbyt_ joined #git
16:32 whitby Oh, shit, never mind me
16:32 whitby I read s/stage/stash/ this whole time
16:32 TheSimonator joined #git
16:32 rewt`` joined #git
16:32 rts-sander :)
16:32 finalbeta1 joined #git
16:32 whitby I was thoroughly confused
16:32 marianina8 joined #git
16:32 TomyLobo2 joined #git
16:32 Starkythefox joined #git
16:32 tristanp_ joined #git
16:32 zefferno joined #git
16:32 m0viefreak joined #git
16:32 aax joined #git
16:32 tnecniv_ joined #git
16:32 phase3 joined #git
16:32 monjwf joined #git
16:32 tinanoo1 joined #git
16:32 jimklo joined #git
16:32 madewokherd` joined #git
16:32 Tee_Pee_ joined #git
16:32 l2y_ joined #git
16:32 Spinkzeit` joined #git
16:32 ThiefMasterrr joined #git
16:32 ariver joined #git
16:32 phtes_ joined #git
16:32 PtxDK_ joined #git
16:32 rokups_ joined #git
16:32 DelTree joined #git
16:32 angseus_ joined #git
16:32 filcab joined #git
16:32 yanope joined #git
16:32 inovas joined #git
16:32 BeerSerc joined #git
16:32 deltab joined #git
16:32 djh joined #git
16:32 bejeb joined #git
16:32 Introoter_ joined #git
16:32 Serus_ joined #git
16:32 fakenerd joined #git
16:32 Darcidride joined #git
16:32 hakzsam joined #git
16:32 moop joined #git
16:32 m1dnight_ joined #git
16:32 olbat joined #git
16:32 jost__ joined #git
16:32 Nicmavr joined #git
16:32 nexxus6 joined #git
16:32 lagothri1 joined #git
16:32 jozwior_ joined #git
16:32 alphor joined #git
16:33 jokester joined #git
16:33 Olipro joined #git
16:33 tjbp joined #git
16:33 leah2 joined #git
16:33 FF0033_ joined #git
16:33 eblip joined #git
16:33 neunon joined #git
16:33 NightMonkey joined #git
16:34 sbulage joined #git
16:34 eldritch joined #git
16:34 forrestv joined #git
16:35 yena joined #git
16:36 tvw joined #git
16:36 thebird joined #git
16:38 freimatz3 joined #git
16:38 hussam joined #git
16:39 grumble joined #git
16:41 ojdo joined #git
16:43 nettoweb joined #git
16:44 finalbeta joined #git
16:45 Es0teric joined #git
16:45 Mobutils joined #git
16:46 pt joined #git
16:46 robattila256 joined #git
16:46 brent__ joined #git
16:47 ezzieyguywuf joined #git
16:47 pt left #git
16:48 diogenese joined #git
16:48 Motoko joined #git
16:48 ggherdov joined #git
16:48 nitric joined #git
16:48 cagomez joined #git
16:52 Ownix joined #git
16:54 re1 joined #git
16:55 theoceaniscool joined #git
16:56 hseg joined #git
16:56 ivo_ joined #git
16:59 hseg Hi. I'm having trouble figuring out what to put in the commit message for adding a bunch of functions to a utility library. Advice?
17:00 moritz the issue/ticket number you're working on, a short summary ("added a bunch a of functions to lib/util"), an empty line, and then a more detailed descriptions of the functions, and what you need them for
17:00 ToeSnacks joined #git
17:01 BSAlb joined #git
17:01 Iacobus joined #git
17:01 nettoweb joined #git
17:01 hseg Just realized I'm xy-probleming a bit here. The library in question is a latex package, and the functions are just definitions of macros to expand unicode chars to.
17:01 twisted` joined #git
17:02 hseg I don't see how I can describe these more clearly and concisely than by the code itself.
17:03 gesh joined #git
17:03 Wayne_Shephard joined #git
17:04 whitby hseg: "added unicode macros"
17:05 whitby Not every commit message can be a great 3 page story :)
17:05 whitby s/added/Add/
17:05 TbobbyZ joined #git
17:05 Lope joined #git
17:05 Lope hey guys I'm a little stuck.
17:05 whitby Lope: being stuck isn't any fun. What's up?
17:05 hseg Sure, but that means I'll have 90% of my log with the exact same message. In which case, why bother with a message?
17:06 Lope I ran `git stash`. Then did some stuff. Now I'm trying to `git stash pop` but it won't let me. "error: Your local changes to the following files would be overwritten by merge:"
17:06 Lope Then it lists one file.
17:06 whitby hseg: what do you mean? If you have a bunch of commits that all add the same thing maybe they should be one commit?
17:06 Lope I tried running `git reset HEAD foo.js` (the file) but it still gives same error trying to `git stash pop`
17:07 m0viefreak joined #git
17:07 whitby I think you mean `git checkout HEAD -- foo.js` if you want to reset the contents of foo.js to what was last committed in HEAD
17:07 Cabanossi joined #git
17:08 Lope okay, quite right whitby thanks.
17:08 whitby np
17:08 hseg Most of the commits to my utility lib are unicode character definitions. That doesn't mean they should all be 1 commit - in that case, I might as well drop the file out of git altogether.
17:08 EDAKIRI joined #git
17:09 sbasso joined #git
17:09 jason237 joined #git
17:10 dsdeiz joined #git
17:10 dsdeiz joined #git
17:10 codemann joined #git
17:10 morenoh149 joined #git
17:11 whitby Ah, yes, I think I see what you're saying
17:11 brent__ joined #git
17:12 whitby You should expand on what the change is you're making and why. If you're adding a macro, what macro is is and why do you need it?
17:12 mmlb joined #git
17:13 Murii joined #git
17:14 hseg Basically, Latex permits defining expansions for unicode characters. I'm using this facility to make my latex code readable by defining expansions for e.g. ℤ[ζₚ] so that I can write that instead of \mathbb{Z}[\zeta_p]
17:14 pbrewczynski_ joined #git
17:14 whitby "Add macro for \mathbb{Z}[\zeta_p] expansion"
17:14 hseg But I'm adding characters piecemeal, as needed. So I'd have commits along the lines of: "Add blackboard C,N,Z,Q"
17:15 harrymoreno joined #git
17:15 hseg Hm... Yeah, it seems all I needed was a bit finer-grained commits for there to be reasonable messages.
17:16 ping0ra joined #git
17:16 oleksiyp joined #git
17:17 Xenophon1 joined #git
17:19 zeroed joined #git
17:19 kfoonamalik joined #git
17:20 vkareh joined #git
17:21 hseg Question: I know I can use git add -e to add only part of the changes I made to a file. How do I do this for the first commit the file is in?
17:21 Xenophon1 joined #git
17:22 Groscheri joined #git
17:23 exotime joined #git
17:23 alexandre9099 joined #git
17:24 overlord_tm joined #git
17:25 Tuor joined #git
17:25 Tuor joined #git
17:26 khfeng joined #git
17:27 peterbec` joined #git
17:27 TikityTik am I able to filter git log based off the # of additions > some-number?
17:28 TikityTik I want to see who made the most additions to a file recently
17:28 thebope joined #git
17:31 vkareh joined #git
17:34 hseg Question: I know I can use git add -e to add only part of the changes I made to a file. How do I do this for the first commit the file is in?
17:35 TheSimonator joined #git
17:37 duderonomy joined #git
17:37 Nicmavr joined #git
17:39 elmcrest joined #git
17:39 tuor_ joined #git
17:41 marianina8 joined #git
17:42 durham joined #git
17:44 xall joined #git
17:44 oghamb joined #git
17:45 masuberu joined #git
17:49 Es0teric joined #git
17:49 archer121_ joined #git
17:49 s1scha joined #git
17:50 archer121_ hi, I am called in to debug a git issue. Apparantly, the people here tried to configure git to push without passwords using ssh key based auth. I don't know if it is because of this, but "git push" just hangs without printing abything. How do I go about debugging this?
17:51 archer121_ as of now, I have tried adding `GIT_SSH_COMMAND="ssh -vvv"` to the beginning of the command, but still, it prints nothing to the screen, and I get a blinking cursor
17:52 sea-gull joined #git
17:53 oleksiyp joined #git
17:54 cbreak archer121_: git remote -v
17:54 satifant joined #git
17:54 cbreak get the user and hostname of the server
17:54 cbreak then try to connect to it directly via ssh
17:54 cbreak archer121_: also check man git, search for GIT_TRACE
17:54 gitinfo archer121_: the git manpage is available at http://jk.gs/git.html
17:55 lowercaseman joined #git
17:55 webdev007 joined #git
17:56 s1scha_ joined #git
17:58 s1scha joined #git
17:59 ToBeCloud joined #git
18:00 Tuor joined #git
18:00 Tuor joined #git
18:01 sbasso joined #git
18:03 MineCoins joined #git
18:03 gesh joined #git
18:04 archer121_ cbreak: I can confirm that it is a ssh issue, not a git issue. thanks, fellas
18:05 lavalamp joined #git
18:06 dsdeiz joined #git
18:06 dglambert joined #git
18:08 ionelmc joined #git
18:09 Sasazuka joined #git
18:10 JimDungo joined #git
18:12 ertesx joined #git
18:13 Cassiopaya joined #git
18:14 earnestly joined #git
18:14 sbasso joined #git
18:16 khfeng joined #git
18:17 thebope joined #git
18:17 Mobutils joined #git
18:17 Oatmeal joined #git
18:19 atomi joined #git
18:19 User458764 joined #git
18:21 TheSimonator joined #git
18:21 chardan left #git
18:22 Glooomy joined #git
18:27 zeroed joined #git
18:27 zeroed joined #git
18:29 hhee2 joined #git
18:31 vkareh joined #git
18:34 desnudopenguino joined #git
18:34 r0ry joined #git
18:35 desnudopenguino I just changed the file permissions on a local branch, and now git says all the files have changed. is this normal (on linux)?
18:36 zeroed joined #git
18:36 zeroed joined #git
18:38 nixdork joined #git
18:38 notebox joined #git
18:39 mikecmpbll joined #git
18:39 ToxicFrog desnudopenguino: if one of the permissions you changed is +x, then yes; git tracks whether files are executable or not
18:39 ToxicFrog It doesn't track r/w bits
18:40 fenikso yea
18:40 fenikso core.fileMode setting will fix that
18:40 fenikso git config core.fileMode false
18:40 desnudopenguino fenikso: thanks!
18:41 fenikso no prob
18:41 desnudopenguino i thought i did something really bad for a minute
18:41 desnudopenguino haha
18:42 fenikso well, if you made everything +x, that could be considered really bad :)
18:42 desnudopenguino yeah lol
18:44 ulfox joined #git
18:45 LionsMane joined #git
18:45 Glooomy joined #git
18:46 dreiss joined #git
18:47 sea-gull joined #git
18:51 webdev007 joined #git
18:53 oleo joined #git
18:58 mknod joined #git
18:59 zeroed joined #git
18:59 oleksiyp joined #git
19:00 TheSimonator joined #git
19:00 zeroed_ joined #git
19:02 dsdeiz joined #git
19:02 dsdeiz joined #git
19:02 zeroed joined #git
19:03 porfiriopaiz joined #git
19:06 dtrott joined #git
19:06 ping0ra joined #git
19:06 Atm0spher1c joined #git
19:07 jstimm joined #git
19:07 Cavallari joined #git
19:10 re1_ joined #git
19:11 thebope joined #git
19:11 oleo joined #git
19:13 memori joined #git
19:15 memori My file has several <<<< HEAD and >>>> hex strings; did I break anything?
19:15 dreiss joined #git
19:15 preaction memori: no, you're in the middle of a !conflict
19:15 gitinfo memori: [!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
19:19 thebope joined #git
19:20 PioneerAxon joined #git
19:22 TbobbyZ joined #git
19:25 re1 joined #git
19:27 re1 joined #git
19:28 afuentes joined #git
19:30 finalbeta joined #git
19:31 zeroed joined #git
19:31 peoliye joined #git
19:31 peoliye how can i apply a patch file partially?
19:33 _ikke_ By editing the patch to only include what you want?
19:34 preaction applying it fully and then interactively checking out what you don't
19:34 preaction it would be nice if patch(1) or git-apply(1) took a --interactive option...
19:36 AndresInSpace joined #git
19:37 AndresInSpace question: if we cherrypick into a 'live' branch, from a 'dev' branch. and during course of development, say we have a couple commmits on dev we didnt want to chrry pick, but we leave them applied to dev branch
19:37 AndresInSpace then we make changes to file that had dev commits, not cherry picked to live, we make the new changes as a new commit
19:37 AndresInSpace woudl it possibly conflict if we cherry pick the new commit to live
19:37 preaction yes. but that's fine
19:37 drodger joined #git
19:37 preaction conflicts aren't evil
19:38 AndresInSpace but if it does it would be on the local level, and would ask us to fix it before pushing to repo
19:38 AndresInSpace correct
19:38 AndresInSpace yes I know,j ust trying to solve an issue
19:38 preaction the cherry-pick wouldn't happen until the merge conflict was resolved
19:38 AndresInSpace i pulled live, cherrypicked into it, had aconflict, resolved it,
19:38 AndresInSpace went to pull on live
19:38 AndresInSpace and had conflict again
19:38 preaction you pulled twice?
19:39 AndresInSpace No, i locally pulled live repo, cherry picked my commit, fixed conflict, then pushed the changes back to live repo
19:39 AndresInSpace then i SSHd into server, and pulled live repo
19:39 dave0x6d joined #git
19:39 _W_ joined #git
19:39 preaction sounds like the server's repo has diverged from the "live" repo
19:40 re1_ joined #git
19:42 jimklo joined #git
19:44 jstimm joined #git
19:47 AndresInSpace yeah it does
19:47 AndresInSpace only way i would say is someone ftped edits
19:47 rorro joined #git
19:47 AndresInSpace or someone made commits to live that never went to dev.. (downstream should NOT be allowed though)
19:50 FF0033_ left #git
19:54 finalbeta joined #git
19:56 navidr joined #git
19:57 daxroc joined #git
20:00 cagomez joined #git
20:01 Mobutils joined #git
20:04 cjohnson AndresInSpace: Ideally, if you are using git as a deploy tool (and it's recommended you don't but I admit even I do this), you totally blow away local changes before any pull. Your repo should be set up to be able to handle that
20:05 agusyc joined #git
20:05 thebope_ joined #git
20:05 jstimm joined #git
20:05 AndresInSpace ^ i didnt set itup and nor am i a Git expert
20:05 cjohnson my deploy looks like this: git reset --hard HEAD && git checkout -- . && git clean -df && git pull && git submodule --quiet sync && git submodule --quiet update --init --recursive
20:05 AndresInSpace but I know that they did not do it properly
20:06 paolo_ joined #git
20:07 cjohnson That's how I would fix your situation, fix up your deployer to be able to do that. You will probably just have to gitignore any temp files and refactor any environment-specific overrides into ignored config env files
20:07 cjohnson That or, stop using git, but that's the easy approach
20:07 cjohnson ha
20:07 cjohnson git status from your prod server will tell you how much you have to clean up to make your server git-deployable
20:07 cjohnson you ideally want git status to report nothing
20:09 paolo_ joined #git
20:12 orbyt_ joined #git
20:13 Xenophon1 joined #git
20:14 alzagros i pushed a commit with a terrible commit comment. how can i fix this?
20:15 Rodya_ joined #git
20:18 moritz invent time travel?
20:18 alzagros ok. so i guess i should be smart for the next time.
20:19 moritz yes, sounds like a good plan
20:19 alzagros i guess i have the freedom to edit my local comments, as long as i have not pushed them yet. right? then i can edit all i want?
20:19 cliluw alzagros: If the commit message is bad because it's lacking something, you could add a git note to it using the "git notes" command. Note that by default, Git is not configured to show commit notes.
20:21 jstimm joined #git
20:22 moritz alzagros: correct
20:22 moritz (git commit --ammend, git rebase -i + reword)
20:23 cjohnson alzagros: You can always rewrite history, it's just good practice not to push rewritten history to others who have to clean up your mess
20:23 cjohnson but I don't like the suggestion that you should "never push rewrites", it's rather naive
20:23 cjohnson if you know you are hte only one with that branch you can pretty safely push for example
20:24 cjohnson If it's urgent to add the note then personally I would make a whitespace change and just add a new commit. it'll show up close to the other one in log
20:25 paolo_ joined #git
20:26 MrWoohoo joined #git
20:26 causasui joined #git
20:28 phase2 joined #git
20:29 cdg joined #git
20:29 Bob8989|2 joined #git
20:30 ec_ left #git
20:30 ec_ joined #git
20:30 ec_ joined #git
20:31 dreiss joined #git
20:31 tango_ 26
20:31 anuxivm joined #git
20:32 sea-gull joined #git
20:37 MrRicecake joined #git
20:41 ec_ left #git
20:44 hseg joined #git
20:47 Jackneill joined #git
20:49 dsdeiz joined #git
20:50 jcay joined #git
20:50 phtes joined #git
20:50 TheSimonator joined #git
20:50 cahoots joined #git
20:51 jcay hello.. howto set up pushing when git runs on my server? do I need to create a git user?
20:51 selckin !gitolite
20:51 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolite/overview/#basic-use-case
20:54 cahoots hi, we just did a migration over to an enterprise github account, and now i get the message "Not Found" when pushing. i did some edits to migrate, but i guess not enough. any ideas?
20:54 cmmagid joined #git
20:55 moritz cahoots: maybe ask in #github?
20:55 cahoots moritz, i think it's a git issue though
20:55 cahoots the point is that we changed our remote and now i get an issue
20:55 cahoots shouldn't have mentioned github :P
20:55 rossome joined #git
20:55 moritz cahoots: from git's POV you need to run git remote set-url
20:55 moritz and your ssh keys need to be correct
20:56 moritz and known to the server etc.
20:57 cahoots moritz, git remote -v shows i have the right one for fetch and push
20:58 rossome joined #git
20:59 thebope_ joined #git
21:03 robotroll joined #git
21:03 Nicmavr joined #git
21:05 pbandark joined #git
21:09 harrymoreno joined #git
21:11 felixjet joined #git
21:12 TheSimonator joined #git
21:13 ali1234 joined #git
21:13 tnecniv joined #git
21:14 jeffreylevesque joined #git
21:14 ali1234 look at this and tell me why it's wrong and what i should do instead please: https://github.com/ali1234/rpi-ramdisk/blob/master/kernel/Makefile
21:15 cdg joined #git
21:15 Snak3byt3 joined #git
21:15 Snak3byt3 left #git
21:16 cjohnson uh, any context?
21:16 ali1234 the intention is a Makefile which clones a repository if it doesn't exist. if it does exist it pulls changes, and then only if there actually were any changes, it builds the repository
21:16 GT4066 joined #git
21:16 ali1234 the rest is just housekeeping - building a tarball from the built repo
21:17 cjohnson ok and what's not working? why have you decided it's wrong?
21:17 ali1234 it seems to work
21:17 ali1234 i'm not sure if i trust it though
21:18 cjohnson best way to find out is to use it! change urls to point to a test repo. run make, watch it clone. run make again, make sure it does nothing. push a change to test repo, run make, watch it pull, watch it rebuild
21:18 cjohnson seems easy enough to test
21:18 jost_ joined #git
21:18 pks joined #git
21:18 ali1234 i would like if it also worked on a dirty repo
21:19 ali1234 it does also work if you commit changes locally, but then that breaks pull probably since a merge would be needed
21:19 cjohnson well if the pull conflicts with local changes it's not going to work
21:19 ali1234 exactly
21:19 cjohnson right so don't leave a dirty repo
21:19 cjohnson ignore build files
21:19 cjohnson use ignored environment overrides
21:19 cjohnson etc
21:19 ali1234 the repo is a linux kernel
21:20 ali1234 i just feel like this should be a solved problem
21:20 ali1234 but i don't know what solves it
21:20 cjohnson I'm sure the solution is not to use git as a deployment system :P
21:20 ali1234 i'm not
21:20 druonysus joined #git
21:20 ali1234 the linux source is in git
21:20 cjohnson that's what this makefile suggests you are doing?
21:21 ali1234 this makefile compiles linux... twice
21:21 cjohnson you want to deploy and build new changes whenever the remote repo is pushed to
21:21 cjohnson that's using git as a deployment system
21:21 ali1234 so what should i use instead?
21:21 ali1234 gven that linux kernel is stored in git...
21:21 cjohnson linux kernel is usually available as a package
21:22 ali1234 this one isn't
21:22 cjohnson where somebody took git out of the equation already
21:22 cjohnson ok so that's the solution though
21:22 cjohnson become the package maintainer
21:22 cjohnson you'll occasionally pull, snapshot the current build, bundle it up in a package
21:22 ali1234 okay. so how would i do that, without using git?
21:22 ali1234 i mean that's literally what i'm trying to do
21:22 cjohnson which distro?
21:23 ali1234 none
21:23 ali1234 alternatively, "my own distro"
21:23 cjohnson Ok, which package manager?
21:23 ali1234 uh... tar?
21:23 cjohnson tar's an archive manager
21:23 ali1234 yes
21:23 cjohnson I dunno I'm just trying to respond to what you said
21:24 cjohnson you said this should be a solved problem
21:24 ali1234 yes
21:24 cjohnson it is, it's called using a package manager and having people build packages from the git repo
21:24 ali1234 and i said that's what this script does
21:24 cjohnson If you don't like that solution then of course you're gonna have to cobble some hacks together hah
21:24 ali1234 it pulls git and builds a tarball from it
21:24 cjohnson nah, it's not
21:24 cjohnson it tries to keep an ongoing repo going
21:25 cjohnson Normally when you produce builds you would pull a fresh copy, do the build, package it up, release that
21:25 cjohnson it won't be a perpetual git checkout
21:26 ali1234 yeah that's the part that should be a solved problem
21:26 ali1234 building a new packages only when there are upstream updates
21:26 Rodya_ joined #git
21:26 ali1234 without requiring manual intervention
21:27 cjohnson It is, the way it works is you hook the package builder into your github or whatever
21:27 cjohnson it receives a hook notification when you push
21:27 cjohnson it does a clone, it builds the package
21:27 ali1234 hmm
21:27 cjohnson Anyway you can do it the way you want but it's just not normal
21:28 cjohnson But you can try using git reset/git checkout/git clean/git pull
21:28 cjohnson to make your local copy un-dirty
21:28 cjohnson and then pull
21:28 cjohnson but no guarantee the repo you're messing with will not break if you just blow away changes, depends on their setup
21:28 ali1234 i think maybe what i actually want is a submodule
21:29 ali1234 and then rebuild only if the submodule points to something different than before
21:29 ali1234 after all, i probably don't want to get some random kernel version every time i rebuild
21:30 nexemacs joined #git
21:30 askb joined #git
21:31 govg joined #git
21:31 andrewhl joined #git
21:31 andrewhl joined #git
21:32 durham_ joined #git
21:32 sonOfRa joined #git
21:35 drodger joined #git
21:36 atomi joined #git
21:37 selckin joined #git
21:38 cagomez joined #git
21:38 thebope joined #git
21:39 cahoots moritz, any thoughts?
21:41 drodger joined #git
21:41 govg joined #git
21:45 gesh joined #git
21:47 cjohnson yes but submodules require you to explicitly update
21:47 cjohnson but sure that might be a good idea
21:47 ali1234 yes, i know
21:47 ali1234 i can't decide what i want :(
21:49 Tee_Pee joined #git
21:52 foreal joined #git
21:53 thebope joined #git
21:55 guardian` left #git
21:55 guardian joined #git
21:55 alexandre9099 joined #git
21:58 cagomez joined #git
22:01 alexandre9099_ joined #git
22:02 eikhorst joined #git
22:02 peepsalot joined #git
22:03 cahoots joined #git
22:03 durham joined #git
22:04 gugah joined #git
22:05 jstimm joined #git
22:07 nick123 joined #git
22:07 fk joined #git
22:07 Cabanossi joined #git
22:09 harrymoreno left #git
22:11 mizu_no_oto joined #git
22:11 cha18 joined #git
22:15 gesh joined #git
22:15 Nicmavr joined #git
22:15 elsevero joined #git
22:16 dsdeiz joined #git
22:16 dsdeiz joined #git
22:17 pifon joined #git
22:18 oleo joined #git
22:19 gesh left #git
22:21 cha1800 joined #git
22:22 theoceaniscool joined #git
22:27 Rodya_ joined #git
22:29 cha18 joined #git
22:30 dedondesta joined #git
22:31 snowalpaca joined #git
22:31 dedondesta i was doing changes in dev, to wich i commited my branch recently (i forgot to switch back) how do i uncommit and commit the changes to my original branch
22:31 dedondesta ?
22:31 dedondesta which
22:31 dedondesta to which i merged *
22:32 bannakaffalatta joined #git
22:32 TbobbyZ_ joined #git
22:33 dedondesta am i need this? git reset --soft HEAD^
22:33 dedondesta i haven't pushed my dev yet
22:33 dave0x6d joined #git
22:33 netj joined #git
22:35 dedondesta i did so, now i have nothing to commit
22:35 dedondesta my modifications gone?
22:39 thebope joined #git
22:39 Skuzzzy dedondesta: did you switch branches?
22:39 Skuzzzy resetting should move your head back, but leave your changes (with soft, they will still be staged I think)
22:44 snowkidind joined #git
22:44 cha18 joined #git
22:44 oghamb joined #git
22:47 thebope joined #git
22:49 nexemacs joined #git
22:49 dtrott left #git
22:53 Cabanossi joined #git
22:57 jimklo joined #git
22:59 jimklo joined #git
23:01 TheSimonator joined #git
23:04 cahoots joined #git
23:05 telephone joined #git
23:05 telephone joined #git
23:06 theiostream joined #git
23:06 cahoots hi, we just changed to a new remote for our repo, and now i get the message "Not Found" when pushing. i did some edits to migrate, but i guess not enough. any ideas?
23:08 nick123 joined #git
23:08 bronson joined #git
23:10 anddam joined #git
23:14 utrack joined #git
23:14 Mindi joined #git
23:17 menip joined #git
23:17 hseg joined #git
23:18 hseg Somehow I managed to get git to forget that my directory is a repo. This, despite the .git directory still existing. Help!
23:18 hseg Unfortunately, my shell crashed soon after this, so I don't have logs.
23:19 Vampire0 hseg, is the .git repository readable by you?
23:19 hseg Yes
23:19 Vampire0 And how do you know it is not known as repo? What message do you get exactly when you call what?
23:19 Vampire0 cahoots, !repro
23:19 gitinfo cahoots: [!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
23:20 hseg fatal: Not a git repository (or any parent up to mount point /cygdrive/f)
23:20 hseg Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
23:20 ali1234 say i have a linux git tree at linux/ and i do "git -C linux/ ls-files"
23:20 hseg This happens for all git commands - git status, git fsck, ...
23:20 ali1234 i need it to print all the paths with "linux/" stuck on the front
23:20 Gustavo6046 joined #git
23:20 ali1234 ie relative to the current directory. is that possible?
23:21 Vampire0 hseg, hm, if .git is still there and readable and has the correct content, this is really strange
23:21 hseg I was going through a git rebase, git borked halfway through (even though I made no changes). I don't know what caused it to bork.
23:22 Vampire0 ali1234, `git -C linus/ ls-files | sed 's!^!linux/!'`
23:22 Vampire0 s/linus/linux/
23:23 sbeller ali1234: yes it is possible (using undocumented tools, as "why would anyone ever want to do that?" ;)
23:23 sbeller git --superprefix=linux/ -C linux/ ls-files HEAD
23:23 Vampire0 hseg, a failed rebase should not nullify your repo
23:23 sbeller --super-prefix=<path>
23:23 sbeller Currently for internal use only. Set a prefix which gives a path from above a repository down to its root.
23:23 Mobutils joined #git
23:23 ali1234 sbeller: i want to make every file in the repo be a dependency in a makefile target :)
23:23 ali1234 the makefile being outside the repo
23:24 hseg I should specify that by "bork" I don't mean it failed to apply a patch. I mean it emitted some other error message, which I unfortunately lack.
23:24 ali1234 sbeller: like this: http://stackoverflow.com/questions/17279220/make-recursive-dependencies
23:24 ali1234 except instead of "find", "git ls-files"
23:25 hseg Vampire0: I still have e.g. the .git/rebase-merge/ directory, so we could look there.
23:26 aidalgol joined #git
23:27 cahoots Vampire0, https://gist.github.com/michaeleiselsc/d37ac8f6b736217a2ac6bea262e0601f
23:29 Rodya_ joined #git
23:30 zulutango joined #git
23:30 cqi joined #git
23:30 Ahmed90 joined #git
23:32 pwnz0r joined #git
23:35 madewokherd joined #git
23:38 jeffreylevesque joined #git
23:39 thebope joined #git
23:41 TbobbyZ joined #git
23:41 thebope_ joined #git
23:42 Hink joined #git
23:45 gesh joined #git
23:45 hseg So, any ideas on how to restore my git repo?
23:45 hseg left #git
23:46 hseg joined #git
23:51 cqi joined #git
23:51 rwp hseg, Unfortunately your symptoms read to me like a disk failure. The same thing can happen if the disk is failing to read.
23:51 hseg Would it help if I could host the .git directory somewhere?
23:51 rwp hseg, Try making a complete backup copy of your entire directory elsewhere. Does the copy have any problem copying out the data? I worry that it will.
23:52 hseg No problem copying non-.git data out. Testing .git.
23:53 hseg No errors copying .git either.
23:53 rwp Hmm...
23:53 rwp Does the copy work okay with git?  Or the same errors there?
23:53 hseg Same errors
23:54 rwp Hmm...  Maybe something else then. The reason I worry about disk errors are that there were weird failures and then your session also crashed.
23:55 rwp Do you have an upstream "origin" copy (or other) anywhere?  Is most of your data available elsewhere?  Or is this it for everything?
23:55 hseg Unsure if session crashed or I was just being impatient at apparent freeze.
23:55 hseg I have the data. Just am missing revision history.
23:55 rwp What OS?  Local disk?  (Or networked storage.)
23:55 hseg Win10, USB stick
23:56 rwp So no system logs to speak of available. Well, it was worth asking. USB sticks are not the most reliable either.
23:56 hseg Yeah.
23:56 rwp Is it possible that your USB stick is filling up?
23:56 QwertyDragon joined #git
23:56 rwp There are so many counterfit usb devices that I have to ask if you have considered that possibilty.
23:56 rwp They fake being larger than they are.
23:56 hseg Still have ~3GB free.
23:57 hseg AFAICT, this is original Sandisk stuff.
23:57 thebope joined #git
23:57 rwp Just brainstorming trying to think of possibilities for you.
23:58 hseg Sure, and I appreciate it.
23:58 doener joined #git
23:58 rwp If it were me on my GNU/Linux system I would "find .git -name objects -prune -o -print | less" and browse the file list to see if it looks reasonable.
23:58 rwp I have 67 files in that list in one of my .git dirs.
23:58 hseg Have cygwin installed, can try.
23:58 rwp I prune out objects because that can be many, many files.
23:59 rwp Compare your problem case to a different working case and see if anyththing jumps out at you as being noticably different between the two.  An A-B comparison.
23:59 hseg 53 files, mostly refs, sample hooks, reflog and rebase-merge.

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