IRCloggy #git 2012-11-10

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2012-11-10
	← marhaban left	00:01
	→ mnathani joined	00:01
	← berserkr left	00:02
	← simesy left	00:03
	← dashouzhang left	00:03
	← hwrd\|work left	00:03
	→ TomWij joined	00:05
	→ lresende joined	00:09
	← etcetera left	00:10
	← lresende left	00:10
	→ etcetera joined	00:12
	→ dashouzhang1 joined	00:12
	← nitrix left	00:13
	← dashouzhang1 left	00:15
	← revyd left	00:16
	← skorgon left	00:16
	→ hwrd\|work joined	00:16
	→ skorgon joined	00:17
	← skorgon left	00:17
	→ skorgon joined	00:17
	→ dashouzhang joined	00:17
	← cakehero left	00:19
dogarrhea	local means local copy right?	00:19
	i'm seeing something different in the merge tool from what my local copy looks like	00:19
	← TheJH left	00:20
	→ revyd joined	00:22
	← dashouzhang left	00:23
	→ phlipper_ joined	00:24
	← letharion left	00:25
	→ nardev joined	00:25
	← tvw left	00:26
	← spaceonline left	00:26
	← tewecske left	00:28
	→ tinybluepixel joined	00:28
	← SamB_MacG5 left	00:29
	→ SamB_MacG5 joined	00:30
dogarrhea	git merge from to or git merge to from?	00:30
haarg	git merge from from	00:31
	← infynyxx left	00:31
haarg	it merges into the current branch	00:31
	← torjus_ left	00:31
haarg	you can merge multiple things simultaneously, but probably don't want to	00:32
	← gajop left	00:32
	→ kadoban joined	00:32
	← madewokherd left	00:33
	← jesseFromYVR left	00:33
	→ infynyxx joined	00:34
	← Zomb left	00:34
	← SirCmpwn left	00:34
	← dogarrhea left	00:34
	→ madewokherd joined	00:35
	← p3rror left	00:35
	← infynyxx left	00:38
	← phantomtiger left	00:39
	← jdunck left	00:41
	← e66 left	00:43
	→ SirCmpwn joined	00:43
	→ tmcmahon joined	00:45
	← psoo left	00:45
	← senj left	00:45
	→ aharris joined	00:47
	← aharris left	00:48
	→ infynyxx joined	00:49
	→ p3rror joined	00:49
	→ whaley joined	00:50
	→ chaiz joined	00:50
	← tmcmahon left	00:52
	← ejd left	00:52
	→ carpii joined	00:52
	→ letharion joined	00:53
	← p3rror left	00:55
	← SJr left	00:56
	← thinkdevcode left	00:56
	← srji left	00:57
	→ SJr joined	00:57
carpii	whats the best way to programatically detect if a branch has an upstream branch set? (from bash)	00:57
Vinnie_win	carpii: Can you parse the output of git config?	00:58
	→ marhaban joined	00:58
carpii	possibly, but iwas hoping for a way to invoke git	00:58
Vinnie_win	That's what I'm saying	00:58
carpii	oh git config the command	00:59
Vinnie_win	do a git config on branch.upstream and grep it	00:59
	← AdrienBrault left	00:59
Seveas	git branch -vv shows it	00:59
	← towski left	01:00
Vinnie_win	that shows all the branches though	01:00
Seveas	git branch -vv --list $branchname	01:00
	→ thinkdevcode joined	01:00
Vinnie_win	there's other junk in there too	01:00
	→ hotovson joined	01:01
carpii	thanks :)	01:01
	→ tinyblue1ixel joined	01:01
carpii	i can drop the -vv and itll just return a branchname, or blank	01:01
	it seems	01:01
	→ Chaser joined	01:02
Seveas	git config branch.master.remote ; git config branch.master.merge \| sed -e 's!refs/heads/!!'	01:02
Vinnie_win	There we go!!!	01:02
	← apok left	01:02
	→ apok joined	01:03
carpii	oh awesome, thanks :)	01:03
	← OOPMan left	01:03
	→ glennpratt joined	01:03
carpii	thats piping the output from both commands into sed?	01:03
	← tinybluepixel left	01:03
Seveas	no, just the last	01:03
carpii	ok, makes sense. i remember having problems with pipe precedence in the past	01:04
	← kenperkins left	01:04
carpii	whats the purpose of the first command?	01:05
fx	to get the name of the remote i think	01:05
Seveas	the first one gets the name of the remote (you can have many), the second one the branch it tracks	01:05
	→ jesseFromYVR joined	01:06
carpii	oki, so ideally i need to check for origin, and then the sed to check for refs	01:06
	→ OOPMan joined	01:06
Seveas	remote=$(git config branch.master.remote); branch=$(git config branch.master.merge); upstream_branch="$remote/${branch/refs\/heads\//}"; echo $upstream_branch	01:07
	there :)	01:08
	← nightcrawler786 left	01:08
