IRCloggy #git 2015-03-28

Provider of IRC logs since 2005.

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

	2015-03-28
	← vrishab left	00:00
	← v3d left	00:01
eparis	Eugene: but that only works if I know $REMOTE	00:01
	→ fatalhalt joined	00:01
eparis	and i know some people use 'origin' and some people use 'upstream' :-(	00:01
	← szymek left	00:01
	→ vrishab joined	00:02
Eugene	Add a for loop and `git remote` ;-)	00:02
	← vrishab left	00:02
	← hahuang61 left	00:03
	← TomyWork left	00:04
eparis	Eugene: ahhh, even better, i know i only care about a specific tree, so I can hard code github.com:GoogleCloudPlatform/kubernetes.git instead of giving a remote!	00:04
	← sentriz left	00:04
eparis	Eugene: thank you!	00:05
Eugene	That works, too.	00:05
	→ lidaaa joined	00:05
	→ Timvde joined	00:05
	← ropav left	00:05
	← lys left	00:05
	← jonmorehouse left	00:07
	→ Consuela joined	00:07
	→ HoMM joined	00:10
	← HoMM_ left	00:10
	→ Peasley joined	00:10
	← eeju left	00:13
	→ vrishab joined	00:13
	→ circ-user-jdqwJ_ joined	00:14
	← vrishab left	00:14
	← aloksingh left	00:14
	→ iliketurtles joined	00:15
Timvde	If I have a/ in .gitignore, then create a/{1..3} and a/.gitignore with contents !1, shouldn't git status show a/1 as untracked file?	00:15
	← CussBot left	00:16
	→ ome joined	00:16
	→ CussBot joined	00:16
	← circ-user-jdqwJ left	00:17
	→ zacts joined	00:18
	← gargola_ left	00:18
canton7	Timvde, no. git stops looking when it meets an ignored directory	00:20
	in other words, only things considered directly for ignoral can be unignored	00:20
	... so if you had 'a/*' then an unignore would work. each file within a/ is considered for ignoral, and so can be unignored	00:20
	← nikio_ left	00:21
	← paulweb515 left	00:21
Timvde	canton7: Ah, thanks :)	00:22
canton7	it's a bit counter-intuitive, but needs to be that way for efficiency reasons	00:22
	→ Sadeukko joined	00:23
Timvde	canton7: Yea, from a programmer point of view, it does sound logical :)	00:23
canton7	:)	00:23
	→ Telvr joined	00:24
	→ nour joined	00:25
	← creppe left	00:25
	→ creppe joined	00:26
Timvde	This works exactly as I wanted, thanks :)	00:26
	← airdisa left	00:26
	→ airdisa joined	00:27
	→ AmR\|EiSa joined	00:27
	→ Lovich joined	00:29
	→ m_zr0 joined	00:29
	← jstimm left	00:30
	→ lvegerano joined	00:31
	← airdisa left	00:31
	← iliketurtles left	00:33
	← scientes left	00:35
	→ paulweb515 joined	00:38
	→ Sjio joined	00:38
	← imachuchu left	00:39
	← Telvr left	00:41
	← cagedwisdom left	00:42
	← Sasazuka left	00:43
	← CheckDavid left	00:43
	→ ahr3n joined	00:44
	← rubyonrailed left	00:44
	← Peasley left	00:45
	→ robzilla joined	00:45
	→ echo-area joined	00:46
	← im8bit left	00:46
	← pheaver left	00:48
	← ahr3n left	00:50
	→ APerson_ joined	00:51
	→ ErKa joined	00:51
	→ otter768 joined	00:52
	→ Purrkode joined	00:52
	← bluesm left	00:53
	← martinbmadsen left	00:53
	← Zoddo left	00:53
	← DrHouse\|DellM650 left	00:54
	← mikecmpbll left	00:55
	→ gargola joined	00:55
	← yqt left	00:55
	← raijin left	00:56
	← cdown left	00:56
	→ dsdeiz joined	00:57
	← otter768 left	00:57
	← Sadeukko left	00:57
	← thiago left	00:57
	← BlaXpirit left	00:58
	← kpease left	00:59
	→ watabou joined	00:59
	← fstd left	01:00
	→ cdown joined	01:00
	→ fstd joined	01:00
	→ arez joined	01:01
	→ unixpro1970 joined	01:01
	← PragCypher left	01:01
	→ PragCypher joined	01:01
	→ iliketurtles joined	01:03
	→ sgen joined	01:04
	← iliketurtles left	01:04
	← nour left	01:05
