Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-05

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

All times shown according to UTC.

Time Nick Message
00:00 johnmilton joined #git
00:02 dave0x6d joined #git
00:03 axl__ left #git
00:03 ejb joined #git
00:04 RustyShackleford joined #git
00:05 fedepad joined #git
00:07 axl_ joined #git
00:08 jimi_ joined #git
00:08 fuchstronaut joined #git
00:08 mizu_no_oto joined #git
00:15 alex1a joined #git
00:19 LeBlaaanc joined #git
00:24 psprint_ joined #git
00:25 DJ_Spies joined #git
00:30 nd_ joined #git
00:31 Esya joined #git
00:33 jason237 joined #git
00:39 mellernoia joined #git
00:40 e14 joined #git
00:41 faux___ joined #git
00:42 Gitzilla joined #git
00:42 _sfiguser joined #git
00:44 LeBlaaanc joined #git
00:45 LeBlaaanc joined #git
00:46 e14 joined #git
00:56 Goplat joined #git
00:57 Mobutils_ joined #git
00:59 c0ded joined #git
01:00 elisa87 how can I make gist code.c overwrite the already uploaded code.c ? I downloaded gist using ruby gems :)
01:02 likewhoa joined #git
01:05 justanotheruser joined #git
01:07 aidalgol How would I transplant a topic branch onto an *earlier* commit of its parent branch?
01:08 mehdi___ joined #git
01:08 zeller joined #git
01:08 thecomedian joined #git
01:09 fuchstronaut joined #git
01:09 elmcrest joined #git
01:09 Farelli joined #git
01:09 LBV_User joined #git
01:09 henriquev joined #git
01:10 teadrop_ joined #git
01:10 wizonesolutions joined #git
01:10 Lipp joined #git
01:11 felowe joined #git
01:12 _Vi joined #git
01:14 richardlitt joined #git
01:16 twisted` joined #git
01:17 Iacobus joined #git
01:18 littleforest joined #git
01:18 kerrick_ I want to rebase onto an upstream and if there is a merge conflict, unconditionally take my version of the file
01:19 kerrick_ I thought this would be git rebase <upstream ref> -s theirs
01:19 kerrick_ but this errors out with "git-merge-theirs: command not found"
01:19 kerrick_ How can I do this rebase?
01:20 kerrick_ *How can I rebase and always take my version of the file instead of stopping to edit conflicted files?
01:20 barteks2x joined #git
01:21 realz joined #git
01:22 d^sh_ joined #git
01:23 ejb joined #git
01:28 fstd_ joined #git
01:28 Darren_ joined #git
01:29 Vampire0_ joined #git
01:29 _Vi joined #git
01:32 berndl joined #git
01:33 pks joined #git
01:34 MrWoohoo joined #git
01:35 jimi_ joined #git
01:37 a_thakur joined #git
01:37 rchavik joined #git
01:38 ash_workz joined #git
01:42 SwiftMatt joined #git
01:50 Mobutils joined #git
01:52 e14 joined #git
01:56 Motoko joined #git
01:57 Motoko joined #git
01:58 cdg joined #git
02:01 Limes_ joined #git
02:01 a_thakur joined #git
02:01 cdg joined #git
02:02 cyphase joined #git
02:03 Dougie187 joined #git
02:05 e14 joined #git
02:06 arescorpio joined #git
02:07 axl_ joined #git
02:07 Kitty- joined #git
02:08 ekinmur joined #git
02:08 johnnyfive joined #git
02:08 johnnyfive joined #git
02:10 _dunaeth joined #git
02:10 fuchstronaut joined #git
02:10 LBV_User joined #git
02:10 mmlb94 joined #git
02:11 e14 joined #git
02:12 MrC joined #git
02:13 rgrinberg joined #git
02:24 dreiss joined #git
02:28 QwertyDragon joined #git
02:29 lagothri1 joined #git
02:30 MTecknology joined #git
02:31 mattcen joined #git
02:32 dreiss joined #git
02:34 quadz joined #git
02:34 a_thakur joined #git
02:36 duderonomy joined #git
02:38 titankiller joined #git
02:39 c0ded joined #git
02:45 cyan__ joined #git
02:49 hexagoxel joined #git
02:50 flavius joined #git
02:54 juvenal joined #git
03:01 chachasmooth joined #git
03:03 Dougie187 left #git
03:05 star_prone joined #git
03:08 e14 joined #git
03:08 a3pq51 joined #git
03:09 raspado joined #git
03:10 einnjo joined #git
03:10 snthsnth joined #git
03:10 fuchstronaut joined #git
03:13 mquin joined #git
03:15 Vortex34 joined #git
03:16 snthsnth joined #git
03:20 mkopriva joined #git
03:23 nckpz joined #git
03:24 snthsnth joined #git
03:25 a_thakur joined #git
03:27 fatalhalt joined #git
03:32 LeBlaaanc joined #git
03:33 berndl joined #git
03:34 mehola joined #git
03:36 RustyShackleford do you use any git apps such as sourcetree, github desktop, etc
03:36 RustyShackleford or do you prefer the command line tools
03:37 tgunr joined #git
03:39 snthsnth joined #git
03:42 ochorocho__ joined #git
03:43 safe joined #git
03:44 Puffball joined #git
03:46 olalonde joined #git
03:46 Lipp joined #git
03:49 LeBlaaanc joined #git
03:55 LeBlaaanc joined #git
03:59 ahhughes joined #git
04:00 elsevero joined #git
04:02 ahhughes hi all, rightfully or wrongfully..... I'm wondering if git is an acceptable solution to manage/track data/file changes in a folder. The main conseration is that I have ~800mb of data. It's possible I might hold 3 revisions but when a 4th is created, I want the oldest one to be deleted/removed from the repo. Anyone know if this might be possible?
04:05 daey_ joined #git
04:06 RustyShackleford well git will hang on to every revision
04:06 RustyShackleford what kind of files?
04:07 ojacobson ahhughes: aside from intentional history-rewriting operations, git is append-only
04:07 dsantiago joined #git
04:07 ojacobson old revisions remain reachable indefinitely, and removing them from history effectively creates a new, independent history
04:07 zacts joined #git
04:08 blackwind_123 joined #git
04:08 ahhughes what about git rebase --interactive <commit>   ?
04:09 ahhughes seems to be able to squash revisions together, but I am not sure if that is only from the tip down.
04:09 ahhughes I'll TIAS.
04:10 RustyShackleford if you know how to use it, you can probably make it work
04:10 RustyShackleford if you really HAVE to rotate revisions instead of keeping them all
04:10 nettoweb joined #git
04:10 RustyShackleford you could create three branches, maintain a history for each of them, and merge/rebase versions together as you would like
04:10 ahhughes yeah, looks like it can squash all revisions so long as its not the root revision.... so I'll just start with my first revision being a VERY empty repo
04:11 fuchstronaut joined #git
04:11 ahhughes RustyShackleford: I want the option of doing so... Hg doesn't support it so I would see if git can (with no preference either way).
04:12 RustyShackleford when you're done with revision 1, will you ever go back and edit it?
04:13 RustyShackleford either way, you could branch revision 2 from revision 1, revision 3 from revision 2, and so on
04:13 RustyShackleford then when you get to revision 4 you can delete revision 1 if you really can't stand it there
04:13 Andrew_K joined #git
04:15 lindenle joined #git
04:15 mkopriva joined #git
04:17 ojacobson ahhughes: any tool that amends history wil necessarily create new history from the point of modification forward
04:17 jooni joined #git
04:18 ojacobson if your amendment is "remove the oldest commits" then the entire result will be new history, disconnected from the original
04:18 ojacobson (You can use `git rebase` to do this -- that's what `--root` is for)
04:20 watabou joined #git
04:22 mehola joined #git
04:22 ahhughes ok not sure I fully understand, but my use case, imagine I have a single file in my repo called TheImage.png and its 800MB in size. It gets edited and a new revision created daily. I need to keep the repo with working copy under 4.5GB so that means I can have one as the working copy (800MB) and 4 revisions (4x800MB = ~3.2GB) totaling ~4GB. To be cont....
04:24 phanimahesh joined #git
04:24 ahhughes when the 5th day arrives, and I rebase the revisions of day 1 and day 2 will the repo size shrink down to 3.2GB thus allowing the 5th day's revision @ 800MB to be committed and keep the total size under 4.5GB?
04:26 ojacobson First of all, no, it won't. You'll create an additional few hundred byes of commits using rebase. Months later, when the reflog entries and loose objects age enough, git will become _able_ to reclaim some of the space, but even then it won't actually do so until something triggers garbage collection.
04:27 ojacobson Second of all, on day 5, your rebase creates an entirely new history. The original history is d1<-d2<-d3<-d4<-d5, the new history is d3'<-d4'<-d5' where all three commits are totally new (but reuse the original commits' files and trees)
04:29 Andrew_K joined #git
04:31 snthsnth joined #git
04:34 dalias joined #git
04:38 nettoweb joined #git
04:38 MTecknology Is it possible to tell git to go fetch all remote branches and updates?
04:38 MTecknology git checkout --all --remote? :D
04:38 grawity that's the default; `git fetch <remote>` or `git remote update <remote>`
04:39 grawity assuming the default fetch refspec of +refs/heads/*:refs/remotes/<remote>/*
04:40 grawity (otoh, if you want local branches to be automagically created for all those remote-tracking branches, then `git push . refs/remotes/<remote>/*:refs/heads/*` miiiight work, or you might need to script with `git for-each-ref` instead.)
04:40 MTecknology hm?
04:40 MTecknology this answer is making my brain hurt
04:41 grawity stick to the 1st line then
04:41 moei joined #git
04:41 MTecknology I can't seem to get that working, so I was looking at the man pages for those to try to figure it out
04:42 grawity describe how it is "not working"
04:42 MTecknology It says "Fetching origin" for "git remote update origin" but no new branches show up locally
04:42 grawity i.e. what you expect to see where
04:43 grawity meanwhile, remember the difference between local branches and remote-tracking branches
04:43 jmkeyes I have an SVN repository that has been mangled over time. I'd like to import it into Git and preserve it's history.
04:43 MTecknology meanwhile what? I told you what happened and what I expected to happen :S
04:43 Raging_Hog joined #git
04:45 jmkeyes It has two problems: the first is that the trunk of the repository is the root folder and it's branches are in a subfolder, and the second problem is that the contents of the "branches" isn't identical in structure to the trunk.
04:45 danslo joined #git
04:46 jmkeyes Can I use 'filter-branch' to reconstruct the branches while still preserving history?
04:48 freimatz joined #git
04:50 Mixologic joined #git
04:51 greendo joined #git
04:52 nckpz joined #git
04:52 jaguarmagenta joined #git
04:55 Cabanossi joined #git
04:57 Mixologic_ joined #git
04:58 wtiger joined #git
04:58 wtiger Hi!
04:58 nilg joined #git
04:59 wtiger how does develop branch workflow work with repos? after merge with master is it recommended to delete the develop branch and start a new develop?
05:03 ewet joined #git
05:03 Motoko Well, if they're at the same point, deleting and re-creating the branch would leave it the exact same state.
05:04 Mixologic joined #git
05:04 wtiger exactly, one can continue with the develop branch as it is, and merge it again in the future, right?
05:04 freimatz3 joined #git
05:04 wtiger (if needed)
05:05 wtiger Motoko: ^
05:06 Motoko Should be able to.
05:06 Motoko If master gets ahead, then you'll have a bit more trouble merging.
05:08 Motoko If master and develop wind up pointed on the same commit, then you really don't need to delete and re-create.
05:09 Kitty- joined #git
05:10 wtiger cool!
05:11 Lipp joined #git
05:11 Spec-Chum joined #git
05:12 fuchstronaut joined #git
05:16 WayToDoor joined #git
05:16 svm_invictvs joined #git
05:16 rscata joined #git
05:17 lordjancso joined #git
05:17 cdown joined #git
05:17 qt-x joined #git
05:17 UTAN_dev_ joined #git
05:20 Mixologic joined #git
05:20 faux___ joined #git
05:24 johnny56 joined #git
05:32 jmkeyes left #git
05:33 overlord_tm joined #git
05:34 berndl joined #git
05:34 theskillwithin dang wat  https://i.imgur.com/nOTzzRg.png   No user exists for uid 501 fatal: Could not read from remote repository.
05:35 autofly joined #git
05:37 ThomasLocke_ joined #git
05:37 snthsnth joined #git
05:40 fedepad joined #git
05:42 phaleth joined #git
05:42 sostenuto joined #git
05:45 moop joined #git
05:45 Lor_ joined #git
05:46 dpower joined #git
05:46 danslo joined #git
05:46 iota_pi joined #git
05:46 lmatteis joined #git
05:47 Kitty- joined #git
05:48 bsanford joined #git
05:48 littleforest joined #git
05:51 LucaTM joined #git
05:51 satya4ever joined #git
05:58 zeroed joined #git
05:59 Keridos joined #git
06:08 jaequery joined #git
06:09 prawnzy joined #git
06:12 mozzarella guys help
06:13 fuchstronaut joined #git
06:13 Seveas theskillwithin: your server's broken
06:13 * Seveas melts mozzarella and sprinkles him on a pizza
06:15 lb1c joined #git
06:16 Kitty- joined #git
06:16 Masber_080 joined #git
06:17 glebihan joined #git
06:17 elsevero joined #git
06:18 chele joined #git
06:19 roelmonnens joined #git
06:21 bocaneri joined #git
06:23 dan2k3k4 joined #git
06:23 jnavila joined #git
06:25 neersighted joined #git
06:27 JeroenT joined #git
06:28 ogny joined #git
06:29 xaa joined #git
06:30 Keridos joined #git
06:32 mkopriva joined #git
06:33 star_prone joined #git
06:36 Puffball joined #git
06:37 freimatz joined #git
06:39 SimonNa joined #git
06:40 dan2k3k4 joined #git
06:41 hyperair is there a way to retrieve a dangling commit from a remote repository if i know its hash?
06:42 hyperair i.e. on the remote, i know that the commit of specified $sha exists, but there are no refs pointing to it. can i git fetch this somehow?
06:43 Sceorem joined #git
06:46 littleforest joined #git
06:46 Seveas hyperair: only if the repo allows it, which is not the default.
06:47 hyperair Seveas: oh so there's a config option for this? what is it?
06:48 howdoi joined #git
06:48 Seveas actually, retrieving dangling commits isn't possible at all, sorry.
06:48 Seveas only git archive can be enabled for such commits
06:49 elect joined #git
06:49 hyperair huh? i thought git archive only operated locally
06:50 elsevero joined #git
06:50 hyperair so you'd still need to fetch it before running git archive on the dangling commit, right?
06:50 hyperair oh wait i just saw the --remote option
06:55 rominronin joined #git
06:58 King_Hual joined #git
07:00 thiago joined #git
07:00 laumann joined #git
07:02 TomyWork joined #git
07:03 roelmonnens joined #git
07:05 danslo joined #git
07:06 kbdkode joined #git
07:06 kbdkode nice. this channel exists
07:08 dc5ala joined #git
07:08 testild joined #git
07:08 Darcidride joined #git
07:09 kbdkode so.. I am hoping to put a git repo inside of another git repo. This is because I cloned a git repo (the st console), and I am going to put that into my configs which is managed by git. So, I am not quite sure.. should I just delete the .git/ dir inside the st/ git project?
07:10 kbdkode I kinda want to keep it because it has a branch but it seems strange to have a git repo inside a git repo
07:10 _dunaeth joined #git
07:14 fuchstronaut joined #git
07:14 star_prone joined #git
07:14 Motoko You may want to look at a submodule.
07:15 Motoko It may or may not work for you, but worth a check.
07:15 roelmonn_ joined #git
07:15 Motoko !submodule
07:15 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
07:15 kbdkode hm I have used that for .config/nvim/plug/* (or whatever vim plugin manager I was using at the time) repos and what-not. I guess that might work.
07:18 kbdkode ah actually sounds pretty good. I mean suckless tools propose that you essentially take it and modify to suit your needs, but I will just go with that. Thanks Motoko wherever he/she went
07:19 fedepad joined #git
07:21 encod3 joined #git
07:21 eduardas_m joined #git
07:24 eduardas_m joined #git
07:24 vdv joined #git
07:25 acetakwas joined #git
07:26 Andrew_K joined #git
07:27 tzafrir joined #git
07:28 SwiftMatt joined #git
07:30 Alienpruts joined #git
07:31 a_thakur joined #git
07:34 g105b joined #git
07:34 phanimahesh joined #git
07:34 berndl joined #git
07:36 Andrew_K joined #git
07:36 MTecknology left #git
07:38 overlord_tm joined #git
07:38 prillian5 joined #git
07:38 thiago joined #git
07:38 Balliad joined #git
07:41 eshlox joined #git
07:41 Kartagis left #git
07:42 prillian5 git remote add ... followd by git fetch ... shows me something like this: http://dpaste.com/3CE3WRD
07:43 prillian5 But there are no files in this directory
07:43 prillian5 have I first to use git pull xst_dev master ?
07:45 prillian5 if I use git pull ... I got this files. Why? What are the difference?
07:47 brokensyntax joined #git
07:48 __xor joined #git
07:48 nivag joined #git
07:51 roelmonnens joined #git
07:52 a_thakur joined #git
07:53 submitnine joined #git
07:55 ahmedelgabri joined #git
07:55 xameada joined #git
07:55 tobiasvl prillian5: pull does a fetch+merge
07:56 tobiasvl prillian5: a fetch alone only updates !remote_tracking_branch
07:56 gitinfo prillian5: Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'
07:56 Atm0spher1c joined #git
07:56 JeroenT joined #git
07:57 mkopriva joined #git
07:57 prillian5 ok, thank you.
07:57 jaguarmagenta joined #git
08:00 sl33k joined #git
08:00 ocbtec joined #git
08:01 mkopriva joined #git
08:02 a_thakur joined #git
08:02 timvisher joined #git
08:03 dunaeth joined #git
08:03 apotry joined #git
08:04 ferr joined #git
08:04 MrC joined #git
08:05 garethdaine joined #git
08:09 dc5ala joined #git
08:11 nivag joined #git
08:14 jknetl joined #git
08:14 fuchstronaut joined #git
08:18 lindenle joined #git
08:20 Darren_ joined #git
08:22 greendo joined #git
08:23 theskillwithin joined #git
08:25 djb-irc joined #git
08:26 manuels joined #git
08:26 mattcen joined #git
08:27 jbitdrop joined #git
08:27 manuels joined #git
08:27 faux___ joined #git
08:28 manuels joined #git
08:29 chll_ joined #git
08:30 manuels joined #git
08:31 rorro joined #git
08:31 mischat joined #git
08:31 bongjovi joined #git
08:31 manuels joined #git
08:32 dan2k3k4 joined #git
08:33 EY joined #git
08:34 theskillwithin joined #git
08:34 _Vi joined #git
08:35 vassagus joined #git
08:37 pl left #git
08:37 clmsy joined #git
08:38 stk joined #git
08:39 tbboin joined #git
08:39 kurkale6ka joined #git
08:41 m0viefreak joined #git
08:44 stk left #git
08:45 _sfiguser joined #git
08:45 nivag joined #git
08:46 strk osse: had you tried applying the patches by Junio C Hamano about diff.wsErrorHighlight option ?
08:46 strk I'm having troubles git-am'ing them... (patch 4/4 does not apply)
08:47 fedepad joined #git
08:47 strk or, could anyone help with git-am conflicts resolution ? I don't see how to resolve the conflict as I don't see the conflict either
08:47 strk I get: error: patch failed: diff.c:262
08:48 strk and: The copy of the patch that failed is found in: .git/rebase-apply/patch
08:48 Seveas strk: what are you applying them on top of?
08:49 eggoez joined #git
08:49 Seveas also, have you tried simply fetching gitster/git from github and get the patches in a branch? :)
08:50 strk Seveas: good question, I was trying to figure now where were those patches based on. I was applying them in master
08:50 strk Seveas: good idea, will do that, but it's still useful for me to learn about this ... Junio patches are based on 2.10.1-510-g1ef781f2c1
08:51 strk I can git-log 2.10.1-510-g1ef781f2c1 but git branch --contains 1ef781f2c1 returns nothing, how can git-log find what git branch --contains doesn't ?
08:51 barteks2x joined #git
08:51 Seveas https://github.com/gitster/gi​t/tree/jc/ws-error-highlight
08:52 Seveas looks like it's actually based on 2.6.6
08:52 strk btw, Junio's email doesn't contain info about his branch public url (gitster/git)
08:52 phanimahesh strk: maybe because no branch contains the commit?
08:52 strk Seveas: the bottom of his mails all say "2.10.1-510-g1ef781f2c1", is that just the version of "git-send-mail" being used ?
08:53 Seveas yes
08:53 strk phanimahesh: sorry for being so lame, but how can I have a commit not in a branch ?
08:53 ap0c joined #git
08:53 Seveas git format-patch adds that
08:53 strk Seveas: so how do I tell which base are those patches suppposed to be applied to ?
08:53 phanimahesh strk: Git understands only commit trees. Branches are handy references to current tip of the tree.
08:53 Seveas strk: by looking at where Junio applied them :)
08:54 strk Seveas: the "index" line of the diff ?
08:54 DevAntoine joined #git
08:54 DevAntoine hi
08:54 DevAntoine I've unstashed files on the wrong branch, what can I do to cancel this stash pop?
08:54 phanimahesh strk: when you make a commit the new commit points to the previous one as parent.
08:55 nullie De
08:55 nullie DevAntoine: stash again?
08:55 Seveas strk: no, by looking at gitster/git :)
08:55 phanimahesh DevAntoine: git stash show | diff -R (wait a minute, i'll check)
08:55 strk Seveas: ok, so there's _no_ way to tell from a mail received via git-send-mail what the base commit is intended to be ?
08:55 phanimahesh nullie: that works if there were no uncommitted changes
08:55 DevAntoine well, I had two stash but now when I git stash list I have only one
08:56 DevAntoine nullie: I can't, it has conflicts
08:56 phanimahesh DevAntoine: you git stash pop'ed? always git stash apply and git stash drop after apply is successful.
08:56 Seveas strk: not unless the person sending it has put it in that mail. Convention on the git mailinglist is to base patches on master, which is what happened here
08:56 Seveas but the patches are old, so master is significantly different now and the patches may need tweaking
08:57 phanimahesh DevAntoine: scrollback, your should have the reference to dropped ref somewhere immediately after git stash pop
08:57 DevAntoine phanimahesh: I thought apply dropped the stash oO
08:57 roelmonnens joined #git
08:57 phanimahesh DevAntoine: pop = apply + drop.
08:58 DevAntoine nah, I do a pop, not an apply
08:58 phanimahesh strk: you can try looking at the date, and asking git to checkout a commit from roughly then, and applying it.
08:58 strk Seveas: ok, thanks -- so next question would be how to "tweak" patches, but now that I have an handle to the actual source branch I would know how to rebase and fix conflicts locally
08:59 DevAntoine I have no reference after the pop
08:59 DevAntoine only conflicts
09:01 phanimahesh DevAntoine: git prints sha of dropped ref.
09:01 aidalgol joined #git
09:01 phanimahesh search your scrollback
09:01 phanimahesh wait, the stash didn't apply cleanly?
09:02 mozzarella does git remember branches that I have deleted?
09:02 achadwick joined #git
09:03 phanimahesh git reflog has references to the last few movements you made.
09:03 moritz and if the commits were merged into other branches, they live on there
09:03 phanimahesh and git prints sha1 of deleted branches when you haven't merged them properly before deleting
09:03 phanimahesh git makes it hard to lose data as best as it can.
09:04 wrksx joined #git
09:04 phanimahesh (if it's too long reflog may get trimmed and git gc will reclaim space by deleting them for real if they are not referenced from any branch, tag, stash, reflog)
09:04 mozzarella can I merge branches?
09:05 DevAntoine no the stash didn't apply cleanly
09:05 DevAntoine here my terminal http://pastebin.com/mQgTqzmR
09:06 DevAntoine and 15 lines of reflog: http://pastebin.com/T8gYY8n3
09:08 phanimahesh DevAntoine: what is gstp aliased to?
09:08 DevAntoine git stash pop
09:09 DevAntoine git undo you'd be great in that case :,D
09:09 mozzarella you know what sucks?
09:09 cdown joined #git
09:09 thiago joined #git
09:10 moritz vacuum cleaners
09:10 phanimahesh DevAntoine: git stash list should have the ref
09:10 phanimahesh > Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by
09:10 phanimahesh > hand and call git stash drop manually afterwards.
09:10 phanimahesh that's from man git stash
09:10 gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html
09:10 mozzarella I keep having to relearn git every few years, because I use it too rarely
09:10 wrksx I've been using git as a website sources deployment tool successfuly in the past. As I'm starting a new project, I'm considering the alternatives. Is there a reason why I should consider not doing this?
09:11 phanimahesh !deploy
09:11 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
09:11 wrksx phanimahesh, oh great, ty
09:11 phanimahesh :)
09:12 moritz wrksx: I've written a whole chapter on that in https://leanpub.com/deploy :-)
09:12 wrksx moritz, will read thanks =)
09:12 DevAntoine oh god yes, I thought the stash was dropped because I had two but the first one did great and it's the second pop which failed
09:12 DevAntoine \o/
09:12 DevAntoine but I sitll dunno what I need to do
09:13 AlexanderS joined #git
09:14 dan2k3k4 joined #git
09:15 fuchstronaut joined #git
09:15 timvisher joined #git
09:16 DevAntoine I can't reset hard because I've successfully unstashed the first stash
09:16 phanimahesh DevAntoine: git stash show <id-of-stash> -p | patch --reverse
09:17 phanimahesh id of stash will be stash@{number} shown by git stash list
09:17 hotshotguy joined #git
09:17 phanimahesh you have to undo in reverse order of application.
09:18 DevAntoine phanimahesh: $ git stash show stash@{0} -p | patch --reverse
09:18 DevAntoine can't find file to patch at input line 5
09:18 Repox joined #git
09:18 phanimahesh (you can also use git apply instead of patch)
09:18 phanimahesh wut? renamed/moved files?
09:18 phanimahesh check git stash show <id> -p
09:18 phanimahesh should show the diff contained in the stash
09:19 Repox Hi. I have a somewhat noobish question, but I can't seem to wrap my head around git rebase; Usually, I tend to do a git pull and merge it into my branch, but people always tell me that rebasing is better. Can someone do a ELI5 for me?
09:19 phanimahesh DevAntoine: if it looks good, try git stash show <id> -p | git apply -R
09:20 phanimahesh Repox: have you read chapter on rebasing from progit?
09:20 Repox phanimahesh, no - I don't know progit?
09:20 DevAntoine error: src/Agenor/ApiBundle/Tests/Contro​ller/ContractControllerTest.php: patch does not apply
09:20 phanimahesh https://git-scm.com/book/en​/v2/Git-Branching-Rebasing
09:20 DevAntoine -_-'
09:20 Repox phanimahesh, thanks - I'll take a look.
09:21 wrksx moritz, Am I mistaken or is the chapter you are refering to no contained in the free sample?
09:21 DevAntoine ok, phpstorm's local history to the rescue
09:22 tvw joined #git
09:22 phanimahesh DevAntoine: Sorry pal, you have some manual work to do. look at the patch, and then your files, and see what went wrong.
09:22 phanimahesh Or, editor history. That works too.
09:22 fees joined #git
09:24 DevAntoine yeah, that did it, thanks phanimahesh
09:25 wrksx I really love the approach where a post push hook checkout the prod branch in the production dir.
09:27 mattcen joined #git
09:28 wrksx but I fail to see a way to actually revert to a previous version in case something breaks on the freshly deployed version
09:29 phanimahesh wrksx: Don't do that, during the checkout your application will be in an inconsistent state
09:29 phanimahesh you can revert easily by checking out an older commit, though
09:30 phanimahesh better to unpack to a new dir and mv the symlink pointing to current application
09:30 wrksx phanimahesh, yeah exactly what I was writing
09:31 Folatt joined #git
09:31 phanimahesh with git, you can checkout into a different directory, and switch the link.
09:31 Seveas wrksx: recipe 3 on https://git.seveas.net/simple-deployments-​with-git.html#simple-deployments-with-git :)
09:33 Folatt Hey there! I've got a problem with remotes. It's really confusing to me. I've got a branch named local and I want to pull code from another branch named develop from another repo.
09:34 Folatt I've tried "sudo git pull base/develop origin/local", but that doesn't seem to work.
09:34 phanimahesh Seveas: Good advice there.
09:34 phanimahesh Folatt: DO NOT USE SUDO
09:34 flaviodesousa joined #git
09:34 Folatt phanimahesh, okay, thanks for the first advice.
09:34 phanimahesh Please, don't use sudo. Not unless you know exactly what it does and why it's needed.
09:34 Seveas Folatt: you've now messed up permissions in your repo. Fix that first, then just do git fetch base && git merge base/deelop
09:35 wrksx Hum actually I got the feeling that git archive is a much more sensible choice than checkout
09:35 thiago sudo make me a sandwich
09:35 phanimahesh And to fix permissions, the best way is to clone a fresh copy. Say bye bye to your current copy. (you can still clone from it though)
09:35 wrksx and the symlink solution is great
09:36 cdown joined #git
09:37 phanimahesh Folatt: And to answer your original question, git pull <other-repo-name>/develop should do the job
09:38 watersoul joined #git
09:38 Folatt Seveas, phanimahesh, oh, so I only need to switch to the correct branch and I can do git fetch base && git merge base/develop? That's nice
09:39 phanimahesh yes. if you do fetch+merge, that's great. equivalent to pull, but better for recovering from accidental screwups.
09:39 Seveas wrksx: with a more recent git, you could also do 'git worktree add'. That article was written last year.
09:39 wrksx worktree???? I'll lgoogle that, never heard of it :) ty
09:39 Seveas Folatt: yes, you can only merge something into a branch when that branch has been checked out.
09:39 Seveas wrksx: it's' a very recent addition to git.
09:40 Seveas man git-worktree
09:40 gitinfo the git-worktree manpage is available at http://jk.gs/git-worktree.html
09:40 sunri5e joined #git
09:40 wrksx Seveas, dude two years ago I was dreaming of that feature
09:40 dimi1947 joined #git
09:41 Lipp joined #git
09:41 coasterz joined #git
09:41 phanimahesh wrksx: two years ago it was possible to do by mucking with environment variables, but this just makes it simpler. ;)
09:41 strk left #git
09:42 Seveas it wasn't possible in a safe way
09:42 blackwind_123 joined #git
09:42 wrksx phanimahesh, I'm fuckin shy when it comes to envvars, I guess I didn't practice much and always fear to let the system in a broken way
09:42 Seveas GIT_EAT_MY_REPO=YesPlease git commit -a
09:42 Seveas :P
09:43 wrksx Seveas, I think for deployin purpose I don't want to get that .git folder that probably come with the worktree
09:43 luke_penn joined #git
09:43 Seveas wrksx: in worktrees, .git is a file that points to .git/worktrees/<label>/ in the main repo, so it's not that bad
09:43 wrksx indeed
09:43 Seveas but yeah, I agree that I wouldn't want it there
09:44 wrksx I want it clean af
09:44 wrksx =)
09:45 a_thakur joined #git
09:46 cyan__ joined #git
09:46 wrksx Now I'm thinking about how to deploy for testing before live
09:47 ash_workz joined #git
09:47 Seveas depends on your setup
09:47 wrksx It would be great to deploy once in www and have a symlink test -> newversion and a symlink prod -> lastversion
09:47 compeman joined #git
09:48 wrksx but I'll have a few files that need to differ in testing vs prod
09:48 Jellyg00se joined #git
09:49 Seveas then your setup is flawed
09:49 wrksx haha
09:49 Seveas you should be testing what you will deploy
09:49 Seveas otherwise you deploy untested things
09:50 phanimahesh the only exceptions are a limited subsetof configurations. like payment gateway urls, for instance. :P
09:50 wrksx yeah but for instance, the DB connection details of my website is different from prod and testing
09:50 wrksx so how do you deal with those exceptions?
09:50 phanimahesh That's allowed. No code changes, and code shouldn't do anything crazily different between environments.
09:51 phanimahesh turning down log level, etc is okay.
09:52 phanimahesh 12 factor approach recommends that all these confguration options that can differ must be in environment variables
09:52 wrksx I know it's allowed =) but achiving it is not so simple. Goal would be to deploy to a folder like master@v2, then symlink test -> master@v2, ensure everything is correct, have the users test it out, and then symlink prod -> master@v2
09:52 ahmed_elgabri joined #git
09:52 wrksx phanimahesh, ho the envvars really want me today
09:53 phanimahesh env vars aren't evil or magic.
09:53 durham joined #git
09:53 phanimahesh so long as you don't mess with the standard env vars without understanding them, they won't bite you.
09:54 wrksx phanimahesh, so I guess basically the webapp will use different config files based on the value of my custom envvar
09:54 EY__ joined #git
09:55 phanimahesh luckily the standard ones are just a few. $HOME, $PATH, LC_* come to mind.
09:55 phanimahesh wrksx: 12 factor recommends that all config is within env vars. and to keep them to a minimum.
09:56 phanimahesh different urls? set url in env var. etc.
09:56 phanimahesh but yep, reading from a file specified by envvar is also not bad.
09:56 wrksx it's better imo
09:56 phanimahesh if your config is complex, yes.
09:56 phillly joined #git
09:56 phanimahesh but then take out common things.
09:57 HyP3r hello everybody. I never merged with the command line. I changed the file a b c local, and commited them three times, my co work too, now when I do a git pull, git want to merge my commit with the commit of my co worker, I only want to use the files of him
09:57 HyP3r How can I do that?
09:57 phanimahesh git merge --theirs ?
09:57 thiago HyP3r: did the merge or pull stop with a conflict?
09:57 wrksx but how do I get a different envvar value in the testing and prod env? I lack common knowledge on envvar, like when are they set etc...
09:58 HyP3r I did git pull and got a lot of conflicts
09:58 HyP3r (two files were changed from me and him)
09:58 phanimahesh oops git merge -s theirs
09:58 jaguarmagenta joined #git
09:58 thiago HyP3r: git checkout --theirs filename
09:59 thiago that will clear the conflict by selecting their file and throwing away your changes
09:59 HyP3r okay
09:59 phanimahesh wrksx: you set your app to read API_URL and if it is present, use it, or use a development default if it is absent.
10:00 phanimahesh wrksx: And then in prod, you do `API_URL=<prod-url> ./script-to-start-your-program`
10:00 phanimahesh just change the variable to make it point differently in development and testing.
10:01 phanimahesh if you are using php, you should be able to set env vars in the php daemon config, or in apache config I guess (never did much of php)
10:02 wrksx phanimahesh, okay so for the "in app" reading part I'm all good. But both test and prob will be on the same box, and I'm talking website here. So I guess I'd need my webserver to configure the envvar based on the host the query was directed to
10:03 EY__ joined #git
10:03 theskillwithin https://github.com/robbyrussell​/oh-my-zsh/wiki/Cheatsheet#git
10:03 wrksx does that mak sense? or is there a thing I'm missing? because obviously I have nothing to 'start' for a website to run
10:03 phanimahesh wrksx: yep, that works.
10:03 JeroenT joined #git
10:04 zifnab joined #git
10:04 thebope joined #git
10:04 wrksx yeah thankfully they got it covered =) Apache did at least, "Apache Module mod_setenvif: Allows the setting of environment variables based on characteristics of the request"
10:05 courrier joined #git
10:07 mischat joined #git
10:08 ahmedelgabri joined #git
10:11 delboy1978uk joined #git
10:11 delboy1978uk argh crap i just pressed up and return, but the last command was git rebase --skip, and not --continue. How to fix?
10:12 delboy1978uk do i need to abort and start again?
10:14 krux02 joined #git
10:16 diogenese joined #git
10:16 wrksx Seveas, phanimahesh, thank you guys for the help
10:16 wrksx phanimahesh, nice of you chatting a bit off the git topic on that one
10:16 QwertyDragon joined #git
10:17 prawnzy joined #git
10:19 fuchstronaut joined #git
10:20 timvisher joined #git
10:23 ee5_ joined #git
10:23 Lunatrius joined #git
10:25 delboy1978uk hmm, rebase --continue saying No changes - did you forget to use 'git add'?
10:26 tlaxkit joined #git
10:26 delboy1978uk just resolved a conflict, so why is it saying this? the conflicting file not listed when i git status
10:26 delboy1978uk git status saying  (all conflicts fixed: run "git rebase --continue")
10:26 durham joined #git
10:28 delboy1978uk can anyone help? ^
10:29 osse delboy1978uk: git add -u and try again
10:29 delboy1978uk -u?
10:29 thiago delboy1978uk: you resolved the conflict in such a way that there are no changes
10:29 thiago git rebase --skip
10:30 delboy1978uk ah ok safe to skip then?
10:30 thiago you tell me
10:30 thiago it's your commit
10:31 osse I think if rebase tries to apply a commit that ends up doing nothing then you are suggested to use --skip, but if you resolve differences to that effect then that advice doesn't appear and you get stuck in a "loop" where git rebase --continue suggests to do X and doing X does nothing
10:32 mehola joined #git
10:32 stamina joined #git
10:35 jimi_ joined #git
10:36 harish joined #git
10:36 Masber joined #git
10:39 mrBen2k2k2k joined #git
10:40 joki joined #git
10:41 DevAntoine joined #git
10:41 Anja joined #git
10:43 rominronin joined #git
10:44 DieguezZ joined #git
10:45 wrksx joined #git
10:45 Snugglebash joined #git
10:46 mrBen2k2k2k joined #git
10:47 Mowgli joined #git
10:49 DieguezZ joined #git
10:54 encod3_ joined #git
10:58 ocbtec joined #git
10:58 laumann joined #git
11:01 JeroenT joined #git
11:02 eizua joined #git
11:03 dave0x6d joined #git
11:03 greendo joined #git
11:03 mischat joined #git
11:06 thiago joined #git
11:09 titankiller joined #git
11:12 nettoweb joined #git
11:12 ayjay_t joined #git
11:12 mischat_ joined #git
11:15 SpeakerToMeat joined #git
11:15 rnsanchez joined #git
11:16 thiago joined #git
11:17 Mixologic joined #git
11:21 marksei joined #git
11:21 Mixologic joined #git
11:24 thierryp_ joined #git
11:25 dsdeiz joined #git
11:28 ahmedelgabri joined #git
11:29 ojdo joined #git
11:29 nettoweb joined #git
11:32 ahmed_elgabri joined #git
11:35 nuck joined #git
11:36 barduck joined #git
11:37 rorro joined #git
11:37 BSaboia joined #git
11:38 sunri5e joined #git
11:41 i7c osse, mhm are you sure that resolving conflicts that lead to empty commits don’t suggest --skip as well?
11:42 i7c I thought I experienced the opposite, but I can be wrong.
11:42 fuchstronaut having a commit somewhere in the history (already pushed), is there an elegant way to create a new commit reverting the changes and pushing it?
11:42 rgrinberg joined #git
11:42 i7c git revert
11:42 i7c git revert <that commit>
11:42 i7c It does exactly that. :)
11:43 fuchstronaut thank you !
11:43 FilipNortic_ joined #git
11:43 rgrinberg joined #git
11:43 mizu_no_oto joined #git
11:45 Gitzilla joined #git
11:45 durham joined #git
11:48 a_thakur joined #git
11:52 Murii joined #git
11:53 osse i7c: not sure, no. I think I have encountered it.
11:55 star_prone joined #git
11:56 harish_ joined #git
11:57 sunri5e joined #git
11:59 jaguarmagenta joined #git
11:59 mischat_ joined #git
12:01 elect_ joined #git
12:01 omx joined #git
12:02 psprint_ joined #git
12:03 Lipp joined #git
12:03 Cavallari joined #git
12:04 dendazen joined #git
12:04 _h264 joined #git
12:05 neersighted joined #git
12:05 rbr joined #git
12:07 johnmilton joined #git
12:07 Shentino joined #git
12:07 Surfer2010 joined #git
12:08 bruce_lee joined #git
12:09 johnmilton joined #git
12:09 Gamecubic joined #git
12:11 flaviodesousa joined #git
12:12 mehola joined #git
12:12 rivarun joined #git
12:14 bruce_lee joined #git
12:14 bruce_lee joined #git
12:14 fuchstronaut joined #git
12:15 dan2k3k4 joined #git
12:15 eihabarabia joined #git
12:16 synthroid joined #git
12:18 prawnzy joined #git
12:18 buffal0 joined #git
12:18 Snugglebash joined #git
12:21 Amr_ joined #git
12:22 lindenle joined #git
12:23 rominronin joined #git
12:23 SpeakerToMeat joined #git
12:24 sdothum joined #git
12:26 re1 joined #git
12:30 CEnnis91 joined #git
12:31 thiago joined #git
12:34 marijnfs joined #git
12:36 jeffreylevesque joined #git
12:39 re1 joined #git
12:41 algae joined #git
12:43 JamesBaxter joined #git
12:45 ayjay_t joined #git
12:45 rivarun joined #git
12:55 lucz joined #git
12:55 acetakwas joined #git
12:56 a3Dman_ joined #git
12:56 dan2k3k4 joined #git
12:59 delboy1978uk how do i display a single file from a different branch?
12:59 canton7 as in, print it to stdout?
12:59 delboy1978uk yeah :)
12:59 canton7 git show other_branch:path/to/file
12:59 delboy1978uk cheers amigo!
12:59 canton7 (iirc, it's been a while)
13:00 UrsoBranco joined #git
13:06 Filiphe joined #git
13:06 rorro joined #git
13:08 sangy joined #git
13:09 Cavallari1 joined #git
13:09 Folatt left #git
13:10 testild joined #git
13:12 ExoUNX joined #git
13:12 ExoUNX joined #git
13:13 m0viefreak joined #git
13:13 King_Hual joined #git
13:14 Vampire0_ joined #git
13:14 titankil` joined #git
13:16 harish__ joined #git
13:19 timvisher joined #git
13:20 jimi_ joined #git
13:20 bsanford joined #git
13:20 nydel07 joined #git
13:22 ekinmur joined #git
13:22 faux___ joined #git
13:25 maret joined #git
13:26 anonymuse joined #git
13:28 tvw joined #git
13:28 fuchstronaut joined #git
13:28 ejb joined #git
13:29 ash_workz joined #git
13:32 rgrinberg1 joined #git
13:34 cdown joined #git
13:34 fmcgeough joined #git
13:35 Fjffji1 joined #git
13:35 leeN joined #git
13:36 Fjffji1 Hello
13:36 gitinfo Fjffji1: 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.
13:36 jason237 joined #git
13:37 littim joined #git
13:37 littim hello
13:38 littim is anyone here?
13:38 littim this is urgent
13:38 littim I am going to write something that is lengthy, is anyone here present to discuss this with me?
13:38 fuchstronaut joined #git
13:38 ^7heo dude, ask your question; don't ask to ask.
13:38 littim I am aware
13:38 littim but it sucks when you type something that no one would read
13:39 ^7heo just write it on the web
13:39 ^7heo and paste the link.
13:39 ^7heo that way you can easily reproduce.
13:40 courrier joined #git
13:41 GodGinrai joined #git
13:41 AaronMT joined #git
13:43 Fjffji1 joined #git
13:44 Blkt joined #git
13:44 delboy1978uk left #git
13:45 Blkt joined #git
13:45 jason237 joined #git
13:46 re1 joined #git
13:46 rnsanchez_ joined #git
13:46 kus_ubuntui686 joined #git
13:47 littim I was asking someone on another channel on how to preserve a team's copyrights who are located in a country with weak legal structure. The idea is that the team members don't trust each other and need to make sure that there work is to be preserved. Initially, I suggested the presence of a middle man, like a lawyer. However, such person with techni
13:47 littim cal experience in this region(country) doesn't exist. The conclusion was that, what if there is a system online (like a web app) that you can post a hash of an asset, deliverable, or whatever product produces by a team member. The record must be permanent and no one can modify or delete. The record consists of the hash of the file, the author, the
13:47 littim date , and other unspecified meta data yet (this is inspired by git). Finally, the record must have a field where all the members of the team have to check the record for approval. Otherwise it would be deemed unauthentic (not sure if that's a proper usage of the word). All in all, the reocors should exist within a project entity and both should ne
13:47 littim ver be deleted nor modified. The team must check the record upon meetings so that they all approve the owner ship of the file. The question is, is this concept logically consistent?, and is there something implemented somewhere that resemble this or even provide a better more sound concept?
13:47 Fjffji1 joined #git
13:47 littim their work*
13:48 patarr joined #git
13:48 re1 joined #git
13:48 fuchstronaut joined #git
13:48 brokensyntax joined #git
13:49 JeroenT joined #git
13:49 ejb joined #git
13:49 littim I'll correct it
13:51 Jameser joined #git
13:51 littim I was asking someone on another channel on how to preserve a team's copyrights who are located in a country with a weak legal structure. The idea is that the team members don't trust each other and need to make sure that their work is to be preserved. Initially, I suggested the presence of a middle man, like a lawyer. However, such person with tech
13:51 littim nical experience in this region(country) doesn't exist. The conclusion was that, what if there is a system online (like a web app) that you can post a hash of an asset, deliverable, or whatever product produced by a team member. The record must be permanent and no one can modify or delete (immutable). The record consists of the hash of the file, th
13:51 littim e author, the date , and other unspecified meta data yet (this is inspired by git). Finally, the record must have a field where all the members of the team have to check the record for approval. Otherwise it would be deemed unauthentic (not sure if that's a proper usage of the word). All in all, the record should exist within a project entity and b
13:51 littim oth should never be deleted nor modified. The team must check the record upon meetings so that they all approve the owner ship of the file. The question is, is this concept logically consistent?, and is there something implemented somewhere that resemble this or even provide a better more sound concept?
13:51 bsanford joined #git
13:52 e89c8c95a050 joined #git
13:55 littim what do you think ^7heo
13:58 ochorocho__ joined #git
13:58 pothepanda joined #git
13:58 Masber joined #git
13:58 whitby joined #git
13:59 jaguarmagenta joined #git
14:01 ShekharReddy joined #git
14:02 thiago joined #git
14:02 Cavallari joined #git
14:05 al-damiri joined #git
14:06 juvenal joined #git
14:11 rpg joined #git
14:11 ResidentBiscuit joined #git
14:11 JeroenT joined #git
14:11 e14 joined #git
14:13 rwb joined #git
14:13 jesk this is not dicussion at all
14:13 jesk this is copy and paste
14:13 jknetl joined #git
14:14 nettoweb joined #git
14:15 le_melomane joined #git
14:15 axl_ joined #git
14:16 mquin joined #git
14:16 littim I copy pasted it from another channel where i originally posted it there
14:19 prawnzy joined #git
14:21 mischat joined #git
14:21 shinnya joined #git
14:22 fahadash joined #git
14:22 raspado joined #git
14:22 crose joined #git
14:23 LionsMane joined #git
14:24 dendazen joined #git
14:24 thiago joined #git
14:26 eivarv joined #git
14:27 mattcen joined #git
14:28 emg joined #git
14:29 laumann joined #git
14:30 Anupkumar joined #git
14:30 Mowgli joined #git
14:32 fmcgeough joined #git
14:32 e89c8c95a050 joined #git
14:32 Dougie187 joined #git
14:32 theonefoo joined #git
14:34 h4k1m joined #git
14:34 h4k1m Hi
14:34 h4k1m I'm unable to set cygwin to use vim as the editor in my git commit messages!
14:34 theonefoo On branch `develop`, I checkout -b new-feat, make changes, commit and create pull request. I want to start working on a separate branch that requires the changes in `new-feat` while the pull request is in review. Can I `git checkout -b another-new-feat` from `new-feat`, make changes, commit and create a new pull request for it and merge pull request `new-feat` first to develop, then merge pull request `another-new-feat` to develop withou
14:34 theonefoo issues?
14:35 jaafar joined #git
14:35 theonefoo the checkout from `new-feat` should carry over the commits from that branch to `another-new-feat` branch, so when it is merged to develop, it won’t duplicate commits since their sha is the same, right?
14:36 Emperor_Earth joined #git
14:37 harish_ joined #git
14:37 noidea joined #git
14:37 littim left #git
14:38 osse theonefoo: right on the money
14:38 _W_ joined #git
14:38 ixian joined #git
14:38 GingerGeek joined #git
14:38 GingerGeek joined #git
14:38 dcpc007 joined #git
14:38 Milos joined #git
14:38 Vinnie_win joined #git
14:38 kugel joined #git
14:38 kugel joined #git
14:39 ocbtec joined #git
14:39 parasite joined #git
14:39 yazdmich joined #git
14:39 armyriad joined #git
14:39 pikajude joined #git
14:39 Orbitrix joined #git
14:39 Kaisyu joined #git
14:39 fees joined #git
14:39 theonefoo osse: excellent, thank you
14:39 canton7 joined #git
14:39 Guest23964 joined #git
14:39 freimatz joined #git
14:39 cyphase joined #git
14:39 Wind0r joined #git
14:39 rnsanchez_ joined #git
14:39 Jupelius joined #git
14:39 lss8 joined #git
14:39 lss8 joined #git
14:39 sagerdearia joined #git
14:39 ayjay_t joined #git
14:39 kus_ubuntui686 joined #git
14:39 Emperor_Earth joined #git
14:39 jozwior__ joined #git
14:39 elect_ joined #git
14:39 bronson joined #git
14:39 fedepad joined #git
14:39 unreal joined #git
14:39 m0viefreak joined #git
14:39 tuor joined #git
14:39 timvisher joined #git
14:39 coasterz joined #git
14:39 jooni joined #git
14:39 quadz joined #git
14:39 Jameser joined #git
14:39 autofly joined #git
14:39 CussBot joined #git
14:39 nettoweb joined #git
14:39 tgunr joined #git
14:39 mar77i joined #git
14:39 nuck joined #git
14:39 mrkake joined #git
14:39 Dazzyp joined #git
14:39 led_belly joined #git
14:39 DJ_Spies joined #git
14:39 kbdkode joined #git
14:39 AaronMT joined #git
14:39 Samual joined #git
14:39 m1dnight_ joined #git
14:39 xameada joined #git
14:39 jknetl joined #git
14:39 bauruine joined #git
14:39 howitdo joined #git
14:39 kus_ubuntui686 joined #git
14:39 hagabaka joined #git
14:40 miklcct joined #git
14:40 Furai joined #git
14:40 cbreak joined #git
14:40 fuchstronaut joined #git
14:40 gmh joined #git
14:40 roentgen joined #git
14:40 lindenle joined #git
14:40 rbern joined #git
14:40 Ravana joined #git
14:40 eihabarabia joined #git
14:41 e14 joined #git
14:41 le_melomane joined #git
14:41 lmatteis joined #git
14:41 moop joined #git
14:41 nilg joined #git
14:42 codebam joined #git
14:42 johnnyfive joined #git
14:42 _flow_ joined #git
14:43 rominronin joined #git
14:43 ensign joined #git
14:43 dave0x6d joined #git
14:43 lolmac joined #git
14:43 sdothum joined #git
14:43 ChristopheT joined #git
14:44 mischat joined #git
14:44 twisted` joined #git
14:45 Furai joined #git
14:45 MLM joined #git
14:45 CEnnis91 joined #git
14:46 timwis joined #git
14:46 thecomedian joined #git
14:46 ToBeCloud joined #git
14:46 XDS2010 joined #git
14:47 ionelmc joined #git
14:47 discopatrick joined #git
14:47 DuncanT joined #git
14:47 prillian5 Before I commit to origin, (if there where changes on origin) do I make a fetch, or a pull ?
14:48 grawity one doesn't commit to origin, but always to the local repository
14:48 mattcen joined #git
14:48 marlinc joined #git
14:48 timvisher joined #git
14:48 djh joined #git
14:49 XDS2010 joined #git
14:49 felowe joined #git
14:49 grawity best to do that before `git pull`, since Git won't merge uncommitted changes (that is, if they need to be merged)
14:50 al-damiri joined #git
14:50 grawity but it won't break stuff if you don't; the pull/merge will just stop with an error if it has to
14:50 prillian5 ok. thank you
14:51 mrBen2k2k2k joined #git
14:52 thebope joined #git
14:53 wizonesolutions joined #git
14:53 ToeSnacks joined #git
14:53 Awesomecase joined #git
14:53 Limes joined #git
14:54 henriquev joined #git
14:54 JanC_ joined #git
14:54 shgysk8zer0 joined #git
14:57 GenZai joined #git
14:57 thebope joined #git
14:58 Samual joined #git
14:59 fuchstronaut how do I add a folder that is placed in .gitignore, but keep it later ignored for content changes?
14:59 rwb1 joined #git
14:59 mischat_ joined #git
15:00 prillian5 you mean how to ignore a folder which is still added to git?
15:00 theonefoo left #git
15:00 mischat__ joined #git
15:00 grawity "ignore content changes" is a bit... kludgy
15:01 grawity officially, Git doesn't support that
15:01 grawity though there's an option in `git update-index` that can be set for your *local* repo
15:01 littleforest joined #git
15:01 aeae64ff8df64d2a joined #git
15:01 grawity either way though, if a file is tracked, then .gitignore is completely irrelevant
15:02 vassagus_ joined #git
15:03 rpg joined #git
15:04 eivarv joined #git
15:04 _Vi joined #git
15:05 ghostlight joined #git
15:05 fuchstronaut git add -f is what i was looking fo
15:05 dlkd949fweijf joined #git
15:06 grawity it's not what you were asking for, though
15:08 miguelfernandes joined #git
15:08 roelmonn_ joined #git
15:08 KevinMGranger That's in fact the opposite of what you asked for
15:09 fuchstronaut hmm.. I have a log folder i want to include so there are no errors thrown if it doesn't exist. But I don't want to track changes made to this folder (as there are just log files)
15:11 aarobc joined #git
15:11 sonOfRa What's the best way to achieve the following: I have 3 directories in my repos/ folder, work, uni, and private. I want to set different email addresses automatically depending on which subdirectory I clone a repository into
15:12 fuchstronaut seems like git add -f does exactly that @grawity, @KevinMGranger
15:12 grawity except no, it doesn't
15:12 Seveas sonOfRa: you can find some inspiration in https://github.com/seveas/dotfi​les/blob/master/.bashrc.d/cd.sh
15:13 sonOfRa Seveas, that looks great, thanks
15:13 fuchstronaut I added a .keep file using 'git add -f logs/.keep' and commit it. Now created log files are not showing up in my working tree
15:14 fuchstronaut as logs/ is in .gitignore
15:14 EY___ joined #git
15:14 grawity that makes sense, yes
15:14 compeman left #git
15:14 fuchstronaut ok
15:14 grawity not at all what you originally asked for, though
15:14 mehola joined #git
15:15 fuchstronaut might be, my english isn't the best, but that is what I meant actually
15:15 fuchstronaut still it is an ugly solution
15:15 vassagus joined #git
15:15 archaic joined #git
15:16 rwb1 joined #git
15:17 elsevero joined #git
15:17 faux___ joined #git
15:18 vassagus joined #git
15:18 a3pq51_ joined #git
15:18 DeltaHeavy joined #git
15:20 montchr joined #git
15:20 troulouliou_div2 joined #git
15:21 vassagus joined #git
15:22 eivarv joined #git
15:23 jknetl joined #git
15:24 littleforest joined #git
15:25 timvisher joined #git
15:28 ExeciN joined #git
15:29 cyan__ joined #git
15:29 TomyWork socat TCP-LISTEN:8123,reuseaddr SYSTEM:'cd /path/to/my/git/repo && git fetch origin' & { sleep 1; wget -o /dev/null -O /dev/null http://127.0.0.1:8123/; } & wait # Why does this give me weird errors but this doesn't: cd /path/to/my/git/repo && git fetch origin
15:29 TomyWork weird errors being "error: waitpid for rev-list failed: No child processes" and "error: waitpid for fetch-pack failed: No child processes"
15:30 alfism joined #git
15:30 TomyWork this occurs consistently on sles11 but not on 2 other distros
15:30 SimonNa left #git
15:31 synthroid joined #git
15:31 happy-dude joined #git
15:33 matsaman joined #git
15:33 tyreld_ joined #git
15:33 EvilPeng1 joined #git
15:33 anonymus_ joined #git
15:35 crayon joined #git
15:35 crayon joined #git
15:35 zhodge joined #git
15:36 bee431655325dacb joined #git
15:38 thiago joined #git
15:38 zhodge what should I do with a quick one-file experiment that I don't want to trash?
15:39 zhodge can I stash a single untracked file?
15:39 zhodge or should I branch and make a WIP commit?
15:39 acetakwas joined #git
15:39 grawity I'd say branch+commit
15:40 grawity more space for future notes, harder to lose
15:41 zhodge yeah that seems reasonable
15:41 zhodge it's a tiny project so a stash wouldn't be too hard to keep track of in this case
15:42 zhodge but with a branch it'd also become apparent if the experiment is no longer needed and can just be deleted
15:42 ineedarobot joined #git
15:42 * canton7 sometimes drops all old stashes, as I frequently forget to get rid of them
15:43 ochorocho__ joined #git
15:43 zhodge that'd be a bit dangerous with some of my repos :)
15:44 zhodge some have accrued quite the stash debt
15:44 Endarked joined #git
15:44 rominronin joined #git
15:44 ineedarobot hey all.  I have repo that uses a submodule.  the submodule has four submodules to other projects.  When I clone --recursive the repo it takes 10 mins and the .git dir is nearly 2gb.  what is the quickest / lightest way to clone the repo?
15:45 djb-irc joined #git
15:45 stamina joined #git
15:45 _ikke_ quickest way would be without the --recursive
15:46 _ikke_ But then you miss the submodules
15:46 Emperor_Earth joined #git
15:46 einnjo joined #git
15:47 thebope joined #git
15:48 InfoTest joined #git
15:49 dw joined #git
15:49 Jupelius joined #git
15:50 vassagus joined #git
15:50 dw left #git
15:52 ronny left #git
15:52 rwb joined #git
15:53 alex1a joined #git
15:54 unsigned_char joined #git
15:54 thiago joined #git
15:56 e14 joined #git
15:56 grift left #git
15:57 PioneerAxon_ joined #git
15:57 spriz joined #git
15:57 svm_invictvs joined #git
15:58 nanga joined #git
15:58 nanga joined #git
15:58 eka joined #git
15:58 PasiFist joined #git
15:59 harish joined #git
15:59 hexagoxel joined #git
15:59 mischat_ joined #git
15:59 Brando753-o_O_o joined #git
15:59 Darren_ joined #git
15:59 tvw joined #git
16:00 grift joined #git
16:00 jaguarmagenta joined #git
16:00 nettoweb joined #git
16:01 Emperor_Earth joined #git
16:02 roentgen joined #git
16:04 barajasfab joined #git
16:04 thiago joined #git
16:04 littleforest joined #git
16:05 NimeshNeema joined #git
16:06 oskarkv joined #git
16:07 aeae64ff8df64d2a joined #git
16:09 Mobutils joined #git
16:12 yoh Hi git gurus!  with older git 2.1.4 we have on debian stable there is a problem in "git fetch" for some reason  Unable to find 6... (over http) although it is there and recent git performs just fine.  Is there an easy workaround (without cloning afresh which works)?
16:16 svm_invictvs joined #git
16:16 grawity could you compare the output of `GIT_CURL_VERBOSE=1 git fetch whatever` with both versions?
16:18 thebope joined #git
16:19 yoh grawity: will do, thanks
16:20 prawnzy joined #git
16:21 matsaman what'd be the best way to revert to a working directory of a particular commit without changing the log?
16:21 shafun joined #git
16:21 ansimation joined #git
16:24 yoh grawity: well -- new one just requested a pack and lived happy life . http://www.onerussian.com/​tmp/git-old-fetch-curl.log   http://www.onerussian.com/​tmp/git-new-fetch-curl.log
16:24 mattcen joined #git
16:25 thiago joined #git
16:26 Endarked joined #git
16:26 blackwind_123 joined #git
16:28 grawity I wonder if the easiest workaround would be to upgrade git
16:29 grawity what's under the local .git/objects/pack/ ?
16:32 rx01 joined #git
16:32 freimatz joined #git
16:32 ochorocho__ joined #git
16:34 rx01 left #git
16:36 fuchstronaut joined #git
16:36 fuchstronaut joined #git
16:37 aeae64ff8df64d2a joined #git
16:38 a_thakur joined #git
16:38 remziakyuz joined #git
16:38 madewokherd joined #git
16:38 yoh grawity: yeah -- I kinda workaround for that like that (running upgraded git fetch once) but I wondered if now others who access our repository from debian stable would have the same problem ...
16:39 greendo joined #git
16:39 thiago joined #git
16:41 danslo joined #git
16:42 mohsen_ joined #git
16:42 overlord_tm joined #git
16:43 Furai joined #git
16:44 nitric joined #git
16:44 nettoweb joined #git
16:44 yoh grawity: http://pastebin.com/eqFQJayw
16:47 matsaman I want to reset my data but not my log
16:48 kisonecat joined #git
16:48 wogi joined #git
16:50 nettoweb1 joined #git
16:50 mquin_ joined #git
16:52 tax joined #git
16:52 fuchstronaut joined #git
16:53 TinkerTyper joined #git
16:54 LeBlaaanc joined #git
16:54 eivarv joined #git
16:55 gusnan joined #git
16:56 rpg joined #git
16:57 thefifthsetpin joined #git
16:57 fuchstronaut joined #git
16:58 WayToDoor joined #git
17:01 inflames joined #git
17:01 cyan__ joined #git
17:03 mquin_ joined #git
17:06 thebope joined #git
17:06 prawnzy joined #git
17:06 mquin_ joined #git
17:07 SteffanW joined #git
17:08 jaequery joined #git
17:08 juvenal joined #git
17:08 Seveas matsaman: git checkout commit-to-reset-data-to -- .
17:08 eivarv joined #git
17:08 t0by joined #git
17:09 Cavallari joined #git
17:09 tang^ joined #git
17:10 dreiss joined #git
17:11 matsaman Seveas: I guess that doesn't remove files added since that commit?
17:12 durham_ joined #git
17:12 Seveas matsaman: correct
17:12 matsaman any idea how I might remove such files?
17:13 Seveas git rm --cached . && git checkout commit-to-reset-to -- .
17:13 Seveas that'll mark them as untracked
17:13 mehola joined #git
17:14 mquin_ joined #git
17:14 matsaman doesn't seem to do anything on my end
17:15 masuberu joined #git
17:15 Seveas hmm. Then I'll need to actually try it :)
17:15 rominronin joined #git
17:15 matsaman heheh
17:16 matsaman I basically just want to duplicate an existing commit as a new commit at the top
17:16 Seveas it actually marks it as deleted, not untracked
17:16 matsaman or make a branch from an existing commit, add a few changes, then put that commit at the top
17:16 Seveas just tested
17:17 Seveas needs an -r with the rm though
17:17 matsaman it doesn't remove the file, though
17:17 matsaman files added since old commit*
17:18 Seveas correct, it'll leave them as untracked. Nothing git clean can't solve. Or use git rm with out --cached if you're sure they can o.
17:18 Seveas s/o\.$/go./
17:19 harish_ joined #git
17:19 cagedwisdom joined #git
17:21 Sonderblade how do you move a branch label to the current commit you are on?
17:24 quenode joined #git
17:25 Seveas git branch -f branchname HEAD
17:26 mischat joined #git
17:27 Sonderblade i solved it using: git branch -f <branch-name> ; git checkout <branch-name>
17:27 Sonderblade probably it is equivalent
17:28 elastix joined #git
17:30 _ikke_ git checkout -B <branchname>
17:32 Seveas you said nothing about also checking out the branch :-)
17:32 Seveas your solution is equivalent to _ikke_'s
17:33 LeBlaaanc joined #git
17:33 Doginal joined #git
17:34 TinkerTyper joined #git
17:34 ap000ca joined #git
17:35 a_thakur joined #git
17:36 kerrick joined #git
17:37 LeBlaaanc joined #git
17:37 mutex__ left #git
17:39 star_prone joined #git
17:41 Emperor_Earth joined #git
17:43 converge joined #git
17:45 aard_ joined #git
17:45 cspack joined #git
17:48 dsantiago joined #git
17:49 muld joined #git
17:49 re1 joined #git
17:51 Puffball joined #git
17:51 Sasazuka joined #git
17:52 cagedwisdom joined #git
17:54 spudowiar joined #git
17:56 Lipp joined #git
17:59 Puffball joined #git
17:59 flavius joined #git
17:59 TinkerTyper joined #git
18:00 joki joined #git
18:00 thebope joined #git
18:01 jaguarmagenta joined #git
18:01 PocketKiller joined #git
18:02 canuk joined #git
18:02 slikts joined #git
18:02 slikts joined #git
18:02 Zarthus joined #git
18:03 littleforest joined #git
18:04 nettoweb joined #git
18:05 dviola joined #git
18:05 multi_io joined #git
18:06 Doginal joined #git
18:06 f3r70rr35f joined #git
18:07 Puffball joined #git
18:07 Jacob_ joined #git
18:09 fuchstronaut joined #git
18:09 fuchstronaut joined #git
18:09 shgysk8zer0 joined #git
18:10 nettoweb1 joined #git
18:10 stamina joined #git
18:10 snthsnth joined #git
18:12 red82 joined #git
18:13 mehola joined #git
18:21 ensign left #git
18:21 mattcen joined #git
18:21 PioneerAxon joined #git
18:22 rexnsh joined #git
18:23 durham joined #git
18:25 durham_ joined #git
18:26 synthroid joined #git
18:27 synthroi_ joined #git
18:30 einnjo joined #git
18:30 bttf joined #git
18:32 meloc joined #git
18:35 ToBeFree joined #git
18:35 littleforest joined #git
18:38 shafun joined #git
18:39 elsevero joined #git
18:39 vuoto joined #git
18:40 harish joined #git
18:40 nettoweb joined #git
18:40 fedepad joined #git
18:42 thebope joined #git
18:42 thierryp joined #git
18:43 danslo_ joined #git
18:43 durham joined #git
18:46 matrixa1 joined #git
18:46 bronson joined #git
18:47 rominronin joined #git
18:47 bronson joined #git
18:48 bronson joined #git
18:49 bronson joined #git
18:49 thebope joined #git
18:49 nfk joined #git
18:50 tchan joined #git
18:52 e14 joined #git
18:52 kerrick_ joined #git
18:55 Limes_ joined #git
18:55 bronson joined #git
18:56 tang^_ joined #git
18:56 mquin joined #git
18:59 magellanicloud joined #git
19:00 JamesBaxter joined #git
19:01 Anja joined #git
19:02 dodobrain joined #git
19:03 mattcen joined #git
19:04 Phylock joined #git
19:04 Juzzika joined #git
19:06 dodobrain joined #git
19:10 lizzin joined #git
19:10 fuchstronaut joined #git
19:11 lizzin how do i undelete a file that has not been staged for commit yet? https://gist.github.com/anonymous​/f67f0f6c9ce34aa56c8b7d3a6070df7e
19:11 lizzin git checkout -- filename?
19:12 preaction lizzin: yes
19:12 preaction like line 2 says
19:12 preaction sorry, 3
19:14 lizzin does it matter which dir i do that in?
19:15 lizzin confused about the discard changes in working dir part
19:15 Juzzika joined #git
19:16 preaction the change you're discarding is the deletion
19:17 preaction and it matters what dir you do that in only in that it changes what the path to the file you want to restore is
19:22 GodGinrai lizzin: it discards the changes for the specified file
19:24 mattcen joined #git
19:24 rgrinberg joined #git
19:25 garethdaine joined #git
19:26 johnmilton joined #git
19:26 lizzin preaction GodGinrai ok, thank you
19:27 mohshami joined #git
19:27 bsanford joined #git
19:28 DeltaHeavy joined #git
19:30 star_prone joined #git
19:33 kulelu88 joined #git
19:33 Lipp joined #git
19:34 ELFrederich on Windows when I do git help I get some browser window opened.  How can I stop this and just get the help right there in the terminal?
19:34 Vampire0 ELFrederich, man git config there you can find how to change the help format
19:34 gitinfo ELFrederich: the git-config manpage is available at http://jk.gs/git-config.html
19:35 ELFrederich Vampire0: it's in my config?  I odn't see anything about it in ~/.gitconfig
19:35 mohshami hey guys, I have 2 customers which I do sysadmin work for, I have a saltstack configuration repo for each of them. I have them in 2 git repos, but a lot of the code is similar but I can't use subtrees or submodules because I don't want to mix their code together, is there a way to have both reapos read from a shared folder or something?
19:38 ELFrederich Vampire0: I have the same .gitconfig on Windows and on Linux but on Linux I get it inline
19:38 ELFrederich Vampire0: I'm trying to see where this thing is set on Windows so I can unset it
19:39 ELFrederich Vampire0: but I don't see any git stuff in /etc either on Windows in my Git Bash terminal
19:39 ninsei joined #git
19:39 Vampire0 ELFrederich, Windows has other defaults. ~/.gitconfig is only middle tier. There are local settings, global settings and system settings
19:39 Vampire0 ELFrederich, the system settings for Windows define this setting to be 'html' instead of 'man' which is the default on *nix
19:40 Vampire0 ELFrederich, type "git config -l" and you see all settings. You can at any time just overwrite the system setting in the global settings or the local settings
19:41 ELFrederich Vampire0: difference between global and system settings?  I don't have an /etc/gitconfig or a ~/.config/git/config
19:41 Vampire0 ELFrederich, just use "git config --global blah blub" to modify the global config or --system for the system wide onw
19:41 kerrick_ joined #git
19:41 ELFrederich Vampire0: where are the global and system ones stored respectively?
19:42 ELFrederich Vampire0: I think I know... by global, you mean global per user right?  So global goes into ~/.gitconfig
19:43 _ikke_ correct
19:43 Vampire0 ELFrederich, I'm not sure where it is on Windows, maybe it is not in a file but a hard-coded default. But you see it if you use "git config -l"
19:43 _ikke_ git calls that the 'global' config
19:43 Vampire0 ELFrederich, yes, by global I mean what is defined as global, which is usually stored in ~/.gitconfig
19:44 ELFrederich yes I see help.format is html when I do "git config -l"  Just no clue where it is being set from.
19:44 danslo_ joined #git
19:45 emg joined #git
19:45 ELFrederich I wish "git config -l" showed where it came from
19:45 Darcidride joined #git
19:46 _ikke_ git config --show-origin for fairly recent versions of git :-)
19:46 _ikke_ >2.8.0
19:47 ELFrederich I'm on 2.9.3 I'd upgrade to 2.10 but I've seen people install it and the icons don't work on Windows
19:47 _ikke_ 2.10.1 has been released
19:47 ELFrederich _ikke_: I wonder if that has the fix
19:48 _ikke_ "The icon in the Explorer integration ("Git Bash Here"), which was lost by mistake in v2.10.0, is back. "
19:48 _ikke_ This issue?
19:48 ELFrederich _ikke_: on the version that I"m currently on I can do "git config --global -l" and "git config --system -l" and it doesn't show up there
19:48 _ikke_ ELFrederich: Might be that's something hardcoded
19:48 ELFrederich when I do git config --local -l it says I don't have a ~/.config/git/config ... so the help.format seems to be set somewhere else, not any of those 3
19:49 _ikke_ ELFrederich: git config --show-origin -l
19:49 ELFrederich _ikke_: like it's hard coded but "git config -l" acts like it's configured somehow
19:49 aidalgol joined #git
19:50 ELFrederich file:"C:\\ProgramData/Git/config"       help.format=html
19:50 _ikke_ There it is
19:51 * ELFrederich hates Git on windows.  I hate that there are any other options when installing other than "checkout as-is, commit as-is"
19:52 _ikke_ The installer used to ask what it should do
19:52 ELFrederich so how would I even change that file?  Or I shouldn't and just let "git config --global help.format=man" override it for me and leave the original there
19:52 h1d joined #git
19:52 e14 joined #git
19:52 _ikke_ I think that's the best, that's where user preferences go
19:53 ELFrederich _ikke_: now I find out this silly terminal doesn't have the man command.  Looks like I have to use html
19:54 _ikke_ Why do you guess it defaults to html ;-)
19:56 vassagus_ joined #git
19:58 juvenal joined #git
19:58 durham joined #git
20:00 grumble joined #git
20:00 harish_ joined #git
20:02 jaguarmagenta joined #git
20:02 kerrick_ joined #git
20:04 shufan joined #git
20:06 _Vi joined #git
20:09 zeroed joined #git
20:11 fuchstronaut joined #git
20:13 shufan left #git
20:13 shafun joined #git
20:14 mehola joined #git
20:15 synthroid joined #git
20:16 synthroi_ joined #git
20:18 rominronin joined #git
20:21 nettoweb1 joined #git
20:22 ahmed_elgabri joined #git
20:26 derpsauce__ joined #git
20:27 e14 joined #git
20:28 Vinnie_win_s joined #git
20:31 AaronMT joined #git
20:32 nilg joined #git
20:34 vdv joined #git
20:34 nettoweb joined #git
20:36 manuels joined #git
20:37 JamesBaxter joined #git
20:38 manuel_ joined #git
20:39 emg joined #git
20:39 Snugglebash joined #git
20:39 manuels joined #git
20:40 manuels joined #git
20:41 rorro joined #git
20:41 sea-gull1 joined #git
20:41 manuels joined #git
20:41 Masber joined #git
20:42 manuels joined #git
20:42 Dougie187 left #git
20:43 manuels joined #git
20:44 elastix joined #git
20:45 danslo_ joined #git
20:45 jason237 joined #git
20:47 kyledr joined #git
20:47 kyledr i just did "git checkout -- foofile.bar" for a file i never committed. is it possible to get my file back?
20:47 albel727 joined #git
20:48 grawity have you at least `git add`ed it?
20:48 kyledr i don't think
20:49 kyledr it was not staged for commit
20:50 kyledr oh thank goodness, one of my two text editors has the old code after doing CMD+z
20:50 kyledr is it not possible to get it back via git?
20:50 kyledr (now out of curiousity)
20:51 grawity you never told git to remember it, so no
20:51 canuk joined #git
20:51 crayon joined #git
20:51 kyledr why would it even reset a file that was never committed?
20:51 crayon joined #git
20:53 grawity *shrug*
20:53 ahr3n joined #git
20:53 grawity for me, it says "error: pathspec 'foo' did not match any file(s) known to git." if I try to do the same
20:53 kyledr maybe i did a git add of it in its earliest state? or maybe xcode did that for me
20:54 Darren_ joined #git
20:55 greendo joined #git
20:56 osse /
20:56 kbdkode joined #git
20:57 tvw joined #git
20:57 osse kyledr: If you did then you could use git fsck to find it
20:57 thebope joined #git
20:58 kbdkode joined #git
20:58 buffffal00 joined #git
21:00 Zoxc Isn't git rebase suppose to exit with a non-zero value if it doesn't complete?
21:01 anuxivm joined #git
21:01 matsaman Zoxc: probably, why?
21:01 thebope_ joined #git
21:01 mattcen joined #git
21:01 snthsnth joined #git
21:02 Zoxc It didn't do so (which broke my rebase helper script)
21:02 matsaman what makes you think it didn't do so?
21:02 Faylite joined #git
21:03 anuxivm left #git
21:04 CussBot joined #git
21:04 Zoxc matsaman: Because it didn't?
21:04 jglenn9k joined #git
21:05 anuxivm joined #git
21:05 jglenn9k is there some way i can change my commit message with a pre-commit hook or something?
21:05 grawity yes
21:05 nedbat jglenn9k: i don't know, but how would you like it to?
21:06 jglenn9k like if my commit message is "updates" i want my push to say "I did updates today!" where
21:06 matsaman Zoxc: got some log output?
21:06 grawity in fact, the default hooks/commit-msg.sample does just that
21:06 jglenn9k so basically "I did $message today!"
21:07 jglenn9k grawity: sweet
21:07 Zoxc matsaman: https://gist.githubusercontent.com/Zoxc/35ce​cf58711a01d5e6952b7de660d521/raw/c8945a8160a​4d20b8670b8821f81eaeffb6a03e5/gistfile1.txt
21:08 shgysk8zer0 joined #git
21:08 thebope joined #git
21:11 kbdkode if I have a git repo in ~/dir/a and I have another git repo in ~/dir/b, and I want to put ~/dir/b inside of ~/dir/a as a submodule, can I do that if ~/dir/b has already been cloned and modified and has another branch?
21:12 littleforest joined #git
21:14 Zoxc matsaman: I think it's only edit that returns 0?
21:15 CheckDavid joined #git
21:15 shinnya joined #git
21:17 mattcen joined #git
21:19 delboy1978uk joined #git
21:19 unsigned_char left #git
21:19 delboy1978uk i have tagged the wrong commit, can i remove it somehow?
21:19 jglenn9k grawity: got it working!
21:19 delboy1978uk it was the last commit
21:20 delboy1978uk but it aint the last if you know what i mean
21:20 red82 joined #git
21:20 perlpilot delboy1978uk: git help tag
21:21 delboy1978uk cheers
21:21 jglenn9k left #git
21:21 * delboy1978uk walks out shamed
21:22 perlpilot delboy1978uk: don't be shamed; we can't always think of everything we need when we need it.
21:22 harish joined #git
21:22 delboy1978uk lol, cheers peripilot
21:22 thebope joined #git
21:22 delboy1978uk got it now
21:23 tzafrir joined #git
21:23 kerrick-lyft3 joined #git
21:24 Joel left #git
21:25 jeffreylevesque joined #git
21:25 delboy1978uk ok the real question - how do i delete the remote tag? something like force push tag name?
21:26 m0viefreak git push --delete remote tag
21:27 delboy1978uk cheers amigo!
21:27 kbdkode hm I figured that out (didn't realize you needed the git repo's address, but now the submodule is ignoring the .gitignore..?
21:32 Lor_ joined #git
21:38 isysd joined #git
21:39 dsantiag_ joined #git
21:40 johnmilton joined #git
21:44 alex1a_ joined #git
21:47 dsantiago joined #git
21:51 rominronin joined #git
21:54 ehva joined #git
21:58 mattcen joined #git
21:58 nikow joined #git
22:01 xameada joined #git
22:02 jimi_ joined #git
22:02 drizztbsd joined #git
22:02 johnmilton joined #git
22:02 jaguarmagenta joined #git
22:03 mutex joined #git
22:08 Limes_ joined #git
22:11 nevodka joined #git
22:12 fuchstronaut joined #git
22:14 WaReZ joined #git
22:15 Lipp joined #git
22:15 mehola joined #git
22:16 Duder9999 joined #git
22:18 ruby_ joined #git
22:19 fmcgeough joined #git
22:19 brokensyntax joined #git
22:26 snthsnth joined #git
22:27 littleforest joined #git
22:28 mattcen joined #git
22:29 cdown joined #git
22:30 EvilPenguin joined #git
22:31 cdown_ joined #git
22:33 apotry joined #git
22:33 rbern joined #git
22:34 red82 joined #git
22:36 thebloggu joined #git
22:37 cdown joined #git
22:42 harish_ joined #git
22:47 e14 joined #git
22:48 anuxivm1 joined #git
22:51 thierryp_ joined #git
22:54 ResidentBiscuit joined #git
22:55 anonymuse joined #git
22:56 QwertyDragon joined #git
22:58 mycelium joined #git
22:59 Mobutils joined #git
23:03 slikts joined #git
23:03 slikts joined #git
23:06 catsup joined #git
23:07 jimi_ joined #git
23:09 ehva joined #git
23:11 bathtub_shark joined #git
23:12 pragmatism joined #git
23:12 madewokherd joined #git
23:13 fuchstronaut joined #git
23:15 einnjo joined #git
23:16 EvilPenguin joined #git
23:17 sangy joined #git
23:20 dviola joined #git
23:22 rominronin joined #git
23:22 jason237 joined #git
23:24 Lipp joined #git
23:26 ahr3n joined #git
23:27 dodobrain joined #git
23:29 mattcen joined #git
23:32 faux___ joined #git
23:34 dsdeiz joined #git
23:34 jleclanche joined #git
23:37 mablae__ joined #git
23:38 DolpheenDream joined #git
23:39 anonymuse joined #git
23:41 Kitty- joined #git
23:41 jumpman joined #git
23:42 littleforest joined #git
23:43 faux___ joined #git
23:43 delboy1978uk left #git
23:46 afuentes joined #git
23:49 nettoweb joined #git
23:50 jason237 joined #git
23:55 arescorpio joined #git
23:57 snthsnth_ joined #git
23:59 mattcen joined #git

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