carpii	woot :)	01:08
	thats awesome, thanks :)	01:08
	and to rest of guys too :)	01:08
	← devsharpen left	01:10
	← jesseFromYVR left	01:11
	→ friskd_ joined	01:13
	← serj left	01:13
	← dreiss left	01:14
	← friskd_ left	01:15
	← tinyblue1ixel left	01:16
	← friskd left	01:16
	→ adamben joined	01:17
	← thinkdevcode left	01:18
	→ JaredMiller joined	01:19
	→ Yuuhi`` joined	01:19
	← Yuuhi` left	01:20
	← JaredMiller left	01:21
	← doug1 left	01:22
	← hesco left	01:22
	← tinti left	01:23
	→ JaredMiller joined	01:27
	← maletor left	01:27
	← JaredMiller left	01:27
	→ JaredMiller joined	01:31
	→ serj joined	01:34
	→ simesy joined	01:35
	← Xethron left	01:36
	← kermit left	01:38
	← JaredMiller left	01:39
	← madewokherd left	01:39
	← joshsmith left	01:40
	← hwrd\|work left	01:40
	← kcj left	01:41
	← simesy left	01:41
	→ madewokherd joined	01:41
	→ hwrd\|work joined	01:41
	← hwrd\|work left	01:42
	→ g_bleezy joined	01:43
	→ mikepack joined	01:44
	← jspiros left	01:45
	→ jspiros joined	01:46
	← GFLJay left	01:47
	→ joshsmith joined	01:49
	← aantix left	01:50
	← infynyxx left	01:51
	→ lotus2015 joined	01:51
	← carpii left	01:51
lotus2015	What a nice day	01:52
fx	lotus2015, night here	01:52
	← lotus2015 left	01:52
	← mikepack left	01:52
	← chaiz left	01:54
	→ kenperkins joined	01:56
	← maqr left	01:57
	→ Gentlecat joined	01:57
	← metcalfc left	02:01
	← unreal left	02:04
	← axl_ left	02:14
	→ unreal joined	02:15
	→ hwrd\|work joined	02:15
	← skorgon left	02:16
	→ Goplat joined	02:17
	← mmc1 left	02:19
	← glennpratt left	02:20
	→ jalama joined	02:20
	← Chillance left	02:22
	← hotovson left	02:22
	← unreal left	02:22
	→ unreal_ joined	02:22
	← dnivio left	02:23
	→ hotovson joined	02:25
	← etcetera left	02:26
	← Vampire0 left	02:29
	→ nitrix joined	02:29
	← hotovson left	02:30
	← nitrix left	02:30
	→ o] joined	02:32
o]	hello. noob question, how can I output the diff between my current changes and the next to the last revision?	02:32
	is there a cookbook on git or something?	02:33
	← api left	02:35
	→ api joined	02:37
	← hwrd\|work left	02:37
	← nardev left	02:37
	→ etcetera joined	02:38
	← eijk__ left	02:38
	← fx left	02:39
	← kpreid left	02:39
	→ kpreid joined	02:40
	← ikolev left	02:40
	→ SBoudrias joined	02:41
	→ hwrd\|work joined	02:44
	→ apok_ joined	02:44
	→ Vampire0 joined	02:44
	→ infynyxx joined	02:45
	→ Error404NotFound joined	02:46
	← apok left	02:47
	apok_ → apok	02:47
	→ JDuke128 joined	02:47
	← TomWij left	02:50
	→ w09x joined	02:50
	← w09x left	02:51
	← jwmann left	02:51
	→ TomWij joined	02:51
	← adamben left	02:53
	→ srji joined	02:53
	← etcetera left	02:54
	← savid left	02:54
	← hwrd\|work left	02:55
	← skywalkerhere left	02:57
	→ hyperair joined	02:58
	← TomWij left	02:59
	→ TomWij joined	03:00
	→ maqr joined	03:02
	→ kermit joined	03:02
	← hyperair left	03:04
	← Bombe left	03:06
Vinnie_win	o]: http://www.kernel.org/pub/software/scm/git/docs/git-diff.html	03:06
	Anyway, I use a GUI for that sort of thing, it's more convenient.	03:06
	→ friskd joined	03:07
	→ jdunck joined	03:07
o]	Vinnie_win: I got more luck with this http://ndpsoftware.com/git-cheatsheet.html	03:08
Vinnie_win	PH wow...that is quite a nice page	03:09
	→ angelsl joined	03:09
	← fuho left	03:09
	← Error404NotFound left	03:10
	← daniel_-_ left	03:10
	→ Err404NotFound joined	03:10
	→ maletor joined	03:10
	→ aetcore joined	03:11
	Err404NotFound → Error404NotFound	03:11
	← sirdancealot2a left	03:12
	→ gitnewb joined	03:13
	→ JaredMiller joined	03:13
	→ Bombe joined	03:14
	← maletor left	03:15
	← kermit left	03:17
	→ tpope joined	03:18
	← jdunck left	03:20
	← whaley left	03:20
	← eletuchy left	03:24
	→ eletuchy joined	03:25
	→ jdunck joined	03:26
	← houman left	03:27
	→ irqq_ joined	03:29
	← L0L0L0L0L left	03:31
	→ skorgon joined	03:31
	← marhaban left	03:31
	← irqq left	03:31
	→ rchavik joined	03:31
	→ hwrd\|work joined	03:31
	← the_cybersphinx left	03:31
	→ fuho joined	03:33
	→ dnivio joined	03:33
	← Hounddog left	03:36
	← dnivio left	03:37
	← fuho left	03:38
	→ cannonball joined	03:41
	← apok left	03:44
	← hwrd\|work left	03:46
	→ etcetera joined	03:46
	← angelsl left	03:46
	→ fuho joined	03:46
	→ angelsl joined	03:49
	← JaredMiller left	03:50
	→ thinkdevcode joined	03:51
	← ergZay left	03:51
	→ tham joined	03:53
	← OOPMan left	03:55
	← odin_ left	03:59
	→ Connecti0n joined	03:59
	→ tshauck joined	04:03
	→ rakm joined	04:05
	← rakm left	04:05
	→ rakm joined	04:05
	← rakm left	04:05
	→ rakm joined	04:06
	← rakm left	04:06
	→ zheng joined	04:07
	→ rakm joined	04:07
	← rakm left	04:07
	→ rakm joined	04:07
	← rakm left	04:07
	→ rakm joined	04:08
	← rakm left	04:08
	→ rakm joined	04:10
	← rakm left	04:10
	→ rakm joined	04:10
	← rakm left	04:10
	→ rakm joined	04:11
	← rakm left	04:11
	→ rakm joined	04:11
	← jalama left	04:13
	→ mva joined	04:14
mva	hi there!	04:14
	can anybody advice me, where can I ask to add NginX support to instaweb?	04:14
	← Sigma left	04:15
	← dvide left	04:15
	→ hafeez3000 joined	04:18
	→ Chappo joined	04:18
	← Vert left	04:20
	← twobitsprite left	04:21
	← Fandekasp left	04:23
	← donri left	04:23
	← Connecti0n left	04:24
	← jdunck left	04:25
	← hafeez3000 left	04:27
	→ Sigma joined	04:28
	→ FOCer joined	04:28
	← tshauck left	04:29
	→ odin_ joined	04:33
	→ kermit joined	04:34
	← gusnan left	04:36
rking	mva: #nginx ?	04:41
	Not sure.	04:42
	→ dreiss joined	04:42
rking	What commands would be a convenient way to redo the last 3 commit messages? git commit --amend HEAD~3 (then ~2, then ~) or something?	04:42
	← yhager left	04:44
	→ tinybluepixel joined	04:45
	→ BadProphet joined	04:45
	→ doug2 joined	04:46
	← JDuke128 left	04:46
	→ apineda_ joined	04:47
	→ OOPMan joined	04:49
	← BadProphet left	04:50
	→ luc__ joined	04:51
	← luc__ left	04:51
	← Goplat left	04:52
	→ hawaii_2012 joined	04:53
	← hawaii_2012 left	04:54
	← gmarseliss left	04:55
	← thinkdevcode left	04:55
	→ project2501b joined	04:55
	→ kcj joined	04:56
	← cannonball left	04:56
	← eletuchy left	04:57
	← SBoudrias left	04:57
	→ Goplat joined	04:58
Vinnie_win	an interactive rebase can redo the commit messages all in one go	04:58
	→ aetcore_ joined	05:00
	← m0viefreak left	05:01
	→ private joined	05:03
	← aetcore left	05:03
	private → Guest9911	05:03
	→ gauravag joined	05:06
	→ ninegrid joined	05:06
	← madewokherd left	05:07
	← jcao219 left	05:08
	← apineda_ left	05:09
	→ Ugallu joined	05:10
	← project2501b left	05:11
	→ relgar joined	05:12
	← OOPMan left	05:14
	→ aetcore joined	05:15
	→ wilhelmtell joined	05:16
	→ rurufufuss joined	05:16
	← wilhelmtell left	05:17
	→ simesy joined	05:18
	← angelsl left	05:18
	← kukks left	05:18
	← aetcore_ left	05:18
	← gitnewb left	05:18
	← Sigma left	05:19
	← simesy left	05:19
	→ yhager joined	05:21
	← Ugallu left	05:21
rking	Vinnie_win: OK. I haven't done except the most basic of git rebase -i	05:21
	I'll do that. Thanks.	05:21
	→ cakehero joined	05:24
	→ eeanm joined	05:27
	→ angelsl joined	05:30
	→ arlyx joined	05:31
	→ JDuke128 joined	05:33
	→ senior7515 joined	05:34
	← tinybluepixel left	05:35
	← Goplat left	05:35
	→ jeremywen joined	05:35
	← senior7515 left	05:35
	← skorgon left	05:37
	← Chappo left	05:37
	→ Chappo joined	05:38
	→ Connecti0n joined	05:39
	← arlyx left	05:40
	← FOCer left	05:40
	→ Bosox20051 joined	05:40
	→ Sky[x] joined	05:41
	← cakehero left	05:42
	← sashah left	05:43
	→ skorgon joined	05:43
	← yhager left	05:43
	→ thinkdevcode joined	05:44
	→ sashah joined	05:44
	← doug2 left	05:46
	→ BadProphet joined	05:47
	→ xpen joined	05:48
	→ ergZay joined	05:50
	→ hafeez3000 joined	05:50
	← BadProphet left	05:51
	← hafeez3000 left	05:51
	← sashah left	05:55
	→ BadProphet joined	05:57
	→ sashah joined	05:58
	← sashah left	06:00
	← BadProphet left	06:02
	→ sashah joined	06:03
	→ blindingdawn joined	06:03
	→ niggler joined	06:05
	→ archdori joined	06:07
	← electrog1ek left	06:09
	← thinkdevcode left	06:12
	← Guest9911 left	06:16
	→ maleknet joined	06:17
	→ longbeach joined	06:18
	← Connecti0n left	06:18
	→ beautifulmind joined	06:18
	← beautifulmind left	06:19
	← gauravag left	06:24
	→ simesy joined	06:30
	→ zeth2571 joined	06:30
	← simesy left	06:34
	← zeth2571 left	06:35
	← kerrick left	06:36
	→ OOPMan joined	06:38
	← unreal_ left	06:38
	← skorgon left	06:39
	← blindingdawn left	06:40
	← sh4rm4 left	06:41
	→ sh4rm4 joined	06:42
	→ unreal joined	06:42
	← resistivecorpse left	06:42
	→ resistivecorpse2 joined	06:42
	← joshsmith left	06:43
	→ a-l-e joined	06:43
	← OOPMan left	06:43
	→ Tegi joined	06:43
	→ joshsmith_ joined	06:44
	→ swair joined	06:45
	→ skorgon joined	06:47
	← srji left	06:49
	→ srcerer_ joined	06:50
	→ giallu joined	06:52
	← iamjarvo left	06:52
	← srcerer left	06:52
	← Bosox20051 left	06:54
	← conan left	06:57
	→ conan joined	06:58
	→ Bosox20051 joined	07:01
	← jlewis left	07:02
	→ jlewis joined	07:03
	← gerard0 left	07:05
	→ Tegi_ joined	07:05
	← Tegi left	07:06
	→ laurav joined	07:08
	← jlewis left	07:11
	→ jlewis joined	07:12
mva	rking: no, I doubt, that guys from NginX can add support for their server into git-instaweb script, which is in official git distribution ;)	07:14
	→ tapout joined	07:17
	→ Shusshu joined	07:22
	→ hotovson_ joined	07:23
	→ twobitsprite joined	07:23
twobitsprite	hey peeps...	07:23
	so, I'm trying to set up git in my homedir... and I'm trying to get it to ignore everything that doesn't start with a "." or that's in a directory starting with a "." ... so, I have my .gitignore with "", "!." and "!./", but it only goes one directory level deep	07:24
	any idea how I would get it to include all paths relative to the base of the home directory which start with a "." ?	07:25
Spaceghostc2c	**	07:26
	→ drizzd joined	07:28
	→ kerrick joined	07:29
	→ pansdr joined	07:29
	→ sirdancealot2a joined	07:30
	← JDuke128 left	07:32
	← rakm left	07:32
	← niggler left	07:35
	→ m0ltar joined	07:36
	← kadoban left	07:37
	← m0ltar left	07:37
	← laurav left	07:37
	→ w09x joined	07:37
	← skorgon left	07:38
	→ tewecske joined	07:38
	← Shusshu left	07:39
	→ und3f joined	07:40
	→ doug2 joined	07:42
	→ Sigma joined	07:44
	← _huoxito left	07:45
	→ sluther joined	07:45
	← sluther left	07:45
	→ sluther joined	07:46
	← sluther left	07:46
	← doug2 left	07:46
	→ sluther joined	07:46
	← sluther left	07:46
	→ sluther joined	07:47
	← sluther left	07:47
twobitsprite	Spaceghostc2c: I don't get it...	07:48
	→ sluther joined	07:48
	← sluther left	07:48
Spaceghostc2c	twobitsprite: ** is for subdirectory matching.	07:48
twobitsprite	Spaceghostc2c: you mean "!.*" or "!./**"? I tried both and it doesn't seem to be working	07:48
Spaceghostc2c	Nope	07:48
	→ sluther joined	07:49
	← sluther left	07:49
	→ srji joined	07:49
	→ sluther joined	07:49
	← sluther left	07:49
	→ sluther joined	07:50
	← sluther left	07:50
twobitsprite	Spaceghostc2c: you're being way to helpful, it's like you're not even trying. I know you could be less helpful if you wanted too... this is weak	07:50
	→ dimitrig joined	07:50
	→ blindingdawn joined	07:50
	→ sluther joined	07:50
	← sluther left	07:50
twobitsprite	I've met less helpful people in #ubuntu ... you give IRC people a bad name with all your helpfulness	07:51
Spaceghostc2c	twobitsprite: It's 3am.	07:51
twobitsprite	then go to bed	07:51
Spaceghostc2c	So perhaps go google more.	07:51
twobitsprite	don't sit there and say "nope"...	07:51
	→ sluther joined	07:51
	← sluther left	07:51
twobitsprite	and then blame me that you're tired... ugh..	07:51
Spaceghostc2c	https://google.com/?q=git+subdirectory+matching	07:51
	twobitsprite: You're the one asking for help, it's not like I'm beholden to you to give you top notch support at the moment.	07:52
	→ sluther joined	07:52
	← sluther left	07:52
	← swair left	07:52
	→ sluther joined	07:52
	← sluther left	07:52
	→ whitman joined	07:53
	→ sluther joined	07:53
	← sluther left	07:53
	→ arkiver joined	07:53
	→ sluther joined	07:54
	← sluther left	07:54
	→ sluther joined	07:54
twobitsprite	Spaceghostc2c: not at all, but if you don't want to help, the go to bed, or whatever you do when you're tired and grumpy... I'm not keeping you... but don't act like I'm wasting your time when you're the one sitting there staring at your IRC client	07:54
	← sluther left	07:54
Spaceghostc2c	twobitsprite: tl;dr, don't care.	07:54
	Good luck though. I wish you the best.	07:54
twobitsprite	right...	07:55
	← blindingdawn left	07:55
	→ sluther joined	07:55
	← sluther left	07:55
	→ swair joined	07:55
	→ sluther joined	07:56
	← sluther left	07:56
twobitsprite	I swear, about 50% of the peopl on IRC are just self-congratulating dicks with nothing better to do than stare at the screen waiting for someone to slip up so they can jump all over it and be a cynical arrogant prick	07:56
	→ sluther joined	07:56
	← sluther left	07:56
	← infynyxx left	07:57
	→ sluther joined	07:57
	← sluther left	07:57
	→ sluther joined	07:58
Spaceghostc2c	twobitsprite: Sounds pretty victimizing. Do you often think this way?	07:58
	→ eijk joined	07:59
	→ jceb joined	08:00
twobitsprite	nah, at this point I'm just trying to see how long I can troll you along	08:01
	also, you're wrong... the ** thing only works if your fnmatch supports it... there's nothing special about it in git	08:01
Spaceghostc2c	twobitsprite: Sounds like my kind of game. How goes figuring out git?	08:01
twobitsprite	http://stackoverflow.com/questions/681262/difference-in-the-paths-in-gitignore-file	08:01
Spaceghostc2c	If you're trying to match subdirectories, your general syntax is */. for hidden files, I believe.	08:02
	But you're talking to someone who is awake at 3am.	08:02
twobitsprite	I've tried every combination of *, and . I can think of, none work... and everywhere I read says it's platform dependent, not something built in to git, and mine apparently doesn't support it	08:03
	but thanks anyways for the google link	08:05
	maybe I'll look in to mercurial or darcs	08:06
	→ asnoehu joined	08:07
	→ Tabstar joined	08:08
	← jceb left	08:09
	← swair left	08:09
	← joshsmith_ left	08:09
	← ergZay left	08:09
	← relgar left	08:09
	← etcetera left	08:09
	← irqq_ left	08:09
	← theBrettman left	08:09
	← Strogg left	08:09
	← Droolio left	08:09
	← bluj left	08:09
	← Blaster left	08:09
	← LucasTizma left	08:09
	← kallisti5 left	08:09
	← kloeri left	08:09
	← weltall left	08:09
	← DjMadness left	08:09
	← Zx3 left	08:09
	← jjasinski left	08:09
	← lokai left	08:09
	← variable left	08:09
	← sajbar left	08:09
	← Cap_J_L_Picard left	08:09
	← jdav_gone left	08:09
	← Nugget left	08:09
	← notfunk left	08:09
	← adamm left	08:09
	→ relgar joined	08:09
Spaceghostc2c	twobitsprite: Good luck!	08:09
	← Gx4xx left	08:09
Spaceghostc2c	I hear perforce is cool.	08:09
	→ hoschi joined	08:10
	→ Gx4xx joined	08:10
	→ svetlyak40wt joined	08:10
	→ jceb joined	08:11
	→ swair joined	08:11
	→ joshsmith_ joined	08:11
	→ ergZay joined	08:11
	→ VAADRHQ joined	08:11
	→ etcetera joined	08:11
	→ irqq_ joined	08:11
	→ theBrettman joined	08:11
	→ Strogg joined	08:11
	→ Droolio joined	08:11
	→ bluj joined	08:11
	→ Blaster joined	08:11
	→ LucasTizma joined	08:11
	→ kallisti5 joined	08:11
	→ kloeri joined	08:11
	→ DjMadness joined	08:11
	→ Zx3 joined	08:11
	→ jjasinski joined	08:11
	→ lokai joined	08:11
	→ variable joined	08:11
	→ sajbar joined	08:11
	→ Cap_J_L_Picard joined	08:11
	→ jdav_gone joined	08:11
	→ Nugget joined	08:11
	→ notfunk joined	08:11
	→ adamm joined	08:11
	→ oojacoboo joined	08:11
	→ avar joined	08:11
	→ roto joined	08:11
	→ eft joined	08:11
	→ blami joined	08:11
	→ davidh joined	08:11
	→ teukka joined	08:11
	→ gniourf_gniourf joined	08:11
	rajaniemi.freenode.net set mode: +v	08:11
	← conan left	08:11
	→ weltall joined	08:12
	← jjasinski left	08:12
	← notfunk left	08:12
	→ notfunk joined	08:12
	← srji left	08:12
	→ jjasinski joined	08:13
obiwahn	lol	08:13
	→ cmn joined	08:13
obiwahn	twobitsprite: what os are you using?	08:13
	i am not sure how it is handled but */ looks like shell globbing	08:14
	← irqq_ left	08:14
	← dimitrig left	08:16
	→ thiago joined	08:16
	→ Malar joined	08:18
	→ resmo_ joined	08:18
obiwahn	twobitsprite: so maybe the behavior depends on a shell that supports it like bash4 zsh	08:19
	← Sky[x] left	08:19
	← s34n left	08:19
	→ s34n_ joined	08:19
Malar	if i had forgotten to create a branch before making a new commit to the original branch, is it possible to do so later by checking out to the original commit?	08:20
obiwahn	uhm no depends on http://www.kernel.org/doc/man-pages/online/pages/man3/fnmatch.3.html	08:21
	Malar: sure	08:21
Spaceghostc2c	Malar: Yes.	08:22
	→ JDuke128 joined	08:22
obiwahn	git co -b branch_name Commit were commit is something like HEAD~4 or the hash	08:22
Malar	oh, then by default git co -b branch branches from the HEAD commit, but we can optionally specify the commit we want to branch from right?	08:26
	← swair left	08:26
	archdori → Fandekasp	08:26
obiwahn	yes	08:28
	klubko → lubko	08:29
	→ swair joined	08:30
	← Malar left	08:31
	← afuentes left	08:31
	→ resistivecorpse3 joined	08:35
	← resistivecorpse2 left	08:35
	→ Paul92 joined	08:37
	← Paul92 left	08:37
	← thiago left	08:38
	← IcePic left	08:38
	← asakura0 left	08:39
	← Bigcheese left	08:39
	→ srji joined	08:40
	← sh4rm4 left	08:40
	→ witul joined	08:42
	→ conan joined	08:42
	← witul left	08:42
	← Chappo left	08:42
	← resistivecorpse3 left	08:42
	→ resistivecorpse2 joined	08:42
	→ Paul92 joined	08:43
	→ IcePic joined	08:44
	→ Malar joined	08:44
	← srji left	08:45
	→ Dreadnaught joined	08:45
	← Dreadnaught left	08:45
	→ Dreadnaught joined	08:45
	← sirdancealot7 left	08:46
	← Kulrak left	08:46
	→ Gentlecat_ joined	08:46
	→ srji joined	08:46
	← srji left	08:46
	← Gentlecat left	08:46
	← fobban left	08:49
	→ gerard0 joined	08:50
	→ blindingdawn joined	08:50
tapout	what's the best gui for windows ... tortoisegit?	08:51
obiwahn	ohwhat was the facebok git frnt end called?	08:51
	← Paul92 left	08:52
	→ sh4rm4 joined	08:52
	← dreiss left	08:52
Spaceghostc2c	tapout: msysgit and git shell.	08:54
	← gerard0 left	08:55
	→ BadProphet joined	08:57
	→ optixx joined	09:00
	← BadProphet left	09:01
	→ fobban joined	09:01
	→ gerard0 joined	09:03
	→ EhevuTov joined	09:04
	← beneggett left	09:05
	→ thiago joined	09:05
	← blindingdawn left	09:05
	→ DarkClown joined	09:06
	→ subhojit777 joined	09:06
	→ BadProphet joined	09:07
	→ beneggett joined	09:07
	← svetlyak40wt left	09:07
	→ chaiz joined	09:09
	← Dreamer3 left	09:10
	→ rob_w joined	09:10
	→ diegoviola joined	09:11
	→ Dreamer3 joined	09:11
	← BadProphet left	09:13
	→ caseymcg joined	09:13
	← swair left	09:15
	→ jesseFromYVR joined	09:15
	→ dc5ala joined	09:15
	→ Mode-M joined	09:15
	← letharion left	09:17
	← Bosox20051 left	09:19
	← JDuke128 left	09:20
	→ svetlyak40wt joined	09:20
	← jesseFromYVR left	09:20
	← kerrick left	09:21
	← jceb left	09:21
	→ devsharpen joined	09:22
	→ landypro joined	09:23
	← landypro left	09:23
	→ jceb joined	09:24
	← jceb left	09:25
	→ jceb joined	09:25
	← hotovson_ left	09:25
	→ mishok13 joined	09:27
	← oscailt left	09:28
	→ zhen1 joined	09:28
	← zhen1 left	09:29
	← chaiz left	09:30
	→ h0bbit joined	09:30
	→ dr_lepper joined	09:31
	← sirdancealot2a left	09:32
	→ j416 joined	09:32
	← Error404NotFound left	09:33
	→ zhen1 joined	09:33
	→ Err404NotFound joined	09:34
	→ landypro joined	09:34
	→ letharion joined	09:34
	← thiago left	09:34
	Err404NotFound → Error404NotFound	09:35
	← mishok13 left	09:35
	← maleknet left	09:36
	← jceb left	09:37
	← zhen1 left	09:38
	→ swiety joined	09:38
	→ psoo joined	09:38
	→ sq-one joined	09:39
	← hoschi left	09:40
	← Malar left	09:41
	→ hoschi joined	09:41
	← diegoviola left	09:42
	→ doug2 joined	09:43
	← joshsmith_ left	09:43
	← zoeshadow left	09:45
	→ thiago joined	09:46
	← doug2 left	09:47
	← jakob left	09:48
	← Cerise left	09:48
	← gerard0 left	09:48
	→ maleknet joined	09:49
	← Mez left	09:49
	→ rpetre joined	09:50
	← rpetre left	09:50
	→ rpetre joined	09:50
	→ Mez joined	09:50
	→ jceb joined	09:53
	→ jakob joined	09:54
	← arkiver left	09:54
	→ Cerise joined	09:57
	→ gerard0 joined	09:58
	→ tg joined	09:58
	← babilen left	09:58
	← landypro left	09:58
	→ mishok13 joined	10:01
	→ babilen joined	10:01
	← mishok13 left	10:09
	← caseymcg left	10:11
	→ Chappo joined	10:14
	← subhojit777 left	10:15
	→ Guest____ joined	10:15
	→ tokiya_ joined	10:19
	→ episage joined	10:20
	→ LeMike joined	10:22
	← tokiya left	10:23
	→ Anders_J joined	10:23
	→ bux joined	10:23
	→ FernandoBasso joined	10:24
	→ subhojit777 joined	10:32
	← maleknet left	10:35
	→ mishok13 joined	10:35
	← felipec left	10:40
	← api left	10:41
	→ akakcolin_ joined	10:42
	→ Y_Ichiro joined	10:42
	← Y_Ichiro left	10:42
	→ Y_Ichiro joined	10:42
	→ daniel_-_ joined	10:42
	→ api joined	10:42
	← Y_Ichiro left	10:43
	→ Y_Ichiro joined	10:44
	← Y_Ichiro left	10:44
	→ Y_Ichiro joined	10:44
	← Y_Ichiro left	10:44
	← kcj left	10:49
	→ abcd_ joined	10:50
	abcd_ → Guest36443	10:50
	→ maleknet joined	10:56
	→ Hounddog joined	10:58
	→ the_cybersphinx joined	10:58
odin_	is there a way to recover an old stash commit-id ? after I poped it already ?	10:58
thiago	there's no reflog of the reflog	10:59
esc	odin_: there is a long command at the end of the git stash manpage, it may help you	10:59
thiago	unless you've written it down somewhere or you still have it in your screen, it's gone	10:59
	← Guest36443 left	10:59
	← fisted left	11:00
esc	odin_: git fsck --unreachable \|	11:00
	grep commit \| cut -d\ -f3 \|	11:00
	xargs git log --merges --no-walk --grep=WIP	11:00
	→ fisted joined	11:01
odin_	yeah the ref i wrote down @stash{0} haha! ok trying this command	11:01
cbreak	if you've popped, then the changes are back in your working dir/index	11:03
odin_	Ive poped, merged, committed, done other work for 10 mins, then decided I want it back	11:03
cbreak	well, you've committed	11:04
	just look at the commit.	11:04
	← api left	11:05
	← mastro left	11:05
odin_	its been conflict resolved manually, so I'm after the original commit data from the stash	11:06
cbreak	that will be hard to find	11:06
	unless you have it in your scroll back buffer	11:06
	(the sha)	11:06
	→ api joined	11:06
cbreak	you can try to filter the whole unreachable set	11:07
	but that'll be time consuming	11:07
	← svetlyak40wt left	11:07
	→ dnivio joined	11:08
	→ jlg13 joined	11:09
	→ Y_Ichiro joined	11:10
	← Y_Ichiro left	11:10
	→ Y_Ichiro joined	11:10
	← swiety left	11:11
	→ torjus_ joined	11:12
	→ hotovson joined	11:14
	← Y_Ichiro left	11:14
	→ frank joined	11:14
	← letharion left	11:14
	← frank left	11:15
	→ frank joined	11:16
odin_	it has come back with 24 unreachable things only 5 to check through based on date range	11:16
	→ flijten joined	11:16
odin_	so thanks for tips all	11:16
	→ blindingdawn joined	11:16
	← mishok13 left	11:16
	→ ampz joined	11:16
	← dr_lepper left	11:21
	→ francisfish joined	11:21
	← frank left	11:21
	← und3f left	11:25
	→ yshh joined	11:25
	← thiago left	11:26
	→ mabrand joined	11:27
	← mabrand left	11:27
	← ampz left	11:28
odin_	can I restore it into the 'stash list' ? I tried 'stash pop 7d82713' as it is 2 commits for WIP and index	11:30
	← subhojit777 left	11:30
	→ hwrd\|work joined	11:30
	→ Imaginativeone joined	11:30
	← daniel_-_ left	11:30
	← blindingdawn left	11:31
	← hwrd\|work left	11:31
	→ letharion joined	11:33
	→ hinst joined	11:33
	→ andrewebdev joined	11:34
andrewebdev	Why is it that when I do: ``git pull origin master`` Git does the right thing, but then says that my branch is ahead of origin/master by X commits. It should be the same, right?	11:35
	It only resolves itself again when I push again	11:35
	→ alee joined	11:36
	→ subhojit777 joined	11:36
odin_	because you asked it to pull origin/master only and not to also pull master	11:36
	git branch -av # lists them all, I think "git pull origin master" only affects remotes/origin/master	11:37
	→ marhaban joined	11:37
	→ Mogget joined	11:38
	← flijten left	11:38
odin_	and "git pull" affects the current branch "master" by looking up the origin/master and doing a pull, then going another between origin/master and master	11:38
	← Anders_J left	11:40
	→ tenmilestereo joined	11:41
	← drizzd left	11:41
	→ drizzd joined	11:41
andrewebdev	ok	11:41
	thx for the explanation odin_	11:41
	→ zeppo joined	11:42
	→ doug2 joined	11:43
	← maleknet left	11:44
	← doug2 left	11:48
	→ robbyoconnor joined	11:48
	← Chappo left	11:48
	← FernandoBasso left	11:51
	→ FernandoBasso joined	11:51
	→ sbodo joined	11:52
	← babilen left	11:52
	→ dr_lepper joined	11:53
	← dr_lepper left	11:53
	→ dr_lepper joined	11:53
	← zheng left	11:53
	← SeySayux left	11:54
	← Villadelfia left	11:54
	← marhaban left	11:54
	→ Sky[x] joined	11:54
	→ TLGreg joined	11:55
	→ SeySayux joined	11:55
	→ Villadelfia joined	11:56
	← zeppo left	11:58
	→ zeppo joined	11:58
	← zeppo left	11:58
Nevik	andrewebdev: "git pull origin master" will fetch the remote changes to origin/master (which, in your repo, is immutable to you), and will then try to merge those changes into your local master branch (if it is set up as tracking, which it probably is)	11:59
	andrewebdev: if your master is ahead of origin [truly ahead, not diverged], then nothing needs to be merged that way	11:59
	instead, you have to merge your master into origin/master, which is done by pushing	12:00
	← drizzd left	12:00
	→ mr_daniel joined	12:00
andrewebdev	aaahhh right	12:00
mr_daniel	I setup a local git bare repo on my filesystem and want to push to it. But it fails. This is how I setup the bare repo and the local repo I want to push from: http://pastebin.com/zdz2gG5b	12:04
	It fails when I try to run "git push origin" with this failure: http://pastebin.com/L6C5D4Nt	12:04
	→ marhaban joined	12:05
mr_daniel	oh no, permissiosn	12:05
	→ ghartmann joined	12:05
	← sluther left	12:05
mr_daniel	found the error, test.git is owned by root, ouch	12:05
Nevik	lol :D	12:05
	mr_daniel: love problems that solve themselves ;)	12:06
mr_daniel	me too :)	12:06
	→ codeFiend joined	12:07
	→ Innocentus joined	12:09
	→ whaley joined	12:09
	→ thiago joined	12:10
	← jceb left	12:11
	→ lausi joined	12:12
	← fobban left	12:14
cbreak	that proves again that it's stupid to work as root :)	12:14
	→ Ugallu joined	12:17
	→ BadProphet joined	12:17
	→ mmc joined	12:18
	← xpen left	12:19
	→ babilen joined	12:19
	← codeFiend left	12:20
	→ codeFiend joined	12:21
	← codeFiend left	12:21
	← sq-one left	12:22
	← BadProphet left	12:23
	← jlg13 left	12:24
	← EhevuTov left	12:25
	→ Tegi joined	12:27
	← lausi left	12:27
	→ jceb joined	12:28
	← Tegi_ left	12:28
	→ simplechat joined	12:30
	← simplechat left	12:30
	→ simplechat joined	12:30
	Ugallu → GFLJay	12:30
	→ rpet joined	12:31
	→ chris64 joined	12:32
	→ xpen joined	12:35
	→ dangerousdave joined	12:35
	→ Xizor joined	12:35
	→ mishok13 joined	12:36
	← rpet left	12:38
	→ laurav joined	12:39
	← Hounddog left	12:42
	→ blindingdawn joined	12:42
	→ Hounddog joined	12:43
	← blindingdawn left	12:46
	← gerard0 left	12:47
	← ghartmann left	12:47
	→ ghartmann joined	12:48
	← relgar left	12:51
	← thiago left	12:51
	→ gusnan joined	12:52
	→ gerard0 joined	12:52
	→ ology joined	12:53
	→ Xethron joined	12:54
	→ Element9 joined	12:54
	→ resistivecorpse3 joined	12:56
	← jceb left	12:57
	→ Zomb joined	12:57
	→ dimitrig joined	12:58
	← resistivecorpse2 left	12:59
	← ghartmann left	13:02
	→ chussenot joined	13:07
	→ thiago joined	13:09
	→ rafter joined	13:10
	← dimitrig left	13:11
	→ saju_m joined	13:12
	→ asakura joined	13:15
	← Guest____ left	13:15
	→ TheJH joined	13:16
	→ ghartmann joined	13:16
	← tenmilestereo left	13:16
	→ xpen_ joined	13:16
	← rchavik left	13:17
	→ ShadeTornado joined	13:18
	← xpen left	13:19
	← hotovson left	13:20
	→ daniel_-_ joined	13:22
	← subhojit777 left	13:25
	→ Paul92 joined	13:26
	→ dimitrig joined	13:26
	→ donri joined	13:27
	← chussenot left	13:27
	← Sonder left	13:28
	→ svetlyak40wt joined	13:28
	→ Sonderblade joined	13:29
	→ tinti joined	13:30
	← bux left	13:30
	← episage left	13:33
EugeneKay	Wat. http://joeyh.name/blog/entry/git_push_over_XMPP/	13:33
thiago	:-)	13:34
	← Paul92 left	13:34
thiago	XMPP can do everything, can't it?	13:34
EugeneKay	Apparently so.	13:34
	It looks like he's doing a base64-encode of the git-upload-pack stream and then dropping it into XMPP messages	13:34
	Which is pretty sane.... but.... wat.	13:34
cbreak	What's next? Git over tcp?	13:35
EugeneKay	XMPP lets you have truly decentralized workflows	13:36
cbreak	so does git over email.	13:36
EugeneKay	email sucks	13:36
cbreak	git bundle ftw	13:36
Mode-M	git over smoke signals would be nice	13:36
EugeneKay	And you can't do 'git fetch' via email	13:36
	← Error404NotFound left	13:36
	→ dzonder joined	13:36
EugeneKay	That's already possible. Extend RFC1149 to cover deflagration-based transports	13:37
	← eijk left	13:37
	← _dzonder left	13:37
	→ chussenot joined	13:39
	→ Error404NotFound joined	13:40
	→ yhager joined	13:41
Nevik	what we need is Git by Avian Carriers	13:41
	i smell an amendment to TCP via Avian Carriers for next 04-01	13:41
	→ iamjarvo joined	13:42
	→ blindingdawn joined	13:42
cbreak	just extend git via email.	13:42
thiago	isn't that.... git-send-email?	13:43
	→ doug2 joined	13:43
cbreak	I'd send bundles	13:44
	→ Martz joined	13:44
cbreak	I don't trust git am to reproduce history with same hashes	13:44
	← svetlyak40wt left	13:45
	→ svetlyak40wt joined	13:45
	→ kukks joined	13:45
	→ Cromulent joined	13:45
	→ infynyxx joined	13:47
	← doug2 left	13:47
	→ minusthetiger joined	13:48
	→ chaiz joined	13:49
	→ JDuke128 joined	13:49
	← svetlyak40wt left	13:49
	→ m0ltar joined	13:49
	→ svetlyak40wt joined	13:49
	← dimitrig left	13:50
	← h0bbit left	13:50
	← thiago left	13:52
	← mr_daniel left	13:56
	→ xnox joined	13:56
	→ Chappo joined	13:56
EugeneKay	Nevik - Look up RFC1149 -_-	13:56
xnox	guilt the quilt for git fails it's test-suite against 1.8.0	13:56
	← psoo left	13:57
	← blindingdawn left	13:57
xnox	anybody knows if there is a new version or can sombody look at fixing it?	13:57
	← Chappo left	13:57
xnox	"+fatal: unrecognized input"	13:57
	→ dimitrig joined	13:57
EugeneKay	Nope. I'd talk to the guilt author	13:58
cbreak	guilt is not something git users should feel	13:58
	→ tenmilestereo joined	13:59
OMGOMG	oh but they do	14:00
	← w09x left	14:01
	← chaiz left	14:01
xnox	"Newer git doesn't like empty patch files."	14:01
	→ irqq joined	14:01
	← netzmonster left	14:02
xnox	is the comment on the fedora patch.....	14:02
	← variousnefarious left	14:02
	← gerard0 left	14:02
cbreak	lazy devs make empty patches :)	14:02
	→ chaiz joined	14:02
comps	what? .. git-am can no more do a git commit --allow-empty kind of thing? :)	14:03
	→ variousnefarious joined	14:03
comps	I know git-rebase kind of tends to eliminate those	14:03
	← iamjarvo left	14:04
	→ swiety joined	14:04
	→ hafeez3000 joined	14:04
	→ gerard0 joined	14:05
xnox	http://pkgs.fedoraproject.org/cgit/guilt.git/commit/?id=b6859824ab57bf5bf669554d579daf48a437c5ee	14:05
	is the "work around" in guilt's test-suite.	14:05
	xnox thinks testing quilt like functionality with git while using empty patches is a bit pointless....	14:06
	→ madewokherd joined	14:06
	← saju_m left	14:08
	← variousnefarious left	14:10
	→ variousnefarious joined	14:10
	← yhager left	14:10
	← IcePic left	14:13
	→ IcePic joined	14:13
	→ gitnewb joined	14:13
	→ yhager joined	14:15
	← Milossh left	14:15
	→ NetJunky joined	14:18
	→ daniel_- joined	14:19
	→ vitor-br joined	14:20
	→ apok joined	14:21
	← daniel_-_ left	14:21
	→ thiago_ joined	14:22
	thiago_ → thiago	14:22
	← infynyxx left	14:24
	← tinti left	14:24
	← minusthetiger left	14:31
	→ timj joined	14:31
	→ Chillance joined	14:32
	← dnivio left	14:32
	← Yuuhi`` left	14:33
	← Cromulent left	14:35
	← yhager left	14:40
	← Croms left	14:41
	← torjus_ left	14:41
	← FernandoBasso left	14:41
	← daniel_- left	14:41
	→ Hounddog_ joined	14:43
	← Hounddog left	14:44
_ikke_	uhoh, are we gitinfoless?	14:48
	← hiroyuki_ left	14:48
	→ andre_pl joined	14:49
andre_pl	I've got an idiot coworker who messed up a repo for the lack of a better word. he was working directly on the staging server and didn't commit the changes, git status shows me every single file in the repo as being Deleted:	14:50
	they're all still there, but i dont know what he did or how to reverse it	14:50
SethRobertson	http://www.perforce.com/blog/120927/auditing-git-better-governance-git-fusion .. it is possible to effectively change history in Git in a way not easy to detect later	14:50
	→ nitrix joined	14:50
	← JDuke128 left	14:51
SethRobertson	andre_pl: !repro	14:51
_ikke_	andre_pl: git reset	14:51
andre_pl	!repro	14:51
_ikke_	SethRobertson: gitinfo is awol	14:51
SethRobertson	bah. Please pastebin your `git status`	14:51
andre_pl	one sec. its large.	14:51
SethRobertson	Just the first 20-50 lines	14:52
	→ Milossh joined	14:52
	← dimitrig left	14:52
	→ Paul92 joined	14:52
andre_pl	http://pastebin.com/9C19pp3U	14:53
_ikke_	If the files are still there, git reset is enough	14:53
	git rm --cached * would get you that result	14:53
andre_pl	that's probably what he did then...	14:53
SethRobertson	yes, agree	14:54
andre_pl	git reset will lose the changes that he did make though right?	14:54
_ikke_	andre_pl: No	14:54
	andre_pl: git reset (without --hard), ony 'unstages' changes	14:54
	only*	14:54
SethRobertson	Resets the index to HEAD< leaves the working tree alone	14:54
andre_pl	oh, so i should be able to just properly re-commit the changes afterwards	14:55
SethRobertson	See what `git status` says	14:55
_ikke_	yeah. Just git add them, and then commit	14:55
andre_pl	git status looks a lot more sane after the reset	14:55
	i think i got it from here, thanks guys	14:56
	→ Goplat joined	14:57
	→ Mag-en00b joined	14:57
	→ glennpratt joined	14:57
	→ blindingdawn joined	14:57
	variable → constant	14:58
	constant → trout	14:58
	→ dnivio joined	15:00
	→ jesseFromYVR joined	15:00
	← blindingdawn left	15:02
	→ oivind joined	15:02
	→ yhager joined	15:02
	← Plouj- left	15:02
	→ nbari joined	15:03
	← dnivio left	15:04
	→ Plouj joined	15:04
Mag-en00b	git-http-backend documentation states that GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL are formed from REMOTE_USER and REMOTE_ADDR, but the source code states those variables are set ONLY if they have not been set already. custom functionality built on top of git-http-backend benefits from the possibility offered by the source code, but it seems futile to trust the source code if the documentation states the	15:05
	exact opposite (maybe it'll be "fixed" one way or the other in the future). i ask if it is possible to change the documentation to reflect the fact that GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL can be set beforehand and will not be overridden if they are?	15:05
	← jesseFromYVR left	15:05
	← TheFuzzball left	15:05
	← glennpratt left	15:07
	← chaiz left	15:08
	← kpreid left	15:09
	→ kpreid joined	15:09
	→ daniel_- joined	15:12
	→ TheFuzzball joined	15:12
_ikke_	Mag-en00b: Questions like that are best fit for the mailing list (git@vger.kernel.org)	15:13
	→ alegen joined	15:13
Mag-en00b	thanks. i though they would, but was too scared to ask directly there	15:14
_ikke_	Mag-en00b: Don't be.	15:14
	It's quite a friendly place	15:14
EugeneKay	Except for the cannibalism	15:15
_ikke_	shhh	15:15
Mag-en00b	i just thought based on the posts that i was more for the bugs -kind of discussion	15:15
EugeneKay	Doc errors are bugs	15:15
_ikke_	bugs, feature requests, improvements, questions	15:15
	all kinds of things	15:15
	→ maleknet joined	15:16
	→ martinjlowm-lapt joined	15:16
	→ rednaks joined	15:17
	→ BadProphet joined	15:18
	← Zomb left	15:21
	← svetlyak40wt left	15:21
	← Esa_1 left	15:22
	← BadProphet left	15:22
	← daniel_- left	15:22
	→ Esa_ joined	15:23
	← Mode-M left	15:24
	→ erichynds joined	15:25
	→ flijten joined	15:26
	→ JDuke128 joined	15:26
	← flijten left	15:26
	← maleknet left	15:26
	→ BadProphet joined	15:28
	→ jlg13 joined	15:28
	← plains left	15:28
	← jlg13 left	15:29
	← erichynds left	15:30
	→ dvide joined	15:30
	← letharion left	15:30
	→ drizzd joined	15:32
	→ svetlyak40wt joined	15:32
	→ bux joined	15:32
	→ srji joined	15:33
	← BadProphet left	15:33
	← hafeez3000 left	15:33
	← xpen_ left	15:34
	← cagedwisdom left	15:35
	← rednaks left	15:37
	→ maleknet joined	15:38
	→ skorgon joined	15:39
	← sbodo left	15:40
	← Dreamer3 left	15:40
	← xnox left	15:41
	→ deadmund joined	15:42
	→ chaiz joined	15:42
deadmund	How can I change the default text editor for git?	15:42
_ikke_	git config core.editor <your editor>	15:43
	→ doug2 joined	15:44
deadmund	_ikke_: Thanks	15:44
	git is great	15:44
	← Xethron left	15:45
	← Milossh left	15:46
	← Hounddog_ left	15:46
	→ Hounddog joined	15:47
	← srji left	15:47
	← doug2 left	15:48
	→ glennpratt joined	15:49
	← drizzd left	15:49
	← swiety left	15:49
	→ srji joined	15:51
	← m0ltar left	15:51
	→ hafeez3000 joined	15:52
	← nbari left	15:53
	← resmo_ left	15:53
	← jso- left	15:54
	→ dreiss joined	15:54
	→ drizzd joined	15:55
	→ jso- joined	15:55
	→ matthewwilkinson joined	15:56
	← matthewwilkinson left	15:56
	→ kfe joined	15:56
	→ srji_ joined	15:57
	→ letharion joined	15:58
	← srji left	16:00
	← deadmund left	16:00
	← drizzd left	16:00
	← chussenot left	16:00
	→ david1010 joined	16:01
	→ gitinfo joined	16:02
	ChanServ set mode: +o	16:02
	← srji_ left	16:02
	→ Beket joined	16:03
_ikke_	!botsnack	16:03
VasionBot	Thanks, _ikke_! Om nom nom	16:03
_ikke_	lol	16:03
	EugeneKay: Is that your bot?	16:03
gitinfo	Om nom nom	16:03
Beket	Hello people! I did a fixup with git rebase -i and my commit disappeared :\ (certainly a pebkac). How can I undo it ? git reflog ?	16:03
_ikke_	yes	16:04
	→ herdingcat joined	16:04
_ikke_	Use the reflog to find the HEAD which refers to that ocmmit	16:05
	commit	16:05
	← herdingcat left	16:05
	→ drizzd joined	16:06
	→ herdingcat joined	16:06
	→ resmo_ joined	16:07
Beket	argh	16:07
	I ended up with a detached HEAD	16:07
	→ rpet joined	16:08
	→ blindingdawn joined	16:08
	← herdingcat left	16:08
_ikke_	you did git checkout HEAD@{n} (where n is a number)?	16:08
Beket	now I checkedout master and my commits are gone	16:08
	yeh I did git checkout HEAD@{n} and fixed the rebase issue	16:08
	but now I accidentally detached HEAD	16:09
	→ herdingcat joined	16:09
	← JEEB left	16:09
_ikke_	What do you want to happen	16:09
Beket	I'd like to get back my commits	16:10
	← herdingcat left	16:10
Beket	do they live in the detached HEAD now or I lost them for good?	16:10
	→ Zomb joined	16:10
	→ Gentlecat joined	16:10
	← TLGreg left	16:10
_ikke_	Beket: They're unreferenced	16:10
	You need to make them referenced again	16:11
Beket	how can I reference them from master again ?	16:11
	→ Cromulent joined	16:11
	← Gentlecat_ left	16:11
_ikke_	It's hard to tell what to do exactly, because I don't know the exact situation	16:11
	if you checkout that commit, and do a git log	16:12
	← hafeez3000 left	16:12
_ikke_	do you see all the commits you want to keep?	16:12
Beket	I have 1 commit in (no branch) and I'd like to move it to master. Can I cherry pick it from there ?	16:12
	yes I see all of them (only 1 actually it is)\	16:12
cbreak	just merge it.	16:12
	← Gentlecat left	16:12
Beket	after I checkout master or?	16:12
	git branch says I'm in (no branch) right now	16:12
_ikke_	that's right	16:13
	as long as you don't commit, that's not a problem	16:13
Beket	so I checkout master and then how do I merge the nameless branch ?	16:13
cbreak	merge the commit...	16:13
	it's not a branch.	16:13
Beket	via its sha1 hash ?	16:13
cbreak	yes.	16:13
_ikke_	cbreak: Why not cherry-pick?	16:13
cbreak	because that'll lose the parent commits he might have made, and it will duplicate the commit	16:14
	and it might change meta data	16:14
_ikke_	right	16:14
cbreak	if the merge is ff, merging is better	16:14
_ikke_	git checkout master; git merge <hash>	16:14
cbreak	if it's not ff, he'll complain later and he can cherry-pick still	16:14
	→ torjus_ joined	16:14
Beket	ok, I see the commit in master again	16:15
	but also an ugly merge commit. Can I squash them ?	16:15
	→ AdrienBrault joined	16:15
cbreak	you can do what ever you want with it.	16:16
	note that it's rewriting of history	16:16
	(probably private, so no big deal)	16:16
	← glennpratt left	16:16
Beket	ugh, git rebase -i failed again and went me to detached HEAD . wtf	16:16
cbreak	git rebase --abort	16:17
	and it's not a failure	16:17
	it's working as intended	16:17
	→ tshauck joined	16:17
Beket	when I do git rebase -i HEAD~4, I don't see the merge commit, so I can't squash it with previous	16:18
	and then I did a :q! and I ended up in a detached state. Shouldn't :q! be equivalent to abort the rebase ?	16:18
	← blindingdawn left	16:18
	← api left	16:19
cbreak	no	16:19
Beket	ok	16:19
	what about the fact that I don't see the merge commit in interactive rebase ? Is that normal ?	16:19
cbreak	merge commits are not squashed by rebases	16:19
Beket	does it have to do with '~' ?	16:19
	ah	16:19
	how are they squashed ?	16:19
cbreak	reset it away and git merge --squash instead	16:19
Beket	git-reset HEAD~1 and then git merge --squash ?	16:20
cbreak	or do a normal rebase, they kill merges afaik	16:20
	← AdrienBrault left	16:20
	→ api joined	16:20
	→ AdrienBrault joined	16:21
Beket	oh nm, I'll just reset it hard and I'll rewrite the patch :\	16:22
	→ foraks joined	16:23
	→ Odd_Bloke joined	16:23
	→ kadoban joined	16:23
	→ hafeez3000 joined	16:23
	→ eijk joined	16:24
	→ glennpratt joined	16:24
	→ orafu joined	16:25
cbreak	rewrite the what?	16:27
	→ iamjarvo joined	16:27
	← david1010 left	16:29
	→ BadProphet joined	16:32
	← chaiz left	16:32
	→ Milossh joined	16:34
	← Sky[x] left	16:34
	← maleknet left	16:34
JDuke128	hello , i've did "git config push.default origin" but i want to roll back to none , how can i rollback ?	16:34
	i want something like "git config push.default null" but how can i set ?	16:34
	← svetlyak40wt left	16:34
	→ sbodo joined	16:35
_ikke_	JDuke128: git config --unset push.default	16:35
	JDuke128: But that value means something different that you seem to think	16:35
JDuke128	like?	16:36
m1sc	JDuke128: did you read man git-config push.default?	16:36
gitinfo	JDuke128: the git-config manpage is available at http://jk.gs/git-config.html	16:36
	← bux left	16:36
JDuke128	no	16:36
	→ alem0lars joined	16:36
_ikke_	It has a limited set of valid values	16:36
	nothing, matching, upstream, simple, current	16:36
	→ Sky[x] joined	16:38
	← francisfish left	16:40
	← BadProphet left	16:43
twobitsprite	gitinfo: **	16:44
	gitinfo: subdirectory	16:44
_ikke_	twobitsprite: !bot	16:44
gitinfo	twobitsprite: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	16:44
	← whaley left	16:45
twobitsprite	!**	16:45
	hmm	16:45
	← iamjarvo left	16:46
	→ JEEB joined	16:46
	← angelsl left	16:46
	← hafeez3000 left	16:52
	← pansdr left	16:52
	← Xizor left	16:52
	→ pansdr joined	16:53
	← glennpratt left	16:57
	→ kerrick joined	16:58
	→ legumbre_ joined	16:59
	← eeanm left	17:00
	→ jaloose joined	17:00
JDuke128	thanks	17:01
	hey , how can i submit new updates to git repo ? "git push origin" ?	17:02
offby1	well, "git push something" certainly	17:02
	→ glennpratt joined	17:02
offby1	sometimes even just 'git push'	17:02
JDuke128	but its not updating	17:03
	Everything up-to-date	17:03
	it says this	17:03
	i ve 2 client	17:03
	one is windows worker	17:03
	other is mac worker	17:03
_ikke_	JDuke128: are you just executing git push?	17:03
JDuke128	i want to combine windows worker to mac	17:03
	yes	17:03
Learath2	JDuke128 didnt you commit first	17:03
JDuke128	but mac user doesn't seem effected	17:03
	→ Xizor joined	17:04
	→ psoo joined	17:04
JDuke128	ah	17:04
_ikke_	JDuke128: !book	17:05
gitinfo	JDuke128: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	17:05
JDuke128	but	17:05
	error: RPC failed; result=52, HTTP code = 0	17:05
	fatal: The remote end hung up unexpectedly	17:05
	fatal: The remote end hung up unexpectedly	17:05
_ikke_	Please read something like that	17:05
JDuke128	Everything up-to-date	17:05
	this time i ve this problem	17:05
	when i do "git push"	17:05
_ikke_	JDuke128: Where did you clone this repo from?	17:06
JDuke128	i do on windows pc	17:06
	→ koltroll joined	17:12
JDuke128	its my own repo	17:12
	i did with "git init"	17:12
_ikke_	did you add a remote?	17:13
	← robbyoconnor left	17:13
	← psoo left	17:13
	← colona left	17:15
	→ colona joined	17:16
	← aetcore left	17:16
	→ luc__ joined	17:17
	→ dnivio joined	17:20
	← Innocentus left	17:21
	→ katsh joined	17:21
	→ rchavik joined	17:21
	← rchavik left	17:21
	→ rchavik joined	17:21
	← oivind left	17:22
	← rchavik left	17:24
	→ svetlyak40wt joined	17:24
	→ maleknet joined	17:24
	← JDuke128 left	17:25
	→ Fissure joined	17:27
	← tshauck left	17:27
	→ atomx`` joined	17:29
	→ keebod joined	17:30
	→ hafeez3000 joined	17:30
	← atomx` left	17:31
	← marhaban left	17:31
	← keebod left	17:32
	→ keebod joined	17:32
	← svetlyak40wt left	17:37
	← keebod left	17:38
	→ Dr4g joined	17:38