eparis	Eugene: I thought this was working.... $ git branch --contains HEAD lkjsdflkjdsflkjfds; echo $?	01:05
	it always returns 0 :-(	01:06
	← mellernoia left	01:06
	← Dorf left	01:06
	→ scientes joined	01:06
	← scientes left	01:06
	→ scientes joined	01:06
	← Hestil left	01:06
eparis	it only dies if the revision doesn't exist, not if it isn't in any matched branches :-(*	01:07
	→ vixterra joined	01:07
	← vixterra left	01:07
	← JustinMac left	01:07
	→ lid_ joined	01:07
	→ vixterra joined	01:08
	← King_Hual left	01:08
	→ harish joined	01:08
	← CodeBot3000 left	01:10
	→ jazzzu joined	01:11
	← robustus left	01:11
	← lidaaa left	01:11
	← m0ltar left	01:11
	← bronson left	01:12
	→ kcj joined	01:12
	← HoMM left	01:12
	→ markholmes joined	01:12
	→ robustus\|Off joined	01:14
	robustus\|Off → robustus	01:14
	← solidus-river left	01:14
	→ Es0teric joined	01:17
	→ ology joined	01:17
	→ martinbmadsen joined	01:17
	← baweaver left	01:18
	← dreiss left	01:18
	← paul424 left	01:18
	→ bronson joined	01:19
	← blubberbop left	01:19
	← AmR\|EiSa left	01:19
	← bket left	01:20
	← mikiones left	01:22
	← Gitzilla left	01:22
	← d10n-work left	01:22
	← fstd left	01:23
	→ fstd joined	01:23
	← _Atom_ left	01:23
	← cdown left	01:24
	← fstd left	01:25
	→ fstd joined	01:25
	→ airdisa joined	01:27
	← m_zr0 left	01:27
	→ Goplat joined	01:28
	→ jerematic joined	01:28
	→ EminenceHC joined	01:28
	→ wrouesnel joined	01:29
	→ m_zr0 joined	01:30
	← watabou left	01:31
	← jerematic left	01:32
	← EminenceHC left	01:33
	← Purrkode left	01:33
	→ strictlyb joined	01:34
	→ _1_killer2005 joined	01:34
	← whitby left	01:35
	→ watabou joined	01:35
	← _1_killer2005 left	01:35
	→ Gitzilla joined	01:35
	→ hithard joined	01:36
	← Goopyo left	01:36
	← airdisa left	01:41
	← slimsag left	01:43
	→ mr-kyd joined	01:43
	← xaa left	01:44
	→ purrist joined	01:45
	← martinbmadsen left	01:45
	→ codeman joined	01:49
	← Es0teric left	01:49
	→ Dorf joined	01:50
	← axs221 left	01:50
	← PaulCapestany left	01:50
	→ ahr3n joined	01:52
	→ PaulCapestany joined	01:52
	← purrist left	01:52
	→ thiago joined	01:55
	← MattMaker left	01:56
	→ IIT joined	01:56
	→ DuckMaestro joined	01:56
	← Consuela left	01:56
	→ MattMaker joined	01:59
	← ology left	02:00
	→ oriba_ joined	02:00
	→ bramgg joined	02:02
bramgg	Is there any reason to choose to use an HTTPS remote URL over SSH, or vice versa?	02:02
morriscox	I tried to "git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" and get the message that "Clone succeeded, but checkout failed." because a file couldn't be found: "error: unable to create file drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c (No such file or directory)". "git checkout -f HEAD" doesn't work, claiming that HEAD doesn't exist. The path is not too long. Anyone	02:03
	have any idea what's going on?	02:03
	→ Rakkan joined	02:03
	← oriba left	02:03
	← Rakkan left	02:05
	→ dreiss joined	02:05
	→ m0ltar joined	02:05
	→ Rakkan joined	02:05
	← m_zr0 left	02:06
	← oriba_ left	02:07
	← arez left	02:08
	← wrouesnel left	02:09
	← sgen left	02:09
	→ wrouesnel1 joined	02:09
	← dreiss left	02:10
	← taruner left	02:11
	← boombatower left	02:12
	← lvgx left	02:14
	← robzilla left	02:15
	← ahr3n left	02:15
	→ andrew710 joined	02:16
	← mezod left	02:17
	→ Hestil joined	02:17
	→ devoldmx joined	02:18
	→ neps joined	02:18
	→ Guest58 joined	02:18
	→ Asiajey joined	02:18
	← Asiajey left	02:18
	→ Asiajey joined	02:18
	← Hestil left	02:22
	← neps left	02:22
	← pks left	02:24
	→ pks joined	02:27
	← chr[is] left	02:27
	← lvegerano left	02:28
	→ michelangelo joined	02:28
	→ lvegerano joined	02:28
	← devoldmx left	02:29
	→ chr[is] joined	02:29
	→ TheNet joined	02:29
	→ Peasley joined	02:30
	→ nettoweb joined	02:30
	→ devoldmx joined	02:30
	→ dreiss joined	02:30
	→ DrHouse\|DellM650 joined	02:31
	← donmichelangelo left	02:31
	→ Consuela joined	02:34
	→ maximski joined	02:35
	← Rakkan left	02:36
	← chr[is] left	02:37
	→ IIT_ joined	02:37
	→ AustinTheGrey joined	02:38
	→ gaoli joined	02:40
	← Guest58 left	02:41
	← IIT left	02:41
	→ Guest58 joined	02:41
	→ mdhopkins joined	02:41
	← dreiss left	02:41
	← mdhopkins left	02:41
	→ mdhopkins joined	02:42
	← mdhopkins left	02:42
	→ mdhopkins joined	02:43
	← IIT_ left	02:43
	← freestyl3r left	02:44
	← towski_ left	02:45
	→ dreiss joined	02:45
	← nettoweb left	02:45
	← aidalgol left	02:45
	← markholmes left	02:46
	← hgl left	02:47
	← circ-user-jdqwJ_ left	02:47
	→ hgl joined	02:48
	→ sctskw joined	02:49
	→ macabre joined	02:50
	← devoldmx left	02:51
	→ devoldmx joined	02:51
	→ otter768 joined	02:53
	← sdothum left	02:53
	← neo1691 left	02:53
	← SimonNa left	02:55
	← _X_C_V_B_ left	02:56
	← Guest58 left	02:56
	← otter768 left	02:58
	← MattMaker left	02:58
	→ Vampire0_ joined	02:59
	← maximski left	03:01
	→ MattMaker joined	03:01
	Allen` → Allen`\|Dead	03:02
	← Vampire0 left	03:02
	← Dorf left	03:03
	← codeman left	03:03
	→ Dorf joined	03:03
	← Peasley left	03:03
	→ Dougie187 joined	03:06
	← DrHouse\|DellM650 left	03:07
	← Dorf left	03:07
	→ berz3rk_ joined	03:12
	← APerson_ left	03:12
	← berz3rk left	03:12
	→ _Cyclone_ joined	03:13
	→ raymond joined	03:14
	← xnox left	03:14
	→ reaverb1 joined	03:15
	→ curiousmansi joined	03:15
	← berz3rk_ left	03:16
	← reaverb left	03:16
	reaverb1 → reaverb	03:16
	→ xnox joined	03:16
	→ jerematic joined	03:17
	→ EminenceHC joined	03:17
	→ neps joined	03:18
	← duderonomy left	03:19
	← teran left	03:21
	← jerematic left	03:21
	← EminenceHC left	03:22
	← curiousmansi left	03:22
	→ mikiones joined	03:22
	→ sexybeast joined	03:23
	→ airdisa joined	03:24
	← dsdeiz left	03:24
	→ pheaver joined	03:25
	← reaverb left	03:26
	← neps left	03:27
	← mikiones left	03:27
	← airdisa left	03:29
	← diegoviola left	03:30
Eugene	eparis `\| wc -l` ;-)	03:30
	← dreiss left	03:33
	← devoldmx left	03:34
	← toothrot left	03:36
	← jsolano left	03:38
	← _Cyclone_ left	03:38
	← bronson left	03:39
	← msonntag left	03:39
	← Sjio left	03:40
	→ jsolano joined	03:40
	→ tudc joined	03:41
	← tudc left	03:41
	→ msonntag joined	03:41
	→ elementalest joined	03:42
	← elementalest left	03:42
	→ elementalest joined	03:42
	→ Kxo joined	03:42
deltab	bramgg: access through firewalls	03:42
	→ Balliad joined	03:44
	→ DevHC joined	03:45
	← elementalest_ left	03:45
	← FroMaster left	03:45
	→ elementalest_ joined	03:45
	← AustinTheGrey left	03:45
	← govg left	03:45
DevHC	i need to parameterize Git to make it work with a repository located in a subdirectory of the current directory, and to have paths be relative to the current directory	03:47
	details:	03:47
	← elementalest left	03:48
DevHC	- i have ./repo/.git, ./repo/main.c, and ./irrelevant.txt	03:48
	- from the viewpoint of the repository, there's a single "main.c" file, which is has a modified working copy	03:49
	- some ``git [...] status'' command should display: modified: repo/main.c	03:50
	→ nkouevda joined	03:50
DevHC	ie., not just main.c; copying the path text and making it an argument to a Unix program (eg., a text editor) should point the program to the file	03:51
	→ bronson joined	03:52
	→ durham joined	03:52
DevHC	i'm unable to get the --git-dir, --work-tree and -C arguments to work as desired	03:52
	HALP?	03:52
	← nnyk_ left	03:54
	← harish left	03:54
raymond	I think to get what you want, you need to issue the "git ... status" from the stop level of the repo, otherwise "git status" is relative from where it's issued.	03:55
	← madewokherd left	03:55
	← durham left	03:56
DevHC	nope, that's the exact opposite of what i want	03:56
	← Dougie187 left	03:57
	← darkbasic left	03:58
	→ darkbasic joined	03:59
bramgg	deltab: thanks, anything else?	04:00
	← Consuela left	04:01
	← fstd left	04:02
	← aerth left	04:02
	→ Corey84 joined	04:02
raymond	DevHC: I guess I'm not following.	04:03
	You want to strip the any paths which may exist?	04:03
	→ BuenGenio joined	04:03
DevHC	no	04:03
	→ aerth joined	04:03
DevHC	i want paths not to be stripped	04:03
	← basiclaser left	04:04
	← Corey84 left	04:04
	→ fstd joined	04:05
	← morriscox left	04:06
	→ markholmes joined	04:07
	← fatalhalt left	04:07
	← Balliad left	04:07
	→ Corey84 joined	04:07
	← Gamecubic left	04:07
deltab	bramgg: virtual hosting, maybe	04:09
	← aerth left	04:09
	← goldstar left	04:11
deltab	bramgg: less load on the server due to pre-prepared packs	04:11
	→ aerth joined	04:11
	→ cagedwisdom joined	04:12
	← Corey84 left	04:13
	→ Corey84 joined	04:13
deltab	http://www.git-scm.com/2010/03/04/smart-http.html	04:13
bramgg	deltab: ty	04:14
	→ Consuela joined	04:14
	← jokester left	04:15
	→ jokester joined	04:16
	← mostlybadfly left	04:18
	← Arsonide left	04:18
	→ kadoban joined	04:20
	← aerth left	04:21
	→ aerth joined	04:22
	→ sahil1 joined	04:22
	← vstoniest left	04:22
	← fstd left	04:23
	→ vstoniest joined	04:23
	→ Vgr_ joined	04:25
	→ martinbmadsen joined	04:25
	→ fstd joined	04:25
	← unixpro1970 left	04:26
	← Vgr left	04:26
	← aerth left	04:27
	← misterpink left	04:27
	→ boombatower joined	04:27
	→ aerth joined	04:27
	← Consuela left	04:28
	← jantje left	04:29
	← hgl left	04:31
	← andrew710 left	04:32
	→ hgl joined	04:33
	→ duderonomy joined	04:34
	← Noldorin left	04:35
	← neonKow left	04:36
	→ mizu_no_oto joined	04:36
	← aerth left	04:38
	← zumba_addict left	04:38
	← ErKa left	04:38
	→ aerth joined	04:39
	→ jantje joined	04:41
	→ AnujSharma joined	04:42
	← fstd left	04:42
	→ nnyk_ joined	04:43
	→ devoldmx joined	04:44
	→ unixpro1970 joined	04:45
	← aerth left	04:47
	← nnyk_ left	04:48
	← gsingh93 left	04:48
	→ gsingh93 joined	04:48
	→ mostlybadfly joined	04:49
	← f3lp left	04:51
	← u1106 left	04:51
	→ Dorf joined	04:52
	Briman → Briman\|off	04:53
	← hgl left	04:53
	→ otter768 joined	04:53
	→ u1106 joined	04:53
	→ beautifulmind joined	04:54
	→ hgl joined	04:54
	→ aerth joined	04:54
	→ robertt_dex joined	04:54
	→ neps joined	04:55
	← Dorf left	04:57
	← DuckMaestro left	04:57
	→ nettoweb joined	04:58
	← beautifulmind left	04:58
	→ PragmaticCypher joined	05:00
	→ iliketurtles joined	05:01
	→ beautifulmind joined	05:01
	← nkouevda left	05:01
	→ jerematic joined	05:03
	← shinnya left	05:03
	← AugustoCesar left	05:03
	← aerth left	05:04
	← PragCypher left	05:04
	→ AugustoCesar joined	05:04
	→ EminenceHC joined	05:06
	→ darkPT joined	05:07
	← jerematic left	05:07
	← mizu_no_oto left	05:07
	darkPT → niko-is-GAY	05:07
	← unixpro1970 left	05:08
	← niko-is-GAY left	05:09
	→ Peace- joined	05:09
	← Peace- left	05:09
	→ Peace- joined	05:09
	← EminenceHC left	05:10
	→ anuby joined	05:11
	→ aerth joined	05:13
	→ airdisa joined	05:13
	→ harish joined	05:14
	← pheaver left	05:14
	← hithard left	05:15
	→ rubyonrailed joined	05:15
	→ Consuela joined	05:16
	← aerth left	05:17
	→ Tommy[D]_ joined	05:17
	→ aerth joined	05:17
	← airdisa left	05:18
	→ hithard joined	05:19
	→ EminenceHC joined	05:19
	← Corey84 left	05:19
	← macabre left	05:20
	← Tommy[D] left	05:21
	→ mikiones joined	05:23
	← gdoteof left	05:24
	← EminenceHC left	05:24
	→ satwo_ joined	05:26
	→ MegaDork joined	05:27
	← mikiones left	05:27
	→ elementalest_dc joined	05:27
	← MegaDork left	05:29
	→ in3xes joined	05:29
	← elementalest_ left	05:32
	← lvegerano left	05:33
	← happy-dude left	05:36
	← sahil1 left	05:36
	→ jim joined	05:38
	→ rubyonra_ joined	05:40
	← gaoli left	05:40
	← zivester left	05:41
	→ pheaver joined	05:42
	→ einmalfel joined	05:42
	← rubyonrailed left	05:43
	← Asiajey left	05:45
	← aerth left	05:45
	→ jayeshsolanki joined	05:46
	→ aerth joined	05:46
	← wrouesnel1 left	05:46
	← rubyonra_ left	05:47
	← sexybeast left	05:48
	→ dreiss joined	05:49
	← aerth left	05:51
	← rethnor left	05:51
	→ aerth joined	05:51
	← hithard left	05:52
	← nettoweb left	05:53
	← hgl left	05:54
	→ f3lp joined	05:56
	→ hgl joined	05:57
	← bumbar_ left	05:57
	← sctskw left	05:59
	→ andrew710 joined	06:00
	← andrew710 left	06:00
	← m0ltar left	06:00
	→ m0ltar joined	06:01
	→ andrew710 joined	06:01
	← BuenGenio left	06:03
	→ wrouesnel1 joined	06:04
	← martinbmadsen left	06:04
	← m0ltar left	06:05
	← aerth left	06:05
	→ CodeBot3000 joined	06:07
	→ aerth joined	06:09
	→ Vadimus joined	06:10
	← lindenle left	06:13
	→ Dragooon joined	06:13
	← adamm left	06:14
	← devoldmx left	06:14
	→ devoldmx joined	06:14
	→ gfixler joined	06:15
	← aerth left	06:16
	→ nikio_ joined	06:17
	→ aerth joined	06:19
	→ adamm joined	06:19
	← Vadimus left	06:21
	← ejd left	06:21
	→ BuenGenio joined	06:25
	← lid_ left	06:25
	← CodeBot3000 left	06:27
	→ Anuj_ joined	06:27
	← gsingh93 left	06:28
	← AnujSharma left	06:29
	← iliketurtles left	06:30
	← f3lp left	06:30
	→ f3lp joined	06:30
	→ Polyatomic joined	06:31
	← Polyatomic left	06:31
	← robertt_dex left	06:31
	→ totoybato joined	06:32
	→ Error404NotFound joined	06:32
	← adamm left	06:32
	→ adamm joined	06:32
	→ cdown joined	06:32
totoybato	Hi everyone, during "git rebase -i master" command, I pick the first commit and squash the rest of commits, how do I use the timestamp of the last (squashed) commit as the timestamp for the combined commit?	06:33
	→ Polyatomic joined	06:34
	→ DrHouse\|DellM650 joined	06:35
	← aerth left	06:35
	→ aerth joined	06:36
	→ tomog999_ joined	06:38
	← adamm left	06:38
	← dreiss left	06:39
	← thebrush left	06:40
	← tomog999 left	06:40
	→ Dorf joined	06:40
	→ airdisa joined	06:44
	← Dorf left	06:45
	← bramgg left	06:46
gfixler	totoybato: the author date never changes	06:48
	only the committer date, because you're the new committer	06:48
	← airdisa left	06:49
totoybato	gfixler: I see, thanks!	06:51
	← elementalest_dc left	06:51
	→ jerematic joined	06:51
	→ elementalest joined	06:51
	← elementalest left	06:51
	→ elementalest joined	06:51
gfixler	totoybato: you could amend the commit with --date="YYYY-MM-DD HH:MMPM" if you wanted to change the author date	06:52
	→ bket joined	06:53
	← oojacoboo left	06:53
	← Kxo left	06:53
	← aerth left	06:53
totoybato	good to know that, I decided I'll keep the default behaviour. I realized now the that git log shows the author date by default but the commit date is indeed recent, this is ok since it reflects that I did commit something on that specific time.	06:54
	→ nilg joined	06:55
	→ Eshe joined	06:55
	← jerematic left	06:56
	← Eshe left	06:57
	→ Vbaat joined	06:57
	← watabou left	06:59
	→ gebjgd joined	07:00
	← gebjgd left	07:00
	→ gebjgd joined	07:00
	→ aerth joined	07:01
	→ lqi joined	07:02
	→ rchavik joined	07:03
	← zadock left	07:04
	→ fstd joined	07:05
	← BuenGenio left	07:06
	→ teran joined	07:07
	→ EminenceHC joined	07:08
	← aerth left	07:09
	→ aerth joined	07:10
	→ nnyk_ joined	07:11
	← EminenceHC left	07:12
	→ pyokagan joined	07:14
	→ adamm joined	07:15
	→ ciampix joined	07:15
	← thiago left	07:17
	← f3lp left	07:18
	→ f3lp joined	07:18
	← michael_mbp left	07:18
	← Lyqyd left	07:19
	→ michael_mbp joined	07:19
	→ zumba_addict joined	07:20
	← chaudhary left	07:20
	→ Takle joined	07:21
	→ chaudhary joined	07:26
	← nilg left	07:27
	→ MechtiIde joined	07:27
	← DrHouse\|DellM650 left	07:28
	← adamm left	07:29
	← Error404NotFound left	07:31
	→ diegoviola joined	07:31
diegoviola	hi	07:31
	→ DrHouse\|DellM650 joined	07:32
diegoviola	I want to create a patch for a repo/project but the repo is too big, is it ok if I clone the repo with --depth 1? would my patch still apply cleanly on the other side?	07:32
	← cnj left	07:32
diegoviola	assuming they have the whole history	07:32
	← beautifulmind left	07:32
	← guampa left	07:33
diegoviola	or the history has nothing to do with that?	07:33
	→ wedgie_ joined	07:33
	← wedgie_ left	07:33
	→ wedgie_ joined	07:33
	← KeelOfSteel left	07:33
	← javaJake left	07:33
	→ KeelOfSteel joined	07:33
	→ toothrot joined	07:34
	← kaictl left	07:34
	← wedgie left	07:34
DevHC	diegoviola: patch as in a ".patch" aka diff(1) output? then history is irrelevant	07:34
	← dialeth left	07:34
	→ jrahmy joined	07:34
	→ dialeth joined	07:34
diegoviola	DevHC: I want to submit a patch to a mailing list	07:34
DevHC	then definitely irrelevant	07:34
	→ Joel__ joined	07:34
diegoviola	thanks	07:34
	← Vadtec left	07:35
	← ben_alman left	07:35
	← crankharder left	07:35
	← jrahmy left	07:35
	→ guampa joined	07:35
	→ ben_alman joined	07:35
	→ javaJake joined	07:35
	← andrew710 left	07:35
	→ crankharder joined	07:35
	→ cnj joined	07:35
	→ andrew710 joined	07:35
	→ chiemseesurfer_ joined	07:36
diegoviola	--depth 1 should give me all the branches as well, right?	07:36
	DevHC has no idea	07:37
	← neps left	07:37
	→ Vadtec joined	07:37
	← FreezingCold left	07:39
	→ kaictl joined	07:40
	← MattMaker left	07:42
	← chiemseesurfer_ left	07:43
	← gopar left	07:44
	→ neps joined	07:44
	→ Rephiax joined	07:44
	→ adamm joined	07:44
	→ shinnya joined	07:45
	← Sleepy63 left	07:47
	→ Error404NotFound joined	07:49
	← adamm left	07:50
	→ NBhostin_ joined	07:50
	→ Ancchi joined	07:50
	← DrHouse\|DellM650 left	07:52
	→ ashu11 joined	07:52
	← NBhosting left	07:53
	→ Nizumzen joined	07:54
	← Rephiax left	07:54
	← anuby left	07:54
	← TheNet left	07:55
	← aerth left	07:55
	← jazzzu left	07:55
	→ aerth joined	07:56
	← Vbaat left	07:56
	→ wicope joined	07:56
	← markholmes left	07:57
	→ iyji joined	07:58
	← falstaff left	07:58
	← iyji left	07:59
	→ roelmonnens joined	07:59
	→ falstaff joined	08:00
	→ ManikM joined	08:00
	→ Guest26223 joined	08:00
	← aerth left	08:01
	← Ancchi left	08:01
	→ aerth joined	08:02
	← cdown left	08:02
	→ sahil1 joined	08:03
	→ Manny joined	08:03
	← ManikM left	08:03
	→ settermjd joined	08:03
	→ Rephiax joined	08:05
	→ jiku joined	08:06
	← bronson left	08:06
	← neps left	08:07
	→ IIT joined	08:07
	← teran left	08:07
	← aerth left	08:08
	→ aerth joined	08:08
	← ashu11 left	08:09
	→ _1_heluvaguy joined	08:10
	← _1_heluvaguy left	08:11
	← kadoban left	08:12
	← f3lp left	08:13
	→ phoenixz joined	08:13
	← phoenixz left	08:13
	→ phoenixz joined	08:13
	← settermjd left	08:15
	← wrouesnel1 left	08:15
	← toothrot left	08:17
	→ aswen joined	08:18
	← aerth left	08:19
	→ aerth joined	08:19
	← CEnnis91 left	08:20
	→ Dumblez0r joined	08:23
	→ kerrick_ joined	08:24
	← Dumblez0r left	08:24
	← scientes left	08:24
	← u1106 left	08:26
	→ u1106 joined	08:28
	← sahil1 left	08:29
	→ Dorf joined	08:29
	→ settermjd joined	08:30
	→ airdisa joined	08:32
	← MLM left	08:33
	← settermjd left	08:33
	← Dorf left	08:34
	→ King_Hual joined	08:34
	→ creep joined	08:34
	→ wrouesnel1 joined	08:36
diegoviola	git diff > foo.patch should be good enough for sending a patch over email, right?	08:37
	→ thevishy joined	08:37
bremner	diegoviola: git format-patch is generally better	08:38
	← airdisa left	08:38
bremner	most projects will want a sensible commit message.	08:38
	shrug depends _why_ you are sending the patch	08:39
diegoviola	to fix a typo	08:39
DevHC	2. edit the top of foo.patch and write information	08:39
bremner	diegoviola: if it's contribution to another project, then make an actual commit, and use format-patch.	08:39
	→ nour joined	08:39
diegoviola	ok thanks	08:39
	→ jasabella joined	08:40
	→ jerematic joined	08:40
jasabella	hi :) what happens if there is a .git further down the path? it's ok right? git will use the nearest one? or do i need to merge the repos?	08:41
	→ setra joined	08:41
	→ thierryp joined	08:42
