IRCloggy #git 2016-06-08

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2016-06-08

→ MattMaker joined00:00
← kilo_bravo left00:00
← d10n-work left00:01
← rnsanchez_ left00:01
← eletuchy left00:02
→ eletuchy joined00:03
→ rnsanchez_ joined00:03
→ rominronin joined00:05
← eletuchy_ left00:05
← knutstrut left00:05
→ knutstrut joined00:05
→ IWishIKnew joined00:05
→ eletuchy_ joined00:06
→ eletuch__ joined00:08
← eletuchy left00:08
← dopesong left00:10
→ fission6 joined00:10
← kpease left00:10
← rominronin left00:10
← EvilPenguin left00:10
← eletuchy_ left00:10
← mmlb left00:11
→ eletuchy joined00:11
→ Vinnie_win joined00:11
← Vinnie_win_l left00:11
→ eletuchy_ joined00:13
← frem_ left00:13
← Lyqyd left00:13
← eletuch__ left00:13
← garethdaine left00:13
← diegoviola left00:13
→ EvilPenguin joined00:14
→ tax joined00:14
← rgrinberg left00:14
→ livingstn joined00:15
→ texinwien joined00:15
← eletuchy left00:15
→ raijin joined00:15
← CEnnis91 left00:16
→ eletuchy joined00:19
← shgysk8zer0 left00:19
→ CEnnis91 joined00:19
→ eletuch__ joined00:21
← texinwien left00:21
← eletuchy_ left00:21
→ JanC_ joined00:23
← eletuchy left00:23
JanC → Guest7484500:24
JanC_ → JanC00:24
→ eletuchy joined00:24
← Guest74845 left00:24
← qpdb left00:25
→ qpdb joined00:25
→ mmlb joined00:25
→ rkazak joined00:26
← drodger left00:26
← eletuch__ left00:26
→ eletuchy_ joined00:27
→ gp5st joined00:27
→ Guest55 joined00:28
→ fuchstronaut joined00:28
← eletuchy left00:29
→ eletuchy joined00:30
← Khisanth left00:31
→ Khisanth joined00:32
→ shgysk8zer0 joined00:32
→ drodger joined00:32
→ eletuch__ joined00:32
← eletuchy_ left00:32
← cdg left00:33
→ cdg joined00:33
← endiruna left00:33
← nhawdge left00:34
← fuchstronaut left00:34
← eletuchy left00:35
← MattMaker left00:35
→ eletuchy joined00:35
← githogori left00:36
← livingstn left00:36
→ interne7y joined00:36
→ githogori joined00:37
← eletuch__ left00:37
← cdg left00:38
→ Kaisyu joined00:40
→ livingstn joined00:40
← interne7y left00:41
← Khisanth left00:41
→ allcentu1 joined00:41
→ Khisanth joined00:42
← Ahmed90 left00:42
→ adambrenecki_ joined00:42
← adambrenecki_ left00:43
→ adambrenecki joined00:43
← orbyt_ left00:43
← shgysk8zer0 left00:44
← keltvek left00:44
→ boudicca joined00:44
← Guest55 left00:45
← gp5st left00:46
adambrenecki → adambrenecki_00:46
→ wxg joined00:46
← boudiccas left00:47
adambrenecki_ → adambrenecki__00:47
barteks2x What exactly does "^M" at the end of newly added line in got diff mean?00:47
← fission6 left00:47
barteks2x *git diff00:47
adambrenecki__ → adambrenecki00:48
← dreiss left00:49
barteks2x I know it means that I have issues with line endings, but what exactly? I need to know to know which program blame for it00:50
← raijin left00:51
→ Schwarzbaer_ joined00:52
preaction it's a \r, which windows uses as part of its line-ending00:53
← eletuchy left00:54
→ _vyscond joined00:55
→ nilsi joined00:55
barteks2x and if it's red in the console, does it mean it's removed?00:55
→ jaguarmagenta joined00:55
→ fission6 joined00:56
← Schwarzbaer left00:57
→ Tanger joined00:57
→ eletuchy joined00:57
preaction what's red? red in what?00:58
← BombStrike left00:58
← keepguessing left01:00
← nilsi left01:00
← jaguarmagenta left01:00
← IWishIKnew left01:00
→ rgrinberg joined01:01
→ harmfulbytes joined01:02
barteks2x preaction, like this: http://i.imgur.com/ciPeFUG.png01:02
← thiago left01:03
preaction no, it doesn't mean it's removed. whatever is displaying that diff is highlighting it as something you likely want to remove01:03
← ams__ left01:03
→ BombStrike joined01:04
barteks2x ah, so currently there are windows line endings in this file, and they are not being changed?01:04
preaction something has added windows line endings, yes01:04
→ rominronin joined01:06
barteks2x so these line endings are only in this one place, or in the whole file?01:06
→ checkItOut joined01:07
barteks2x If they are only here, then my IDE messed it up01:07
← Noldorin left01:07
preaction the diff seems to look like they're only in these new lines01:08
→ moei joined01:09
→ Noldorin joined01:09
← Sasazuka left01:10
← msonntag left01:11
← drodger left01:11
← rominronin left01:11
← Corosus left01:13
← boudicca left01:13
→ edude03 joined01:14
→ Nikesh joined01:15
← romerocesar left01:15
← _vyscond left01:15
Nikesh Given a commit history like (descending) abc123, def456, ghi789 - how can I make a small change to commit ghi789 and replay the changes from the later/newer commits?01:16
← fscala left01:16
Eugene Nikesh - !sausage is a good read; tl;dr run `git rebase -i` and "edit" ghi78901:17
gitinfo Nikesh: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect01:17
→ boudicca joined01:17
→ drodger joined01:17
→ fscala joined01:18
→ linuxmint joined01:19
← livingstn left01:19
← allcentu1 left01:20
← snfgf left01:20
→ ahr3n joined01:21
→ boudiccas joined01:22
Nikesh Eugene: I keep getting caught in merge conflicts and then end up applying a new commit after abc12301:22
← Noldorin left01:22
← fstd left01:22
← pks left01:22
→ livingstn joined01:22
→ fstd joined01:22
Eugene What are you rebasing-against? !lol is helpful01:22
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all01:22
→ scorphus joined01:23
← EduardoMartins left01:24
← boudicca left01:24
← rkazak left01:24
Nikesh Eugene: I'm rebasing against the parent commit01:24
→ MattMaker joined01:25
→ pks joined01:25
Nikesh i.e. `git rebase -i ghi789^`01:25
Eugene Sounds like you might just need to resolve the conflict manually then01:25
→ eletuchy_ joined01:26
← drodger left01:26
→ watabou joined01:26
← scorphus left01:27
→ drodger joined01:27
Nikesh Hm yeah, I guess I'm confused because I resolve it manually,01:27
but then it just applies the commit after abc12301:27
→ interne7y joined01:27
← eletuchy left01:28
→ scorphus joined01:28
Eugene Is there a merge involved?01:28
→ Sareuon joined01:28
→ rkazak joined01:29
← harish left01:30
→ eletuchy joined01:30
← livingstn left01:31
→ msonntag joined01:31
← eletuchy_ left01:31
→ sbeller_ joined01:32
← mellernoia left01:32
→ eletuchy_ joined01:33
← EvilPenguin left01:33
← AndroidLoverInSF left01:33
← durham left01:33
← scorphus left01:34
← eletuchy left01:35
← dermoth left01:35
→ dermoth joined01:35
→ eletuchy joined01:36
← ncd|leeN left01:36
→ sioseal joined01:37
→ eletuch__ joined01:38
← eletuchy_ left01:38
→ the_cybersphinx joined01:39
→ livingstn joined01:40
→ ensyde__ joined01:40
← yqt left01:41
← eletuchy left01:41
← sioseal left01:41
→ eletuchy joined01:41
→ ensyde joined01:42
→ scorphus joined01:42
→ orbyt_ joined01:42
→ boudicca joined01:42
→ eletuchy_ joined01:43
← eletuch__ left01:43
← wxg left01:43
→ raijin joined01:44
← xorox90 left01:44
← ensyde__ left01:45
← boudiccas left01:46
← ilbot3 left01:46
← d4rklit3 left01:46
← eletuchy left01:46
→ Corosus joined01:46
→ boudiccas joined01:47
→ eletuchy joined01:47
→ tomboy64 joined01:48
← msonntag left01:48
← boudicca left01:48
← eletuchy_ left01:48
→ eletuch__ joined01:48
→ ilbot3 joined01:49
→ eletuchy_ joined01:50
← eletuchy left01:51
→ dsantiago joined01:52
← fahadash left01:52
← eletuch__ left01:53
← griffindy left01:53
← domgetter left01:54
→ eletuchy joined01:54
← edude03 left01:54
→ thiago_ joined01:55
← eletuchy_ left01:55
← MattMaker left01:56
← dsantiago left01:57
→ edude03 joined01:57
← Rodya_ left01:57
→ eletuchy_ joined01:57
← jimi_ left01:58
→ dsantiago joined01:59
← eletuchy left01:59
→ eletuchy joined02:00
← eletuchy_ left02:02
← orbyt_ left02:02
→ grawity joined02:03
→ _rnsanchez_ joined02:03
→ Rodya_ joined02:03
→ eletuchy_ joined02:03
→ msonntag joined02:03
← dsantiago left02:05
→ MattMaker joined02:05
← barteks2x left02:05
← eletuchy left02:05
← rnsanchez_ left02:06
← Nikesh left02:06
→ dreiss joined02:06
← the_cybersphinx left02:06
→ eletuchy joined02:06
← linuxmint left02:06
→ rominronin joined02:07
→ checkItOut_ joined02:08
← eletuchy_ left02:09
← checkItOut left02:09
← checkItOut_ left02:09
→ checkItOut_ joined02:09
→ eletuchy_ joined02:09
← checkItOut_ left02:10
→ checkItOut_ joined02:11
→ fahadash joined02:11
← checkItOut_ left02:11
← eletuchy left02:11
→ eletuchy joined02:12
← rominronin left02:12
→ checkItOut joined02:12
← ericvw left02:13
→ eletuch__ joined02:13
← eletuchy_ left02:14
→ checkItO1t joined02:15
→ ajf- joined02:15
← eletuchy left02:16
→ eletuchy joined02:17
→ eletuchy_ joined02:18
← eletuch__ left02:19
→ eletuch__ joined02:20
→ the_cybersphinx joined02:21
→ franl joined02:21
← eletuchy left02:21
→ wald joined02:23
← eletuchy_ left02:23
← DolpheenDream left02:24
→ eletuchy joined02:24
→ _habnabit joined02:26
← CEnnis91 left02:26
→ eletuchy_ joined02:26
← eletuch__ left02:27
← LaT0rtue left02:27
← dreiss left02:27
← wald left02:27
_habnabit grumble grumble. git-annex doesn't preserve if a file is executable in its metadata, so doing a sync from a url means that whatever it was you had will no longer be executable. any alternatives to git-annex (all i need is large files stored out-of-line) or potential workarounds?02:28
→ skylite joined02:28
→ dreiss joined02:28
← eletuchy left02:29
→ eletuchy joined02:30
← eletuchy_ left02:32
← livingstn left02:32
← MattMaker left02:33
→ cdg joined02:33
→ eletuchy_ joined02:33
→ ISmithers joined02:33
ISmithers Hi all, when cloning a repository is it possible for me to set the remote to a specific URI?02:33
→ MattMaker joined02:33
→ dmto joined02:34
← ToBeCloud left02:34
ISmithers For example I may clone from https including user credentials, but want my origin remote to not include those in the URI02:34
→ eletuch__ joined02:35
← eletuchy left02:35
→ justanot1eruser joined02:36
→ eletuchy joined02:37
→ david007 joined02:37
← eletuchy_ left02:38
← pwnawannab[NE] left02:39
← eletuch__ left02:39
→ eletuchy_ joined02:40
← interne7y left02:40
→ santa-fire joined02:41
← xlegoman left02:41
← pelegreno_ left02:41
← dmto left02:42
← eletuchy left02:42
→ eletuchy joined02:43
→ pelegreno joined02:44
← eletuchy_ left02:45
← santa-fire left02:46
← cdg left02:46
→ dmto joined02:46
→ eletuchy_ joined02:46
preaction clone without the credentials. it should ask for them. otherwise, do git remote set-url after you clone02:47
← franl left02:47
→ A124 joined02:47
→ Goplat joined02:48
→ assgrass joined02:48
← edude03 left02:48
← eletuchy left02:48
ISmithers I am writing a script to clone around 30 repositories for a new machine setup. I don't want to enter my password 30 times preaction02:49
preaction i did say "otherwise"02:49
← assgrass left02:49
→ assgrass joined02:49
ISmithers Yeah I was contemplating that, I was hoping for something potentially built-in.02:50
I was looking at credential cache too.02:50
preaction or a .netrc file?02:50
← assgrass left02:50
→ edude03 joined02:50
→ eletuchy joined02:51
→ grassazz joined02:51
← grassass left02:51
preaction git's just using curl, it sees a url, so it can't really do anything with it02:51
ISmithers I think set-url is going to be the way.02:52
Requires minimal setup from end-users.02:52
I can just write it into the script02:52
→ eletuch__ joined02:52
← eletuchy_ left02:53
→ syg_ joined02:53
→ eletuchy_ joined02:54
← eletuchy left02:55
← hexagoxel left02:55
→ jaguarmagenta joined02:56
A124 ISmithers https://help.github.com/articles/caching-your-github-password-in-git/02:56
← eletuch__ left02:57
← chachasmooth left02:58
→ woodruffw joined02:58
ISmithers Thanks A124. I have installed the windows git credential manager, but I think I'm running into issues as I'm configuring a grunt project to handle this, include prompts and multiple shell commands.02:58
→ eletuchy joined02:58
→ chachasmooth joined02:58
A124 Well, that is different path. But if you are using git underneath, this would do.02:59
ISmithers Yeah I am using git underneath, just got to get it all working together. :)02:59
← eletuchy_ left03:00
→ interne7y joined03:00
→ hexagoxel joined03:00
→ eletuchy_ joined03:01
← jaguarmagenta left03:01
→ Mateo_W joined03:01
← sgen left03:02
→ eletuch__ joined03:03
← eletuchy left03:03
← adambrenecki left03:03
→ aavrug joined03:04
← aavrug left03:05
→ eletuchy joined03:05
→ aavrug joined03:05
← eletuchy_ left03:05
← mmlb left03:06
← eletuch__ left03:08
→ rominronin joined03:08
→ ShekharReddy joined03:09
→ eletuchy_ joined03:10
← axiom_1 left03:11
→ MattMake_ joined03:11
← MattMake_ left03:12
← eletuchy left03:12
→ eletuchy joined03:13
ISmithers So weird, it provides an input for my password, but when I enter it I see the characters. After pressing enter it carriage returns and nothing happens, I then need to enter the password again which does hide the characters as normal and it accepts it.03:13
← rominronin left03:13
← edude03 left03:14
← MattMaker left03:14
← dreiss left03:14
← eletuchy_ left03:15
→ eletuch__ joined03:15
→ romerocesar joined03:15
dalias i'm looking for a way to use signed commits/tags without running git and doing my development on a box that has private keys03:16
i want to use gpg.program git-config item to run a script that ssh's to the signing server03:16
preaction ISmithers: likely because whatever you're using to run git is taking control of the terminal and/or not letting the credential-gathering-thing get at it03:17
dalias however because git is using stdin/out for the data, ssh doesn't have a pty to enter the gpg passphrase on03:17
← eletuchy left03:17
ISmithers preaction: Yeah this is my thinking. Is there a way to get Git to prompt for credentials before cloning a repo? Like, asking it to test the connection or configure credentials first?03:18
→ eletuchy joined03:18
preaction not that i'm aware of. git asks libcurl to do its thing and it does03:18
→ toogley joined03:19
← eletuch__ left03:20
← romerocesar left03:20
→ k3rn31 joined03:20
→ eletuchy_ joined03:21
→ wloncom joined03:21
← eletuchy left03:23
→ eletuchy joined03:24
→ eletuch__ joined03:26
← eletuchy_ left03:26
← interne7y left03:27
← drodger left03:27
→ SwiftMatt joined03:27
← grassazz left03:27
→ grassaSS joined03:28
→ eletuchy_ joined03:28
← eletuchy left03:28
← Mateo_W left03:29
ISmithers I give in, I will change the remote-url after each clone. Bleh03:29
← eletuch__ left03:31
→ eletuchy joined03:31
← CheckDavid left03:32
→ drodger joined03:33
← eletuchy_ left03:33
→ eletuchy_ joined03:35
→ pmort joined03:35
← eletuchy left03:37
→ mizu_no_oto joined03:37
→ eletuchy joined03:38
→ mehola joined03:38
→ Nikesh joined03:40
→ eletuch__ joined03:40
← eletuchy_ left03:40
← drodger left03:42
→ eletuchy_ joined03:42
← eletuchy left03:42
→ eletuchy joined03:44
← siprbaum left03:44
← eletuch__ left03:44
← dmto left03:46
→ dmto joined03:46
→ d4rklit3 joined03:46
← eletuchy_ left03:47
→ eletuchy_ joined03:47
→ drodger joined03:48
→ wxg joined03:48
→ eletuch__ joined03:49
← eletuchy left03:49
← hahuang61 left03:51
← eletuchy_ left03:52
→ eletuchy joined03:52
← eletuch__ left03:54
→ eletuchy_ joined03:56
→ ccolorado joined03:56
← eletuchy left03:58
← rkazak left03:58
→ T4nkAbb0t joined03:59
→ ahr3n_ joined03:59
→ Gsham joined04:00
← radsy left04:00
→ robotroll joined04:00
→ eletuchy joined04:00
→ dsantiago joined04:00
→ dreiss joined04:00
← bilb_ono left04:01
← Gsham left04:02
→ rkazak joined04:02
→ eletuch__ joined04:02
← eletuchy_ left04:02
← ahr3n left04:02
← eletuchy left04:05
→ eletuchy_ joined04:05
← dsantiago left04:05
← tgunr left04:06
← eletuch__ left04:07
→ eletuchy joined04:08
← unbalancedparen left04:08
→ rominronin joined04:09
← fission6 left04:10
← eletuchy_ left04:10
← mizu_no_oto left04:10
→ eletuch__ joined04:10
← mehola left04:11
← _habnabit left04:11
justanot1eruser → justanotheruser04:11
← eletuchy left04:12
→ hahuang61 joined04:13
→ eletuchy joined04:14
← rominronin left04:14
→ josuebrunel joined04:15
← josuebrunel left04:15
← eletuch__ left04:16
→ eletuchy_ joined04:17
← checkItOut left04:17
→ faux___ joined04:17
→ mehola joined04:18
← hahuang61 left04:19
← dmto left04:19
→ eletuch__ joined04:19
← faux___ left04:19
→ hahuang61 joined04:19
← eletuchy left04:19
← wxg left04:20
← Cabanossi left04:20
→ eletuchy joined04:21
→ Cabanossi joined04:21
← eletuchy_ left04:22
→ dmto joined04:22
← eletuch__ left04:23
← ccolorado left04:24
→ armyriad joined04:24
→ eletuchy_ joined04:25
← eletuchy left04:27
→ eletuchy joined04:28
← sdothum left04:30
→ Ragnor joined04:30
← robotroll left04:30
→ eletuch__ joined04:30
→ fuchstronaut joined04:30
← eletuchy_ left04:30
→ romerocesar joined04:31
← dmto left04:31
← mehola left04:31
→ dmto joined04:32
← arooni left04:32
← eletuchy left04:32
→ variable joined04:32
← grassaSS left04:33
→ bilb_ono joined04:33
→ eletuchy joined04:33
← fracting left04:33
variable → trout04:34
→ eletuchy_ joined04:35
← fuchstronaut left04:35
← eletuch__ left04:35
← rahtgaz left04:35
→ eletuch__ joined04:37
← eletuchy left04:38
← Lynxium left04:39
← eletuchy_ left04:39
→ wxg joined04:39
→ eletuchy joined04:40
← lindenle left04:41
← drodger left04:41
← eletuch__ left04:42
→ faux___ joined04:43
→ eletuchy_ joined04:43
← wxg left04:45
← eletuchy left04:45
← italoacasas left04:45
→ fracting joined04:46
→ eletuchy joined04:46
ChanServ set mode: +o04:47
→ drodger joined04:47
Eugene kicked zifnab (YOU MUST SUBMIT ADDITIONAL JOKES)04:47
Eugene set mode: -o04:47
→ zifnab joined04:48
→ eletuch__ joined04:48
← toogley left04:49
← eletuchy_ left04:49
← ahr3n_ left04:50
→ dsantiago joined04:51
← eletuchy left04:51
→ eletuchy joined04:51
← eletuch__ left04:54
← drodger left04:54
→ santa-fire joined04:54
→ eletuchy_ joined04:55
→ Raging_Hog joined04:55
← dsantiago left04:55
← santa-fire left04:56
→ nivag joined04:56
→ santa-fire joined04:56
→ subhojit777 joined04:57
→ eletuch__ joined04:57
← eletuchy left04:57
→ jaguarmagenta joined04:57
← Mobutils left04:57
→ Mobutils joined04:59
→ eletuchy joined04:59
← eletuchy_ left05:00
→ drodger joined05:00
← eletuch__ left05:01
← jaguarmagenta left05:02
→ eletuchy_ joined05:02
← rkazak left05:04
→ eletuch__ joined05:04
← eletuchy left05:04
→ eletuchy joined05:06
← dmto left05:06
→ cqi joined05:06
cqi does git distinguish different errors by different return codes?05:07
← eletuchy_ left05:07
← Raging_Hog left05:08
← eletuch__ left05:09
→ eletuchy_ joined05:09
→ mehola joined05:10
→ rominronin joined05:10
← santa-fire left05:11
→ eletuch__ joined05:11
← eletuchy left05:11
← Rodya_ left05:12
→ settermjd joined05:12
→ pwnz0r joined05:12
→ shafox joined05:13
← arescorpio left05:13
← eletuchy_ left05:13
→ eletuchy joined05:14
← rominronin left05:15
→ eletuchy_ joined05:16
← eletuch__ left05:16
← sangy left05:17
← WayToDoor left05:17
→ eletuch__ joined05:18
← eletuchy left05:18
→ diogenese joined05:19
← eletuchy_ left05:21
← faux___ left05:21
→ eletuchy joined05:21
← drodger left05:22
→ sauvin joined05:22
← eletuch__ left05:23
→ eletuchy_ joined05:24
← eletuchy left05:26
→ eletuch__ joined05:26
→ interne7y joined05:27
→ drodger joined05:27
→ eletuchy joined05:28
→ tinajohnson___ joined05:28
← eletuchy_ left05:28
→ dfr33zy joined05:28
← fscala left05:29
← eletuch__ left05:30
→ fscala joined05:30
← rgrinberg left05:31
→ dlab joined05:31
← interne7y left05:32
→ apotry joined05:32
→ rominronin joined05:32
← dlab left05:33
← romerocesar left05:40
→ romerocesar joined05:40
→ ochorocho__ joined05:45
← drodger left05:46
→ ThomasLocke joined05:47
→ a_thakur joined05:48
→ ahr3n joined05:49
← ochorocho__ left05:49
→ MattMaker joined05:49
→ drodger joined05:51
→ exxit joined05:52
← hahuang61 left05:52
← dfr33zy left05:52
exxit i have delete a file , now even after a push shows delete filename..05:52
how can i remove it from git status ?05:52
kadoban exxit: Did you commit the deletion? Do you want to?05:52
push doesn't really have anything to do with status, by the way.05:53
exxit kadoban: yeah05:53
i did commited the deletion05:53
it tells me that..05:54
kadoban exxit: And git status shows what? Did you add it to .gitignore, or some other exclusion/ignore mechanism?05:54
exxit 'git checkout -- <file>... " to discard changes in working directory05:54
kadoban: no didn't add it to exclusion/ignore mechanism.05:54
kadoban exxit: I don't really understand what it's saying changed, that's just the "helpful" part of status's output, not what it's saying changed.05:55
exxit Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)05:55
that's what git status shows05:55
kadoban That's not all that it shows.05:55
← fracting left05:56
← ensyde left05:56
→ stuh84 joined05:56
exxit https://bpaste.net/show/8640c9c2256105:56
kadoban exxit: Doesn't look like you commited the deletion. It's still showing it as a file that's been deleted but not been staged or commited.05:57
exxit: 'git rm ../demo' and then commit. Then if you want, add it to an ignore mechanism, depends what you're trying to do.05:58
← tyreld left05:58
→ qt-x joined05:59
exxit kadoban: that helped..06:00
thanks mate06:00
kadoban 'welcome06:00
← bilb_ono left06:01
exxit kadoban: one thing i didn't understand is that why did it showed as ../demo instead of just demo ?06:01
because this file was in current directory06:01
kadoban exxit: It's relative to wherever you were when you were running 'git status' maybe you had two of them?06:02
← yuhlw left06:05
→ yuhlw joined06:05
← realz left06:06
→ realz joined06:07
→ shgysk8zer0 joined06:07
← shgysk8zer0 left06:07
→ rscata joined06:08
← eka left06:09
exxit kadoban: maybe i have no idea about it now..06:10
→ Wulf joined06:10
Wulf Hi06:10
What's the command to get the commit hash from the latest commit to the current directory?06:10
→ cyan__ joined06:11
Wulf i.e. some nicer version of: git log . | grep ^commit | head -n 106:12
← a_thakur left06:13
→ a_thakur joined06:13
→ t0by joined06:13
→ LaT0rtue joined06:13
← lolmac left06:13
→ fracting joined06:15
→ zeroed joined06:16
← zeroed left06:16
→ zeroed joined06:16
→ lamppid joined06:16
→ lolmac joined06:17
→ muthu joined06:17
→ Repox joined06:17
← Mobutils left06:19
→ nilsi_ joined06:20
← Lunatrius left06:20
← Gamecubic left06:20
→ Mobutils joined06:22
← stuh84 left06:22
→ dopesong joined06:22
← Kaisyu left06:24
← nilsi_ left06:24
osse Wulf: git log --format=%H -1 -- .06:25
Wulf osse: thank you!06:26
← dopesong left06:26
→ dopesong joined06:26
→ endiruna joined06:26
← endiruna left06:26
← blur3d left06:26
← MrWoohoo left06:27
→ interne7y joined06:28
← TomyLobo left06:28
→ freimatz joined06:29
→ gsingh joined06:29
← gsingh left06:30
→ jagob joined06:30
← dreiss left06:31
→ Fijit joined06:31
← SwiftMatt left06:31
← interne7y left06:32
→ pungi-man joined06:32
← pwnz0r left06:32
← boudiccas left06:33
← syg_ left06:33
→ syg_ joined06:34
→ boudiccas joined06:34
← madewokherd left06:35
← moei left06:36
→ Alienpruts joined06:36
← eletuchy left06:39
→ helpD joined06:39
helpD Hello guys06:40
← a3Dman left06:40
Wulf hi D06:40
← k3rn31 left06:41
helpD please, i am working on a git branch and I need to save all changes to it so I could checkout to a different branch, can I use git commit without pushing this upstream?06:41
Wulf "git push" pushes, "git commit" does not push.06:41
helpD the goal is , I will still have to come back to that branch and I don't want other developers to pull it as the work is still ongoing06:41
Wulf are they pulling from *your* computer?06:42
helpD Wulf: no, they are pulling from a central repository06:42
Zarthus helpD: temporarily push it to a different branch?06:42
helpD my branch is locally on my machine06:42
Wulf helpD: as long as you don't push to it, they can't see it06:42
← t0by left06:42
helpD Zarthus: it is already on a branch. the branch is different from the main develop branch.06:42
Zarthus you can branch off further; that's not a worry. If you still want your chances on the remote without interfering with existing development it's a good choice. If you don't want things on the remote at all Wulf's advice has you covered.06:43
changes*06:43
helpD Wulf: so, I git commit and then checkout to another branch. say 2 hours later, I checkout to the previous branch I committed, will my changes committed still be visible in the branch?06:43
→ eletuchy joined06:44
helpD Wulf: I do know git stash does this but I don't want to stash it. I want to somehow save it and can refer to any changes made in that branch when I checkout to it again. Just like one does in 'stashing'06:44
Wulf helpD: yes, of course06:44
ISmithers It would be scary to live in a world where they would just disappear for some reason lol06:44
Wulf helpD: commits don't magically disappear from a branch...06:45
→ elastix joined06:45
Wulf ISmithers: yes, it is. Happened to me.06:45
helpD ISmithers: lol. i just need to be sure as I have made alot of changes to the branch . the thought of everything going or someone else seeing it as I am still working on it is scarry06:45
→ ochorocho__ joined06:45
Zarthus then i'd follow my advice and just put it on the remote elsewhere06:46
Wulf helpD: if in doubt, you can always create a full copy of your repository06:46
Zarthus in the event of your computer catching fire your changes would still be on the server.06:46
helpD Wulf: that might help but what really is the different between git stash and git commit?06:46
Wulf: what i want to do with git commit is exactly what git stash does. with git stash, I can always come back to my changes.06:47
Zarthus: lol. that is stretching it far off06:47
Zarthus gotta cover your bases 8)06:47
→ boingy joined06:48
→ TomyWork joined06:48
→ Rish joined06:50
← ochorocho__ left06:50
← helpD left06:50
← ahr3n left06:50
→ boudicca joined06:51
→ Sceorem joined06:51
← fahadash left06:52
← boudiccas left06:53
→ zincrokx joined06:53
→ jknetl joined06:54
← zincrokx left06:54
→ Lynxium joined06:54
→ gsingh joined06:54
→ encod3 joined06:56
← syg_ left06:57
→ Dazzyp joined06:57
→ k3rn31 joined06:57
→ jaguarmagenta joined06:58
← eletuchy left06:59
← gsingh left06:59
→ gsingh joined06:59
→ xbob joined07:00
← romerocesar left07:00
→ dsantiago joined07:01
← apotry left07:01
→ boudiccas joined07:01
← jaguarmagenta left07:02
→ LJHSLDJHSDLJH joined07:03
← boudicca left07:03
LJHSLDJHSDLJH Hi, I'm wondering if git does any real changes on the working directory files or it just track their actions! can anyone tell?07:04
Wulf WERTZUJFNZTEFUNJ: Of course it changes the working dir.07:04
kadoban LJHSLDJHSDLJH: It will change files if you tell it to of course. I'm not sure what you mean.07:04
If all you ever do is commit, it doesn't change any files except in .git/ I guess?07:05
LJHSLDJHSDLJH one more thing is the exact difference between git reset --soft/hard HEAD^07:05
Wulf hard changes working dir, soft does not07:05
LJHSLDJHSDLJH they both undo the last commit but one put back into staging!! I don't understand that07:05
→ SoRoot joined07:05
→ xorox90 joined07:06
→ dreiss joined07:06
LJHSLDJHSDLJH ok say I have a repo of 5 commits and I want to completely go back to second commit in history and blowout all last three changes... how to do that?07:06
→ circ-user-WUSoW joined07:08
→ bilb_ono joined07:09
→ josuebrunel joined07:10
← LJHSLDJHSDLJH left07:11
→ LJHSLDJHSDLJH joined07:11
→ t0by joined07:11
pungi-man LJHSLDJHSDLJH, git reset --hard HEAD~207:11
That would *completely* blow out the changes07:12
LJHSLDJHSDLJH is HEAD~2 equivalent to HEAD^^ ?07:12
→ moei joined07:12
kadoban Yes07:13
LJHSLDJHSDLJH thank you07:13
→ PCatinean joined07:13
LJHSLDJHSDLJH I will test it on my experimental repo07:14
→ harish joined07:14
→ JeroenT joined07:15
← gsingh left07:16
→ emPi joined07:16
← bittin left07:18
→ bittin joined07:18
← checkItO1t left07:20
LJHSLDJHSDLJH works like magic .. now I'm trying this remove command but it's not working git rm -rf *07:21
← k3rn31 left07:22
← stonerfish left07:22
← LaT0rtue left07:23
→ stonerfish joined07:23
← bilb_ono left07:23
→ Psychiatrist joined07:24
→ jceb joined07:24
← watabou left07:24
← exxit left07:25
← thiago_ left07:25
→ fees joined07:25
→ esc joined07:26
← esc left07:26
→ esc joined07:26
← Nikesh left07:27
← josuebrunel left07:27
→ checkItOut joined07:28
→ Macaveli joined07:28
→ eijk_ joined07:28
→ interne7y joined07:28
→ pratima joined07:31
→ eletuchy joined07:32
← interne7y left07:33
← a_thakur left07:34
→ ahmedelgabri joined07:34
← drodger left07:34
→ a_thakur joined07:34
→ interne7y joined07:34
boz_v1 Hi, is it ok to use repository clone done with lower version of git with the greater version one?07:35
jast yes07:35
→ drodger joined07:36
← xorox90 left07:36
boz_v1 ok, thanks jast07:36
jast sometimes major releases mean you can't use new repositories with an older git, but old repo with new git is always possible07:36
← Schwarzbaer_ left07:37
Stummi how do I remove the deletion of a file from the index?07:37
← boudiccas left07:37
jast (I don't think that has actually even happened so far)07:37
→ snfgf joined07:37
← eletuchy left07:37
jast Stummi: 'git status' gives you hints about stuff like that. to get back the version in the last commit, 'git reset -- <file>'07:37
→ cdown_ joined07:37
→ boudiccas joined07:38
← cdown left07:40
cdown_ → cdown07:40
gitinfo set mode: +v07:40
pratima Hi There07:40
gitinfo pratima: 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.07:40
jast hi :)07:40
pratima :-)07:41
Need small clarification on git pre-commit hooks implementation07:41
jast first time on IRC can be a little tricky, but now you've got it07:41
okay, what do you want to know?07:41
pratima I have a project where I have successfully implemented pre-commit hook and tested it in git bash07:41
← JeroenT left07:42
pratima but now my developers started using Jdeveloper and they are using team plugin in jdev to do git operations right from git clone07:42
← ISmithers left07:42
← dreiss left07:42
pratima pre-commit hook is not being triggered when using jdev -> team-> git ->commit07:42
I have ensured that my pre-commit file is in .git/hooks folder07:43
jast yeah, and it needs to be marked executable, too07:43
pratima does IDEs have special configuration to make for pre-commit hooks07:43
you mean file permissions ?07:44
jast I don't know JDeveloper specifically, but some git plugins don't actually use the official git client and have their own implementation which may not support hooks at all07:44
yes07:44
← tax left07:44
← Psychiatrist left07:44
← a_thakur left07:44
→ a_thakur joined07:45
pratima $ ls -ltr total 16 -rwxr-xr-x 1 pmangena 1049089 16252 Jun 8 11:55 pre-commit*07:45
jast that looks good07:46
pratima permissions seems to be fine07:46
← a_thakur left07:46
→ GavinMagnus joined07:46
pratima :-( this scares me07:46
I have to restrict them committing code with out copyright information07:47
→ nnyk_ joined07:47
→ keltvek joined07:48
jast well, as I said, I don't really know JDeveloper. you could ask the developers of the team plugin what they know about support for hooks like pre-commit07:48
← fracting left07:49
← checkItOut left07:49
jast worst case: it's not supported at all, then if you can't teach your developers to commit properly you might have to set up a way to only allow reviewed commits in the repository07:49
→ watabou joined07:50
→ JeroenT joined07:50
→ eijk joined07:53
← ajf- left07:54
← JeroenT left07:54
→ eletuchy joined07:55
→ JeroenT joined07:55
← eijk_ left07:55
← snfgf left07:56
← MattMaker left07:56
→ eijk_ joined07:57
← moei left07:58
← JeroenT left07:59
← eletuchy left07:59
← eijk left07:59
→ apotry joined08:00
→ JeroenT joined08:01
→ fracting joined08:01
← eijk_ left08:02
→ eijk_ joined08:02
→ _rgn joined08:02
← _rgn left08:02
→ _rgn joined08:02
← _rgn left08:03
→ blur3d joined08:03
→ bongjovi joined08:03
→ boudicca joined08:04
→ _rgn joined08:04
→ eletuchy joined08:04
→ garethdaine joined08:05
→ emx joined08:05
emx what is the easiest way to undo a pushed merge?08:05
→ comps joined08:05
emx is it only possible with "git revert -m 1/2 hash"?08:05
← boudiccas left08:07
← knutstrut left08:07
← eletuchy left08:08
← Goplat left08:08
→ mikecmpbll joined08:08
→ knutstrut joined08:09
← eijk_ left08:10
← b1tchcakes left08:10
→ _pix joined08:11
← d4rklit3 left08:11
→ b1tchcakes joined08:12
→ marcogmonteiro joined08:12
← boudicca left08:12
→ bilb_ono joined08:16
→ MrWoohoo joined08:17
→ eijk_ joined08:18
→ kurkale6ka joined08:19
← kadoban left08:19
→ guardianJ joined08:19
→ MattMaker joined08:20
← monoxane left08:23
→ monoxane joined08:23
← MattMaker left08:25
→ dskfldm joined08:25
gitinfo set mode: +v08:26
dskfldm Hello08:26
gitinfo dskfldm: 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.08:26
dskfldm !backup08:27
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups08:27
← bilb_ono left08:31
← eijk_ left08:31
→ a_thakur joined08:31
→ moei joined08:31
→ fuchstronaut joined08:32
LJHSLDJHSDLJH how can I undo git add --all08:32
lb LJHSLDJHSDLJH git reset08:32
← emx left08:32
← qt-x left08:33
→ qt-x joined08:33
← JeroenT left08:34
LJHSLDJHSDLJH that works ... thanks08:34
lb you're welcome08:34
→ kedare joined08:35
← linuxmodder left08:35
→ courrier joined08:35
→ encod3_ joined08:35
→ Silenced_v2 joined08:35
Wulf How can I get the path of the current directory relative to the git repo's root, and the name of the repository?08:36
← guardianJ left08:36
← fuchstronaut left08:36
← dsop left08:36
→ dsop joined08:36
← encod3 left08:37
→ JeroenT joined08:37
ecraven is there a name for the thing you put after git checkout <here>? it can be a branch, or a tag, as far as I understand. any common word for branch-or-tag?08:37
or even branch-or-tag-or-commit08:37
→ cxz joined08:37
← cxz left08:37
→ cxz joined08:37
lb ecraven "commitish" anything that git can break down to a commit object08:38
← interne7y left08:38
lb ecraven https://www.kernel.org/pub/software/scm/git/docs/#_identifier_terminology08:39
← reactormonk left08:39
ecraven lb: thanks!08:40
→ fahadash joined08:40
→ hexafluoride joined08:41
hexafluoride okay, so I added and deleted some files before ever doing a git add or git commit08:42
ecraven one more question, I want to reorder some stuff around, how can I check out the content of branch <a>'s HEAD into my current branch?08:42
hexafluoride but when I do a git status or git diff, they show up as a "deleted" change08:42
even though they were never staged or committed in the first place08:42
how do I fix that?08:42
→ checkItOut joined08:42
→ lindenle joined08:43
→ linuxmodder joined08:43
← dopesong left08:43
→ dopesong joined08:44
lb ecraven reorder in terms of "moving commits around in the history" or do you really just want to checkout the content of branch a into your current workdir ?08:44
dskfldm I was working on a branch, then i had to fix something, so i did a git stash, then checked out into master branch, did the fix while on the master branch, commit, and now i want to get back. I also need the changes from master, so do i checkout the branch where i did the git stash and pop it then merge, or do i merge from master before then pop the stash08:44
lb hexafluoride not possible. if they are shown as changed, they are tracked. otherwise the status would be untracked08:44
hexafluoride you can examin the commits with git log -- filename08:45
dskfldm or is it the same thing08:45
hexafluoride oh, apparently monodevelop did it for me08:45
thanks08:45
I did a git rm08:45
lb dskfldm basically the same thing08:45
dskfldm it figures08:46
→ josuebrunel joined08:46
lb dskfldm only the part where you might get conflicts change08:46
→ Schwarzbaer joined08:47
dskfldm i might have conflicts.. i don't know, i did not do it08:47
lb if the things from the stash and the new stuff from master does have conflicts08:47
ecraven lb: just check it out into the working directory, but without leaving my current branch08:47
lb: something easier than git archive <a> | tar ...08:47
← lindenle left08:48
lb ecraven git checkout <branch-a> -- .08:48
ecraven git checkout <branch-a> -- file or path08:48
← dopesong left08:48
lb dskfldm maybe do just git stash apply instad of pop08:48
ecraven lb: wow, thank you!08:48
dskfldm how is that, are you saying that the order of doing thing matter when there are conflicts? like merge from master then pop vs pop then merge ?08:48
ecraven lb: never thought it would be this easy :D08:48
→ fuchstronaut joined08:49
← fuchstronaut left08:49
→ fuchstronaut joined08:49
lb dskfldm that way you can go back if any conflict and you always have your stash for a second try ;)08:49
→ tvw joined08:49
dskfldm well i guess now i need to read about git stash apply..08:49
lb dskfldm it just changing the view. the conflicts ( if there are any ) thay the same of course.08:49
dskfldm stash pop = stash apply + stash drop08:50
apply from stash to current workdir + drop the stash info08:50
← droidicus left08:50
lb just do the apply part and drop the stash later if you dont need it any longer08:50
dskfldm oh, so i lose the stash after pop08:50
got it08:50
thanks08:50
lb thats what pop does ;)08:50
← Orbitrix left08:51
→ texinwien joined08:51
lb dskfldm ( you dont really loose it because of the reflog but it's easier that way :) )08:51
→ Orbitrix joined08:51
← jab416171 left08:52
← JeroenT left08:52
→ barteks2x joined08:53
→ bruce_lee joined08:53
← bruce_lee left08:53
→ bruce_lee joined08:53
← lolmac left08:54
→ sparetire joined08:55
→ jab416171 joined08:55
→ JeroenT joined08:56
→ nuck joined08:56
← cdown left08:56
nuck → Guest2397208:56
→ MattMaker joined08:57
← jceb left08:58
→ lolmac joined08:58
→ djb-irc joined08:58
→ jaguarmagenta joined08:58
→ paul424 joined09:00
→ romerocesar joined09:01
← MattMaker left09:02
← jaguarmagenta left09:03
→ cdown joined09:04
← jknetl left09:04
← lolmac left09:05
← romerocesar left09:06
→ troulouliou_div2 joined09:06
← Rish left09:06
→ Guest53386 joined09:07
← SoRoot left09:08
→ SoRoot joined09:08
→ jceb joined09:09
← SoRoot left09:10
→ SoRoot joined09:10
← Silenced_v2 left09:10
→ Silenced_v2 joined09:10
← Guest53386 left09:11
→ lolmac joined09:11
→ ocbtec joined09:12
← diogenese left09:12
→ cdown_ joined09:13
← SoRoot left09:13
→ SoRoot joined09:14
← SoRoot left09:14
→ King_Hual joined09:14
→ SoRoot joined09:14
← SoRoot left09:15
→ SoRoot joined09:16
← cdown left09:16
cdown_ → cdown09:16
← LJHSLDJHSDLJH left09:17
→ jknetl joined09:17
→ Jellyg00se joined09:18
→ isxek joined09:18
→ notebox joined09:19
→ CheckDavid joined09:22
← Macaveli left09:22
← AlexRussia left09:23
→ morrolan1 joined09:24
→ diogenese joined09:24
→ neps joined09:24
→ Rish joined09:26
→ Macaveli joined09:27
→ mdw joined09:27
→ dsdeiz joined09:27
→ dopesong joined09:30
→ romerocesar joined09:32
← joki left09:32
→ PHPanos joined09:33
→ a3Dman joined09:33
PHPanos hello09:33
→ acetakwas joined09:34
PHPanos I have a feature branch which contains some commits I don't want into the master branch. So I was thinking I could cherry pick the commits I wanted into the master branch, but not all commits are getting through. Any idea?09:34
← acetakwas left09:35
← romerocesar left09:36
→ rolha joined09:37
← watabou left09:37
→ acetakwas joined09:37
→ joki joined09:37
→ discopatrick joined09:38
← jknetl left09:38
→ zincrokx joined09:38
← Jellyg00se left09:38
← acetakwas left09:38
← zincrokx left09:39
← Fr4n left09:39
→ eletuchy joined09:39
→ zincrokx joined09:39
← settermjd left09:39
← zincrokx left09:39
→ settermjd joined09:39
→ acetakwas joined09:40
← fscala left09:40
← texinwien left09:41
← acetakwas left09:41
← neps left09:42
→ acetakwas joined09:42
← pmort left09:43
← acetakwas left09:43
→ texinwien joined09:43
← isxek left09:43
→ fscala joined09:43
→ acetakwas joined09:43
← eletuchy left09:44
← acetakwas left09:45
→ acetakwas joined09:45
← qt-x left09:46
← jceb left09:46
← acetakwas left09:47
→ boudiccas joined09:47
→ pol123456 joined09:47
→ jceb joined09:47
→ acetakwas joined09:47
← garethdaine left09:47
→ mischat joined09:47
→ neps joined09:48
→ Psychiatrist joined09:48
← acetakwas left09:48
→ mdw_ joined09:49
→ mohabaks joined09:49
→ mdw__ joined09:50
→ allcentu1 joined09:51
→ Fr4n joined09:51
← fuchstronaut left09:51
→ Guest23290 joined09:52
→ Jellyg00se joined09:52
Guest23290 → nb-ben09:52
← mdw left09:52
← cdown left09:52
← jceb left09:52
→ leeN joined09:53
→ jceb joined09:53
← mdw_ left09:54
PHPanos Anyone?09:54
→ isxek joined09:57
← MrWoohoo left09:57
← Sareuon left09:58
→ fuchstronaut joined09:58
← settermjd left10:02
← cqi left10:02
← fracting left10:02
→ settermjd joined10:03
→ mdw joined10:03
→ qt-x joined10:04
← Silenced_v2 left10:05
← mdw__ left10:06
→ Darcidride joined10:07
← JeroenT left10:07
← jceb left10:09
→ jceb joined10:09
→ cdown joined10:10
→ piling_ joined10:10
← piling left10:12
← mohabaks left10:14
→ garethdaine joined10:14
← mdw left10:14
→ mdw joined10:17
→ WayToDoor joined10:18
← cdown left10:18
← qt-x left10:18
→ fracting joined10:19
→ qt-x joined10:19
→ gechr joined10:19
← neps left10:20
← PHPanos left10:21
← SoRoot left10:22
→ SoRoot joined10:22
→ AlexRussia joined10:23
← zeroed left10:23
← mehola left10:25
← iota_pi left10:26
← moop left10:28
→ FunkyAss joined10:28
→ acetakwas joined10:29
← acetakwas left10:30
← subhojit777 left10:31
→ acetakwas joined10:32
← acetakwas left10:32
→ watabou joined10:33
← jceb left10:35
→ eletuchy joined10:35
→ wrouesnel joined10:36
← checkItOut left10:37
← encod3_ left10:37
→ encod3 joined10:37
← watabou left10:38
→ neps joined10:38
→ interne7y joined10:39
→ acetakwas joined10:39
← texinwien left10:39
← AlexRussia left10:39
→ jtkovf joined10:39
→ bollullera joined10:39
← eletuchy left10:40
→ iota_pi joined10:40
→ JeroenT joined10:41
→ moop joined10:42
← sostenuto left10:42
→ tlaxkit joined10:43
← interne7y left10:44
→ rnsanchez_ joined10:44
← boudiccas left10:45
→ EduardoMartins joined10:45
→ iLembus joined10:45
→ boudiccas joined10:46
← fracting left10:46
← _rnsanchez_ left10:47
→ LJHSLDJHSDLJH joined10:47
→ Kaisyu joined10:47
→ sostenuto joined10:47
LJHSLDJHSDLJH what is the difference between git diff HEAD~3 ..HEAD~2 and git diff HEAD~3..HEAD~2 , I'm not able to comperhend the difference of the output10:48
→ subhojit777 joined10:48
← circ-user-WUSoW left10:50
← acetakwas left10:50
← CussBot left10:50
→ acetakwas joined10:50
→ CussBot joined10:52
→ boudicca joined10:52
→ Kurvivor joined10:53
Kurvivor good evening10:53
i have a problem with remote repository (actually - local, mounted in my /mnt subdirectory)10:53
← boudiccas left10:53
Kurvivor it goes like this: i can run git remote show, git pull with it10:54
→ son joined10:54
Kurvivor however when i try to push, i get "fatal ... does not appear to be a git repository"10:54
→ fission6 joined10:54
← mdw left10:55
← PCatinean left10:56
→ Lunatrius joined10:56
← EduardoMartins left10:56
→ PCatinean joined10:57
← WayToDoor left10:57
Kurvivor oh, it seems root did not have access rights there somehow10:57
sorry for bothering10:57
← johnmilton left10:59
← subhojit777 left11:00
→ fracting joined11:01
← trout left11:01
→ le-idiot joined11:01
→ variable joined11:01
→ mdw joined11:01
← lamppid left11:07
→ _rnsanchez_ joined11:08
→ PHPanos joined11:09
← neps left11:10
← rnsanchez_ left11:12
← raijin left11:12
→ raijin joined11:12
→ subhojit777 joined11:13
→ neps joined11:13
← garethdaine left11:14
→ boudiccas joined11:15
← GandalfTheWizard left11:15
← tomboy64 left11:15
→ mohabaks joined11:17
→ k3rn31 joined11:17
← boudicca left11:18
→ garethdaine joined11:18
← raijin left11:18
→ boudicca joined11:19
← dsdeiz left11:19
→ dsdeiz joined11:20
← dsdeiz left11:20
→ dsdeiz joined11:20
← boudiccas left11:21
← pungi-man left11:21
→ LaT0rtue joined11:24
_rnsanchez_ → rnsanchez11:26
← k3rn31 left11:27
← flaguy48 left11:28
→ texinwien joined11:28
→ espindola joined11:28
→ eletuchy joined11:30
→ netcarver joined11:30
→ Sendoushi joined11:30
← dskfldm left11:32
→ k3rn31 joined11:32
← fuchstronaut left11:33
← eletuchy left11:34
→ watabou joined11:34
← Sceorem left11:35
→ sioseal joined11:39
← sioseal left11:39
← watabou left11:39
← le-idiot left11:40
← _pix left11:40
→ circ-user-MwZ8X joined11:41
← fahadash left11:42
→ mdw_ joined11:42
→ edude03 joined11:43
→ _pix joined11:43
← subhojit777 left11:45
→ raijin joined11:45
→ pungi-man joined11:45
← Rish left11:46
← mdw left11:46
→ Rooxo joined11:48
→ johnmilton joined11:50
→ sdothum joined11:50
← a_thakur left11:50
← notebox left11:52
← jeffreylevesque left11:53
← Macaveli left11:54
← leeN left11:55
→ Macaveli joined11:55
← nanga left11:56
→ nanga joined11:56
← nanga left11:56
→ nanga joined11:56
→ SimonNa joined11:57
← LaT0rtue left11:57
← philipp64|work left11:57
← encod3 left11:58
← djb-irc left11:59
→ mmlb joined11:59
← Macaveli left12:00
← espindola left12:00
→ Musok joined12:01
← Sendoushi left12:01
→ boudiccas joined12:01
→ jknetl joined12:03
← Musok left12:03
→ Sendoushi joined12:03
→ stasmakarov joined12:03
← fission6 left12:04
← Sendoushi left12:04
→ Sendoushi joined12:04
→ kedare_ joined12:04
→ Sceorem joined12:06
→ Douhan joined12:06
← boudicca left12:06
← liuzhen left12:06
→ encod3 joined12:06
→ a_thakur joined12:07
→ encod3_ joined12:07
→ boudicca joined12:07
← boudicca left12:07
→ leeN joined12:07
← boudiccas left12:07
→ boudicca joined12:08
← kedare left12:08
→ pwnawannab[NE] joined12:08
← edude03 left12:10
→ lamont joined12:11
← encod3 left12:11
← Sendoushi left12:11
→ Sendoushi joined12:11
← pratima left12:12
← leeN left12:12
→ ncd|leeN joined12:12
← fracting left12:12
→ philipp64|work joined12:13
→ synthroid joined12:13
← Sendoushi left12:14
→ Sendoushi joined12:15
→ rwb joined12:15
→ MattMaker joined12:15
→ Kicer86 joined12:17
← k3rn31 left12:17
→ espindola joined12:18
→ jeffreylevesque joined12:19
← MattMaker left12:20
→ Cyw joined12:23
→ eletuchy joined12:24
← acetakwas left12:24
→ acetakwas joined12:24
→ AlexRussia joined12:25
→ fracting joined12:25
circ-user-MwZ8X I have noticed that I add a lot of formatting in unrelated code, which seems stable. I do not like formatting updates be mixed with my feature commits. I want to merge all small formatting shit that I find into a separate commit. How do I spit small formatting commits when working on the current feature?12:27
→ DARSCODE joined12:27
i7c You could use git add -p to add changes.12:27
And possibly first add all the functional ones and then all the formatting rest (or the other way round, whichever seems more convenient?).12:28
→ jon-mac joined12:28
circ-user-MwZ8X The problem is that you notice the formatting while you inspect the code for the functional needs.12:28
← elastix left12:28
← eletuchy left12:29
i7c Where is the problem exactly?12:30
I mean yeah, that's often the case.12:30
→ jceb joined12:31
← bluezone left12:31
→ k3dare joined12:31
nb-ben make it habitual to first format the code and then change its functionality12:31
circ-user-MwZ8X You see that here you could code much more optimal and your hands are itching to reformat. Such It is sorta eyesoring. You cannot efficiently to accomplish the functional change.12:31
← aavrug left12:31
← netcarver left12:31
nb-ben so you have two commits12:31
→ djb-irc joined12:32
→ elastix joined12:32
nb-ben then if you failed with your functional changes you can reset back to your pretty formatted code commit12:32
circ-user-MwZ8X But, once you have done with your new functionality, you have forgotten were all the nusances that pissed you off during the course.12:32
→ jaaronamo joined12:33
→ fuchstronaut joined12:34
← JeroenT left12:34
← kedare_ left12:34
→ happy-dude joined12:35
← jonesinator left12:36
→ watabou joined12:36
→ iLembus_ joined12:37
→ JeroenT joined12:37
← fuchstronaut left12:39
← iLembus left12:39
← PHPanos left12:39
→ pmort joined12:39
→ dermoth_ joined12:40
→ interne7y joined12:40
← dermoth left12:40
dermoth_ → dermoth12:40
→ rossome joined12:40
← watabou left12:41
← CheckDavid left12:42
← ncd|leeN left12:42
→ mizu_no_oto joined12:43
← jon-mac left12:44
→ livingstn joined12:45
← interne7y left12:45
← raijin left12:46
→ lindenle joined12:46
← david007 left12:46
← akiva left12:46
→ achadwick joined12:47
→ ochorocho__ joined12:49
→ david007 joined12:50
← lindenle left12:50
← jknetl left12:50
← djb-irc left12:52
← ochorocho__ left12:53
← dopesong left12:53
→ fission6 joined12:53
→ jon-mac joined12:53
← paul424 left12:53
→ dopesong joined12:53
→ jessu joined12:56
jessu hi what is git ?12:57
← mdw_ left12:57
selckin http://lmgtfy.com/?q=git12:57
← JeroenT left12:58
← Sendoushi left12:58
→ JeroenT joined12:58
→ fahadash joined13:00
LJHSLDJHSDLJH I created an alias.xname but it's not working when I use .. git xname13:00
alias.mylog=git log -p --abbrev-commit --stat --date short13:00
→ nilsi joined13:00
→ rgrinberg joined13:00
→ CEnnis91 joined13:01
selckin looks like its named mylog13:01
LJHSLDJHSDLJH although it shows in the config and command syntax works separately13:01
ybden LJHSLDJHSDLJH: just do `log -p --abbrev-commit --stat --date short` or ¬git log -p --abbrev-commit --stat --date short`13:01
← david007 left13:01
ybden LJHSLDJHSDLJH: it automatically prefixes it with git, unless you do !13:01
er, s/¬/`/13:01
oops13:01
latter should be !git log -p --abbrev-commit --stat --date short13:01
← mohabaks left13:02
← neps left13:02
ybden that is, `alias.mylog=log -p --abbrev-commit --stat --date short` or `alias.mylog=!git log -p --abbrev-commit --stat --date short`13:02
← JeroenT left13:04
→ JeroenT joined13:04
→ jimi_ joined13:06
→ lamppid joined13:06
← jon-mac left13:08
→ italoacasas joined13:09
→ fuchstronaut joined13:09
→ cdown joined13:09
← Sonderblade left13:10
→ tgunr joined13:11
→ soc42 joined13:12
→ Gsham joined13:12
← mizu_no_oto left13:13
→ unbalancedparen joined13:15
← boingy left13:16
→ k3rn31 joined13:17
→ notebox joined13:18
→ Raging_Hog joined13:18
→ rnsanchez_ joined13:20
← rnsanchez left13:21
→ mflow joined13:21
→ odingodner joined13:21
mflow How can I make git show only return the author date of a commit without the file or diff?13:22
git show $hash --pretty='%an' returns the diff13:22
along the date13:22
I want only the date13:22
← italoacasas left13:23
→ boombatower joined13:23
← variable left13:23
i7c git log $hash --pretty='%ad'13:23
err and -1 probably13:24
→ mdw joined13:24
lb mflow man git show search for: PRETTY FORMATS13:24
gitinfo the git-show manpage is available at http://jk.gs/git-show.html13:24
← mdw left13:24
osse mflow: git show -s or git log -113:25
→ mdw joined13:25
→ mohabaks joined13:25
← Khisanth left13:26
lb so the full version would be: git show -s <sha> --pretty='%aD'13:26
rnsanchez_ → rnsanchez13:26
→ boingy joined13:26
→ cdg joined13:27
→ thiago_ joined13:27
← mdw left13:27
→ diegoviola joined13:27
→ xorox90 joined13:27
← boudicca left13:28
ybden lb: they don't want the diff13:28
git log is just fine13:28
lb compare the output ;)13:29
→ vishnurao joined13:30
→ btyne79 joined13:30
i7c log with -1 seems a bit crippled in comparison to show -s. :)13:30
ybden i7c: howso?13:30
i7c Just by intuition, show is supposed to show one object and log is really more to inspect the history.13:31
Ofc the outcome is the same so doesn't really matter.13:31
← xorox90 left13:31
ybden I suppose that show is more semantically correct13:31
i7c That's what I was trying to express.13:31
← philipp64|work left13:31
← boingy left13:31
→ mdw joined13:32
← notebox left13:33
← isxek left13:34
← bongjovi left13:34
→ xorox90 joined13:35
→ __name__ joined13:36
osse i7c: but you can do git log -213:36
and -313:36
and -69, -666 and -133713:37
→ watabou joined13:37
i7c I'm aware.13:38
How about -42?13:38
→ boudiccas joined13:39
osse i assume so13:39
I would be disappointed if not13:39
i7c Likewise.13:39
→ Khisanth joined13:39
→ FeersumEndjinn joined13:40
← Orion3k left13:41
FeersumEndjinn Hi - we recently developed a new feature on a new branch which introduced some new CSS. Tested fine on all supported browsers, so did a pull request and merged into master. Users of old unsupported versions of IE complain, boss says rollback to before merge. My question is, what is the best way to do that, and then push this back to the front of master?13:42
→ reactormonk joined13:42
i7c !revert13:42
gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?13:42
reactormonk How can I find out which gitignore file ignores a specific file? Or at least which gitignore files git is picking up? Can't figure out why a specific file isn't picked up.13:42
← watabou left13:43
→ italoacasas joined13:43
FeersumEndjinn reactormonk: git should pick up .gitignore from repository root as far as I'm aware?13:43
lb FeersumEndjinn you can have multiple .gitignore in sub dirs13:44
reactormonk FeersumEndjinn, I just deleted all the contents, still ignored.13:44
i7c FeersumEndjinn, this could be worth a read, too. https://git-scm.com/blog/2010/03/02/undoing-merges.html13:44
reactormonk lb, there's just one according to ls **/.gitignore13:44
lb reactormonk do you know git check-ignore? ( although it just checks for ignorance, not for the ignore source)13:45
FeersumEndjinn i7c: thanks, will take a look at that. I'm just worried that whilst I can rollback the code to a specific point, that I'll encounter fast forward conflicts when I try and commit to push this back to the front of master13:45
← wrouesnel left13:45
lb reactormonk there could also be system/user wide gitignores be present on your machine13:45
reactormonk lb, checked user wide13:46
lb reactormonk does `git config -l | grep core.excludesfile` show something?13:47
→ ash_workz joined13:47
← nnyk_ left13:47
lb reactormonk ahh got it13:47
reactormonk git check-ignore -v <filename>13:48
reactormonk just gives me a return value of 1, nothing else.13:48
→ baraba joined13:48
lb Oo13:49
← boudiccas left13:49
i7c FeersumEndjinn, yes, that's a valid concern. It will cause additional work (or "trouble") for your coworkers if you use the first approach (reset and remerge, which basically rewrites history).13:49
→ Orion3k joined13:49
← Orion3k left13:49
→ nnyk_ joined13:49
i7c FeersumEndjinn, the git-revert approach should be safe tho, history-wise.13:49
FeersumEndjinn i7c: Luckily for me, I'm the only dev on this project at the moment so if I can implement this, next time someone else works on this hopefully this is all undone :)13:49
→ Noldorin joined13:50
i7c Well if you work alone rewriting history shouldn't be too bad. :)13:50
lb reactormonk https://git-scm.com/docs/git-check-ignore -> exit status 1 = None of the provided paths are ignored.13:50
FeersumEndjinn I'm 45 commits ahead of where I need to be at the moment, so based on that info, how would be best?13:50
reactormonk lb, yargh13:50
FeersumEndjinn Ideally totally rewriting history is fine for me if it leaves a cleaner master branch13:51
i7c interactive rebase and throw out what you don't want, maybe?13:51
Or do you just want to go back in history really?13:51
FeersumEndjinn I actually don't want any of it so don't need any interactivity, just simply go back in history13:51
i7c git reset --hard <commit-where-you-wanna-be>13:52
FeersumEndjinn I still have the new feature in a separate branch so I won't lose anything13:52
i7c: and doing that won't give me any issues when I then commit that and push to github?13:52
i7c git push --force-with-lease <remote> <branch>13:52
← xorox90 left13:52
FeersumEndjinn --force-with-lease is a new one on me13:53
→ AaronMT joined13:53
i7c FeersumEndjinn, if all you said is true and rewriting history is fine, you won't run into trouble.13:53
→ neps joined13:53
→ lmat joined13:53
FeersumEndjinn i7c: Many thanks :)13:53
i7c --force-with-lease is the same as --force, just that it checks your remote/branch first if it matches with the actual revision at the remote.13:53
lmat I have an alias, lola, defined as lola = log --graph --oneline --decorate --all. I also have [pager] log = less -S (don't chop lines)13:54
i7c If there is a mismatch git will complain.13:54
lmat It's chopping lines.13:54
→ boudiccas joined13:54
→ MattMaker joined13:54
lmat I should say, git log isn't chopping lines, but lola is.13:54
i7c This keeps you from rewriting things if someone else already did so.13:54
lmat oh, nevermind...it's not chopping now.13:54
Ohhhhhhhhh it's chopping when I git lola | head13:55
→ madewokherd joined13:55
lmat I guess I should head over to ##bash13:55
→ MattMake_ joined13:55
→ boudicca joined13:55
← fscala left13:56
→ fscala joined13:57
→ ramsub07 joined13:57
← Noldorin left13:58
← boudiccas left13:58
ramsub07 hello, i branched out of master a few days ago. I need to know at what commit i branched out. As in, what was the commit on master when i branched out?13:58
← MattMaker left13:59
osse ramsub07: git merge-base master yourbranch13:59
→ xorox90 joined13:59
← boudicca left14:01
← neps left14:01
→ Macaveli joined14:01
→ jerematic joined14:02
← baraba left14:03
→ aavrug__ joined14:04
→ neps joined14:04
→ kadoban joined14:04
← Fr4n left14:05
→ JJM joined14:05
JJM → Guest9627014:06
→ djb-irc joined14:06
FeersumEndjinn i7c: You sir, are a gentleman. Fixed my problem perfectly, thank you again.14:08
← t0by left14:09
→ boudiccas joined14:09
→ toogley joined14:09
→ MattMaker joined14:09
← aavrug__ left14:09
← texasmynsted left14:10
lb ramsub07 have a look at !lol14:11
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all14:11
→ edude03 joined14:12
→ boudicca joined14:12
→ eletuchy joined14:12
→ Fr4n joined14:12
← Repox left14:13
← MattMake_ left14:13
← boudiccas left14:13
← nnyk_ left14:14
→ infra-red joined14:14
→ mostlybadfly joined14:15
← eletuchy left14:16
← MattMaker left14:16
→ sangy joined14:17
→ boudiccas joined14:17
← qt-x left14:17
← soc42 left14:17
→ MattMaker joined14:17
→ linuxmint joined14:18
← boudicca left14:18
→ bluezone joined14:19
i7c FeersumEndjinn, you're welcome. :)14:19
→ Ahmed90 joined14:20
→ boudicca joined14:22
← Fr4n left14:22
→ jost__ joined14:22
← boudiccas left14:22
← Douhan left14:22
→ Fr4n joined14:23
→ frem_ joined14:24
← MattMaker left14:24
← Jellyg00se left14:24
← xorox90 left14:25
← jost_ left14:25
← pmort left14:26
→ CJKinni joined14:27
→ Jellyg00se joined14:27
← yuhlw left14:29
→ espindol_ joined14:30
← espindola left14:30
→ eijk_ joined14:31
→ yuhlw joined14:31
← boudicca left14:31
← LJHSLDJHSDLJH left14:32
← infra-red left14:32
← tinajohnson___ left14:34
→ boudicca joined14:34
← ramsub07 left14:35
→ texasmynsted joined14:36
→ eijk joined14:36
→ RedShift joined14:38
← eijk_ left14:38
→ fmcgeough joined14:38
← yuhlw left14:38
→ watabou joined14:38
→ dimi1947 joined14:40
→ WayToDoor joined14:40
→ interne7y joined14:41
→ ramsub07 joined14:41
← settermjd left14:41
→ MattMaker joined14:41
← diegoviola left14:42
→ Orion3k joined14:43
← Orion3k left14:43
← xbob left14:43
← watabou left14:43
← rgrinberg left14:44
→ rgrinberg joined14:44
← MattMaker left14:45
→ MattMake_ joined14:45
→ rchavik joined14:45
← interne7y left14:45
← espindol_ left14:46
→ baraba joined14:48
← texasmynsted left14:49
← k3rn31 left14:50
→ quenode_ joined14:53
→ LJHSLDJHSDLJH joined14:53
← Fr4n left14:53
← LJHSLDJHSDLJH left14:53
→ LJHSLDJHSDLJH joined14:53
→ espindola joined14:54
→ flaguy48 joined14:54
← Gsham left14:55
→ kilo_bravo joined14:57
← drodger left14:57
← livingstn left14:58
→ rafalcpp joined14:58
→ livingstn joined14:58
← livingstn left14:58
→ drodger joined14:59
→ livingstn joined14:59
← FeersumEndjinn left15:00
← cyan__ left15:00
→ yuhlw joined15:00
← Guest96270 left15:00
← JeroenT left15:00
→ JJM joined15:00
JJM → Guest5339715:01
← rgrinberg left15:02
← jagob left15:02
← dopesong left15:02
← blur3d left15:02
→ rgrinberg joined15:02
← drodger left15:02
← madewokherd left15:03
← rscata left15:03
← UTAN_dev left15:03
→ Gsham joined15:04
→ bango2 joined15:04
← rgrinberg left15:04
→ rgrinberg joined15:04
→ tyreld joined15:05
← muthu left15:05
→ dopesong joined15:05
→ xorox90 joined15:05
← Cyw left15:06
← TomyWork left15:08
→ kpease joined15:08
← garethdaine left15:08
→ crst joined15:08
→ drodger joined15:08
→ Tecan joined15:09
Tecan was wondering how i would check this repo out https://www.gitorious.org/guile-gcc/guile-gcc/commit/ca3a6664e57f757aa37996d88708a321b84d67f8?p=guile-gcc:guile-gcc.git;a=tree;h=refs/heads/master;hb=refs/heads/master15:09
→ UTAN_dev joined15:10
← encod3_ left15:10
← neps left15:11
→ exarch joined15:11
← synthroid left15:11
grawity start with `git clone https://www.gitorious.org/guile-gcc/guile-gcc.git`, which the new Gitorious somehow forgot to mention in their repo 'summary' tab15:12
← SoRoot left15:12
grawity if you specifically need commit ca3a6664e57, `git checkout` it15:12
← Sceorem left15:12
grawity though it's the latest commit anyways15:12
Tecan thanks that worked15:13
→ dmto joined15:13
Tecan surprised gitorious doesnt provide that15:13
grawity they probably forgot to configure it in gitweb15:13
← Rooxo left15:13
grawity it's just a mirror provided by some randos, anyway15:14
← crst left15:14
← Alienpruts left15:15
← jaaronamo left15:17
→ encod3 joined15:17
→ Fr4n joined15:17
→ jonesinator joined15:17
← encod3 left15:17
← rgrinberg left15:17
→ encod3 joined15:17
→ MattMaker joined15:18
→ griffindy joined15:18
→ garethdaine joined15:18
← Kurvivor left15:19
← MattMake_ left15:20
← grawity left15:20
→ grawity joined15:21
→ Gamecubic joined15:21
→ dreiss joined15:22
→ robotroll joined15:23
← MattMaker left15:23
→ llo joined15:24
← WayToDoor left15:24
→ zivester joined15:24
→ MattMaker joined15:24
← jonesinator left15:25
→ bilb_ono joined15:26
→ eroussel joined15:27
← jceb left15:27
← Raging_Hog left15:27
→ SoRoot joined15:27
← Schwarzbaer left15:28
→ Schwarzbaer joined15:28
← SnoopyDgg left15:29
→ rgrinberg joined15:32
← ThomasLocke left15:33
→ romerocesar joined15:33
→ MattMake_ joined15:34
← romerocesar left15:34
→ ams__ joined15:34
→ romerocesar joined15:34
← mohabaks left15:34
← MattMaker left15:37
→ JohnBat26 joined15:37
← MattMake_ left15:37
→ davisonio joined15:37
→ TomyLobo joined15:39
← PCatinean left15:39
→ dietr1ch joined15:39
→ watabou joined15:39
→ MattMaker joined15:39
← a_thakur left15:40
← bilb_ono left15:41
← davisonio left15:41
→ raijin joined15:41
→ a_thakur joined15:41
→ neps joined15:42
← Darcidride left15:42
→ hobodave joined15:43
← sangy left15:44
→ MattMake_ joined15:44
→ boudiccas joined15:45
← MattMaker left15:45
← boudicca left15:46
← garethdaine left15:46
→ jjasinski joined15:46
→ netcarver joined15:46
→ madewokherd joined15:47
→ LucaTM joined15:47
→ t0by joined15:47
← watabou left15:49
→ lindenle joined15:49
← yuhlw left15:49
→ synthroid joined15:49
→ diegoaguilar joined15:49
← diegoaguilar left15:49
← tlaxkit left15:49
← bollullera left15:49
→ diegoaguilar joined15:50
← neps left15:50
→ MattMaker joined15:51
← diegoaguilar left15:51
→ LionsMane joined15:51
→ boudicca joined15:51
→ durham joined15:51
← durham left15:51
→ durham joined15:51
← lindenle left15:53
boudicca → noudiccas15:53
← b1tchcakes left15:53
← MattMake_ left15:53
← boudiccas left15:53
noudiccas → boudiccas15:54
thiago_ → thiago15:54
→ b1tchcakes joined15:54
→ diegoaguilar joined15:54
← diegoaguilar left15:54
→ PCatinean joined15:54
← dimi1947 left15:54
→ diegoaguilar joined15:55
→ davisonio joined15:55
← t0by left15:55
→ MacWinner joined15:56
← davisonio left15:57
→ rahtgaz joined15:57
→ phaleth joined15:58
→ t0by joined15:58
→ davisonio joined15:58
← davisonio left15:58
← ShekharReddy left15:58
← jeffreylevesque left15:59
← eroussel left15:59
← rominronin left15:59
→ nnyk_ joined15:59
← xorox90 left15:59
→ lindenle joined16:00
→ eletuchy joined16:00
← synthmeat left16:01
→ AaronMT_ joined16:01
← ahmedelgabri left16:01
→ xorox90 joined16:02
→ eijk_ joined16:02
→ philipp64|work joined16:03
← eijk left16:03
← AaronMT left16:04
← k3dare left16:04
→ aard_ joined16:04
← eletuchy left16:05
← netj left16:05
→ nnyk joined16:06
← netcarver left16:07
← nnyk_ left16:07
→ davisonio joined16:07
← stonerfish left16:07
→ netj joined16:07
→ neps joined16:07
→ boudicca joined16:07
→ stonerfish joined16:07
→ gfortune joined16:08
→ synthmeat joined16:08
← boudiccas left16:09
← Jellyg00se left16:12
← llo left16:13
gfortune I have some code in a git clone on my local box (cloned from our gitlab server) that I would like to run from one of our database servers. Is there a good way to get a clone onto the db server that does not require my credentials in gitlab to be used through the db server?16:13
→ pullphinger joined16:13
KevinMGranger packaging / archiving / pushing to the db server16:14
kadoban gfortune: rsync, or whatever file transfer thing you like16:15
gfortune The pushing in that case would be a simple file copy, correct?16:15
→ texasmynsted joined16:15
→ MattMake_ joined16:15
gfortune kadoban: so don't use git at all for moving the files around?16:16
→ izjaq joined16:16
→ tomog999_ joined16:17
→ snfgf joined16:17
kadoban gfortune: I don't see any reason to. I don't use git for deployment, it's not designed for it, and it's not very good at it.16:18
← Mobutils left16:18
← MattMaker left16:18
← tomog999 left16:18
ilmari !deploy16:19
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.html16:19
← josuebrunel left16:19
← izjaq left16:20
← pol123456 left16:21
← GavinMagnus left16:21
→ bilb_ono joined16:22
→ Wue joined16:23
← drodger left16:24
← ramsub07 left16:24
← acetakwas left16:24
← dreiss left16:25
guardian hello, is there a way to disable colors when git log is used with a pretty format that contains color switches?16:25
→ acetakwas joined16:25
→ drodger joined16:26
← nilsi left16:26
bango2 → techni_bango16:27
← Wue left16:27
techni_bango → techno_bango16:27
kadoban git --color=never or something maybe? It's probably not never, I forget what the actual value is though.16:27
guardian nope16:28
pretty format starts with %C(auto) though16:28
as far as I understand man, it should disable colors when using --no-color16:28
→ notebox joined16:29
← dopesong left16:30
→ Bduo joined16:30
← JohnBat26 left16:30
← nnyk left16:30
ilmari always, auto or never, but that doesn't disable explicit %C in the format16:31
→ dopesong joined16:31
← mischat left16:31
← baraba left16:31
← thiago left16:31
← freimatz left16:31
guardian hmm seems like you have to write it this way16:31
--pretty=format:'%C(auto,red)%h%Creset -%C(auto,yellow)%d%Creset %s %C(auto,green)(%cr)%C(auto,bold blue)<%an>%Creset'16:31
← dietr1ch left16:32
→ dietr1ch joined16:32
ilmari ah, that works16:33
ilmari fixes his alias16:33
→ dreiss joined16:34
← dietr1ch left16:34
← MattMake_ left16:34
← davisonio left16:35
← nidr0x left16:35
← dopesong left16:35
→ juslintek joined16:35
juslintek Hi I'm trying to write git pre-commit script16:36
I want to make universal per directory16:36
lets say I want it to be executed in each project i create in server16:36
← rolha left16:36
← netj left16:36
juslintek The script must get connection data from wp-config.php16:36
dump database16:36
← acetakwas left16:36
juslintek and add it to git16:36
milki this already sounds like a bad idea16:37
← mikecmpbll left16:37
← fuchstronaut left16:37
juslintek its bitbucket private repo.16:37
→ kaldoran joined16:37
juslintek all of them will be like that.16:37
→ sacha joined16:38
juslintek And as well why does it sound like a bad idea?16:38
milki database dumps in a git repo doesnt seem like a good use of git16:38
→ netj joined16:38
→ baraba joined16:38
KevinMGranger Are you sure you want it pre-commit? You can put it in your skeleton dir16:38
juslintek milki, so how should I backup db?16:38
And save it with project, so on pull it would automatically add it to db16:39
← kurkale6ka left16:39
milki using normal database backup tools16:39
← Ravana left16:39
← dreiss left16:39
juslintek milki, but it is a hassle, I want one commant or click to do it all in one place. Less hassle in long term.16:40
← boudicca left16:40
KevinMGranger db *schema* or db *data* ?16:40
juslintek As well it would be easier for other devs to setup project and already have demo data.16:40
milki you think its less hassle. i dbout it though16:40
juslintek KevinMGranger, both. I need both.16:41
preaction you want devs to download every database dump that's ever been made just to work on the site?16:41
→ nejni-marji joined16:41
nejni-marji Does git understand hardlinks?16:41
bremner not really16:41
← gechr left16:41
preaction nejni-marji: no. because hardlinks are invisible16:41
← encod3 left16:41
juslintek Db dumbs will be overritten per each push from server.16:41
nejni-marji That's a good pooint16:41
preaction juslintek: that's not how git works16:41
→ interne7y joined16:42
juslintek but why you can version database16:42
db is text file as well16:42
You can see changes that have been made16:42
preaction juslintek: the git repo has every version of every file that's ever been committed to the repo. when you download the repo, you get everything locally16:42
juslintek: git doesn't store deltas, it stores the whole file, entirely16:42
KevinMGranger Until it's packed, that is16:43
juslintek So maybe i should pack it.16:43
Arghh16:43
→ garethdaine joined16:43
KevinMGranger To answer your original question, see the TEMPLATE DIRECTORY section of the git init man page16:43
!man git init16:43
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 !) ?16:43
the git-init manpage is available at http://jk.gs/git-init.html16:43
→ Ravana joined16:44
← Bduo left16:44
KevinMGranger I'm not entirely against your approach, just keep in mind that data is usually tracked separately from code. And I really don't think you want pre-commit16:44
techno_bango → bango216:45
juslintek So which hook should I use?16:45
← Tecan left16:45
KevinMGranger Well, I guess I don't understand the workflow entirely. Maybe you do want pre-commit16:46
← SoRoot left16:46
juslintek Well pre-commit script adds db dump16:46
→ boudiccas joined16:46
juslintek I just want to make it dynamic16:46
← interne7y left16:46
juslintek So i can copy paste it per each git repo on the project and it would work16:47
preaction oh it's going to be every commit even? how are people going to use the git history to see what happened if they have to scroll past a massive database dump?16:47
→ MattMaker joined16:47
← LJHSLDJHSDLJH left16:47
juslintek peaction, oh yeah, haven't thought about it.16:47
preaction but i should just shut up because nobody's going to dissuade you from this absolutely terrible idea...16:47
juslintek preaction.16:47
← jimi_ left16:47
juslintek So what kind of approach would be best?16:48
→ diegoviola joined16:48
juslintek Are archives versioned?16:48
like zip or rar or tar.gz?16:48
preaction i don't know what you mean by that16:48
juslintek Or just overwritten16:48
← wviana left16:48
preaction the git repo stores every version of every file that's ever been committed16:48
→ MattMake_ joined16:48
juslintek I does git show diff between zips and rars?16:48
preaction that includes zip files, tarballs, images, sql files16:49
→ eroussel joined16:49
preaction no, binary files it will usually not display diffs, but displaying diffs says nothing about how the git repo stores data16:49
juslintek or like zip 2016-05-07 and 2016-05-0816:49
preaction you can make git display binary diffs using the gitattributes file, but that's off the topic here16:49
juslintek I pushed one zip yesterday and today I pushed another16:49
preaction the git repo has both in there16:49
nejni-marji But git understands symlinks, right?16:49
Those are visible16:49
preaction nejni-marji: yes. if your filesystem does, they might even work16:50
→ MattMak__ joined16:50
nejni-marji Good.16:50
Because for some stupid reason16:50
→ nnyk joined16:50
nejni-marji wiki redirects Xdefaults to Xresources, says Xdefaults is depreciated, but if I delete it my terminal stops working right16:50
Isn't technology wonderful?16:50
juslintek preaction, what is best practice in my case then. To version code and as well to store latest database in the same package?16:51
gitinfo set mode: +v16:51
sacha Hello I have a .git directory. How can I extract master branch from it??16:51
Eugene sacha - man git-archive16:51
gitinfo sacha: the git-archive manpage is available at http://jk.gs/git-archive.html16:51
preaction juslintek: no. keep the data on the server. pull backups and put them on another server as needed. keep the schema in the repo16:51
→ Mobutils joined16:51
← a_thakur left16:51
← MattMaker left16:52
sacha Thanks16:52
Eugene juslintek - !database_schema is a good read16:52
gitinfo juslintek: Changing database schemas is a very complicated topic. Some reading: http://thedailywtf.com/Articles/Database-Changes-Done-Right.aspx16:52
preaction juslintek: git-annex and git-lfs are also things, but i really don't think that's what you want here16:52
← courrier left16:52
← MattMake_ left16:54
→ eletuchy joined16:54
← durham left16:55
← sacha left16:55
← jjasinski left16:56
juslintek dang need to ask wordpress community, what is best practice to version database, maybe I can extract all data to php import files and then they can be used to put data back via php.16:56
← neps left16:56
← bilb_ono left16:56
← z8z left16:57
→ ShekharReddy joined16:57
← italoacasas left16:58
→ ToBeCloud joined16:58
gitinfo set mode: +v16:58
→ JZA joined16:58
← eroussel left16:58
← eletuchy left16:59
→ IWishIKnew joined16:59
JZA hi I have an issue with a push I am trying to do. There is a change that my pull didnt get.16:59
→ rominronin joined17:00
→ Raging_Hog joined17:00
→ durham joined17:00
→ govg joined17:01
→ shinnya joined17:01
→ jaguarmagenta joined17:01
JZA I think I need to stash the changes17:01
← nnyk left17:02
→ nitin joined17:03
→ reim joined17:03
← garethdaine left17:03
← rgrinberg left17:04
→ Ediz joined17:04
→ ramsub07 joined17:05
← rominronin left17:05
→ deadnull_ joined17:05
← linuxmint left17:05
← jstimm left17:05
← jaguarmagenta left17:06
← mdw left17:07
→ bilb_ono joined17:07
gfortune kadoban, ilmari: Thanks for the info. That's very helpful.17:08
→ italoacasas joined17:08
→ davisonio joined17:09
← eijk_ left17:10
→ eijk joined17:10
← son left17:10
← fracting left17:10
← SimonNa left17:10
piling_ → piling17:11
→ son joined17:11
← ramsub07 left17:11
→ Szym joined17:11
← romerocesar left17:11
← netj left17:12
← edude03 left17:12
← Szym left17:12
→ romerocesar joined17:12
→ SimonK joined17:12
← djb-irc left17:12
← kaldoran left17:13
→ netj joined17:13
→ kaldoran joined17:13
← kaldoran left17:14
→ ramsub07 joined17:14
→ kaldoran joined17:14
← kaldoran left17:14
→ kaldoran joined17:15
← elastix left17:15
→ mikecmpbll joined17:15
← notebox left17:15
→ jimi_ joined17:16
→ Limes_ joined17:16
→ djb-irc joined17:17
← Schwarzbaer left17:17
← jimi_ left17:17
→ jimi_ joined17:17
→ SteffanW joined17:17
← romerocesar left17:18
_xor Probably a dumb question, but can a remote tracking branch be added to a complete different, unrelated repo?17:19
→ hahuang61 joined17:19
grawity remote tracking branches are added for whatever remotes you add via `git remote`17:20
there are no specific requirements for common history or anything17:20
← davisonio left17:20
_xor So if I have repos A and B that are completely separate and unrelated, I can add a remote tracking branch in B that points to some branch in A. Do I have that right?17:21
→ wviana joined17:21
→ thiago joined17:21
grawity yes17:21
_xor Cool :)17:21
← roentgen left17:21
grawity except for the part where you 'add' remote tracking branches17:21
← toogley left17:21
→ XHFHX joined17:21
_xor Hmm. I'm trying to settle on how I want to structure my projects. I'm using GitLab as my "main" server. My current options seem to be...17:22
A) Keep everything in one single repo. B) Keep a master repo with submodules for different components (Android app, iOS app, etc.). C) Keep a single repo with worktrees. D) Keep separate repos all together.17:22
grawity E) Just keep separate repos.17:23
_xor The main thing is that I want to track & be able to keep in sync a given project folder across 2-3 different workstations.17:23
→ Paras joined17:23
_xor Hmm, yeah I'm considering that.17:23
→ Somelauw joined17:23
← Paras left17:23
_xor Any particular reason why it would be better?17:23
→ roentgen joined17:23
← roentgen left17:23
→ roentgen joined17:23
← thiago left17:23
→ leeN joined17:24
XHFHX Hi there. I want to add something to a project at github but I can't push it because I can't make it public, just for myself. But I still want to be able to pull the updates from the public stream. The problem is that I have to add one line to this file ( https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/extractors.py ) in order to get it work. Can I say that follow every change on this file except my line?17:24
_xor Someone mentioned comparing histories would be harder if kept in separate repos, but that's not a huge concern right now for me.17:24
→ irco joined17:24
grawity XHFHX: no17:24
Somelauw I have broken my git somehow. When typing 'git branch' it tells me: fatal: Failed to resolve HEAD as a valid ref.17:24
→ Paras joined17:24
← netj left17:24
XHFHX grawity: what's the best option then?17:25
grawity Somelauw: what does `git symbolic-ref HEAD` show?17:25
→ netj joined17:25
Somelauw grawity: fatal: No such ref: HEAD17:25
grawity point it to refs/heads/master17:25
Somelauw I broke it by using vim-fugtive17:25
grawity: you mean, edit .git/HEAD?17:26
the contents of this file are: ref: refs/heads/master17:26
← vishnurao left17:26
→ fracting joined17:26
→ vishnurao joined17:27
→ neps joined17:27
Somelauw removing the 'ref: ' in front of it may have helped17:27
grawity or it may have not17:27
Somelauw at least now git symbolic-ref HEAD returns /refs/heads/master17:28
← diegoviola left17:29
← xorox90 left17:29
← netj left17:29
← Paras left17:30
→ ahmed_elgabri joined17:30
Somelauw grawity: it's not fixed. My index shows "fatal: not a git repository".17:31
→ netj joined17:32
Somelauw i'll undo my changes to get back to the broken state17:33
→ timblechmann joined17:34
← djb-irc left17:34
← cdown left17:35
→ xorox90 joined17:35
← neps left17:35
→ thiago joined17:36
← Ahmed90 left17:36
→ Darcidride joined17:37
← xorox90 left17:37
← fracting left17:37
→ xorox90 joined17:38
→ settermjd joined17:39
← xorox90 left17:39
← tvw left17:39
Somelauw okay, i fixed it manually. it does need 'ref: ' in front, my .git/refs/heads/master was corrupted17:40
← troulouliou_div2 left17:40
→ rgrinberg joined17:41
← knutstrut left17:41
→ xorox90 joined17:41
← reim left17:41
← rgrinberg left17:42
→ rgrinberg joined17:42
← thiago left17:42
→ knutstrut joined17:43
← xorox90 left17:43
→ thiago joined17:43
→ CJKinni` joined17:43
→ xorox90 joined17:43
→ WayToDoor joined17:44
← rgrinberg left17:46
→ watabou joined17:46
→ d5sx43 joined17:46
→ rgrinberg joined17:46
← d5sx43 left17:48
→ romerocesar joined17:48
→ edude03 joined17:48
→ eletuchy joined17:49
← rgrinberg left17:49
→ rgrinberg joined17:49
→ Dyonisos joined17:49
→ mangolisk_ joined17:50
→ fracting joined17:51
← watabou left17:51
← settermjd left17:51
← Macaveli left17:51
→ nilsi joined17:51
→ Sasazuka__ joined17:52
← A124 left17:52
← rgrinberg left17:53
← romerocesar left17:53
deadnull_ → _deadnull17:53
→ rgrinberg joined17:53
← eletuchy left17:53
→ A124 joined17:54
← timblechmann left17:54
→ eletuchy joined17:54
Sasazuka__ → Sasazuka17:54
← rgrinberg left17:55
→ rgrinberg joined17:56
← nilsi left17:56
_deadnull → deadnull_17:57
← eletuchy left17:59
← Psychiatrist left17:59
← marcogmonteiro left17:59
→ dreiss joined18:01
→ rominronin joined18:01
→ dopesong joined18:02
→ garethdaine joined18:02
← mikecmpbll left18:05
→ mikecmpbll joined18:06
← ramsub07 left18:06
← rominronin left18:06
← garethdaine left18:07
→ hahuang65 joined18:07
→ ramsub07 joined18:08
← hahuang61 left18:09
→ hahuang61 joined18:09
← iLembus_ left18:10
→ ochorocho__ joined18:10
← hahuang65 left18:11
← durham left18:12
→ eeo joined18:13
← todd_dsm left18:13
← nitin left18:13
→ fuchstronaut joined18:14
→ Repox joined18:14
→ CBX joined18:15
← xorox90 left18:15
→ durham joined18:16
← durham left18:16
→ durham joined18:18
→ morenoh149 joined18:18
→ tomboy64 joined18:18
morenoh149 how do I revert a git commit but as a new commit?18:19
→ xorox90 joined18:19
morenoh149 so undo a commit but leave a trail18:19
→ eroussel joined18:19
→ arooni joined18:19
← fuchstronaut left18:19
← shafox left18:20
kadoban morenoh149: With 'git revert'18:20
← thiago left18:20
morenoh149 thanks18:20
→ thiago joined18:21
← allcentu1 left18:21
← dopesong left18:22
← t0by left18:23
→ Schwarzbaer joined18:24
→ Spacew00t joined18:24
← sauvin left18:25
← mostlybadfly left18:26
← raijin left18:28
← xorox90 left18:30
→ dopesong joined18:31
← FunkyAss left18:32
→ nowhere_man joined18:32
← jtkovf left18:33
← deadnull_ left18:33
← multi_io left18:33
→ nilg joined18:34
← espindola left18:34
→ espindola joined18:34
← macefr left18:34
← espindola left18:35
→ espindola joined18:35
→ deadnull_ joined18:36
← SteffanW left18:36
→ jstimm joined18:37
→ noobiewan joined18:37
← eeo left18:37
noobiewan hey guys, I had some big files in my repo that I download on my last commit. Now I want to push the current state only to the remote repo. How can I do this? It's an empty remote. If I simple push it, it will push all the history and it will exceed the available space I have for that repo. Thank you18:39
*that I deleted (not downloaded)18:39
Somelauw First I git stashed my changes, then I performed a cherry-pick and then I merged that cherry pick with my own changed and comitted. After doing git stash pop, it tells me there is an unmerged path. What is that?18:40
kadoban noobiewan: Start an orphan branch with just the current state I guess18:40
← jessu left18:40
→ multi_io joined18:40
→ Ahmed90 joined18:41
← CBX left18:41
← deadnull_ left18:41
→ nwkj86 joined18:42
→ interne7y joined18:43
← rchavik left18:43
→ dfyc joined18:44
→ siprbaum joined18:44
→ macefr joined18:46
← diegoaguilar left18:47
→ watabou joined18:47
← interne7y left18:47
← przemoc left18:49
← achadwick left18:49
← dsdeiz left18:50
→ garethdaine joined18:50
← Gsham left18:52
← watabou left18:53
→ LaT0rtue joined18:53
→ SoRoot joined18:53
← Somelauw left18:53
→ CJKinni`` joined18:54
→ eletuchy joined18:55
← alex1a left18:55
→ fuchstronaut joined18:56
→ przemoc joined18:56
← doener left18:57
← diogenese left18:57
← CJKinni left18:58
← CJKinni` left18:58
→ diogenese joined18:58
← Raging_Hog left18:59
← eletuchy left18:59
→ davisonio joined19:00
← diogenese left19:00
→ rominronin joined19:00
→ neps joined19:01
← boudiccas left19:01
← neps left19:01
→ neps joined19:02
← fahadash left19:02
→ jaguarmagenta joined19:02
← SoRoot left19:04
→ grubles_ joined19:05
← unbalancedparen left19:05
← rominronin left19:05
← wviana left19:05
→ wviana joined19:06
← robotroll left19:06
← jaguarmagenta left19:07
→ eletuchy joined19:07
→ diogenese joined19:07
→ rueben_ joined19:08
← diogenese left19:08
← neps left19:09
→ diogenese joined19:09
→ Rish joined19:09
→ eletuchy_ joined19:10
← diogenese left19:10
→ WaReZ joined19:11
→ wald joined19:11
→ yqt joined19:12
→ eletuch__ joined19:12
← eletuchy left19:12
→ cyan__ joined19:13
← ToBeCloud left19:14
← eletuchy_ left19:14
→ boudiccas joined19:14
→ eletuchy joined19:16
← eletuch__ left19:17
← italoacasas left19:18
→ diogenese joined19:19
← nejni-marji left19:19
→ nitin joined19:19
→ eletuchy_ joined19:19
JZA hi how can I setup my login/pwd so it doesnt keep asking me everytime?19:21
← baraba left19:21
← eletuchy left19:22
→ eletuchy joined19:22
→ italoacasas joined19:22
→ t0by joined19:23
← eletuchy_ left19:24
→ nitin_ joined19:24
← Rish left19:25
→ denimsoft joined19:25
← nitin left19:25
→ boudicca joined19:26
→ Rish joined19:26
→ eletuchy_ joined19:26
Eugene JZA - !github_ssh19:27
gitinfo JZA: [!ssh_github] If you are having problems accessing github repos over HTTPS you should switch to SSH (the default used by git, for many very good technical reasons): https://help.github.com/articles/generating-ssh-keys19:27
→ alex1a joined19:27
← eletuchy left19:27
← boudiccas left19:28
← mmlb left19:28
grubles_ → grubles19:28
← vishnurao left19:28
← johnmilton left19:28
← nitin_ left19:29
→ k3rn31 joined19:30
reactormonk Is there a GUI to browse old versions of files?19:30
circ-user-MwZ8X Curiously, I have removed an empty line after a line of text but git reports me that tile of text itself has changed, like -a line of text +a line of text19:31
I mean like19:31
-a line of text19:31
← Grimm_ left19:31
circ-user-MwZ8X here goes an empty line19:31
+a line of text19:31
→ eletuchy joined19:31
← fuchstronaut left19:31
← rgrinberg left19:31
→ rgrinberg joined19:32
→ johnmilton joined19:32
→ starsinmypockets joined19:32
circ-user-MwZ8X I remember that in the past git diff reported -(empty line) if empty line removed19:32
← eletuchy_ left19:32
→ shafox joined19:32
starsinmypockets I want to delete a branch, but... is there a way to ensure that the branch to-delete does not contain any 'unique' commits (I know that's not how it works but I want to make sure there are no commits that are ONLY in the branch to be deleted)19:33
← phaleth left19:33
← rueben_ left19:33
→ rueben_ joined19:33
→ mmlb joined19:33
← denimsoft left19:33
← dfyc left19:33
→ MrWoohoo joined19:34
→ eletuchy_ joined19:34
→ hashpuppy joined19:36
→ SwiftMatt joined19:36
← eletuchy left19:36
→ dsdeiz joined19:37
circ-user-MwZ8X I think that you need to check the hash codes.19:37
→ mbrzuzy joined19:37
← IWishIKnew left19:37
→ boudiccas joined19:37
grubles → dingus19:37
→ dhollinger joined19:37
← italoacasas left19:38
→ eletuchy joined19:38
← cdg left19:39
→ italoacasas joined19:39
→ kenansulayman joined19:39
← boudicca left19:39
→ sangy joined19:40
kenansulayman → Guest353519:40
← eletuchy_ left19:40
← nilg left19:40
circ-user-MwZ8X It is a worthy question, worth to ask at SO. On the other hand, I have a lot of editions of the same commit. So, I think that the tool that would check that is useless. I want only latest edition of the commit to appear in the branch, despite all editions are "unique commits".19:41
→ eletuchy_ joined19:42
← johnmilton left19:42
→ allcentu1 joined19:42
← rueben_ left19:42
← italoacasas left19:42
→ rueben_ joined19:43
← rgrinberg left19:43
← eletuchy left19:44
→ italoacasas joined19:44
→ rgrinberg joined19:44
← Spacew00t left19:44
→ eletuchy joined19:44
→ denimsoft joined19:44
→ mizu_no_oto joined19:45
← eletuchy_ left19:46
→ eletuchy_ joined19:46
← rueben_ left19:47
← keltvek left19:47
→ watabou joined19:48
→ rueben_ joined19:48
← eletuchy left19:49
→ urx joined19:49
→ eletuchy joined19:49
← synthroid left19:50
← morrolan1 left19:52
← urx left19:52
← eletuchy_ left19:52
→ eletuchy_ joined19:52
← pwnawannab[NE] left19:53
→ josuebrunel joined19:53
← watabou left19:53
→ ProbabilityMoon joined19:54
← eletuchy left19:54
← boudiccas left19:55
→ qrcu joined19:55
← kaldoran left19:55
→ m0viefreak joined19:56
← diogenese left19:57
→ mablae joined19:57
→ fuchstronaut joined19:58
← livingstn left19:59
→ livingstn joined19:59
→ Psychiatrist joined19:59
← SwiftMatt left19:59
← rueben_ left20:00
→ rueben_ joined20:00
→ rominronin joined20:01
→ satifant joined20:02
→ fahadash joined20:02
→ SwiftMatt joined20:02
← Rish left20:03
→ Rish joined20:05
→ XHFHX2 joined20:05
→ neps joined20:06
→ ochorocho__1 joined20:06
← rominronin left20:07
→ cdg joined20:07
→ mdw joined20:07
← ochorocho__ left20:07
circ-user-MwZ8X It is weird. I have reset to one of the commits, checked if browser can load it and switched to even more earlier commit. But, the second reset has failed because of uncommitted changes (I did both of them hard). I have to idea where those source changes came from. I believed that hard reset must alwas succeed because it abandons any uncommitted changes.20:08
← XHFHX left20:08
← cdg left20:08
circ-user-MwZ8X I could not do any reset until switched to another branch. This also failed, but first branch is able to reset now.20:08
→ cdg joined20:09
→ albel727 joined20:09
← albel727 left20:09
→ albel727 joined20:12
← ProbabilityMoon left20:12
← Rish left20:14
← neps left20:15
→ Rish joined20:15
← dsdeiz left20:15
← madewokherd left20:16
← denimsoft left20:17
peepsalot i have a local repo and my own branch that i've been commiting to, if i view git log, and find the first commit that wasn't me, that should be the commit that my branch was based off of?20:17
i'm thoroughly confused because the date i'm seeing on that commit is way before the branch was made, and there were other commits that should have been in there in that time, as far as i can tell20:19
osse peepsalot: you ayou20:21
peepsalot: you are probably correct20:21
do git log --decorate20:21
← pungi-man left20:22
osse that is useful, so use it always: git config --global log.decorate true20:22
← ahmed_elgabri left20:22
osse it will mark commits as branches if relevant20:22
→ dzho joined20:23
← Rish left20:24
→ unbalancedparen joined20:24
→ Rish joined20:25
← mizu_no_oto left20:26
→ johnmilton joined20:26
← rwb left20:28
→ duderonomy joined20:28
→ allcentury joined20:28
← allcentu1 left20:28
← cdg left20:29
→ elastix joined20:30
← Rish left20:30
← johnmilton left20:31
← fracting left20:32
← ojdo left20:32
→ denimsoft joined20:33
→ diegoviola joined20:34
← qrcu left20:35
→ diogenese joined20:37
← starsinmypockets left20:38
← ocbtec left20:39
→ ojdo joined20:39
← Saxon left20:40
← mbrzuzy left20:40
→ haq joined20:41
← lamont left20:43
→ johnmilton joined20:43
→ interne7y joined20:43
→ bjpenn joined20:44
bjpenn whats the best way to break a code change away from an existing commit, onto a new separate commit20:45
and then merge that commit onto another branch20:45
← haq left20:45
→ madewokherd joined20:45
← m1dnight_ left20:45
→ BSaboia joined20:45
← BSaboia left20:45
← allcentury left20:45
← noobiewan left20:46
→ BSaboia joined20:46
← BSaboia left20:46
→ BSaboia joined20:46
← BSaboia left20:46
→ BSaboia joined20:46
← XHFHX2 left20:47
→ radsy joined20:48
← BrunoSaboia left20:48
← interne7y left20:48
← sangy left20:48
jhass I usually git reset before it and git commit -p two new commits, then rebase around20:48
→ fracting joined20:49
← rgrinberg left20:49
jhass if you just want some changes from the commit in some other branch but leave the original fully intact, just git show | git apply, git commit -p in the target branch20:49
← sdothum left20:49
bjpenn jhass: hmm ok20:50
let me try that20:50
this seems like an advance git exercise for me :p20:50
→ lamont joined20:50
← jimi_ left20:51
→ xbob joined20:51
→ ahr3n joined20:51
← t0by left20:51
← bittin left20:51
→ GT joined20:51
→ Zish joined20:51
← mmlb left20:51
bjpenn what does git show by itself do?20:52
i just tried it and it seems it shows all commits?20:52
← diogenese left20:52
← k3rn31 left20:52
bjpenn hmm maybe not all20:52
→ diogenese joined20:52
→ sangy joined20:52
← LucaTM left20:52
← fission6 left20:53
bjpenn yah i guess just the last commit20:53
jhass bjpenn: a specific one, if you give it no argument, the HEAD commit20:53
← Fr4n left20:53
jhass bjpenn: so give it the commit sha of the commit you want20:53
→ sdothum joined20:54
← Zish left20:55
← diogenese left20:55
← diegoviola left20:55
→ Saxon joined20:56
→ mmlb joined20:57
→ m1dnight_ joined20:58
← texasmynsted left20:58
→ Xjaey joined21:00
→ axiom_1 joined21:02
→ rominronin joined21:02
→ fission6 joined21:02
→ jaguarmagenta joined21:03
← pullphinger left21:03
→ bittin joined21:03
← odingodner left21:04
← italoacasas left21:04
→ UTAN_dev_ joined21:05
→ ynanm joined21:05
← mdw left21:06
→ diegoaguilar joined21:06
← livingstn left21:06
→ dopesong_ joined21:06
← T4nkAbb0t left21:07
← UTAN_dev left21:07
← rominronin left21:07
← jaguarmagenta left21:08
← dopesong left21:08
→ fission6_ joined21:09
← fission6 left21:09
fission6_ → fission621:09
→ neanderslob joined21:09
← UTAN_dev_ left21:10
→ UTAN_dev joined21:10
→ neilthereildeil joined21:10
→ BSAlb joined21:10
← BSAlb left21:10
→ neps joined21:10
neilthereildeil hey guys21:11
git tells me some files are modified, but git diff on them doesnt show any changes21:11
whats happening?21:11
← hobodave left21:12
jhass neilthereildeil: git diff HEAD21:12
I guess you already staged them21:12
← CJKinni`` left21:12
neilthereildeil yea they are staged21:13
→ italoacasas joined21:13
neilthereildeil so it was comparing the current file to the file in the current commit, which were identicle?21:13
← BSaboia left21:13
← Repox left21:13
jhass not the current commit, against the staging area21:13
neilthereildeil wait, what was getting compared?21:14
→ BSAlb joined21:14
jhass git diff HEAD compares against the current commit21:14
← BSAlb left21:14
jhass nothing since you don't have any unstaged changes21:14
→ mellernoia joined21:15
← ash_workz left21:15
neilthereildeil why do these files show up in green staged although they dont have any changes?21:15
jhass ran git diff HEAD yet?21:15
neilthereildeil yea and i see all the changes21:15
preaction they do have changes. the changes are from HEAD (the last commit) and the staging area. when you do "git add" or "git rm", you add the changes to the staging area.21:16
jhass they "show up in green" (better worded in the staging area) because you staged them, likely by running git add on them21:16
← fmcgeough left21:16
neilthereildeil ahh ok. so if i dont make any modifications to a file i can still stage by running git add on it?21:16
jhass no21:16
I mean you can but it has no effect21:17
it's not actually the file that's transferred into the staging area, its its changes21:17
if there are no changes, nothing happens21:17
→ CJKinni joined21:17
← davisonio left21:17
→ lopin joined21:18
bjpenn jhass: how about git apply? ive spent the last 20 mins or so reading about git apply21:19
still not sure what it does21:19
it has something to do with "patches"21:19
jhass bjpenn: which git show gives you21:19
bjpenn: git show <sha> | git apply21:19
bjpenn i dont want to apply the entire commit though21:19
jhass bjpenn: hence git commit -p afterwards21:19
bjpenn just part of it21:19
← neps left21:19
bjpenn jhass: AHHH21:20
jhass once you committed just git checkout the rest21:20
→ Grimm_ joined21:20
bjpenn sweet...21:20
i think im clear now21:20
jhass cool21:20
neilthereildeil whats the difference between "git checkout HEAD" and "git checkout MASTER"?21:20
← italoacasas left21:21
jhass without file arguments, git checkout HEAD is usually a noop21:21
← RedShift left21:21
→ italoacasas joined21:21
jhass git checkout MASTER would checkout the MASTER branch (note the default branch is called master, lowercase)21:22
bjpenn jhass: gave me an error, saying theres a trailing white space, and theres a file that doesnt exist21:22
← Psychiatrist left21:23
← ochorocho__1 left21:23
bjpenn i typed in `git show <sha> | git apply'21:23
→ eletuchy joined21:23
← satifant left21:23
← fission6 left21:24
jhass bjpenn: and no changes at all in the working tree? (git status)21:24
try git apply -3 then21:24
← bruce_lee left21:24
← italoacasas left21:24
jhass and watch out for conflict markers21:25
→ bruce_lee joined21:25
← a3Dman left21:25
← bluepixel left21:25
bjpenn jhass: no changes at all21:25
jhass: i think that whole process failed21:25
← eletuchy_ left21:25
jhass git apply --reject might be another option21:25
bjpenn jhass: ok let me try that21:25
trying --reject21:26
→ mdw joined21:26
bjpenn k a bunch of stuff got applied cleanly21:26
some didnt21:26
→ GavinMagnus joined21:26
bjpenn because "no file found"21:26
now i see all the changes21:26
→ mizu_no_oto joined21:26
→ italoacasas joined21:27
→ fission6 joined21:27
→ mdw_ joined21:27
← jerematic left21:27
→ eletuchy_ joined21:28
→ Brando753-o_O_o joined21:28
→ jimi_ joined21:28
← eletuchy left21:28
← mizu_no_oto left21:29
→ bluepixel joined21:30
← gfixler left21:30
→ eletuchy joined21:31
neilthereildeil i did git reset --hard HEAD^ a few times and i cannot see anything in git log after a few commits ago21:31
← mdw left21:31
neilthereildeil how can i view newer commits?21:31
bjpenn jhass: this essentially creates a whole new commit right? so eventually when the branch that pulled the changes from gets merged into this one, there will be a merge conflict?21:31
← sangy left21:32
bjpenn jhass: this meaning "git show <sha> | git apply --reject"21:32
GavinMagnus because you decrement your commit pointer, hence you cannot see forward21:32
jhass bjpenn: yes21:32
bjpenn: no way around that21:32
bjpenn jhass: k that works21:32
← SwiftMatt left21:32
bjpenn jhass: i was thinking maybe to break up the existing commit in the other branch to separate that change itno its own commit21:32
how would i go about doing that?21:33
and then maybe cherry pick it over, or something21:33
← emPi left21:33
← eletuchy_ left21:33
bjpenn ivenever used cherry-pick but i remember it did that sort of thing21:33
← ynanm left21:33
jhass bjpenn: now that we basically did a partial cherry-pick by hand here, you could rebase the other branch against this, will get a conflict on that commit and in resolving that conflict remove the changes from it21:34
→ rgrinberg joined21:34
→ eletuchy_ joined21:34
neilthereildeil so then how would i undo these changes and checkout the most recent commit in this branch?21:34
jhass bjpenn: if rebasing against it is not an option, git rebase -i against the base commit, pick edit21:34
→ SwiftMatt joined21:35
← mellernoia left21:36
jhass bjpenn: then one option would be to git reset one up and git commit -p twice21:36
← eletuchy left21:36
neilthereildeil jhass: any idea?21:36
bjpenn jhass: thanks :)21:37
jhass: how did you learn so much from git, did you read a book or something21:37
jhass neilthereildeil: hard to tell, the most general answer is to find the sha you want to go backto in git reflog and git reset --hard to it21:37
→ eletuchy joined21:37
← fuchstronaut left21:38
jhass bjpenn: uh I read pro git years ago, someday the base concepts clicked in and then it falls into place and you can easily learn and compose stuff as you use it daily21:38
→ Juzzika joined21:38
jhass bjpenn: https://www.youtube.com/watch?v=1ffBJ4sVUb4 can help a bunch towards that basic understanding21:39
though I watched it after it already clicked for me, so can't say 100% certain21:39
← mdw_ left21:39
→ eletuch__ joined21:39
← eletuchy_ left21:40
→ mdw joined21:40
← denimsoft left21:40
← edude03 left21:41
← eletuchy left21:42
→ hahuang65 joined21:42
→ denimsoft joined21:42
→ eletuchy joined21:42
→ TinkerTyper joined21:43
← eroussel left21:43
→ edude03 joined21:43
← hahuang65 left21:44
→ eletuchy_ joined21:44
← eletuch__ left21:45
bjpenn jhass: ill check that out21:45
→ ahmed_elgabri joined21:46
→ eletuch__ joined21:46
← eletuchy left21:47
→ Mateo_W joined21:47
→ hahuang65 joined21:48
← rossome left21:48
→ rossome joined21:49
← eletuchy_ left21:49
→ CheckDavid joined21:49
→ BSaboia joined21:50
→ eletuchy joined21:50
← italoacasas left21:50
← vishal left21:50
→ vishal joined21:51
← eletuch__ left21:52
← espindola left21:52
→ eletuchy_ joined21:53
→ boudiccas joined21:53
← rueben_ left21:53
← dhollinger left21:54
→ eletuch__ joined21:54
→ sgen joined21:54
← aard_ left21:55
← eletuchy left21:55
← diegoaguilar left21:56
← eletuchy_ left21:57
← hahuang65 left21:58
→ mellernoia joined21:58
→ eletuchy joined21:58
→ hahuang65 joined21:58
← bango2 left21:59
← eletuch__ left22:00
→ eletuchy_ joined22:00
← bluezone left22:01
← zivester left22:01
→ eletuch__ joined22:02
← eletuchy left22:02
→ fuchstronaut joined22:02
→ rominronin joined22:03
← Mateo_W left22:03
→ xbob_ joined22:04
→ LeBlaaanc joined22:05
← eletuchy_ left22:05
← xbob left22:05
LeBlaaanc how do i git ignore all folders like this `*.xcodeproj/project.xcworkspace/**/*`22:05
→ eletuchy joined22:05
LeBlaaanc the *.xcodeproj part isn't woriing22:06
**/*.xcodeproj/xcuserdata/**/* maybe?22:06
**/*.xcodeproj/project.xcworkspace/**/* rather*22:06
→ eletuchy_ joined22:07
← eletuch__ left22:08
← CJKinni left22:08
← rominronin left22:08
→ wrouesnel1 joined22:08
← dopesong_ left22:08
→ cdg joined22:09
← xbob_ left22:09
← irco left22:09
← Fijit left22:09
→ espindola joined22:10
← Kicer86 left22:10
← eletuchy left22:10
← Xjaey left22:10
→ eletuchy joined22:10
→ a_thakur joined22:11
← PCatinean left22:12
← hahuang65 left22:12
→ eletuch__ joined22:12
← lopin left22:12
← eletuchy_ left22:13
→ belak joined22:13
→ Hoy joined22:13
← GavinMagnus left22:13
← mmlb left22:14
← eletuchy left22:15
→ neps joined22:15
→ eletuchy joined22:16
sgen does anyone know how to reference an issue in another repo on github?22:16
→ eletuchy_ joined22:17
← eletuch__ left22:18
→ eletuch__ joined22:19
← lindenle left22:19
← eletuchy left22:20
jhass sgen: either just paste full URL, github will render it nicely22:21
or user/repo#number should work too, though I never tried22:21
← wrouesnel1 left22:22
← hashpuppy left22:22
← eletuchy_ left22:22
← TomyLobo left22:23
→ eletuchy joined22:23
← neps left22:23
→ hahuang65 joined22:24
→ italoacasas joined22:25
→ Samual joined22:25
← eletuch__ left22:25
← drodger left22:26
← edude03 left22:26
→ eletuchy_ joined22:26
→ mischat joined22:27
sgen jhass: ty22:27
← fuchstronaut left22:27
← Darcidride left22:27
← jstimm left22:27
← apotry left22:28
← AaronMT_ left22:28
→ Vinnie_win_f joined22:28
← eletuchy left22:29
→ jstimm joined22:29
← denimsoft left22:29
→ a3Dman joined22:29
→ eletuchy joined22:29
← przemoc left22:29
← a_thakur left22:30
← eletuchy left22:30
← Vinnie_win left22:30
→ cdown joined22:31
→ mykespb joined22:31
← exarch left22:31
← eletuchy_ left22:31
← circ-user-MwZ8X left22:32
→ drodger joined22:32
← fahadash left22:32
← shinnya left22:36
→ EduardoMartins joined22:37
← Dyonisos left22:37
→ boudicca joined22:43
→ Arsonide joined22:44
→ interne7y joined22:44
→ rxc joined22:45
← rxc left22:45
→ rxc joined22:45
← boudiccas left22:46
→ pawel0982 joined22:47
philipp64|work any other git developers around?22:48
→ mmlb joined22:48
philipp64|work I've broken one of the unit tests and can't figure out how to unbreak it.22:48
← ShekharReddy left22:48
milki lol22:48
philipp64|work: no developers here afaik22:49
← bilb_ono left22:49
milki philipp64|work: they all live on the mailing list22:49
← interne7y left22:49
→ Mateo_W joined22:49
Grievre philipp64|work: git bisect :)22:49
← shafox left22:50
→ eletuchy joined22:51
← nwkj86 left22:53
← Limes_ left22:53
← espindola left22:53
← mdw left22:55
← unbalancedparen left22:56
← King_Hual left22:56
← eletuchy left22:56
← ramsub07 left22:56
← rahtgaz left22:56
← pawel0982 left22:56
← jimi_ left22:57
← ahmed_elgabri left22:57
→ eletuchy joined22:57
→ espindola joined22:57
→ interne7y joined22:57
← mmlb left22:58
→ jimi_ joined22:58
← neilthereildeil left22:58
→ sweatsuit joined22:59
← wald left23:00
→ jaguarmagenta joined23:04
→ rominronin joined23:04
← morenoh149 left23:07
← a3Dman left23:07
← kpease left23:07
← nickthetait left23:07
← jaguarmagenta left23:08
→ nickthetait joined23:08
← Mateo_W left23:08
→ Mateo_W joined23:09
→ Didac joined23:09
← bjpenn left23:09
← rominronin left23:10
← Mateo_W left23:11
← Hoy left23:12
→ Mateo_W joined23:12
← ffabi left23:16
→ ahr3n_ joined23:17
→ anth0ny joined23:17
← ahr3n left23:18
→ mablae_ joined23:18
← dmto left23:19
→ a3Dman joined23:19
→ neps joined23:20
→ trobotham joined23:20
← bluepixel left23:20
← mykespb left23:20
← jimi_ left23:21
→ ffabi joined23:21
← garethdaine left23:21
← mablae left23:22
→ bluepixel joined23:22
← eletuchy left23:24
← cdown left23:25
← SwiftMatt left23:25
← espindola left23:25
→ espindola joined23:25
→ eaa joined23:27
← neps left23:28
→ Douhan joined23:28
← fees left23:29
← mattfoo left23:31
← thiago left23:34
← mischat left23:35
→ mattfoo joined23:35
← texinwien left23:35
← LionsMane left23:37
→ thiago joined23:37
→ jimi_ joined23:40
← josuebrunel left23:41
← fission6 left23:42
→ ToBeCloud joined23:42
gitinfo set mode: +v23:42
→ rkazak joined23:43
→ fahadash joined23:43
← espindola left23:45
← cdg left23:45
→ espindola joined23:45
→ cdg joined23:46
→ diegoviola joined23:48
→ rbern joined23:49
← cdg left23:51
← cyan__ left23:51
← mikecmpbll left23:51
→ fstd_ joined23:53
← fstd_ left23:53
→ fstd_ joined23:53
→ eletuchy joined23:54
← fstd left23:55
fstd_ → fstd23:55
→ mmlb joined23:55
← fracting left23:56
→ rueben joined23:56
← eaa left23:56
← kilo_bravo left23:56
→ bjpenn joined23:56
← griffindy left23:58
← eletuchy left23:58
← WaReZ left23:59
→ Yhie joined23:59

Logs Search ←Prev date Next date→ Channels Documentation