Dr4g	I'm trying to switch to a branch that does exist. it's called config-2.0	17:38
	dragoonis$ git checkout "config-2.0"	17:38
	→ Innocentus joined	17:38
Dr4g	error: pathspec 'config-2.0' did not match any file(s) known to git.	17:38
	thoughts ?	17:38
	→ keebodd joined	17:38
	← ShadeTornado left	17:39
	← Zomb left	17:40
_ikke_	git branch	17:40
	← jaloose left	17:41
	← torjus_ left	17:41
	← kfe left	17:41
	→ sebar joined	17:42
_ikke_	what does that return?	17:42
	→ sq-one joined	17:42
Dr4g	_ikke_: just master,	17:42
	config-2.0 isn't htere	17:42
	there *	17:42
	→ rchavik joined	17:42
Dr4g	this is the repo: https://github.com/ppi/framework/	17:43
	← WinstonSmith left	17:43
	→ doug2 joined	17:44
	→ BadProphet joined	17:44
_ikke_	Did you clone that repo?	17:44
	← Cromulent left	17:45
_ikke_	git checkout -b config-2.0 origin/config-2.0	17:45
Dr4g	_ikke_: i cloned that repo yet	17:46
	yes *	17:46
	thanks i'll try that command	17:46
	← Goplat left	17:46
	→ WinstonSmith joined	17:46
	→ pbramos joined	17:47
	← BadProphet left	17:48
	← doug2 left	17:48
	← alem0lars left	17:49
	← rchavik left	17:49
	→ hyperair joined	17:50
	→ rchavik joined	17:50