bremner	!subrepo	08:42
gitinfo	[!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	08:42
jasabella	ta	08:43
	← mdhopkins left	08:44
jasabella	must be a common thing though? with refactoring and all that?	08:44
	← jerematic left	08:45
	← Goplat left	08:45
	→ mdhopkins joined	08:46
DevHC	http://i.imgur.com/vOfjinu.jpg	08:47
	→ pwnz0r joined	08:48
	→ jagob joined	08:50
	← setra left	08:51
	← Joel__ left	08:51
	← Guest26223 left	08:52
jim	jasabella, I have what might be called plugins in my web app, and there is a .git at the root and another .git for a plugin which is up the tree a ways	08:53
	→ Yojq joined	08:53
jim	and it's working fine, I can commit to either and it gets to the right repo	08:54
	← _Vi left	08:54
	← echo-area left	08:54
jasabella	k	08:55
	→ TomyLobo joined	08:55
jim	as you might expect both repos have remotes, and they work too	08:56
	← u1106 left	08:56
	← bet0x left	08:56
	→ EminenceHC joined	08:57
	→ mihaicris joined	08:57
	→ Ancchi joined	08:57
	← wicope left	08:57
jasabella	i see	08:58
	← Ancchi left	08:58
	→ wicope joined	08:58
	← mihaicris left	08:58
	→ u1106 joined	08:59
	← jayeshsolanki left	08:59
	→ davispuh joined	09:00
	← Xiti left	09:01
	← Joseph_Silber left	09:01
	← EminenceHC left	09:02
	→ toothrot joined	09:02
	→ Xiti joined	09:02
	→ Joseph_Silber joined	09:02
	← wicope left	09:03
	→ wicope joined	09:03
diegoviola	can I sign off a commit after I made the commit?	09:05
	--amend I guess?	09:06
	← wicope left	09:07
	→ neps joined	09:07
	← neps left	09:08
	→ teran joined	09:08
	← u1106 left	09:10
	→ mrtmmgg joined	09:12
	→ u1106 joined	09:12
	→ pantsman- joined	09:13
	→ neps joined	09:13
	→ incredible joined	09:13
	→ opdavies_ joined	09:14
	← tyreld left	09:14
	← mrtmmgg left	09:15
	← DevHC left	09:15
	← teran left	09:15
	← opdavies left	09:15
	→ Hestil joined	09:15
	← sparetire left	09:16
	← creep left	09:17
	→ justtobe joined	09:17
	→ justtobe_ joined	09:18
	← justtobe_ left	09:18
	← aerth left	09:18
	→ aerth joined	09:22
	→ Joel__ joined	09:22
	→ SimonNa joined	09:22
	← boombatower left	09:23
	→ zadock joined	09:23
	← aerth left	09:26
	← belak left	09:27
	→ ashu11 joined	09:27
	→ aerth joined	09:27
	→ belak joined	09:28
	→ anchorite joined	09:29
	← michael_mbp left	09:29
	→ michael_mbp joined	09:30
	→ twoface88 joined	09:31
	← davispuh left	09:31
	← twoface88 left	09:33
	← zumba_addict left	09:35
	→ dc5ala joined	09:36
	← Guest10437 left	09:36
	→ goldstar joined	09:37
	→ davispuh joined	09:38
	← roelmonnens left	09:39
	← kerrick_ left	09:40
	← ashu11 left	09:40
	→ oriba joined	09:43
	→ JTAARRHN joined	09:44
	→ tvw joined	09:47
	← thierryp left	09:47
	← pwnz0r left	09:48
	→ Kicer86 joined	09:48
	→ twoface88 joined	09:50
	← jiku left	09:51
	← slick left	09:54
	← uber left	09:54
	→ Zoddo joined	09:54
	→ mezod joined	09:54
Seveas	diegoviola: correct.	09:55
	→ yvan1 joined	09:56
	→ aax joined	09:56
diegoviola	ty	09:56
	→ slick joined	09:59
	→ uber joined	09:59
	uber → Guest69530	10:00
	→ bluesm joined	10:00
	→ morois joined	10:01
	← Manny left	10:02
	→ ManikM joined	10:02
	← phoenixz left	10:03
	→ uber joined	10:04
	← Polyatomic left	10:04
	→ kapott joined	10:04
	← thevishy left	10:05
	← Takle left	10:06
	← morois left	10:07
	← kapott left	10:09
	→ zmqc joined	10:09
	→ morois joined	10:10
	← ws2k3 left	10:12
	→ teran joined	10:12
	→ andrew_ joined	10:12
	→ _Vi joined	10:13
	← andrew710 left	10:15
	→ plumzl joined	10:16
	← zmqc left	10:16
	→ jazzzu joined	10:17
	→ andrew710 joined	10:18
	← neps left	10:18
	→ neps joined	10:18
	← teran left	10:18
	→ Dorf joined	10:18
	gitinfo set mode: +v	10:20
	← andrew_ left	10:20
	→ airdisa joined	10:21
	← zadock left	10:22
	← Dorf left	10:23
	← mdhopkins left	10:26
	→ ws2k3 joined	10:26
	← airdisa left	10:26
	→ thevishy joined	10:29
	← u1106 left	10:29
	→ jerematic joined	10:29
	← Vile left	10:31
	→ u1106 joined	10:31
	← jasabella left	10:32
	← jerematic left	10:33
	→ HelloShitty joined	10:37
	← aswen left	10:38
	← Guest69530 left	10:38
	→ Guest69530 joined	10:38
	Guest69530 → over	10:39
	← mezod left	10:41
	← Joel__ left	10:44
	→ EminenceHC joined	10:45
	← neps left	10:46
	→ settermjd joined	10:46
	→ sdothum joined	10:46
	→ Gizburdt joined	10:47
	→ cdown joined	10:47
	→ thierryp joined	10:47
	→ neps joined	10:49
	→ roelmonnens joined	10:50
	← EminenceHC left	10:50
	← shinnya left	10:50
	← kcj left	10:52
	← slick left	10:52
	← over left	10:52
	→ shinnya joined	10:52
	← thierryp left	10:53
	→ mihaicris joined	10:53
	← Rephiax left	10:53
	← plumzl left	10:54
	← roelmonnens left	10:54
	→ cdown_ joined	10:54
	← cdown left	10:55
	→ nfk joined	10:57
	← eletuchy left	10:57
	← settermjd left	10:57
	→ eletuchy joined	10:57
	→ Ancchi joined	10:58
	→ Takle joined	10:59
	← Ancchi left	10:59
	→ slick joined	11:00
	→ settermjd joined	11:00
	← settermjd left	11:00
	→ uber2 joined	11:00
	← opdavies_ left	11:02
	← eletuchy left	11:02
	→ encod3 joined	11:03
	→ jasabella joined	11:04
	→ Ancchi joined	11:04
	← encod3 left	11:04
	→ thierryp joined	11:04
	← Lovich left	11:05
	← uber2 left	11:06
	→ ube- joined	11:07
	← ube- left	11:08
	← thierryp left	11:08
	← einmalfel left	11:08
	→ einmalfel joined	11:08
	→ ology joined	11:10
	→ bmcorser_ joined	11:10
	← bmcorser_ left	11:12
	→ mikiones joined	11:12
	← nour left	11:12
	→ stamina joined	11:12
	→ bmcorser_ joined	11:13
	← saidelike left	11:13
	← cdown_ left	11:14
	→ teran joined	11:14
	→ cdown joined	11:16
	→ saidelike joined	11:18
	← teran left	11:19
	→ taruner joined	11:19
	→ b0ne_ joined	11:20
	← Ancchi left	11:21
	← Yojq left	11:22
	→ Urd joined	11:25
	← cdown left	11:25
	→ HoMM joined	11:26
	← Urd left	11:27
	→ hexagoxel joined	11:29
	→ Seii joined	11:30
	← ws2k3 left	11:30
	→ xukdnv joined	11:31
	← aerth left	11:33
	→ Jackneill joined	11:34
	→ aerth joined	11:34
	→ ws2k3 joined	11:35
	→ Ancchi joined	11:36
	← ws2k3 left	11:40
	→ vreo joined	11:40
	← HelloShitty left	11:41
	← Gizburdt left	11:42
	← ef5c_ef5c left	11:42
	→ cdown joined	11:42
	← aerth left	11:42
	← jasabella left	11:42
	← Seii left	11:42
	→ aerth joined	11:43
	→ ef5c_ef5c joined	11:44
	→ Sieu joined	11:45
	← Sieu left	11:46
	→ Jmgay joined	11:47
	→ mdhopkins joined	11:49
	→ airdisa joined	11:52
	← tango_ left	11:55
	← mikiones left	11:55
	→ happy-dude joined	11:56
	→ tango_ joined	11:57
	← airdisa left	11:58
	→ _Cyclone_ joined	11:59
	→ adamm joined	11:59
	→ jerematic joined	12:00
	→ CEnnis91 joined	12:01
	← Ancchi left	12:01
	← ManikM left	12:02
	→ pacon joined	12:02
	→ ManikM joined	12:02
	← joki left	12:03
	← jazzzu left	12:03
	→ b00n joined	12:04
	→ jazzzu joined	12:04
	← jerematic left	12:04
	← yang left	12:08
	→ bronson joined	12:09
	→ joki joined	12:09
	← jazzzu left	12:10
	← cdown left	12:10
	→ Vigmo joined	12:10
	← ruukasu left	12:11
	← morois left	12:12
	← bronson left	12:13
	← b00n left	12:13
	→ teran joined	12:15
	→ s8321414 joined	12:16
	← Anuj_ left	12:16
	← justtobe left	12:17
	← mostlybadfly left	12:18
	→ unixpro1970 joined	12:19
	← teran left	12:20
	← andrew710 left	12:20
	→ andrew710 joined	12:21
	Vgr_ → Vgr	12:25
	→ Asiajey joined	12:25
	→ m_zr0 joined	12:28
	→ ruukasu joined	12:29
	← ruukasu left	12:29
	→ ruukasu joined	12:29
	← _Cyclone_ left	12:30
	→ morois joined	12:31
	← ciampix left	12:32
	← stamina left	12:32
	← neps left	12:32
	→ fedorafan joined	12:32
	→ freestyl3r joined	12:33
	← _Vi left	12:34
	→ EminenceHC joined	12:34
	← lqi left	12:34
	← Vigmo left	12:34
	→ ascarter joined	12:36
	← unixpro1970 left	12:37
	→ nixhr joined	12:37
	→ skylite joined	12:38
	← EminenceHC left	12:39
	← Nizumzen left	12:40
	→ Ancchi joined	12:41
	← ghostpl_ left	12:42
	← deltab left	12:43
	→ tier joined	12:44
	→ deltab joined	12:45
	→ ashokrajar joined	12:45
	← andrew710 left	12:45
	→ jazzzu joined	12:47
	← u1106 left	12:47
	→ ncd\|leeN joined	12:48
	← vdagli left	12:48
	← Nikhil_D left	12:48
	→ vdagli joined	12:49
	vdagli → hephaestus	12:49
	→ Nikhil_D joined	12:49
	← D-Boy left	12:49
	→ u1106 joined	12:50
	← leeN left	12:51
	← pantsman- left	12:52
	→ Gizburdt joined	12:52
	← ashokrajar left	12:52
	→ Napoelon joined	12:52
	← diegoviola left	12:52
	→ D-Boy joined	12:53
	← vstoniest left	12:53
	→ vstoniest joined	12:54
	← ManikM left	12:55
	→ johannes_ joined	12:55
	→ airdisa joined	12:55
	← ag4ve left	12:56
	gitinfo set mode: +v	12:56
Napoelon	hello, noob @ irc here, not sure of the protocol	12:56
	← tier left	12:57
osse	don't worry about the protocol. your irc client takes care of that.	12:57
	← oriba left	12:57
osse	or do you mean like the "human protocol"?	12:58
	→ ag4ve joined	12:58
Napoelon	thnx :) I was actually referring to how to go about speaking in the channel.	12:58
osse	So far, so good.	12:58
Napoelon	cheers	12:58
	→ cdown joined	12:59
	← fstd left	13:00
osse	Napoelon: I presume you have a git-related questionb?	13:00
Napoelon	I am having difficulty setting up a local 'origin' repo in a particular way.	13:00
	yes	13:00
	→ fstd joined	13:00
	← cdown left	13:01
Napoelon	I am working on a project @ uni, and I have a number of folders in my thesis document root	13:01
	→ cdown joined	13:01
Napoelon	Each folder has its own .git repo	13:01
	← jagob left	13:02
Napoelon	That part is working fine.	13:02
	I'm trying to learn more about git, so I setup a 'origin' repo in a different folder on my PC	13:02
	In my thesis structure, each folder is an independent piece of work. I think it could be called a 'submodule' using GIT terminology.	13:03
	← johannes_ left	13:04
	← meaneye left	13:04
	→ mostlybadfly joined	13:04
	→ ropav joined	13:04
Napoelon	I would like to have these submodules go into my origin repo in a way that I can pull each one out without getting the whole lot.	13:04
	→ Nizumzen joined	13:05
Napoelon	when I created my 'origin', I used the command "git init --bare ~/git/thesis.git	13:06
	← cdown left	13:06
osse	you cannot stuff several submodules into one repo.	13:07
Napoelon	ah ha.	13:07
nanonyme	In case those ideas came from prior SVN experiences, Git doesn't work at all like SVN. Just FWIW :)	13:07
osse	you need one bare repo per submodule in that case.	13:07
Napoelon	No, I haven't used SVN at all (though I know what it is)	13:07
	ok.	13:08
	→ durham joined	13:08
osse	Also: they aren't technically submodules unless you also have an additional arepo at the root of your thesis.	13:08
Napoelon	So, if someone asks for my planning work, I can have them pull from the 'planning.git' repo	13:08
nanonyme	Well, what you wanted sounded more like SVN as there a concept of checking out a directory from inside a repo is a thing. In Git if you want to split things, you have multiple repositories	13:09
Napoelon	Then, if someone asks for my webots work, I can have them pull from 'webots.git'	13:09
	→ Rephiax joined	13:09
Napoelon	the above 2 scenarios I can already do.	13:09
	→ bronson joined	13:10
Napoelon	What I would like to be able to do is automatically give someone who wants ALL my work both repos	13:10
	so if they ask for my thesis, I would tell them to pull 'thesis.git'	13:10
	← airdisa left	13:10
Napoelon	and they would get the planning and webots in one hit.	13:10
	→ airdisa joined	13:11
Napoelon	I have separate repos in my working folders. But I'm trying to bring them together somehow.	13:11
	→ cavallari joined	13:11
	← Jmgay left	13:11
osse	Napoelon: then you need a third repo, one which has the other two as submodules	13:11
Napoelon	ok	13:12
	← cavallari left	13:12
Napoelon	My working folders are in ~/Documents/thesis/...	13:12
	← durham left	13:12
Napoelon	My 'origin' which I call 'planning' and 'webots' are in ~/git/planning.git and ~/git/webots.git respectively.	13:13
	so to make the overriding repo, do I go a 'git init' in ~/Documents/thesis?	13:14
	→ basiclaser joined	13:14
	← harish left	13:14
	← bronson left	13:14
	← Ancchi left	13:15
Napoelon	Or do I need to move my 'origins' down one level; ~/git/thesis/planning.git and ~/git/thesis/webots.git	13:15
	→ BuenGenio joined	13:15
Napoelon	and then do a 'git init --bare ~/git/thesis.git' ?	13:15
	→ harish joined	13:15
	← airdisa left	13:16
osse	Napoelon: git init in ~/Documents/thesis sounds like a good start	13:16
Napoelon	the .git files are a compressed version of my working folders but in a single file?	13:16
osse	no, .git contains a bunch of files	13:16
	→ teran joined	13:16
_ikke_	It's a directory	13:16
Napoelon	osse: you mean the .git folder in the working folder	13:17
osse	yes	13:17
	→ goldstar_ joined	13:17
	→ thierryp joined	13:17
Napoelon	ok, I just had a look, and the '~/git/thesis.git' is actually a folder as well, with similar files under it	13:18
	ok, I've done the git init at the thesis level in my working folders	13:19
	I can add the planning and webots folders to it if I choose.	13:19
	→ niseak joined	13:19
Napoelon	But if I do that, won't I be doubling up on the storage?	13:19
	← ruukasu left	13:19
	← m_zr0 left	13:20
	→ ruukasu joined	13:21
	← ruukasu left	13:21
	→ ruukasu joined	13:21
	← aerth left	13:21
	← teran left	13:22
	← rchavik left	13:22
	← saidelike left	13:22
	→ aerth joined	13:22
	← ruukasu left	13:22
	← ome left	13:23
	← BuenGenio left	13:23
Napoelon	I think I have a faulty conception of what GIT is.	13:23
	→ ruukasu joined	13:24
	← ruukasu left	13:24
	→ ruukasu joined	13:24
	← Rephiax left	13:24
	→ neps joined	13:27
	→ m0ltar joined	13:27
	← neps left	13:28
	→ metts joined	13:29
	→ neps joined	13:30
	→ zivester joined	13:31
	← shinnya left	13:31
	→ saidelike joined	13:33
	← Gizburdt left	13:33
	→ denisMone joined	13:34
	→ berz3rk joined	13:34
	← Vampire0_ left	13:34
	→ Vampire0_ joined	13:35