Dr4g	_ikke_: yea that worked	17:50
	← katsh left	17:51
	→ JDuke128 joined	17:51
	→ jaseemabid joined	17:51
	→ e66 joined	17:52
	← simplechat left	17:52
	← arietis left	17:52
	← kadoban left	17:53
	→ BadProphet joined	17:54
	← BadProphet left	17:54
	← rchavik left	17:54
	→ srji joined	17:55
	→ BadProphet joined	17:55
	→ iamjarvo joined	17:55
	← TheFuzzball left	17:55
	→ jimmyeatworld joined	17:55
	→ jesseFromYVR joined	17:56
	← rpet left	17:56
	→ subichan joined	17:57
subichan	in laymen terms what does --set-upstream do in git push?	17:57
	← atomx`` left	17:57
	→ atomx joined	17:58
Spaceghostc2c	subichan: man git-push	17:58
gitinfo	subichan: the git-push manpage is available at http://jk.gs/git-push.html	17:58
	← rurufufuss left	17:58
	→ TheFuzzball joined	17:59
subichan	I've read but I don't understand	17:59
	I'm new to git	17:59
Spaceghostc2c	It sets your upstream.	17:59
	← BadProphet left	17:59
wereHamster	subichan: man gitglossary explains what 'upstream' is	17:59
gitinfo	subichan: the gitglossary manpage is available at http://jk.gs/gitglossary.html	17:59
Spaceghostc2c	Have you ever used a vcs or anything that has the concept of being a derivative of another thing?	17:59
subichan	wereHamster: still clueless.	18:01
	I have a local repository cloned from my bitbucket one. I changed some stuff in the local, want to push it back.	18:01
	I noticed git push	18:01
JDuke128	i ve error when i try to "git push"	18:01
subichan	last sentence got cut	18:01
JDuke128	http://pastie.org/5356902	18:02
	here is my problem	18:02
	someone can help ?	18:02
subichan	I noticed git push and git push -u upload my changes to the remote online repository. what's the difference between the two versions?	18:02
	→ RaceCondition joined	18:03
	→ sentinal8473 joined	18:03
	← sentinal8473 left	18:03
bremner	subichan: what part of the documentation for the --set-upstream option is unclear to you?	18:04
	→ sentinal8473 joined	18:04
	← sentinal8473 left	18:04
	← keebodd left	18:04
	→ sentinal8473 joined	18:04
	← sentinal8473 left	18:04
	→ sentinal8473 joined	18:05
	← sentinal8473 left	18:05
	→ kfe joined	18:06
subichan	bremner: when I do "push" I'm pushing "branches"? I thought I were pushing "commits"	18:07
Spaceghostc2c	You're actually pushing objects and refs.	18:08
	← iamjarvo left	18:08
Spaceghostc2c	But that'll confuse you more.	18:08
wereHamster	brnaches first, and by extension also commits, because branches point to commits. so really both	18:08
subichan	when I clone a repository am I creating a new branch?	18:08
cbreak	several	18:09
Spaceghostc2c	No, you're copying the remote repo to your machine.	18:09
cbreak	cloning involves the creation of lots of new branches	18:10
Spaceghostc2c	I don't think that's a very good way to explain it.	18:10
cbreak	one remote tracking for each on the remote, + a new master	18:10
	the truth is truer than a simple explanation :)	18:10