_ikke_	Napoelon: thesis.git is a so called bare repository	13:36
	← aerth left	13:36
	→ aerth joined	13:36
	→ paul424 joined	13:36
Napoelon	yes	13:37
_ikke_	Napoelon: Right, was just reading back	13:37
Napoelon	it's not located in my working folders	13:37
	I'm doing what osse suggested b4	13:38
	I can clone 'planning' and get planning, then clone 'webots' and get webots.	13:38
	Now I'm about to see if I can get clone 'thesis' to give me both of them.	13:38
_ikke_	Napoelon: use git clone --recursive if you have added them as submodules (git submodule add)	13:39
	→ Gamecubic joined	13:40
Napoelon	yea, I've head of the recursive option. But then I read that submodules are 'static' in the repo and decided to install IRC and ask.	13:41
	← u1106 left	13:42
	→ ghostpl_ joined	13:42
osse	Napoelon: in your setup you need a total of six repos: the two that contain your thesis work, the one that has the other two registered as submodules, and the bare counterparts for all those three.	13:42
Napoelon	yes, 3 in my working folders, and 3 in the '~/git/'	13:43
osse	yes	13:43
	now, which do you have so far	13:43
	→ Adsp joined	13:43
	→ u1106 joined	13:44
	→ sentriz joined	13:44
	← Adsp left	13:45
Napoelon	I created a repo in thesis. Then I did 'git add *', 'git commit -m "Initial Commit"', 'git init --bare ~/git/thesis.git', 'git remote add thesis ~/git/thesis.git', and git push --all thesis	13:45
	then I went to a separate folder and did a clone of thesis.git.	13:46
	← niseak left	13:46
Napoelon	All that came down was the folders 'planning' and 'webots'. But there was no content within them.	13:46
osse	did you clone --recursive=	13:46
	→ Mlva joined	13:47
Napoelon	ahhh, no I didn't. I'll try that	13:47
osse	i'm not sure the 'git add *' added them as submodules proper	13:47
_ikke_	Nope	13:47
	It doesn't	13:47
	← ghostpl_ left	13:47
	← thierryp left	13:48
Napoelon	ok, so I should use the 'git submodule add' in the thesis folder	13:48
	→ jerematic joined	13:48
Napoelon	would the command be: 'git submodule add planning' ?	13:49
	← ruukasu left	13:49
Napoelon	(made a copy of my work in case anything goes pear shaped)	13:50
osse	git submodule add ~/git/plannit.git	13:50
_ikke_	git submodule add <path> <url>	13:50
Napoelon	yep	13:50
_ikke_	Oh,	13:51
	<url> <path>	13:51
osse	_ikke_: it's the other way around	13:51
_ikke_	yeah	13:51
	→ ruukasu joined	13:51
	← pheaver left	13:51
	→ Gama11 joined	13:51
Napoelon	I'm in thesis and reset everything. I recreated my local git.	13:52
osse	now I'm guessing you get an error about the directory already existing or something	13:52
	← parasite__ left	13:52
	→ ashu11 joined	13:52
Napoelon	I've also created the bare 'thesis.git' in ~/git	13:53
	← jazzzu left	13:53
	← jerematic left	13:53
	→ HelloShitty joined	13:54
Napoelon	I haven't used the submodule command yet.	13:54
	I just reset it all to the start	13:54
	'git status' tells me that I can add 'planning' and 'webots'.	13:55
	→ Dougie187 joined	13:55
	← pyokagan left	13:55
	← neps left	13:55
Napoelon	Should I push from the thesis working folder to the remote? (I think NO)	13:56
	→ meaneye joined	13:56
	→ Akagi201 joined	13:56
	← u1106 left	13:57
	→ m_zr0 joined	13:57
	HelloShitty → HelloATMega	13:57
_ikke_	thesis.git is the 'super' project, right?	13:57
Napoelon	In my thesis working folder. 'git submodule add ~/git/plannit.git' will add that to the thesis repo as a module.	13:57
osse	doesn't matter. you don't have to push from that until you're done	13:57
Napoelon	ok	13:57
_ikke_	Napoelon: You start with an empty super project	13:57
	→ BuenGenio joined	13:58
Napoelon	yes, that's what I've just done. Cleaned up my previous attempts	13:58
	← s8321414 left	13:58
Napoelon	I'm about to add the submodule as per osse's suggestion above.	13:58
_ikke_	Why does git status then says you can add planning and webots?	13:58
Napoelon	Can I give the submodule a name within my own repo?	13:59
	→ u1106 joined	13:59
_ikke_	Napoelon: You can decide the folder name	13:59
Napoelon	git submodule add ~/git/plannit.git <== my own custom name possible?	13:59
	yea, by putting it at the end	14:00
_ikke_	the last parameter	14:00
	← Consuela left	14:00
	← BuenGenio left	14:00
	→ joo-_ joined	14:01
Napoelon	'git submodule add ~/git/plannit.git planning' =-> Adding existing repo at 'planning' to the index	14:01
_ikke_	and then git submodule update	14:01
	Hmm	14:01
Napoelon	I have to push it to the origin first	14:02
_ikke_	never done it that way, but perhaps it works	14:02
	→ Arsonide joined	14:03
Napoelon	that worked	14:04
	osse goes to buy a	14:04
osse	fluorescent lamp starter	14:05
Napoelon	use LEDs	14:05
	→ Vigmo joined	14:05
osse	i will when it's time to refurbish my kitchen. but now is not that time.	14:05
	← mdhopkins left	14:07
Napoelon	lol	14:07
	→ sahil1 joined	14:09
Napoelon	Ok, that method works, but only for the clone command.	14:09
	using git pull in my new 'thesis' working folder didn't download webots after I added it as a submodule.	14:10
	→ bronson joined	14:10
	→ airdisa joined	14:11
	← toothrot left	14:11
Napoelon	Also, after the clone, the planning & webots folders did not contain their respective git repos. (ie they were snapshots only)	14:12
	→ Gizburdt joined	14:12
Napoelon	They did have a .git FILE, and when I did git status, I get a message "HEAD detached at #####" nothing to commit, working directory clean.	14:13
	→ mezod joined	14:13
Napoelon	(brb, need a coffee/smoke)	14:13
	← otter768 left	14:14
_ikke_	Napoelon: The .git file is a link to the actual .git directory, which is stored in the parent repo	14:15
	← bronson left	14:15
	← ashu11 left	14:16
	← Takle left	14:16
_ikke_	Napoelon: And the detached HEAD is because git by default tracks the commit of the submodule, so that when someone clones a repo with submodules, they will always get the same commits	14:16
	← happy-dude left	14:16
	← totoybato left	14:17
	→ Corey84 joined	14:18
	→ teran joined	14:18
	→ totoybato joined	14:18
	→ iamjarvo joined	14:18
	← ology left	14:20
	→ ashu11 joined	14:21
	← airdisa left	14:21
	← m_zr0 left	14:21
	→ szacun joined	14:24
	← teran left	14:25
	← sarri left	14:25
	→ sarri joined	14:27
	← aerth left	14:28
	→ aerth joined	14:29
	← sahil1 left	14:29
	→ bronson joined	14:31
	Allen`\|Dead → Allen`	14:31
Napoelon	(back)	14:32
	→ nettoweb joined	14:32
Napoelon	_ikke: ic. Is it possible to have the actual repo of the submodule to be retrieved?	14:32
	so they can do a pull in the submodule?	14:33
	→ zadock joined	14:33
_ikke_	You can do a pull there	14:33
	You do have a full repository, it's just stored different place	14:33
	→ sahil1 joined	14:33
Napoelon	I have to go back to the thesis folder to do the pull. git pull isn't working in the webots folder	14:34
_ikke_	isn't?	14:34
	What is the message?	14:34
	→ absk007 joined	14:34
	← Gizburdt left	14:35
Napoelon	I tried 'git pull webots master'. Msg was: fatal: 'webots' does not appear to be a git repo\n fatal: Could not read from remote repo	14:36
	git pull =-> You are not currently on a branch. Please specify which branch you want to merge with.	14:36
_ikke_	Napoelon: Is it correct those repositories were already there when you used git submodule add?	14:37
	→ Gizburdt joined	14:37
	← SimonNa left	14:39
Napoelon	I'm not 100% sure. I will go through the steps again. I just tried to do 'git push' from the original webots folder and I had to specify --set-upstream even though I used the git remote add webots ~/git/webots.git already.	14:40
	→ Es0teric joined	14:40
	→ Takle joined	14:41
szacun	Hi! I hava a branch called feature1, and branch feature2 comming from feature1, now, i rebased feature1 to master, so its commits changed id's , how can i now rebase feature2 to feature1? here is what i mean: https://gist.github.com/mszacun/67165827093d94a26672	14:42
	← paul424 left	14:43
	→ ghostpl_ joined	14:43
	← Gizburdt left	14:44
Dougie187	szacun: What I would do is: `git checkout feature2; git rebase -i feature1` And then remove any commits that you don't want to move from that file.	14:44
	→ dreiss joined	14:44
Dougie187	there are alternate commands you can use to avoid editing that file, but I don't typically use them. :P	14:44
	→ MadsRC joined	14:45
szacun	Dougie187: the thing is i want all of them, the ones from master and the ones from feature1 branch	14:45
Dougie187	szacun: I don't think you understand what that command does.	14:45
	Do you understand how rebasing works??	14:46
	-?	14:46
	→ Gizburdt joined	14:46
	→ Vgr_ joined	14:46
Napoelon	_ikke: what I didn't do at the start was set an upstream repo. I created the bare, added the remote, and pushed. But I didn't set the upstream.	14:47
	← Vgr left	14:47
	Vgr_ → Vgr	14:47
szacun	yes, it changes commit from which branch start, by applying all of its commits on this start point	14:47
Dougie187	szacun: and it only tries to replay commits that are different from the ref you're trying to rebase onto.	14:47
	→ CheckDavid joined	14:48
	← ghostpl_ left	14:48
szacun	yes, and doesn't it know if commit is diffrent based on it's id hash?	14:48
	→ hcc23 joined	14:48
Dougie187	So, when you type `git checkout feature2; git rebase -i feature1` it will try to figure out what commits are not on feature1 but are on feature2, and apply them at the end of feature1. Giving you all commits on master, and feature1.	14:48
	szacun: sometimes it's more clever than that.	14:49
	Sometimes it will not list commits that were part of the old feature1, because it can tell that the commits have been rebased and are identical.	14:49
	I'm not sure how that stuff works, so if you need to understand that someone else can tell you.	14:49
	But the result will be that master is in the history of feature 1 which is in the history of feature 2	14:49
szacun	ahh, ok, i thought is relays only on hashes, so i thought i will have problem after during rebase to master feature1 commits hashes changed	14:50
Dougie187	szacun: No, but that's also why I said to add the `-i` flag.	14:50
	That lets you manipulate the history it tries to migrate.	14:50
	So, you can remove any commits that you're already migrated.	14:50
szacun	ok, now i see, thanks	14:50
Dougie187	np	14:50
	← bronson left	14:55
	→ neps joined	14:56
	→ rammes__ joined	14:57
	→ durham joined	14:57
	← rammes__ left	14:57
	→ thierryp joined	14:59
	→ cvanball joined	15:00
	← neps left	15:00
	→ voiceofgrog joined	15:01
	← voiceofgrog left	15:01
	→ voiceofgrog joined	15:01
	← durham left	15:01
	→ ArchRogem joined	15:02
	→ neps joined	15:02
	← voiceofgrog left	15:02
	→ ehmatthes joined	15:03
	← Gizburdt left	15:04
	→ jerematic joined	15:04
	← ArchRogem left	15:05
	→ voiceofgrog joined	15:05
	← voiceofgrog left	15:05
	→ voiceofgrog joined	15:05
	→ Dorf joined	15:06
	← absk007 left	15:06
	→ Gizburdt joined	15:06
	← nettoweb left	15:06
	← Corey84 left	15:07
	← MechtiIde left	15:07
	← Gizburdt left	15:07
	→ _1_chopi4453 joined	15:07
	→ Junior joined	15:08
	← jerematic left	15:08
	_1_chopi4453 → 64MACGH97	15:09
	← vstoniest left	15:09
	← ag4ve left	15:09
	→ ag4ve joined	15:09
	→ vstoniest joined	15:09
	← Arsonide left	15:09
	→ lvgx joined	15:10
	→ MechtiIde joined	15:11
	← floppyears left	15:11
	← 64MACGH97 left	15:15
	← voiceofgrog left	15:16
Napoelon	_ikke, r u still here?	15:16
_ikke_	Napoelon: yeah	15:17
Napoelon	osse, u still here?	15:17
	I've gone through the whole procedure, and its ALMOST working.	15:17
	I cloned recursive and got everything. But the submodules don't have a .git folder.	15:18
	← dc5ala left	15:18
	→ CodeBot3000 joined	15:18
_ikke_	a .git file, right?	15:18
	→ bitkiller joined	15:19
Napoelon	yea, but no directory	15:19
_ikke_	That's by design	15:19
	Look at the path that's in the file	15:19
Napoelon	kk	15:19
	→ neonKow joined	15:20
	← synchronous left	15:20
	← Ornacia left	15:20
	→ voiceofgrog joined	15:20
	← voiceofgrog left	15:20
	→ voiceofgrog joined	15:20
Napoelon	gitdir: ../.git/modules/planning	15:20
	→ teran joined	15:20
_ikke_	So there it is	15:20
	→ AustinTheGrey joined	15:21
	← AustinTheGrey left	15:22
Napoelon	I made a change inside the submodule (edited a text file in the clone) and did git status. I got: HEAD detached at ####\n Changes not staged .... modified: me.txt	15:22
_ikke_	If you are going to work in a submodule itself, make sure you first checkout a branch	15:23
	→ AustinTheGrey joined	15:23
Napoelon	then I did cd .. and did git status and got: On branch master .... Changes not staged... modified: webots (modified content)	15:23
_ikke_	yes	15:23
	→ Dorf_ joined	15:23
	→ siamect joined	15:23
_ikke_	That's all normal	15:23
Napoelon	so if I commit/push, that will update the remote repo?	15:23
	← Dorf left	15:24
Napoelon	What do I do about the "HEAD detached at ####"?	15:24
_ikke_	Napoelon: So first you have to commit the change in the submodule itself	15:24
Napoelon	done that now	15:25
_ikke_	Did you check out a branch first like I said?	15:25
	→ ErKa joined	15:25
Napoelon	oh, no I didn't.	15:25
	← mihaicris left	15:25
	← mquin left	15:25
Napoelon	I have to checkout inside the module? checkout master?	15:25
_ikke_	You probably only have master at this point right?	15:25
	→ mquin joined	15:26
_ikke_	git checkout -B master	15:26
	(this will cause master to include the current commit)	15:26
	← mquin left	15:26
	← teran left	15:26
	→ mquin joined	15:26
_ikke_	it basically recreates the master branch at the current commit	15:26
	← neps left	15:26
Napoelon	only master at the moment	15:26
	→ _X_C_V_B_ joined	15:27
Napoelon	checkout master has fixed the detached head issue	15:27
_ikke_	did you add the -B flag?	15:27
Napoelon	no	15:27
	the what flag?	15:27
_ikke_	n/m	15:27
Napoelon	branch?	15:27
_ikke_	git merge HEAD@{1}	15:27
	-b is create branch, -B is force create branch	15:27
	→ pantsman- joined	15:28
	← ashu11 left	15:28
	← moparisthebest left	15:28