bremner	sure, but is it helpful?	18:10
subichan	Ok. When I change a file in a repo to which nobody ever added any branch, I believe I only have a master and a remote origin then, correct^	18:10
	?	18:10
Spaceghostc2c	It's really just making a local copy with a remote pointing to the origin.	18:11
cbreak	subichan: no	18:11
Spaceghostc2c	subichan: I think you should read a git book.	18:11
cbreak	when you create a repository from scratch, you will get a master branch on first commit	18:11
	→ marhaban joined	18:11
cbreak	you will not have any remote	18:11
	→ tinybluepixel joined	18:12
cbreak	if you cloned a repository from an existing repository, you will get this one as remote origin (by default)	18:12
subichan	the remote is online	18:12
cbreak	and you will have all its branches as remote tracking branches	18:12
	← RaceCondition left	18:12
cbreak	and you will have its master branch as new local branch	18:12
subichan	bitbucket forces you to clone an empty repository first	18:12
cbreak	(again, by default)	18:12
Spaceghostc2c	I'd personally go read some books and guides, but if cbreak wants to hold your hand, that's cool too.	18:12
subichan	then you populate it on your HD and repush stuff back	18:13
	← beneggett left	18:13
cbreak	what's bitbucket?	18:13
	some HG thing I think?	18:13