Napoelon	do I need to do a merge?	15:28
_ikke_	it should do a fast-forward merge	15:28
Napoelon	after I cloned and had the detached head, that's when I should have checkout master straight away? right?	15:29
	at that point, I wouldn't need to merge (coz nothing was different)	15:30
_ikke_	Napoelon: Well, you don't have to do that always, only when you plan to make changes	15:30
	← Zeedox left	15:30
Napoelon	OK... the merge you're referring to is part of normal git operations when working with other	15:30
_ikke_	Napoelon: In this case, it's a way to get the 'lost' commit back	15:31
	← m0ltar left	15:31
_ikke_	Napoelon: Make sure to read into how submodules work	15:31
	because they were made with a very specific use case in mind	15:31
	← siamect left	15:32
Napoelon	I'll do that. Really appreciate your help (and osse)!!	15:32
	Dorf_ → Dorf	15:33
	→ siamect joined	15:33
_ikke_	There are some gotcha's you have to account for	15:34
Napoelon	It's working :)	15:35
	lol, more than a couple	15:35
	I'm going to do a few practice runs of what we've gone through so its clear in my head what's happening.	15:36
	But it's working.	15:36
	→ moparisthebest joined	15:36
	← vreo left	15:36
	→ MLM joined	15:36
	← threecatstwodogs left	15:37
Napoelon	After I made the change in the cloned submodule, I did the merge you suggested, then went back to the thesis folder and added the changes to the submodule	15:37
	and pushed	15:37
_ikke_	Don't forget to also push the submodule	15:37
	← deste left	15:37
	→ deste joined	15:37
Napoelon	yes, I did that.	15:37
_ikke_	Ok	15:37
	← vixterra left	15:38
Napoelon	then I went back to the original folders and the change came through	15:38
	← Takle left	15:39
Napoelon	I'm doing this on another computer in Ubuntu. (This is Win) I've got the terminal log and will sift through it and update a document I've been working on.	15:39
	→ hmsimha joined	15:39
	→ ashu11 joined	15:40
	← Vigmo left	15:40
	← Es0teric left	15:40
Napoelon	a sideline question: when doing	15:40
	git remote add xyz <git repo path>. Should I always use xyz = 'origin'?	15:41
_ikke_	No, not necessarily	15:41
	You can give it a descriptive name	15:42
	origin is the name git uses for the repository you cloned from	15:42
Napoelon	In the cloned version, it didn't know the xyz I chose in the original, but understood 'origin'	15:42
	→ Es0teric joined	15:42
Napoelon	ahhh, ic. So if I'm the original author, it's different	15:42
	← pacon left	15:43
Napoelon	it's different in terms of the use case	15:44
	→ ghostpl_ joined	15:44
_ikke_	Napoelon: upstream is mostly used when you are cloning from a project where you don't have commit/push rights, but you are pusing to another repo for example	15:45
	→ lvegerano joined	15:46
_ikke_	But you are free to use a different name	15:46
	→ airdisa joined	15:46
Napoelon	ok, so you can redirect the upstream repo to another location?	15:46
	→ subhojit777 joined	15:47
_ikke_	No, it's just for you	15:48
	So you have 2 remotes, one you call upstream, one you call origin	15:48
	← siamect left	15:49
	→ siamect joined	15:49
Napoelon	but you can have more than 2 remotes by multiple 'remote add' commands?	15:49
_ikke_	You can have as many as you want	15:50
	git doesn't mind	15:50
	← incredible left	15:50
	← Mlva left	15:50
Napoelon	I'll read up about upstream.	15:50
_ikke_	Note that it's just a convention	15:51
	← airdisa left	15:51
	→ incredible joined	15:51
Napoelon	yep	15:52
	← ghostpl_ left	15:52
_ikke_	You see that often with github	15:53
	You fork a project. The original project you forked from you call upstream, and your fork you call origin (or git creates that one automatically when cloning)	15:53
	wedgie_ → wedgie	15:54
	← bmcorser_ left	15:54
Napoelon	when I created the remotes (--bare) for the modules (before I added them as submodules to the thesis repo), I had to use the '-u' shorthand when adding my files into it. Without setting the upstream, I could not pull back from the remote.	15:55
	I found that to be strange.	15:55
	→ bronson joined	15:55
	← sahil1 left	15:56
_ikke_	-u to what command?	15:56
	→ absk007 joined	15:56
	→ netcarver joined	15:57
Napoelon	in my repo, I did git init, then add, then commit. That created the original repo. Then I created the remote with --bare and added to it.	15:57
	But I had a problem doing a git pull afterwards.	15:57
	When I did the add using -u, I was able to pull.	15:58
	I could have used --up-stream, but chose to use -u instead	15:58
	→ GoddeR joined	15:59
	← ascarter left	15:59
_ikke_	You mean to git push?	15:59
	← GoddeR left	16:00
_ikke_	git add -u is something different	16:00
Napoelon	I'm going to go through all the steps from scratch again. (Reset it all back to initial conditions)	16:00
	← Dorf left	16:00
	→ ropav_ joined	16:00
	← bronson left	16:00
	→ GoddeR joined	16:00
Napoelon	'git push -u --add webots' worked. But when I tried to do git pull, it didn't work.	16:00
	→ ashokrajar joined	16:01
	→ airdisa joined	16:01
_ikke_	git push does not have an --add parameter	16:01
	But anyway	16:01
	← devoldmx left	16:01
Napoelon	--add adds everything. Like *	16:01
_ikke_	Git by default does not know what remote branch belongs to what local branch (git does not assume anything in that regard)	16:01
	Napoelon: That makes no sense with git push	16:02
	it does with git add	16:02
Napoelon	Ok, its like that because I'm pushing to the remote	16:02
thierryp	Hi there	16:02
_ikke_	but git add uses -A / --all	16:02
	→ Vile joined	16:02
thierryp	I had a question about cleaning up a repo that I posted on stackoverflow	16:03
	here	16:03
	http://stackoverflow.com/questions/29253990/how-to-remove-a-path-in-git	16:03
Napoelon	yes, -A was the other one. * / -A / -all are the same I believe.	16:03
thierryp	but I could not find any answer so far	16:03
	→ Ancchi joined	16:03
	→ jasabella joined	16:03
	→ FreezingCold joined	16:03
	→ nour joined	16:03
thierryp	it is all about keeping only one path between 2 commits once everything was merged	16:03
	→ Dorf joined	16:04
thierryp	just for cleaning up	16:04
_ikke_	thierryp: Seems you want a squash merge	16:04
Napoelon	lol, I've given up on StackOverflow.... Everything I ask is off-topic, and I don't have enough reputation on a lot of their sites to post a comment (while I can post an answer)...	16:04
thierryp	anyone would care to take a look ?	16:04
	_ikke_: a squash merge ?	16:04
	→ Arsonide joined	16:04
thierryp	how would I go about that then ?	16:04
	→ devoldmx joined	16:05
	→ BuenGenio joined	16:05
	→ m_zr0 joined	16:05
	→ Sadeukko joined	16:05
	→ vrilya joined	16:07
	gitinfo set mode: +v	16:07
	→ toothrot joined	16:07
vrilya	is there a way to tract a different folder as remote branch? i have to use svn, but it is too bug to use with git, because the server will truncate the session before fetch is complete but git is unable to retry from cache .......	16:08
	so i checked it out with svn and now want to use git for local changes	16:08
_ikke_	thierryp: Answered on SO	16:09
	← GoddeR left	16:09
thierryp	_ikke_: yes I am reading all this - thanks for the tip	16:09
_ikke_	vrilya: No, that does not really work	16:09
	→ ome joined	16:10
vrilya	is there a convenient way to pass patches from that svn to git and vise versa?	16:10
_ikke_	vrilya: You can create diffs from the commits, and apply them, but this might easily lead to confliccts	16:11
	conflicts and patches that don't apply	16:11
	→ EminenceHC joined	16:11
vrilya	ok so ill have to try to convince the maintainer to switch to git ;)	16:12
	is git able to resume fetched actually? i have still the windows built old version.. but if 2.x is has lot more features id try to build it	16:13
_ikke_	vrilya: No, not yet	16:13
	→ devoldmx3 joined	16:13
vrilya	what speaks against it?	16:13
	→ GoddeR joined	16:13
	← bvi left	16:13
	← GoddeR left	16:14
_ikke_	vrilya: git builds pack-files on the fly tailored to the client fetching them, and keeps them in memory, they are not kept.	16:14
	← devoldmx left	16:14
	→ cavallari joined	16:14
	→ bvi joined	16:14
vrilya	ohh true	16:14
_ikke_	And there is no provisions in the protocol yet to support it	16:14
	→ GoddeR joined	16:14
	← voiceofgrog left	16:15
thierryp	_ikke_: just making sure	16:15
	→ otter768 joined	16:15
thierryp	I already have the 2 paths in my repo, can git --squash merge still help me ?	16:15
	or should I have used this in the first place and now it's too late for cleaning up ?	16:15
	← GoddeR left	16:16
	← EminenceHC left	16:16
_ikke_	have you pushed anything yet?	16:16
	→ GoddeR joined	16:16
thierryp	yes but I control the upstream repo too so	16:16
_ikke_	Ok, but do you expect anyone to have fetched these commits already?	16:17
thierryp	no	16:17
_ikke_	ok, then you can still clean it up and do a force push	16:17
	← airdisa left	16:18
	→ airdisa joined	16:18
	← AustinTheGrey left	16:19
	→ karrtmomil joined	16:19
	← otter768 left	16:19
	→ jerematic joined	16:20
	→ gsingh93 joined	16:22
	→ teran joined	16:22
	← raymond left	16:22
	← airdisa left	16:23
	← jerematic left	16:24
	→ Takle joined	16:25
	← vrilya left	16:25
	← GoddeR left	16:26
	← ehmatthes left	16:26
	← cagedwisdom left	16:26
	→ beagleGuy joined	16:27
	← teran left	16:27
	→ durham joined	16:28
	← Takle left	16:28
	← lvegerano left	16:28
	→ zumba_addict joined	16:28
	← bvi left	16:30
	← durham left	16:32
	→ martinbmadsen joined	16:33
	→ n-st joined	16:34
	→ eddy joined	16:34
	→ DrHouse\|DellM650 joined	16:35
	→ GoddeR joined	16:36
	gitinfo set mode: +v	16:36
eddy	Is there a way to easily switch from tracking specific commits in a submodule to tracking a branch?	16:36
	Is there a way to easily switch from tracking specific commits in a submodule to tracking a branch?	16:36
	→ rcn joined	16:37
eddy	changing .gitmodules to add submodule.<path>.branch <branch> and running git submodule --update --remote leaves the submodule metadata (HEAD) still tracking the commit, not the ref	16:39
_ikke_	eddy: changing .gitmodules doesn't do anything, you need to update the repo config	16:39
	eddy: You can try to use git submodule sync though	16:39
	→ m0ltar joined	16:40
	← ncd\|leeN left	16:40
	→ Vigmo joined	16:40
	→ psoo joined	16:41
eddy	_ikke_, I meant s/changing.*to add/running git config/	16:42
	← pantsman- left	16:42
	← FabTG__ left	16:43
	→ ascarter joined	16:43
eddy	OTOH, isn't the config for modules stored in .gitmodules?	16:43
	eddy → eddyp	16:44
	→ _Cyclone_ joined	16:45
_ikke_	No	16:46
	It's just a file that contains a mapping from directory to url, which can be shared	16:46
	← psoo left	16:47
	→ kadoban joined	16:47
	→ Balliad joined	16:47
	← Gitzilla left	16:47
	← Dorf left	16:47
eddyp	sync doesn't help	16:48
	Briman\|off → Briman	16:49
	→ AustinTheGrey joined	16:49
	eddyp thinks it would be very useful to be able to switch back and forth between tracking and freezing on a specific version - think development versus release version	16:49
	→ Gitzilla joined	16:50
	→ psoo joined	16:50
	← robustus left	16:50
preaction	submodules don't ever track branches	16:51
	→ robustus joined	16:51
_ikke_	preaction: That got added	16:51
eddyp	preaction, yes, they do	16:51
preaction	... so the module i wrote to do it is now useless...	16:51
eddyp	the problem is the current implementation is still lacking	16:52
	→ parasite joined	16:52
	← Es0teric left	16:52
	← Ancchi left	16:52
eddyp	I had a module using the old method and can't switch to tracking easily	16:52
	← blackwind_123 left	16:53
	→ nkouevda joined	16:53
_ikke_	eddyp: Could you compare the submodules config with one from a submodule that does track a branch?	16:53
eddyp	the .git/module/<module>/HEAD is still stuck to the commit, instead of the ref	16:53
	_ikke_, that's the difference I see	16:54
	→ thiago joined	16:54
_ikke_	but not in the config file?	16:54
	→ johannes_ joined	16:54
_ikke_	I mean, no differences	16:54
FreezingCold	So weird git question... I have the source code to a program and I'm allowed to modify it, but I can't share the original program. Is there a way I can still share my changes?	16:54
	→ sudshekhar joined	16:54
_ikke_	It's not a git question	16:54
	← u1106 left	16:54
_ikke_	It's a legal question	16:55
FreezingCold	_ikke_: Well, I track my changes with git	16:55
_ikke_	Doesn't matter	16:55
FreezingCold	I am 100% sure I cannot share the original source.	16:55
	→ blackwind_123 joined	16:55
preaction	what do you mean "allowed". how are you allowed to modify it? why can't you share the original program?	16:56
	← psoo left	16:56
FreezingCold	it's a tactical military mapping software used by a few NATO countries	16:56
_ikke_	modifying is changing it for your own use	16:56
preaction	and it's... what? GPL? MIT? CC-BY-NC?	16:56
	→ pobivan joined	16:56
_ikke_	I don't think it's open source	16:56
FreezingCold	Haha it's not...	16:57
_ikke_	/free software	16:57
eddyp	_ikke_, I updated the the .gitmodules config myself (via git config -f ), but there is no other difference	16:57
	→ u1106 joined	16:57
_ikke_	eddyp: Did you also change the super projects config file?	16:57
CareBear\	FreezingCold : if at all then you can probably only share your changes by creating patches using git format-patch - but even then parts of the original software is included as context in the patches	16:57
FreezingCold	preaction: The license I have gives me full permission to make changes and share those changes, but not the original program.	16:57
preaction	you can create a patch set, but since the patch set contains or is derived from code you cannot share, you're going to probably have a bad time.	16:57
	→ sctskw joined	16:58
preaction	man git-format-patch for that	16:58
gitinfo	the git-format-patch manpage is available at http://jk.gs/git-format-patch.html	16:58
FreezingCold	I really doubt it, but is it possible to only have line numbers or something?	16:58
eddyp	_ikke_, you mean superproj/.git/config ?	16:58
	→ mihaicris joined	16:58
_ikke_	yes	16:58
	that's what actually matters	16:58
CareBear\	FreezingCold : try -U 0	16:58
	→ m8 joined	16:59
eddyp	_ikke_, In a new project where I added from the start the module being tracked from a branch there is no information on the branch	16:59
FreezingCold	CareBear\: with git patch?	16:59
CareBear\	FreezingCold : git format-patch, yes	16:59
	FreezingCold : read the manual	16:59
eddyp	s/from a branch/on a branch/	16:59
FreezingCold	CareBear\: yeah I'm RTFM right now :)	17:00
CareBear\	FreezingCold : not having any context of course means that every patch will always apply successfully	17:00
_ikke_	without necessarily making sense	17:00
	→ Consuela joined	17:00