Spaceghostc2c	A git/hg host	18:13
cbreak	they have git now? interesting.	18:13
Spaceghostc2c	We got google fail in here today. I'm back to coding.	18:13
cbreak	with git, you do NOT have to clone any repository	18:14
	you can add as many remotes as you want later on	18:14
	← marhaban left	18:14
JDuke128	hey , can someone tell me why this problem occurs ? http://pastie.org/5356902	18:14
	fatal: The remote end hung up unexpectedly	18:15
	error: RPC failed; result=52, HTTP code = 0	18:15
cbreak	looks like the server has a problem	18:15
	try to push via ssh? :)	18:15
	← sq-one left	18:16
JDuke128	i got this on every line log	18:16
	INFO ARF: bitcoin/bitminer.git/info/refs?service=git-receive-pack (100) authenticated	18:16
	→ beneggett joined	18:17
	→ m0ltar joined	18:17
	← GFLJay left	18:17
	→ codeFiend joined	18:18
	→ marhaban joined	18:18
	← codeFiend left	18:18
	→ witul joined	18:18
	← witul left	18:19
	← hmsimha left	18:19
	← Sigma left	18:19
	→ rchavik joined	18:19
	← rchavik left	18:19
	→ rchavik joined	18:19
	→ Sigma joined	18:19
	← Sky[x] left	18:20
	→ guampa joined	18:20
	→ oo_miguel joined	18:20
	← drizzd left	18:20
	→ Dave^\| joined	18:21
	← maleknet left	18:21
	→ drizzd joined	18:21
	→ minusthetiger joined	18:22
	→ Sky[x] joined	18:23
	← john3 left	18:24
	← skorgon left	18:24
	→ witul joined	18:25
	→ adamben joined	18:25
	← adamben left	18:25
	→ adamben joined	18:25
	← witul left	18:25
	← rchavik left	18:25
	→ SuperrMann joined	18:25
	← drizzd left	18:26
	← kfe left	18:26
	→ drizzd joined	18:26
	→ skorgon joined	18:27
subichan	so basically an upstream reference is a reference to the same branches on origin?	18:27
	← SirCmpwn left	18:28
JDuke128	me ?	18:28
	→ Dreamer3 joined	18:28
JDuke128	subichan , u tell me ?	18:28
cbreak	an upstream is the branch on some other remote repo that your local branch tracks.	18:28
subichan	JDuke128: no, sorry :)	18:28
JDuke128	;(	18:28
subichan	cbreak: and an "upstream reference" is a reference _to_ the upstream?	18:30
	← drizzd left	18:30
	→ lacrymology joined	18:30
	→ drizzd joined	18:30
	→ Connecti0n joined	18:31
	→ SirCmpwn joined	18:32
	→ Turicas joined	18:33
	→ iamjarvo joined	18:34
	→ rpet joined	18:34
	← minusthetiger left	18:35
	→ cakehero joined	18:35
	← drizzd left	18:35
	→ maleknet joined	18:35
	→ drizzd joined	18:36
	← dreiss left	18:36
	→ tobias_93 joined	18:39
	← AdrienBrault left	18:40
	→ FernandoBasso joined	18:41
	← luc__ left	18:41
	← rpet left	18:43
JDuke128	INFO ARF: bitcoin/bitminer.git/info/refs?service=git-receive-pack (100) authenticated	18:43
	ey , can someone tell me why this problem occurs ? http://pastie.org/5356902	18:43
	← srji left	18:44
JDuke128	someone have idea	18:44
	?	18:44
	→ maletor joined	18:44
	← tobias_93 left	18:45
	← dnivio left	18:47
	→ Xethron joined	18:49
cbreak	subichan: it just stores which branch a branch tracks	18:49
	most of the time that's a branch on a remote	18:49
	JDuke128: as I said above: try it via ssh	18:50
	→ dreiss joined	18:50
	→ chussenot joined	18:50
	← Xethron left	18:51
	← maleknet left	18:51
	→ Xethron joined	18:52
	→ OOPMan joined	18:53
	→ alem0lars joined	18:53
	→ _adnasa_ joined	18:55
	→ erichynds joined	18:55
	→ john3 joined	18:56
	← dreiss left	18:57
	← OOPMan left	18:57
	→ svetlyak40wt joined	18:58
	← Paul92 left	18:59
	← Milossh left	18:59
	→ Kaco joined	19:00
	→ margoK joined	19:01
	← drizzd left	19:02
	→ drizzd joined	19:03
	← Kaco left	19:03
	→ maleknet joined	19:04
	← ninegrid left	19:05
	← laurav left	19:06
	← revyd left	19:07
	← sebar left	19:08
	← erichynds left	19:08
	← alem0lars left	19:08
	→ ninegrid joined	19:09
	→ dreiss joined	19:09
	← drizzd left	19:09
	→ OOPMan joined	19:10
	← tham left	19:10
	→ drizzd joined	19:10
	→ und3f joined	19:10
	→ daniel_- joined	19:11
	← drizzd left	19:11
	← glennpratt left	19:11
	→ drizzd joined	19:13
	→ rampantmonkey joined	19:13
	← legumbre_ left	19:14
	← drizzd left	19:14
	← maleknet left	19:14
	→ legumbre_ joined	19:15
	→ drizzd joined	19:15
	← drizzd left	19:15
	← chris64 left	19:16
	← daniel_- left	19:16
	→ rednaks joined	19:17
	← maletor left	19:17
	→ drizzd joined	19:18
	← subichan left	19:18
	← drizzd left	19:18
	← rampantmonkey left	19:18
	→ drizzd joined	19:20
	→ Spudster joined	19:20
	← rafter left	19:21
	← cakehero left	19:21
	← dreiss left	19:22
	← adamben left	19:22
	→ rindolf joined	19:25
	→ adamben joined	19:25
rindolf	Hi all. What can I do about http://paste.debian.net/208122/ ? My machine OOPSed recently (and had OOPSed before a few days ago).	19:26
	← Spudster left	19:26
	→ ipalaus joined	19:27
	← drizzd left	19:27
	→ drizzd joined	19:27
	→ glennpratt joined	19:28
	← koltroll left	19:28
	→ drizzd_ joined	19:29
	← glennpratt left	19:29
cmn	grab your backups	19:29
rindolf	cmn: :-(	19:30
cmn	you have filesystem corruption, that's what happens when your OS goes bye bye	19:30
	← drizzd_ left	19:30
wereHamster	or the disk	19:30
	← Chillance left	19:31
cmn	sure, or the power goes out, or your cat stays too long on your laptop's power button	19:31
	→ Chillance joined	19:31
	← drizzd left	19:32
wereHamster	blamin' it on the cats, are we now?	19:33
	→ saustin joined	19:34
	← tinybluepixel left	19:34
saustin	apologies of JGIT is not the purview of this channel, is JGIT the "proper" way of integrating eclipse with git? Is there a better way?	19:35
	→ electrogeek joined	19:35
	← electrogeek left	19:35
	→ electrogeek joined	19:35
	→ mikepack joined	19:35
milki	isnt egit for eclipse?	19:36
	→ drizzd joined	19:36
milki	well	19:36
	← iamjarvo left	19:36
milki	it might use jgit for its backend	19:36
	→ dreiss joined	19:36
saustin	well, its something for me to google at least, thanks :)	19:38
	← drizzd left	19:39
	→ drizzd joined	19:40
rindolf	cmn, wereHamster : Thanks! Fixed now.	19:40
	→ gain joined	19:40
	→ hwrd\|work joined	19:41
	← legumbre_ left	19:41
	← drizzd left	19:42
	→ drizzd joined	19:43
	← drizzd left	19:44
	→ koltroll joined	19:44
	→ doug2 joined	19:44
	→ drizzd joined	19:44
	← drizzd left	19:45
	→ revyd joined	19:45
	← Tegi left	19:46
	← hwrd\|work left	19:46
	→ legumbre_ joined	19:48
	→ joshsmith joined	19:49
	← doug2 left	19:49
	→ drizzd joined	19:50
	← JDuke128 left	19:51
	→ h0bbit joined	19:51
	→ suy joined	19:53
	→ hwrd\|work joined	19:53
	→ oxidative joined	19:55
	→ glennpratt joined	19:57
infogulch	what?	19:57
	i just did `git reset HEAD~1` twice	19:58
	git log looks fine	19:58
	but git diff doesn't show the changes from the new top commit	19:58
	→ Cassiel joined	19:59
	→ andrewh joined	20:00
	← drizzd left	20:00
	→ drizzd joined	20:01
infogulch	nvm	20:02
	→ kcj joined	20:03
	→ p3rror joined	20:03
	← Sky[x] left	20:04
	← drizzd left	20:06
	→ drizzd joined	20:07
	← o] left	20:09
	← kcj left	20:10
	→ o] joined	20:11
	← ivan\ left	20:11
	← rednaks left	20:11
	← p3rror left	20:11
	← hoschi left	20:12
	← jesseFromYVR left	20:13
	← drizzd left	20:15
	→ drizzd joined	20:15
	← donri left	20:16
	← drizzd left	20:16
	→ donri_ joined	20:16
	donri_ → donri	20:16
	→ drizzd joined	20:17
	→ p3rror joined	20:17
	← p3rror left	20:18
	→ p3rror joined	20:18
	← rgr left	20:19
	→ sirdancealot7 joined	20:19
	← p3rror left	20:20
	→ p3rror joined	20:20
	← drizzd left	20:21
	← m0ltar left	20:21
	→ drizzd joined	20:22
	← Xizor left	20:22
	→ maletor joined	20:24
	← liquid-silence left	20:26
	← dreiss left	20:26
	→ hoschi joined	20:26
	← maqr left	20:26
	→ maqr joined	20:28
	→ robbyoconnor joined	20:28
	← sbodo left	20:29
	← Hounddog left	20:31
	← drizzd left	20:31
	→ jwmann joined	20:31
	→ metcalfc joined	20:34
	→ drizzd joined	20:34
	← maletor left	20:35
	← adamben left	20:38
	← drizzd left	20:38
	← _adnasa_ left	20:38
	← hwrd\|work left	20:39
	→ drizzd joined	20:39
	→ eijk_ joined	20:40
	← juvenal left	20:41
	← eijk left	20:42
	→ cakehero joined	20:45
	← glennpratt left	20:46
	← svetlyak40wt left	20:46
	← drizzd left	20:46
	← yshh left	20:46
	← hafeez3000 left	20:46
	← rob_w left	20:47
	→ drizzd joined	20:47
	← margoK left	20:49
	→ jesseFromYVR joined	20:49
	→ A_85 joined	20:50
	← jaseemabid left	20:51
	← SuperrMann left	20:52
	← h0bbit left	20:52
	← drizzd left	20:53
	→ glennpratt joined	20:53
	→ drizzd joined	20:53
	← jgoss left	20:55
	← drizzd left	20:55
	→ drizzd joined	20:55
	← p3rror left	20:58
	← andrewh left	20:59
	← Cassiel left	21:00
	← drizzd left	21:00
	→ flavius joined	21:00
	→ drizzd joined	21:01
	→ Cassiel joined	21:01
	→ sluther joined	21:02
	→ senior75151 joined	21:02
	→ hwrd\|work joined	21:05
	→ svetlyak40wt joined	21:06
	→ Chappo joined	21:06
	← metcalfc left	21:07
	← flavius left	21:07
	← setmeaway left	21:08
	→ setmeaway joined	21:08
	→ p3rror joined	21:10
	← drizzd left	21:10
	→ drizzd joined	21:13
	→ jaseemabid joined	21:13
	← joshsmith left	21:14
	← jesseFromYVR left	21:15
	→ jesseFromYVR joined	21:15
	← drizzd left	21:15
	→ drizzd joined	21:16
	← drizzd left	21:16
	→ BiggFREE joined	21:16
lacrymology	is there a way to cherry-pick from x to y, or x and n ancestors? I can't find it in the manpage	21:17
_ikke_	I don't get you	21:17
	→ drizzd joined	21:17
	← BiggFREE left	21:17
	← foraks left	21:18
EugeneKay	lacrymology - yes; cherry-pick can take a range or list. Specify any valid !treeish	21:19
gitinfo	lacrymology: A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection	21:19
	→ foraks joined	21:19
	← dc5ala left	21:19
	→ adamben joined	21:20
	← adamben left	21:20
	→ adamben joined	21:20
lacrymology	EugeneKay: so cherry-pick fromrev..torev?	21:21
_ikke_	aye	21:21
lacrymology	great	21:21
	fromrev is excluded, I guess	21:21
	→ Cromulent joined	21:22
	→ Goplat joined	21:22
	← longbeach left	21:22
lacrymology	cool	21:22
	→ ArchZombie joined	21:23
	← chussenot left	21:23
	← drizzd left	21:23
	→ drizzd joined	21:24
	→ chussenot joined	21:25
	→ jcao219 joined	21:25
	← drizzd left	21:26
	→ drizzd joined	21:26
	← drizzd left	21:26
	→ laurav joined	21:27
	→ drizzd joined	21:28
	→ andrewh joined	21:28
	→ Xizor joined	21:28
	→ SBoudrias joined	21:28
	← drizzd left	21:28
	← cakehero left	21:30
	→ zeth2571 joined	21:30
	← Imaginativeone left	21:30
	→ Narcotic joined	21:31
	→ rehat joined	21:33
	← andrewh left	21:34
	→ drizzd joined	21:35
	→ francisfish joined	21:36
	→ BiggFREE joined	21:37
	← drizzd left	21:37
	← mishok13 left	21:37
	→ drizzd joined	21:39
	← drizzd left	21:40
	→ rednaks joined	21:41
	← laurav left	21:41
	→ joshsmith joined	21:41
	→ drizzd joined	21:43
	← drizzd left	21:43
	→ doug2 joined	21:44
	→ drizzd joined	21:44
	← drizzd left	21:45
	→ drizzd joined	21:46
	→ albertino joined	21:47
	→ mishok13 joined	21:48
	← doug2 left	21:49
	← oxidative left	21:50
	← hinst left	21:50
	→ swiety joined	21:52
	→ AdrienBrault joined	21:52
	← WinstonSmith left	21:54
	← revyd left	21:54
	gitinfo set mode: +v	21:55
albertino	Hello, guys i am just starting with GIT. I watched a few videos with Mattew Mccolloug, reading his book now, also Pro Git, Git Internals, gitready.com etc, but i cann't understand .git/logs directory, and can't find information about it.. if i add an object with hash-object, update-index, then write-tree and then commit-tree nothing is putted in this directory , if i do it with git add, git commit it creates this direcotry and put some info in it.	21:55
	Can somebody tell what this directory purpose?	21:55
FauxFaux	albertino: man git reflog	21:56
gitinfo	albertino: the git-reflog manpage is available at http://jk.gs/git-reflog.html	21:56
albertino	thanks	21:56
	← jcao219 left	21:57
	→ witul joined	21:57
	→ WinstonSmith joined	21:57
	→ guide joined	21:57
	← witul left	21:57
	← rindolf left	21:57
	→ witul joined	21:59
	→ andrewh joined	22:00
	← witul left	22:01
	→ witul joined	22:01
	← whitman left	22:02
	→ rehat_ joined	22:04
	← glennpratt left	22:04
	← senior75151 left	22:04
	→ m0ltar joined	22:05
	← andrewh left	22:05
	→ senior75151 joined	22:05
	← Xethron left	22:05
	→ glennpratt joined	22:06
	→ margoK joined	22:06
	← jimmyeatworld left	22:07
	← rehat left	22:07
	→ whaley joined	22:08
	← koltroll left	22:08
	← OOPMan left	22:08
albertino	i have to admit git man pages are very cryptic at least for me..anyway i found a good explanation of git reflog	22:08
	FauxFaux: thanks again	22:08
	→ toralf joined	22:09
	→ __name__ joined	22:09
	← __name__ left	22:09
	→ __name__ joined	22:09
	← aguynamedben left	22:09
	→ OOPMan joined	22:09
	← albertino left	22:10
	→ Araxia joined	22:10
toralf	just checked out libgxrypt git tree and now I'm wondering why "gitk libgcrypt-1.4.4..libgcrypt-1.4.6" shows boths tags whereas "gitk libgcrypt-1.4.4..libgcrypt-1.5.0" does not show the tag "libgcrypt-1.4.6"	22:11
	toralf uses git 1.7.8.6 at a stable Gentoo Linux	22:12
FauxFaux	Silly question: Is the commit present?	22:12
	→ metcalfc joined	22:13
	→ aguynamedben joined	22:13
toralf	"git show libgcrypt-1.4.6" gives an info, what's interesting that there are empty heading lines	22:13
FauxFaux	It's not necessarily true for that tag to actually be in the history between those two other tags..	22:14
toralf	if I run "gitk" I cannot see that tag too, just if I run "gitk libgcrypt-1.4.4..libgcrypt-1.4.6"	22:15
	← witul left	22:15
	← Sigma left	22:15
	← Mag-en00b left	22:15
FauxFaux	So the tag also isn't in master? Still not a suprise.	22:15
toralf	ah - good hint	22:15
	→ doug2 joined	22:15
	← whaley left	22:15
	→ infynyxx joined	22:16
	→ codeFiend joined	22:17
	→ cagedwisdom joined	22:18
	← Droolio left	22:20
	→ Droolio joined	22:20
	← Araxia left	22:21
	← hoschi left	22:21
	← m0ltar left	22:21
	→ cakehero joined	22:22
toralf	FauxFaux: Hhm, but "git tag -l" shows the tag "libgcrypt-1.4.6", that's why I assumed it is in master	22:22
	← guide left	22:22
	→ koltroll joined	22:23
	← koltroll left	22:23
	← hwrd\|work left	22:24
toralf	Well, the explanation is in the output of "git remote show origin \| wgetpaste" in http://bpaste.net/show/57154/, isn't it ?	22:24
	← Narcotic left	22:25
	→ hwrd\|work joined	22:25
	← resistivecorpse3 left	22:26
	→ resistivecorpse3 joined	22:27
	← giallu left	22:28
	→ ivan\ joined	22:28
	← svetlyak40wt left	22:29
	← rehat_ left	22:32
	← toralf left	22:32
	→ rehat joined	22:32
	← mmc left	22:33
	← zeth2571 left	22:35
	→ rpet joined	22:35
	→ Imaginativeone_ joined	22:37
	← isomorphic_ left	22:39
	→ zheng joined	22:39
	← rpet left	22:42
	→ shruggar joined	22:43
	→ ShadeTornado joined	22:44
	Imaginativeone_ → Imaginativeone	22:44
	← Cromulent left	22:44
	← francisfish left	22:45
	← doug2 left	22:45
	→ Jippi joined	22:47
	← AdrienBrault left	22:48
	→ sbodo joined	22:48
	→ Narcotic joined	22:48
	← Innocentus left	22:50
	→ isomorphic joined	22:50
	← rehat left	22:51
	→ doug2 joined	22:51
	← timj left	22:52
	→ Gue______ joined	22:54
	← Gue______ left	22:55
	← Xizor left	22:58
	→ kadoban joined	22:59
	← fisted left	23:00
	← bartman left	23:00
	← rednaks left	23:00
	← oo_miguel left	23:00
	← sirdancealot7 left	23:00
	→ bartman joined	23:00
	→ fisted joined	23:01
	→ andrewh joined	23:01
	→ Xethron joined	23:04
	→ revyd joined	23:04
	→ BadProphet joined	23:05
	← cakehero left	23:05
LeMike	is git capable of amend a commit to an older one than the last as long as this commit it is not pushed?	23:06
_ikke_	LeMike: Through git rebase, yes	23:07
	← SamB_MacG5 left	23:07
_ikke_	LeMike: Even if it has been pushed, you can still rebase it	23:07
	But you have to know the consequences	23:07
	→ rpet joined	23:07
LeMike	don't i loose my commits that were done after the one i rebase to?	23:07
	← andrewebdev left	23:08
	← doug2 left	23:09
_ikke_	if you do something like rebase -i HEAD~4, then, no	23:09
	← BadProphet left	23:09
LeMike	like having 123456a, 123456b, 123456c. and now i found a file for 123456a. so i "rebase -i 123456a", commit and then "rebase HEAD" again?	23:09
	→ SamB_MacG5 joined	23:09
	← thiago left	23:10
_ikke_	no	23:10
	← mh_le left	23:10
	← revyd left	23:11
_ikke_	git rebase -i 123456a^; pick edit for 123456a and save+quit; ammend your commit; git rebase --continue	23:11
LeMike	ah. ok. thanks _ikke_ !	23:12
	→ Innocentus joined	23:12
	← Dr4g left	23:14
	→ sirdancealot7 joined	23:16
	→ simesy joined	23:16
	← infynyxx left	23:18
	→ DanyO83 joined	23:19
	→ infynyxx joined	23:19
	→ michaeleisel joined	23:20
	→ amiller joined	23:20
	→ sebastorama joined	23:21
	← rpet left	23:21
	← kadoban left	23:23
	← chussenot left	23:24
	← sebastorama left	23:26
	← Element9 left	23:26
	← infynyxx left	23:27
	← simesy left	23:27
	→ infynyxx joined	23:28
	← margoK left	23:28
	→ margoK joined	23:28
	→ boombatower joined	23:28
	→ simesy joined	23:28
	→ doomlord joined	23:32
	← dangerousdave left	23:33
	← infynyxx left	23:34
	← sbodo left	23:34
	← senior75151 left	23:34
	← Goplat left	23:36
	← mishok13 left	23:37
	← und3f left	23:40
	← smw left	23:40
	← j416 left	23:41
	← tewecske left	23:42
	← andrewh left	23:42
	→ hiroyuki joined	23:43
	← codeFiend left	23:44
	← guampa left	23:52
	→ sq-one joined	23:52
	← dr_lepper left	23:55
	← simesy left	23:56
	← drizzd left	23:56
	→ drizzd joined	23:57
	← ShadeTornado left	23:57

Logs Search ←Prev date Next date→

Channels Documentation