eddyp	_ikke_, the only thing in the super/.git/config is submodule.<module>.url	17:00
	← szacun left	17:01
eddyp	the rest is in super/.gitmodules	17:01
CareBear\	right, it is certain to break the source code if patches are not applied to exactly the correct history	17:01
	correct == same as they were created from	17:01
FreezingCold	Hold on, need to figure out how to use git patch properly	17:02
	→ mtakkman joined	17:02
	→ leeN joined	17:02
	← m0ltar left	17:03
	→ Peasley joined	17:03
	→ m0ltar joined	17:03
eddyp	I think the only missing part is that there is no command that makes the super/.git/modules/<module>/HEAD update and also change super/.gitmodules at the same time	17:04
_ikke_	git format-patch -> git am	17:04
	← Balliad left	17:04
FreezingCold	_ikke_: er, how do I tell it which commit to take from?	17:04
	satwo_ → satwo	17:04
FreezingCold	it's giving me nothing after I commit	17:04
_ikke_	git format-patch -1 <commit>	17:04
	→ Balliad joined	17:05
	← Balliad left	17:05
	← m0ltar left	17:05
_ikke_	eddyp: what happens if you check out a branch and then do an update, is that branch still checked out?	17:05
FreezingCold	Thanks!	17:05
	← morois left	17:05
	→ Balliad joined	17:05
	→ ferdinandleinbac joined	17:06
FreezingCold	CareBear\: Yeah, you're right. Deleting lines shows the stock line (which makes sense)	17:06
	← joo-_ left	17:06
	→ LucasTT joined	17:08
	← satwo left	17:08
	→ Takle joined	17:08
	→ jazzzu joined	17:08
	← siamect left	17:10
	→ siamect joined	17:11
	← EXetoC left	17:11
	← skylite left	17:11
	→ skylite joined	17:12
	← siamect left	17:12
	→ siamect joined	17:12
	← siamect left	17:12
eddyp	_ikke_, in which repo? the one I want to transform or a clean one with tracking from the start?	17:13
_ikke_	the one you want to transform	17:13
	→ Es0teric joined	17:14
	→ aytfb joined	17:14
	← aerth left	17:15
	← aytfb left	17:16
	→ aerth joined	17:16
	← Es0teric left	17:16
	→ mellernoia joined	17:16
	→ tristanp joined	17:17
Napoelon	_ikke_: It all works well except for 1 thing. After add/commit in the clone, git status tells me I'm ahead by 1 commit. After I push, I'm up-to-date. When I go the the original work folder, git status incorrectly tells me I'm up-to-date. When I pull, I get the updates I did just before. Is this normal?	17:18
	→ airdisa joined	17:18
	→ ecomo joined	17:18
	← michael_mbp left	17:19
eddyp	_ikke_, I checked out a new branch in submodule, made a commit, then in super submodule update, I am now on the detached commit that was newest on the tracked branch	17:19
_ikke_	And if you do something similar to a branch tracking submodule, it then checks out the branch?	17:20
eddyp	let me check	17:20
	→ airdisa_ joined	17:20
	→ michael_mbp joined	17:20
	→ jerematic joined	17:21
	→ airdisa__ joined	17:22
	→ opdavies joined	17:22
eddyp	_ikke_, no, it behaves the same	17:22
	← sctskw left	17:22
_ikke_	So it checks out a commit?	17:22
eddyp	yes	17:22
	let me check with --remote	17:22
	← GoddeR left	17:23
	→ Phrohdoh joined	17:23
eddyp	same thing	17:23
	← airdisa left	17:23
	→ teran joined	17:23
eddyp	...which is royaly usless	17:23
	useless	17:23
Phrohdoh	Can someone help me with an odd issue? I cloned a repo and I suddenly have an unstaged change. When I try to `git checkout /the/file.ext` to reset it to HEAD nothing changes.	17:24
	→ IIT_ joined	17:24
_ikke_	!crlf	17:24
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	17:24
_ikke_	It's usually that	17:24
	← IIT left	17:24
	← ecomo left	17:24
Phrohdoh	Perhaps, but I’ve never had this issue with this project before.	17:24
	→ ology joined	17:24
	→ Sleepy63 joined	17:24
Phrohdoh	Resetting should fix that anyway, no?	17:25
_ikke_	On what platfrom are you?	17:25
	← gebjgd left	17:25
_ikke_	If checkout doesn't help, resetting doesn't help either	17:25
	← airdisa_ left	17:25
Phrohdoh	hm	17:25
	OS x 10.10	17:25
_ikke_	Another option is case sensitivity	17:25
	→ cuioy joined	17:25
_ikke_	or more, case insensitivy	17:25
	insensitivity	17:26
	← jerematic left	17:26
eddyp	Phrohdoh, do you have 2 files with the same filename, if you ignore case sensitiveness?	17:26
Phrohdoh	nope	17:26
	→ Ancchi joined	17:26
Phrohdoh	single file	17:26
	OpenRA.TilesetBuilder/defaults.yaml: ASCII text, with CRLF line terminators	17:26
	via `file`	17:26
_ikke_	Phrohdoh: What does git diff one the file show?	17:26
Phrohdoh	What?	17:26
	git diff shows the content being removed and readded	17:27
eddyp	then is dos2mac	17:27
	or something of that sort	17:27
Phrohdoh	dos2unix	17:27
osse	Phrohdoh: what about git diff -w	17:27
	← cuioy left	17:27
Phrohdoh	osse: no result	17:27
	empy	17:27
osse	tada	17:28
	→ echo-area joined	17:28
eddyp	!crlf	17:28
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	17:28
eddyp	Phrohdoh, that's for you ^^^^^	17:28
Phrohdoh	That won’t help here as I can’t modify everyone else’s settings	17:28
	→ pmnu joined	17:28
Phrohdoh	and no one else (even osx users) are having this issue	17:28
eddyp	you can modiffy you own	17:28
thierryp	_ikke_:	17:29
	in your answer you do git reset --keep HEAD^	17:29
	← teran left	17:29
	← aerth left	17:29
_ikke_	Phrohdoh: .gitattributes files	17:29
thierryp	but what does HEAD^mean when I am on E	17:29
	since it has 2 ancestors	17:29
osse	Phrohdoh: I think the editor you used to edit that file changed the line endings	17:29
_ikke_	It means the first parent	17:29
Phrohdoh	_ikke_: Can’t add that to the repo	17:29
_ikke_	why not?	17:29
thierryp	how can I know which one it is ?	17:29
Phrohdoh	osse: I didn’t modify the file at all	17:30
osse	Phrohdoh: you seemingly have no other changes to it so you can do git checkout -- file	17:30
Phrohdoh	Already tried that	17:30
eddyp	_ikke_, git submodeule update always moves to a detached commit, unless I am on a branch which has the tip at the same version	17:30
	← ashu11 left	17:30
Phrohdoh	My whole issue is that this is happening on a single file after cloning; I didn’t modify at all and no one else is having this issue.	17:31
	← airdisa__ left	17:31
_ikke_	Phrohdoh: mixed line endings	17:31
Phrohdoh	Then others would have this issue too.	17:31
	Right?	17:31
_ikke_	Depends on their settings	17:31
	That's why I recommend a .gitattributes file	17:31
	which makes everyone use the same settings	17:31
Phrohdoh	The others in the project won’t allow that though.	17:32
thierryp	_ikke_: but this commit has 2 first parents, no ?	17:33
_ikke_	thierryp: No	17:33
thierryp	could be H or D	17:33
_ikke_	it has a first and second parent	17:33
thierryp	in any case I can't seem to get this to work	17:33
	← thierryp left	17:33
_ikke_	//	17:34
	→ naftilos76 joined	17:34
_ikke_	..	17:34
	→ aerth joined	17:35
	→ jaznow joined	17:35
	→ ghostpl_ joined	17:36
	← Consuela left	17:36
	← Peasley left	17:37
	← Ancchi left	17:38
	← AustinTheGrey left	17:41
	← ghostpl_ left	17:43
	← cvanball left	17:43
	→ voiceofgrog joined	17:44
	→ AustinTheGrey joined	17:44
	→ Corey84 joined	17:45
	→ lidaaa joined	17:45
	→ Goplat joined	17:46
	→ c74d joined	17:46
	→ thierryp joined	17:46
	← mtakkman left	17:47
thierryp	_ikke_: sorry Ive been disconnected	17:47
	← Phrohdoh left	17:47
thierryp	I must be missing something	17:47
	so in your example when you said git reset --keep HEAD^	17:48
	would HEAD^be H or D ?	17:48
	← pmnu left	17:48
	← aerth left	17:49
	→ Oti joined	17:49
	← eddyp left	17:49
	→ klrmn joined	17:49
	→ aerth joined	17:49
	← AustinTheGrey left	17:49
	→ AustinTheGrey joined	17:50
	← AustinTheGrey left	17:50
	→ tmager joined	17:51
klrmn	git has decided that the repo i cloned into a sub-directory of an existing project must be a submodule. how can i convince it it's files can be added to the outside project?	17:51
	← potteratt left	17:52
	← tmager left	17:52
	→ ki0 joined	17:53
	→ highball joined	17:53
	← u1106 left	17:53
	← thierryp left	17:53
	← Balliad left	17:53
	← highball left	17:54
	→ highball joined	17:54
	→ u1106 joined	17:55
Napoelon	_ikke_: Thanks for your help!! (I noticed osse has left; the same goes for them). I'll read up on the remaining things we discussed.	17:55
klrmn	is it purely about the existance of .git in the inside project?	17:55
	→ asakura joined	17:56
	← highball left	17:56
	← dharrigan left	17:56
	→ dharriga1 joined	17:56
	← n-st left	17:57
	→ durham joined	17:58
	→ n-st joined	17:59
	← Napoelon left	17:59
	→ EminenceHC joined	18:01
	← ki0 left	18:01
	← tvw left	18:01
	← durham left	18:03
osse	klrmn: I don't think you can convince git about that.	18:04
	← wrouesnel1 left	18:04
	→ daito joined	18:05
	← EminenceHC left	18:05
	← aerth left	18:05
	→ floombilter joined	18:05
	← CodeBot3000 left	18:06
	← jasabella left	18:07
	→ aerth joined	18:08
	→ f3lp joined	18:08
	→ mingwandroid joined	18:10
	← twoface88 left	18:10
klrmn	osse: i had assumed that since i used 'git clone' rather than 'git submodule add' it wouldn't have forced it to be a submodule. i also can't find a .gitmodules file that the docs talk about	18:12
	← ome left	18:13
	← daito left	18:13
osse	klrmn: .gitmodules is a file that the git-submodule command creates/maintains	18:13
	→ iliketurtles joined	18:13
osse	I don't think there is a good way of doing what you want to do, except removing the inner repo but keep the files	18:14
	→ Noldorin joined	18:15
klrmn	yes, like, how?	18:15
	→ noyb joined	18:16
	→ otter768 joined	18:16
	→ Goopyo joined	18:16
	← thiago left	18:17
	→ thiago joined	18:18
	→ splenetic joined	18:20
	← otter768 left	18:20
	← ology left	18:24
	← strictlyb left	18:25
	→ strictlyb joined	18:25
	→ teran joined	18:25
	→ airdisa joined	18:26
	← naftilos76 left	18:28
	← Gamecubic left	18:29
	← jumpman left	18:30
	→ jumpman joined	18:30
	← jaznow left	18:31
	→ rath joined	18:31
	→ sparetire joined	18:31
	← airdisa left	18:31
	← teran left	18:31
	→ psiloLR joined	18:33
	→ airdisa joined	18:35
	→ PeterBooker joined	18:36
Seveas	klrmn: rm -r inner-repo/.git	18:36
	klrmn: if you wish to occasionally merge in changes from the inner repo without doing subtree shenanigans, you may want to look at git-subtree.	18:37
	→ circ-user-jdqwJ joined	18:37
	→ pwnz0r joined	18:39
	← Oti left	18:40
	→ jceb joined	18:41
	→ jaaj joined	18:41
	← DrHouse\|DellM650 left	18:42
	← HelloATMega left	18:43
	→ tmager joined	18:43
	← tmager left	18:43
	← CheckDavid left	18:43
	→ Alienpruts joined	18:46
	→ glosoli joined	18:46
	← Goopyo left	18:47
	→ ki0 joined	18:47
	← xukdnv left	18:47
	→ topahl joined	18:48
	← ki0 left	18:48
	← Dragooon left	18:49
	→ ki0 joined	18:50
	← n-st left	18:53
	→ n-st joined	18:56
	← topahl left	18:57
	→ lqi joined	18:57
	→ bronson joined	18:57
	← Corey84 left	18:57
	← ki0 left	18:57
	→ Goopyo joined	18:58
	← in3xes left	19:01
	← bronson left	19:01
	← JanC left	19:02
	← absk007 left	19:02
	→ JanC_ joined	19:02
	→ micechal joined	19:02
	→ APerson_ joined	19:03
	JanC_ → JanC	19:04
	→ quinxy joined	19:04
	← micechal__ left	19:05
	← glosoli left	19:05
	→ cbonobo joined	19:06
quinxy	i'm new to git, coming from svn, perpetually confused... when I switch branches with checkout i just noticed that the changes I was making to another branch "followed" me (well, didn't go away and revert to the state/changes appropriate to the branch I moved to). i thought they wouldn't.	19:07
	→ MattMaker joined	19:08
	→ devoldmx joined	19:09
	← n-st left	19:09
klrmn	quinxy: if they had been committed, they would have 'gone away' when you switched branches. if you want to make them 'go away' (temporarily), use git stash save/pop/apply	19:09
	← devoldmx3 left	19:09
	→ jerematic joined	19:09
quinxy	ah, thanks! okay, that's what i was figuring, but i couldn't immediately test and i couldn't find info on it. thank you.	19:10
	→ stamina joined	19:10
quinxy	(yes, use stash, but just was confused why the other changes didn't automatically go away)	19:10
	← Nizumzen left	19:10
	← johannes_ left	19:11
quinxy	in this sort of case where let's say i need to switch temporarily to do something else but maybe temporary becomes days. is standard practice to commit on the branch even though the state of the code there might be broken, in the middle of something?	19:12
	← Takle left	19:12
	← MattMaker left	19:12
	→ MattMake_ joined	19:12
	← Vile left	19:12
quinxy	in svn I'm used to only making commits only when things are stable.	19:12
	→ shinnya joined	19:12
	→ tmager joined	19:12
	← tmager left	19:13
	← JanC left	19:13
	← jerematic left	19:14
	→ devoldmx3 joined	19:14
	→ holodoc joined	19:14
	← devoldmx left	19:15
	← Goopyo left	19:15
	→ JanC joined	19:16
klrmn	thanks Seveas!	19:17
	→ Takle joined	19:17
	← devoldmx3 left	19:19
berz3rk	friend tries to clone a branch from bitbucket from the team i setup for us	19:19
	but it gets stuck on terminal	19:19
	on compressing objects	19:20
	at 69%	19:20
	it doesnt do anything	19:20
	Why	19:20
	← NBhostin_ left	19:20
	→ NBhosting joined	19:20
klrmn	quinxy: i would say either use stash to save partial work, or commit it with a name that starts with [WIP] to remind yourself you're not done yet	19:21
quinxy	ah, good idea. thanks.	19:21
	→ devoldmx joined	19:23
	→ ghostpl_ joined	19:24
	← MattMake_ left	19:24
	→ zim_ joined	19:24
	← skylite left	19:24
	→ skylite joined	19:25
	← mingwandroid left	19:26
	← stamina left	19:26
	→ MasterPiece joined	19:28
	→ teran joined	19:28
	→ gopar joined	19:31
	→ mikiones joined	19:33
	→ TheNet joined	19:33
	← teran left	19:33
	← Takle left	19:33
	→ yqt joined	19:33
	→ Takle joined	19:36
	← Takle left	19:37
	← mikiones left	19:37
	→ _Atom_ joined	19:37
	→ SimonNa joined	19:41
	← cavallari left	19:41
	← zim_ left	19:42
	→ nemosyne joined	19:44
	→ Es0teric joined	19:44
	→ MattMaker joined	19:45
	→ durham joined	19:46
	← fr33domlover left	19:46
	← MasterPiece left	19:47
	← nemosyne left	19:48
	→ EminenceHC joined	19:49
	← u1106 left	19:50
	→ mikiones joined	19:51
	→ u1106 joined	19:52
	← toothrot left	19:53
	→ GoddeR joined	19:54
	← EminenceHC left	19:54
	→ fr33domlover joined	19:54
	← Cust0sL1men left	19:55
	← Es0teric left	19:55
	→ jasabella joined	19:56
	← ascarter left	19:56
	← rcn left	19:57
	← Cork left	19:58
	→ bronson joined	19:58
	→ DrHouse\|DellM650 joined	20:02
	← bronson left	20:02
	← berz3rk left	20:05
	← aax left	20:05
	→ berz3rk joined	20:06
	← durham left	20:08
	← mostlybadfly left	20:08
	→ Lyqyd joined	20:08
	← _Cyclone_ left	20:09
	→ Cust0sL1men joined	20:09
	← fackyou left	20:09
	← m8 left	20:10
	→ stamina joined	20:11
	→ btree joined	20:11
	← Kulrak left	20:12
	← ashokrajar left	20:12
	→ durham joined	20:13
	→ otter768 joined	20:17
	→ danguafer joined	20:18
	← voiceofgrog left	20:18
	→ deicon joined	20:18
	→ twoface88 joined	20:19
	← cpt_yossarian left	20:20
	← deicon left	20:20
	→ Cork joined	20:21
	→ dev_tester joined	20:21
	← otter768 left	20:21
	← btree left	20:22
	← mihaicris left	20:23
	← GoddeR left	20:24
	gitinfo set mode: +v	20:25
	← jceb left	20:25
	→ Kulrak joined	20:26
	← Kulrak left	20:26
	→ Kulrak joined	20:26
	← incredible left	20:26
	→ Es0teric joined	20:28
	→ teran joined	20:29
	← jasabella left	20:30
	→ jasabella joined	20:31
	← vith left	20:31
	→ akira_ joined	20:32
	→ ki0 joined	20:32
	← kappy left	20:33
	← TheNet left	20:35
	← teran left	20:35
	← wowaname left	20:36
CareBear\	quinxy : the ability to rework and replace commits is one of the greatest features of git	20:36
	→ wowaname joined	20:37
CareBear\	qunixy : it is a fundamental difference that you should generally commit everything with git	20:37
	quinxy : even if not finished yet	20:37
	→ Takle joined	20:37
CareBear\	quinxy : git did not remove your uncommitted changes because that would lose your work	20:38
	the more common git commands will not lose any work	20:38
	← netcarver left	20:39
	→ thierryp joined	20:40
	→ AustinTheGrey joined	20:40
	→ sctskw joined	20:41
	← hfp left	20:41
	← Junior left	20:41
	← hfp_work left	20:42
	← Takle left	20:42
	← iliketurtles left	20:42
	← sctskw left	20:42
	← subhojit777 left	20:43
	← thierryp left	20:44
	← Arsonide left	20:44
	← jazzzu left	20:46
	→ glosoli joined	20:46
	→ HelloShitty joined	20:47
	→ Vile joined	20:50
	← lidaaa left	20:50
	← ErKa left	20:50
	→ thierryp joined	20:51
	← nnyk_ left	20:52
	→ whitby joined	20:52
	→ Takle joined	20:53
	← einmalfel left	20:53
	→ einmalfel joined	20:53
	← dev_tester left	20:53
	→ cdown joined	20:53
	→ eddyp joined	20:56
	→ ascarter joined	20:57
	← cbonobo left	20:58
	→ jerematic joined	20:58
	→ bannakaffalatta joined	20:58
	→ cbonobo joined	20:58
	→ mostlybadfly joined	20:59
	→ bronson joined	20:59
	→ morois joined	20:59
	→ d3fault joined	20:59
	← DrHouse\|DellM650 left	20:59
	← einmalfel left	21:00
	→ einmalfel joined	21:00
FreezingCold	If I have multiple lines in my gitconfig that change the same setting, will the first or last one be the setting?	21:00
	→ CodeBot3000 joined	21:00
	← Jackneill left	21:00
	→ myyst joined	21:00
	→ Sonicbit joined	21:01
	← einmalfel left	21:01
	→ einmalfel joined	21:01
kadoban	FreezingCold: Why would you do that?	21:02
	← d3fault left	21:02
	→ d3fault_ joined	21:03
d3fault_	is there an [easy] way to do the opposite of "git log --follow file"? that is: "there used to be a file here, but where did it go and where is it now?".... i realize this would be an expensive operation heh, and i know it's possible, but just wondering if there's already an easy way to do it	21:03
	← myst left	21:03
FreezingCold	kadoban: Using insteadOf to force git://, and then pushInsteadOf to force ssh:// when pushing	21:03
	kadoban: make sense?	21:03
	← cbonobo left	21:03
	← jerematic left	21:03
	→ hfp joined	21:03
	← bronson left	21:03
	→ Arsonide joined	21:03
	→ hfp_work joined	21:04
	→ Gamecubic joined	21:04
	← Zifre_ left	21:04
	→ ciampix joined	21:04
	← jumpman left	21:04
	→ jumpman joined	21:05
	← jumpman left	21:05
	→ jumpman joined	21:05
	→ aidalgol joined	21:05
	→ CheckDavid joined	21:06
kadoban	FreezingCold: Those don't sound like the same setting, nor should it matter what order they're in. So are you just asking how the two relate?	21:06
	← MechtiIde left	21:07
	← einmalfel left	21:07
	← ascarter left	21:08
	→ einmalfel joined	21:08
	→ justtobe joined	21:08
	→ devoldmx3 joined	21:09
CareBear\	FreezingCold: sometimes they are cumulative	21:09
FreezingCold	Okay, so I fscked up	21:10
	git seems to have deleted my file	21:10
CareBear\	FreezingCold : just change the url? git remote set-utrl	21:10
	set-url	21:10
	FreezingCold : was it ever committed?	21:10
	→ nilg joined	21:10
FreezingCold	What I just did was change a file, push it to remote, hard reset on my local copy to the previous commit	21:10
	however, it just deleted my file instead of rolling back the file to the previous commit	21:11
	← nilg left	21:11
CareBear\	FreezingCold : by "change" do you mean "change and commit" ?	21:11
FreezingCold	Yes.	21:11
	← devoldmx left	21:11
CareBear\	big difference	21:11
	good	21:11
	how did you reset?	21:11
	→ vith joined	21:12
FreezingCold	git reset --hard	21:12
	git reset --hard [hash]	21:12
	← einmalfel left	21:12
FreezingCold	All the other files seem to be there fine, but just the changed one got deleted =\	21:12
	→ unixpro1970 joined	21:13
CareBear\	so you ran two commands?	21:13
	← sentriz left	21:13
CareBear\	or did you want to clarify that you ran the command only once but with a hash?	21:13
FreezingCold	I wanted to clarify that I didn't just forget to write the hash	21:14
CareBear\	okey	21:14
	this suggests that the file simply wasn't committedin the commit you reset to	21:15
	was the file in the root dir?	21:15
	→ yahoshi joined	21:17
	gitinfo set mode: +v	21:17
yahoshi	im trying to play around with git...can i setup a "tracking branch" that is just my local master?	21:17
	i dont get if tracking branch ahs to be remote or not	21:17
FreezingCold	CareBear\: It was, but I also just realized that I reset back an extra commit than I meant to	21:17
CareBear\	yahoshi : it has to be a remote repo, but a remote repo can be on the same system, with a file:/// url	21:18
	→ ril joined	21:18
CareBear\	FreezingCold : okey. is the file there in the next commit?	21:18
	FreezingCold : tip: run git !lol --all	21:18
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	21:18
	← ki0 left	21:18
FreezingCold	CareBear\: It's in both commits, I don't even get why it deleted it	21:19
yahoshi	hrm ok	21:19
CareBear\	FreezingCold : I can't say without access to the repo	21:19
	FreezingCold : you could try "git ls-tree HEAD"	21:19
FreezingCold	Sorry, I was wrong.	21:20
	I reset three commits back compared to what I meant to..	21:20
	=\	21:20
	So, how can I reset back up?	21:20
CareBear\	just reset again	21:20
FreezingCold	But the commits aren't in my local repo?	21:21
	→ iliketurtles joined	21:21
CareBear\	sure they are	21:21
yahoshi	CareBear\: so i cant link a feature branch to the branch it was created from?	21:21
	→ cpt_yossarian joined	21:21
FreezingCold	wut	21:21
	how	21:21
	you're right	21:21
yahoshi	all i want to do is get the "2 behind" etc syntax when i do a git branch -vv	21:21
CareBear\	yahoshi : oh sure that's possible	21:21
FreezingCold	what is this sorcery?!	21:21
yahoshi	do i just use the set-upsetream?	21:21
	*upstream	21:22
CareBear\	yahoshi : that's a good start - it might all there is to it	21:22
	→ jaznow joined	21:22
CareBear\	FreezingCold : commits do not get deleted just because they aren't on any branch	21:22
	FreezingCold : and in fact, your commits are on branches	21:22
	FreezingCold : on the remote tracking branches, which were also upated by your push	21:22
	← akira_ left	21:22
FreezingCold	that's freaking cool	21:22
CareBear\	FreezingCold : git branch -av	21:23
	FreezingCold : and git log --graph --oneline --decorate --all	21:23
	← cdown left	21:23
	→ madewokherd joined	21:23
yahoshi	ah yeah it worked CareBear\	21:24
CareBear\	yahoshi : cool	21:24
yahoshi	thnx	21:24
CareBear\	you're welcome	21:24
	← johtso_ left	21:24
	→ johtso_ joined	21:24
	← dreiss left	21:25
	→ product-- joined	21:26
product--	Does the email shown in my git commit have any relation to the email address of my GitHub account?	21:26
	or are these two separate beasts?	21:26
	← hfp left	21:26
	← hfp_work left	21:27
	← puff left	21:27
	→ hfp joined	21:27
osse	separate	21:27
	← airdisa left	21:27
product--	osse: ok thanks that's what i thought	21:27
	→ airdisa joined	21:28
	→ joo-_ joined	21:28
	← Cust0sL1men left	21:28
yahoshi	fuck i am so fuckign confused	21:29
	→ ErKa joined	21:29
	← madewokherd left	21:30
	← jumpman left	21:30
	← Gamecubic left	21:30
	← morois left	21:30
	← Takle left	21:30
	← shinnya left	21:30
	← jaaj left	21:30
	← f3lp left	21:30
	← aerth left	21:30
	← IIT_ left	21:30
	← ferdinandleinbac left	21:30
	← nkouevda left	21:30
	← neonKow left	21:30
	← joki left	21:30
	← javaJake left	21:30
	← guampa left	21:30
	← wedgie left	21:30
	← msonntag left	21:30
	← pks left	21:30
	← robbyoconnor left	21:30
	← fedorafan left	21:30
	← adrianr1 left	21:30
	← __main__ left	21:30
	← blr left	21:30
	← raven-au left	21:30
	← githogori left	21:30
	← bipolar left	21:30
	← przemoc left	21:30
	← zapb_ left	21:30
	← bsanford left	21:30
	← Rubin left	21:30
	← gv_ left	21:30
	← andschwa left	21:30
	← halfline left	21:30
	← reactormonk left	21:30
	← edwardly left	21:30
	← zso left	21:30
	← lokus left	21:30
	← pR0Ps left	21:30
	← njbair left	21:30
	← daynaskully left	21:30
	← Steve_Jobs left	21:30
	← ejnahc left	21:30
	← tg left	21:30
	← kschlesselmann left	21:30
	← metaf5 left	21:30
	← phantomcircuit left	21:30
	← romanovic left	21:30
	← minerale left	21:30
	← themill left	21:30
	← Serus left	21:30
	← cods left	21:30
	← RichiH left	21:30
	→ wedgie joined	21:30
	→ Gamecubic joined	21:30
	→ hfp_work joined	21:30
	→ minerale joined	21:30
	→ xtriz__ joined	21:30
	→ aerth joined	21:30
	→ phantomcircuit joined	21:30
	→ themill joined	21:30
	→ zso joined	21:30
osse	yahoshi: while on the feature branch: git branch -u mster	21:30
	→ reactormonk joined	21:30
osse	sorry, master	21:30
	→ przemoc joined	21:30
	→ jumpman joined	21:30
	→ adrianr1 joined	21:30
	→ blr joined	21:30
	→ cods joined	21:30
	→ romanovic joined	21:30
	→ javaJake joined	21:30
	→ lokus joined	21:30
yahoshi	yeah ive got all that i just dont know wtf im doing	21:30
	→ ferdinandleinbac joined	21:30
yahoshi	like do i pull into feaure and push back into master	21:31
	→ Takle joined	21:31
	← ribasushi left	21:31
	→ Serus joined	21:31
yahoshi	or rebase or push or pull	21:31
	→ guampa joined	21:31
	→ robbyoconnor joined	21:31
osse	no	21:31
yahoshi	fuck me	21:31
osse	relax	21:31
	→ nkouevda joined	21:31
	→ bsanford joined	21:31
	→ halfline joined	21:31
	→ __main__ joined	21:31
	→ Steve_Jobs joined	21:31
	→ f3lp joined	21:31
	→ githogori joined	21:31
	→ metaf5 joined	21:31
yahoshi	like im trying to do the keep it all nice and clean rebasing approach	21:31
	← jumpman left	21:31
	→ jumpman joined	21:31
	→ neonKow joined	21:31
yahoshi	im playing around locally...i created a master added a few dumby files...i forked a feature branch...then i commited some files on both branches	21:31
	→ f3lp_ joined	21:32
	→ kschlesselmann joined	21:32
	→ teran joined	21:32
	→ diegoviola joined	21:32
yahoshi	am i supposed to rebase feature so that my changes go on the tip of master in my feature branch...then how to put it back into master?	21:32
	do i have several options?	21:32
osse	yahoshi: the upstream thingy only means that you get that nice status output, etc.	21:32
	→ morois joined	21:32
yahoshi	yes	21:32
	→ edwardly joined	21:32
	← edwardly left	21:32
	→ edwardly joined	21:32
	xtriz__ → IIT	21:32
osse	yahoshi: if you keep rebasing feature onto master you can then git checkout master && git merge feature	21:32
	→ uawi joined	21:33
yahoshi	so as work is being done on master	21:33
	← airdisa left	21:33
yahoshi	i sit in feature and do a git rebase master ?	21:33
	→ tg joined	21:33
	← tg left	21:33
	→ tg joined	21:33
yahoshi	do i have to do git fetch's for that to work on master?	21:33
	→ TheNet joined	21:33
osse	no	21:34
	→ groton joined	21:34
osse	you merge while on master	21:34
	http://sprunge.us/TjEd	21:34
	→ madewokherd joined	21:34
	→ shinnya joined	21:34
	→ msonntag joined	21:34
yahoshi	i mean in the rebase stages	21:34
	→ joki joined	21:34
	→ njbair joined	21:34
yahoshi	while im working away for a fucking week on feature	21:34
	→ digifiv5e joined	21:35
	→ raven-au joined	21:35
	→ pR0Ps joined	21:35
	← karrtmomil left	21:35
	← iamjarvo left	21:35
	digifiv5e → Guest61456	21:35
yahoshi	ok so i issue the rebase commands on the feature branch	21:35
	→ RichiH joined	21:35
	→ ejnahc joined	21:35
yahoshi	but what if my master hasnt been updated ata ll	21:35
	on my local machine from remote	21:36
	like is it safe to just git pull on master	21:36
	← f3lp left	21:36
yahoshi	should just be fast-forward merges	21:36
	→ gv joined	21:36
	gv → Guest61386	21:36
	→ fedorafan joined	21:36
	→ Rubin joined	21:36
	→ bipolar joined	21:36
	← teran left	21:36
groton	is the history of a submodule meant to be seen in “git log” of the git repo that references it?	21:37
osse	yahoshi: you can use pull --ff-only; then it's safe	21:37
	→ Balliad joined	21:37
	→ pks joined	21:37
yahoshi	isnt pullinto nto master always safe	21:38
	if i never make changes there	21:38
	→ zapb_ joined	21:39
	→ mizu_no_oto joined	21:39
	→ ribasushi joined	21:39
	→ toothrot joined	21:40
CareBear\	yahoshi : correct, it is	21:40
	→ nettoweb joined	21:41
	← lqi left	21:41
	→ TheNet_ joined	21:42
	← holodoc left	21:42
	← IIT left	21:42
CareBear\	yahoshi : in general, git only operates on the current branch	21:43
	yahoshi : rebase on the feature branch rebases the feature branch	21:43
	yahoshi : merge on the master branch merges into master	21:43
	← TheNet left	21:44
	← product-- left	21:44
_ikke_	groton: no	21:44
yahoshi	so you have to constantly rebase onto your feature branch and then merge into master?	21:44
CareBear\	yahoshi : s,onto,,	21:45
_ikke_	yahoshi: You rebase your feature branch onto the newest changes on master	21:45
CareBear\	yahoshi : you only really need to rebase once, before themerge	21:45
yahoshi	really if your on a 2week long feature branch when master getting hammered	21:45
	you gonna just rebase at the end?	21:46
	is that good advice?	21:46
_ikke_	Though, you may choos to do it more often if there are many changes	21:46
CareBear\	yahoshi : git doesn't really care	21:46
	→ WaReZ joined	21:46
	← WaReZ left	21:46
_ikke_	But you make it yourself easier	21:46
CareBear\	yahoshi : good advice is to not spend so much time on a branch which is incompatible with work in master	21:46
yahoshi	sure	21:46
	but lets be pragmatic	21:46
CareBear\	yahoshi : two conflicting development efforts going on at the same time is not a version control problem, it is an organizational problem	21:47
	→ WaReZ joined	21:47
yahoshi	either way whats the harm in doing your rebases constantly	21:47
_ikke_	CareBear\: But isn't that what happens all the time?	21:47
	← uawi left	21:47
yahoshi	and working out any conflicts	21:47
CareBear\	yahoshi : no harm - just possibly wasted time because you have to resolve another conflict later	21:48
_ikke_	CareBear\: Some changes necessarily involve shared code	21:48
CareBear\	yahoshi : it's never harmful	21:48
	_ikke_ : sure - but non-trivial conflicts are imo an organizational problem	21:48
_ikke_	I agree	21:48
	But you detect that rather sooner then later	21:49
	→ rosco_y joined	21:49
	→ danxm joined	21:49
rosco_y	How do I rename a branch?	21:49
yahoshi	if you have an upstream tracking branch do you have to update it before doing your rebases onto the feature branch	21:49
CareBear\	rosco_y : git branch -m	21:49
yahoshi	or does the rebase go out to the remote?	21:49
groton	_ikke_: ok, thanks. How to see exactly which version my repo is referencing?	21:49
FreezingCold	Okay, so pushInsteadOf seems to be completely broken	21:49
	Why?	21:49
rosco_y	CareBear\ -- Thanks!	21:49
FreezingCold	It has no affect	21:49
CareBear\	yahoshi : upstream and rebase are independent	21:50
	← rosco_y left	21:50
	← Takle left	21:50
	→ Cust0sL1men joined	21:50
CareBear\	yahoshi : push and fetch (by extension thus also pull) are the only commands that communicate with remotes	21:50
	← stamina left	21:51
	→ P-l joined	21:51
P-l	Hey!	21:51
yahoshi	k	21:51
Sonicbit	I'm trying to get this command ' log --graph --decorate $(git rev-list -g --all) ' set as alias.graph and the only way I'm able to do it is by using double quotation marks, which would replace the ' $(git rev-list -g --all) ' with some sort of long hash reference	21:51
	I'm trying to get this command ' log --graph --decorate $(git rev-list -g --all) ' set as alias.graph and the only way I'm able to do it is by using double quotation marks, which would replace the ' $(git rev-list -g --all) ' with some sort of long hash reference If I use single quotations instead, Git returns ' fatal: ambiguous argument '$(git' ' when command is run	21:51
	Sorry for duplicating message	21:51
	← morois left	21:52
Sonicbit	Ps: If I use single quotations instead, Git returns ' fatal: ambiguous argument '$(git' ' when command is run	21:52
	→ TheNet joined	21:52
	→ Takle joined	21:53
FreezingCold	I figured it out.	21:53
	I had a push set	21:53
	← mizu_no_oto left	21:53
	← u1106 left	21:54
P-l	Hey guys, I need your advice. I have some configurations files in my git repository. Sometimes some friends commit their configuration files and when I pull it's kill my config. I tried to put files in my .gitignore but it doesn't work because it's in git repository. Do you have any ideas how I can manage this? thanks for your help!	21:54
	→ mizu_no_oto joined	21:54
	← mizu_no_oto left	21:54
	← TheNet_ left	21:54
	← Dreamer3 left	21:54
bremner	!config	21:55
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	21:55
	→ Goopyo joined	21:55
P-l	thx bremner!	21:55
	→ u1106 joined	21:56
	→ Henryabcd joined	21:56
	← totoybato left	21:56
	→ arnaud__ joined	21:57
	→ devoldmx joined	21:57
	← BuenGenio left	21:57
	← Goopyo left	21:58
	← Takle left	21:58
	→ Goopyo joined	21:58
	→ duckk joined	21:58
	← King_Hual left	21:59
	← devoldmx3 left	21:59
duckk	I want to clone a public repository and make it private. But I want to keep getting the updates from the public repository. How can I do that?	21:59
	→ mizu_no_oto joined	21:59
	← iliketurtles left	22:00
	← f3lp_ left	22:00
	← ping-pong left	22:00
	→ bronson joined	22:00
	← AustinTheGrey left	22:00
	→ f3lp joined	22:00
	→ GoddeR joined	22:00
preaction	duckk: just clone it and don't make your clone public	22:01
	← diegoviola left	22:01
	→ AustinTheGrey joined	22:02
FreezingCold	P-l: sparsecheckout possibly	22:02
	heh, I don't think you can checkout everything except one file	22:03
	← bronson left	22:04
P-l	FreezingCold: thx, I'll take a look	22:05
	← Goopyo left	22:06
	← arnaud__ left	22:06
	← netj left	22:06
	→ netj joined	22:06
FreezingCold	P-l: yeah it'	22:07
	P-l: yeah it's not quite right	22:07
	→ cagedwisdom joined	22:07
CareBear\	P-l : no solution. delete the configs from the repo.	22:07
FreezingCold	What you could do with sparsecheckout is add every file that you want, but then if somebody added another file, you would accidentally miss it too	22:07
	→ watabou joined	22:08
FreezingCold	but I agree, just push a commit yourself with you deleting it	22:08
	HelloShitty → HelloATMega	22:08
FreezingCold	ideally with a commit message that contains profanity	22:08
	← nettoweb left	22:09
	← pwnz0r left	22:10
	← u1106 left	22:10
yahoshi	now im in some hooped state after i tried to do a git rebase -i	22:11
	im now on a (no branch, rebasing FeatureA) branch	22:11
	→ nettoweb joined	22:11
yahoshi	auto put there	22:11
	and i cant move to another branch	22:11
	it says "error: you need to resolve your current index first"	22:11
	← Alienpruts left	22:12
_ikke_	yahoshi: it means you have a merge conflict	22:12
	← Hestil left	22:12
yahoshi	oh thats a merge conflict	22:12
	a rebase conflict?	22:12
Dougie187	yahoshi: there's no difference.	22:12
	merge conflict == rebase conflict == cherry-pick conflict	22:12
_ikke_	rebasing applies commits one by one	22:12
	→ u1106 joined	22:13
	→ ping-pong joined	22:13
yahoshi	so if your on feature A doing work	22:13
	and then doing git pull's	22:13
	← denisMone left	22:14
yahoshi	and then if back on master you merge in feature A's work	22:14
	← GoddeR left	22:14
yahoshi	do you get like all the merge commits on feature A in the log and also the result of the final merge into master?	22:14
	→ ashokrajar joined	22:14
_ikke_	merge merges the end state, not commits in between	22:14
	← jim left	22:15
	← AustinTheGrey left	22:15
yahoshi	oh, so if your on feature with 10 commit msgs back on master if you merge it in all you get is whatever you put for that merge commit msg?	22:15
	basically applying a patch	22:15
	→ tmager joined	22:16
	← tmager left	22:16
_ikke_	huh?	22:16
	→ phy1729 joined	22:17
	← mizu_no_oto left	22:17
yahoshi	sorry, i meant how do you preserve the commit history on a feature branch when you merge i tin?	22:17
	* it in	22:17
	→ jrahmy joined	22:17
	→ macabre joined	22:17
	→ groton_ joined	22:17
phy1729	is there a way to have git log show all the children of <commit> instead of all commits after <date> ?	22:17
	← u1106 left	22:17
	← Es0teric left	22:18
	→ otter768 joined	22:18
Dougie187	yahoshi: it's preserved no matter what you do (as long as you don't do a squash merge)	22:18
	← groton left	22:18
	groton_ → groton	22:18
	← ashokrajar left	22:19
	→ sctskw joined	22:19
	→ u1106 joined	22:20
	← jasabella left	22:20
_ikke_	phy1729: no, because it's not trivial to get a commits children (only parent is recorded)	22:20
	← macabre left	22:21
	← otter768 left	22:22
	← adamm left	22:23
	→ mizu_no_oto joined	22:23
	→ dreiss joined	22:23
	← jerkey left	22:23
	← sctskw left	22:24
	→ airdisa joined	22:25
Dougie187	phy1729: no. at least I don't think so. But there's a way to see which branches contain a specific commit (i.e. `git branch --contains <hash>`	22:26
	→ Nizumzen joined	22:26
	cebor_ → cebor	22:27
	→ happy-dude joined	22:27
	← groton left	22:29
	← danxm left	22:29
	← airdisa left	22:30
	→ adamm joined	22:30
	→ iqt joined	22:31
	→ diegoviola joined	22:31
	← Vigmo left	22:31
	→ teran joined	22:33
	← ghostpl_ left	22:34
	← TheNet left	22:35
	→ kcj joined	22:35
	← justtobe left	22:35
	← pobivan left	22:35
	← yvan1 left	22:36
	← u1106 left	22:37
	← jaznow left	22:37
	← whitby left	22:37
	← mizu_no_oto left	22:38
	→ lun_ joined	22:39
	→ u1106 joined	22:39
	→ Joel__ joined	22:39
	→ eletuchy joined	22:44
	← Joel__ left	22:44
	← kadoban left	22:44
	← iqt left	22:44
	← Zoddo left	22:44
	← mikiones left	22:45
	← jrahmy left	22:45
	← Vile left	22:45
	← Goplat left	22:46
	→ jerematic joined	22:47
	← Balliad left	22:48
	→ kmod joined	22:48
	← eletuchy left	22:49
	→ jasabella joined	22:49
	← kmod left	22:49
	→ macabre joined	22:50
	← jerematic left	22:51
	→ Bqu joined	22:52
	← macabre left	22:52
	← Bqu left	22:54
	← u1106 left	22:55
	← thierryp left	22:56
	→ thierryp joined	22:56
	→ mizu_no_oto joined	22:56
	← ciampix left	22:57
	← Dougie187 left	22:57
	→ u1106 joined	22:58
	← P-l left	22:58
	← Guest72521 left	22:58
	← Henryabcd left	22:58
	← APerson_ left	22:58
	→ therealGent joined	22:58
	→ devoldmx3 joined	22:59
	← devoldmx left	22:59
	→ devoldmx27 joined	22:59
	→ mikecmpbll joined	23:00
	→ bronson joined	23:01
	← mikecmpbll left	23:01
	← thierryp left	23:01
	→ beastd joined	23:02
	→ Vqaop joined	23:02
	← Vqaop left	23:02
	← PeterBooker left	23:03
	← devoldmx3 left	23:03
	← opdavies left	23:03
	→ oriba joined	23:03
	← davispuh left	23:03
	→ mikecmp__ joined	23:04
	← u1106 left	23:04
	← mikecmp__ left	23:04
	← MattMaker left	23:04
	→ voiceofgrog joined	23:05
	← voiceofgrog left	23:05
	→ voiceofgrog joined	23:05
	← bronson left	23:05
	← nettoweb left	23:06
	→ u1106 joined	23:06
	← jasabella left	23:07
	← nfk left	23:07
	→ macabre joined	23:08
	→ jasabella joined	23:09
	← Kicer86 left	23:10
	← eliasp left	23:11
	→ paul424 joined	23:11
	→ joo--_ joined	23:13
	← jasabella left	23:13
	→ kadoban joined	23:14
	→ vreo joined	23:15
	← vreo left	23:16
	← MadsRC left	23:16
	← joo-_ left	23:16
	→ Es0teric joined	23:16
	→ MadsRC joined	23:18
	→ eletuchy joined	23:18
	→ pacon joined	23:19
	← jumpman left	23:19
	← Gama11 left	23:19
	→ jumpman joined	23:19
	→ enlightified joined	23:20
	← rath left	23:24
	← doener_ left	23:25
	→ Sourcerer\|2 joined	23:26
	→ EminenceHC joined	23:27
	→ doener joined	23:27
	→ Vigmo joined	23:28
	← zacts left	23:29
	← EminenceHC left	23:32
	→ justtobe joined	23:32
	← thevishy left	23:33
	← macabre left	23:33
	→ macabre joined	23:34
	→ nettoweb joined	23:34
	← Gamecubic left	23:36
	→ Gamecubic joined	23:36
	← nettoweb left	23:38
	→ cbonobo joined	23:41
	← Vigmo left	23:42
	← mr-kyd left	23:43
	→ Olipro joined	23:43
	← _Atom_ left	23:43
	Olipro → Guest45667	23:43
	→ jasabella joined	23:43
	← dreiss left	23:44
	→ ahr3n joined	23:46
	← glosoli left	23:47
	→ sgen_ joined	23:48
	→ dreiss joined	23:49
	← macabre left	23:53
	← dreiss left	23:55
	→ devoldmx joined	23:57
	← devoldmx left	23:57
	→ devoldmx joined	23:57
	→ thierryp joined	23:58
	← devoldmx27 left	23:58
	→ macabre joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation