IRCloggy #git 2019-01-23

Provider of IRC logs since 2005.

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

	2019-01-23
	← TheRuckus left	00:03
	← finalbeta left	00:03
	ryjm → ryjm[payon]	00:05
	→ abraxxas joined	00:10
	← sanscoeu_ left	00:13
	→ fission6 joined	00:17
	← mat001 left	00:19
	→ yyy joined	00:23
	← akushner left	00:23
	← Eryn_1983_FL left	00:26
	← courrier left	00:26
	→ courrier joined	00:27
	→ Eryn_1983_FL joined	00:27
	← mitchell left	00:28
	→ andyhuzhill joined	00:28
	← cfoch left	00:29
	← AtumT left	00:30
	→ mat001 joined	00:30
	← mikecmpbll left	00:30
	← Eryn_1983_FL left	00:30
	→ rkazak joined	00:31
	→ Eryn_1983_FL joined	00:33
	→ sanscoeur joined	00:33
	← yyy left	00:34
	← Zexaron left	00:39
	← fission6 left	00:40
	← n3wborn left	00:40
	← LionsMane left	00:41
	← CryptoDavid left	00:42
	← andyhuzhill left	00:43
	→ andyhuzhill joined	00:43
	← andyhuzhill left	00:47
	→ andyhuzhill joined	00:48
	← blackmesa left	00:51
	← gitu left	00:52
	← rkazak left	00:54
	→ TheRuckus joined	00:56
	← TheRuckus left	01:01
	→ jleclanche joined	01:06
	← metrixx left	01:06
	→ sitaram joined	01:08
	← alyptik left	01:12
	← agowa338 left	01:14
	← \void left	01:14
	→ nurdie joined	01:15
	→ atrigent joined	01:17
	← nurdie left	01:19
	→ sammyo joined	01:23
	→ perrier-jouet joined	01:25
	← cagmz left	01:25
	← mat001 left	01:25
	→ mat001 joined	01:27
	→ keepLearning512 joined	01:27
	← mat001 left	01:27
	→ ferdna joined	01:27
	→ mat001 joined	01:28
	← mat001 left	01:28
	→ mat001 joined	01:28
	← thinkpad left	01:29
	→ remcycles joined	01:29
	← TikityTik left	01:30
	→ thinkpad joined	01:30
	← m0viefreak left	01:30
	→ jgkamat joined	01:31
	→ TikityTik joined	01:32
	← Sasazuka left	01:40
	→ waterCreature joined	01:40
waterCreature	hi, git diff checksum checksum~ is giving me - and + for the entire file.	01:41
	any idea how to resolve this?	01:41
TikityTik	waterCreature: does it look like the same text?	01:44
	→ akushner joined	01:47
	← kadoban left	01:47
	→ rgb-one joined	01:48
rgb-one	Hey	01:48
	Can one launch the default git editor (graphical editor) dettached from the terminal on a git commit?	01:48
mostym	Hey all. I'm pretty sure I f'd up. I updated some files, then commited, updated some more files, then commited again. Then I did git rebase -i HEAD~2, changed pick to drop on both commits and thought that would remove the commits... I was wrong. Now any changes I make do not get listed in any commit. and it's always saying it's up to date, even though I just made new changes.	01:50
	→ prakashdanish joined	01:58
	← abraxxas left	02:00
	→ darkbit joined	02:00
	← acidjnk left	02:03
	→ igemnace joined	02:05
	← F0rTex left	02:07
	→ F0rTex joined	02:08
	← boombatower left	02:08
	→ finalbeta joined	02:09
	→ rick8024 joined	02:10
	← KnoP left	02:11
	rick8024 → KnoP	02:11
	← andyhuzhill left	02:13
	← darkbit left	02:13
	→ andyhuzhill joined	02:13
	← remcycles left	02:16
	← andyhuzhill left	02:17
	→ andyhuzhill joined	02:18
	← [Brain] left	02:20
	← sanscoeur left	02:26
	→ esrse joined	02:29
	← rgb-one left	02:31
	→ alyptik joined	02:31
	← prakashdanish left	02:33
	← fragamus left	02:33
	→ cd joined	02:36
	→ aLeSD_ joined	02:37
	← aLeSD left	02:38
	← Nokurn left	02:45
	→ Wetmelon joined	02:46
	→ jungsubk joined	02:46
	→ xall joined	02:50
	← n000g left	02:54
	→ n000g joined	02:54
	→ getSomethingGood joined	02:55
	→ stitched_unicorn joined	02:56
	← Arcaelyx left	02:56
supernovah	is there a manual way to merge	02:57
	like i've got two branches that are a divergance of the same one and need to select and pick code to allow in	02:57
	tried using a custom merge driver but it still auto-merges unmodified files from the 'theirs' side	02:58
	→ floraline joined	02:58
	← keepLearning512 left	03:00
	→ TheRuckus joined	03:00
	← TheRuckus left	03:04
	→ cdown joined	03:04
	→ Livery joined	03:10
	gitinfo set mode: +v	03:11
Livery	(new-ish to git...) I have two branches and one contains commits from the other (somehow?? not even sure how.), neither on master. How would I remove them from one branch while keeping them in the other? They're not on the top of the commit stack, which is where my problem (kinda) lies.	03:14
	reset won't do for this, because of that. any ideas? I don't want them removed from both branches, just one, where they shouldn't be anyway.	03:15
	← andyhuzhill left	03:18
	→ andyhuzhill joined	03:18
	← reveller left	03:19
	← gitinfo left	03:19
	← andyhuzhill left	03:23
	→ andyhuzhill joined	03:23
	← stitched_unicorn left	03:24
	← andyhuzhill left	03:27
	→ andyhuzhill joined	03:28
	→ Valeyard joined	03:31
	← GreenJello left	03:32
	→ GreenJello joined	03:33
	← ferdna left	03:33
	← GreenJello left	03:34
	→ GreenJello joined	03:35
	← jleclanche left	03:35
	← GreenJello left	03:38
	→ prakashdanish joined	03:38
	← gun1x left	03:39
	→ GreenJello joined	03:39
	← mat001 left	03:39
	← velix left	03:41
	← Valeyard left	03:41
	← niko left	03:43
	Redrambles → redrambles	03:44
	lagothrix → Guest62071	03:46
	→ lagothrix joined	03:46
	← prakashdanish left	03:47
	← Guest62071 left	03:49
	← jast left	03:49
	→ prakashdanish joined	03:49
	→ buzzlewoo joined	03:50
	← foul_owl left	03:50
	← Khisanth left	03:57
	← cliluw left	03:59
	→ cliluw joined	04:01
	→ foul_owl joined	04:03
	→ jast joined	04:04
	← buzzlewoo left	04:05
	→ Goplat joined	04:07
	→ Khisanth joined	04:10
	→ bwn joined	04:13
	← jast left	04:13
	→ jast joined	04:15
	← cliluw left	04:16
	→ buzzlewoo joined	04:18
	→ Kaisyu joined	04:20
	→ cliluw joined	04:21
	→ stitched_unicorn joined	04:21
	→ mona_x joined	04:27
	← Mattiaslndstrm left	04:27
	→ pionen joined	04:30
	← floraline left	04:32
	← bwn left	04:34
	→ gitinfo joined	04:37
	ChanServ set mode: +o	04:37
	← Wetmelon left	04:39
	← veegee left	04:42
	← gitinfo left	04:42
	→ \void joined	04:42
	← jast left	04:42
	← alyptik left	04:43
	→ jast joined	04:43
	→ gitinfo joined	04:45
	ChanServ set mode: +o	04:45
	← atrigent left	04:45
	→ fakenerd joined	04:46
	→ bwn joined	04:47
	← jungsubk left	04:49
	→ agowa338 joined	04:50
	→ kadoban joined	04:52
	← gitinfo left	04:56
	← stitched_unicorn left	04:56
	← snowgoggles left	04:57
	→ locrian9 joined	04:58
	← jast left	05:00
	← agowa338 left	05:01
	→ jast joined	05:02
	→ pks_ joined	05:02
	→ ngui joined	05:02
	→ mizu_no_oto joined	05:03
	← pks left	05:03
	pks_ → pks	05:03
	→ dreiss joined	05:03
	← courrier left	05:03
	→ alyptik joined	05:06
	→ nurdie joined	05:12
	→ stitched_unicorn joined	05:13
	→ gitinfo joined	05:16
	ChanServ set mode: +o	05:16
	← orbyt_ left	05:17
	← andyhuzhill left	05:18
	← irrgit left	05:18
	→ andyhuzhill joined	05:18
	← stitched_unicorn left	05:18
	← getSomethingGood left	05:20
	→ stitched_unicorn joined	05:22
	← andyhuzhill left	05:22
	→ andyhuzhill joined	05:23
	← donofrio left	05:25
	← Inline left	05:25
	← ghost43 left	05:27
	→ ghost43 joined	05:27
	← troyt left	05:28
	← stitched_unicorn left	05:29
	← xall left	05:29
	→ metrixx joined	05:29
	← jast left	05:30
	← Livery left	05:30
	→ navidr joined	05:31
	→ jast joined	05:32
	← bwn left	05:33
	→ apoos_maximus joined	05:40
	← jast left	05:41
	← apoos_maximus left	05:41
	→ apoos_maximus joined	05:41
	← mizu_no_oto left	05:44
	→ jast joined	05:45
	→ thebope joined	05:46
	→ awalvie_ joined	05:46
	→ atrigent joined	05:49
	→ troyt joined	05:52
	→ tsdh joined	05:54
	← jast left	05:57
	← awalvie_ left	05:57
	→ jast joined	05:57
	→ Nokurn joined	05:58
	→ veegee joined	06:05
	← nurdie left	06:05
	← mostym left	06:05
	→ nurdie joined	06:05
	← sammyo left	06:06
	← freeman42x left	06:06
	→ bwn joined	06:08
	← nurdie left	06:09
toothe	Hi all. I just merged a pull request into my tree. I see a merge commit, which I wasn't expecting.	06:10
	This might be a github-specific question...but did I Make a mistake?	06:10
	← buzzlewoo left	06:10
	← gitinfo left	06:12
	← apoos_maximus left	06:17
	→ gitinfo joined	06:21
	ChanServ set mode: +o	06:21
	→ n3wborn joined	06:22
	← andyhuzhill left	06:23
thiago	toothe: no	06:23
	toothe: github creates those commits	06:23
	equivalent to git merge --no-ff	06:23
	→ andyhuzhill joined	06:23
	← \void left	06:23
	→ inkbottle joined	06:25
	← andyhuzhill left	06:27
	← gitinfo left	06:28
	→ andyhuzhill joined	06:28
	← mona_x left	06:29
	← jast left	06:29
toothe	darn.	06:30
	← thiago left	06:31
	→ fdwh joined	06:32
	← andyhuzhill left	06:32
fdwh	i have removed a feature branch of mine in local and as well as in remote	06:32
	→ mfiano joined	06:32
fdwh	is there a way to get that back?	06:32
	i remember the branch name	06:32
	could someone tell me how to find it	06:33
	→ andyhuzhill joined	06:33
mfiano	Is there a GitHub Web Hook replacement for the GitHub Service for IRC commit notifications yet?	06:33
	← GreenJello left	06:35
LordRyan	mfiano: i have a friend who has a bot for it	06:36
	jes<tab><tab><tab> nope not here	06:36
	but if you query jesopo she'll set it up for you	06:37
	or https://github.com/jesopo/bitbot and try setting it up yourself	06:37
	→ sanscoeur joined	06:40
	→ jast joined	06:43
	← inkbottle left	06:44
	→ inkbottle joined	06:45
	→ mat001 joined	06:48
	→ gitinfo joined	06:49
	ChanServ set mode: +o	06:49
	→ kapil____ joined	06:53
	← R2robot left	06:54
	← thebope left	06:54
	→ thebope joined	06:54
	← dreiss left	06:56
	← gitinfo left	06:56
	← random_yanek left	06:56
	← pionen left	06:56
	← thebope left	06:59
	← jast left	06:59
	→ awalvie_ joined	07:00
	→ R2robot joined	07:02
	→ random_yanek joined	07:03
	← awalvie_ left	07:05
	→ awalvie_ joined	07:06
	→ Phylock joined	07:06
	← andyhuzhill left	07:08
	→ andyhuzhill joined	07:08
	→ andrzejv joined	07:09
	← aLeSD_ left	07:10
	→ mona_x joined	07:11
	← libertyprime left	07:12
	→ gitinfo joined	07:12
	ChanServ set mode: +o	07:12
	← andyhuzhill left	07:12
	→ andyhuzhill_ joined	07:13
	→ apoos_maximus joined	07:15
	andyhuzhill_ → andyhuzhill	07:17
	→ YuGiOhJCJ joined	07:17
	→ andyhuzhill_ joined	07:18
	← renich left	07:20
igemnace	fdwh: good news is that branches are just references; all the commits are still there	07:21
	→ jast joined	07:21
igemnace	fdwh: bad news is that you'll have to look for the commits yourself. check the reflog, or perhaps you remember what commit that branch was on last. then just recreate the branch	07:21
	← andyhuzhill left	07:22
	← akushner left	07:22
	andyhuzhill_ → andyhuzhill	07:22
	← andyhuzhill left	07:22
	→ sQVe joined	07:22
	→ andyhuzhill joined	07:23
	→ xrexeon joined	07:24
	← xrexeon left	07:24
	← mat001 left	07:24
	→ xrexeon joined	07:25
	← xrexeon left	07:28
	→ xrexeon joined	07:28
	← xrexeon left	07:28
	← inkbottle left	07:29
locrian9	git format-patch question... I have two files in a git initialized directory named 'file1.txt' and 'file2.txt'. Simply the 'file1.txt' has these three lines in the file: line#1=one, line#2=two, line#3=three. The 'file2.txt' has three lines in it: line#1=apple, line#2=banana, line#3=cherry. Each line in the files is commited separately. Basically was trying to find out if 'git format-patch' can create a	07:30
	single patch file that can be executed on two newly created empty files 'file1.txt' and 'file2.txt' and it would insert the 3 X lines into each file. Here's the output of 'git log' so maybe someone can give me the 'git format-patch' syntax that I have to issue in the git initialized directory. https://ptpb.pw/RNhl The current head is: 7b0c153	07:30
	← TikityTik left	07:31
	→ TikityTik joined	07:33
	← jast left	07:34
locrian9	I am trying to setup patches in a package build utility for Linux Arch, where it automatically downloads the source, and runs patches on the source before creating the binary. I saw another user with some single git format patches that seem to patch two files, so I was wondering if he manually put these two patches into the same file, or if this was created by the git format-patch command somehow. That's	07:36
	the reason for the simplified example above.	07:36
	→ dreiss joined	07:37
	→ pfleck joined	07:40
	← apoos_maximus left	07:43
	← Goplat left	07:46
	← pfleck left	07:47
	← foul_owl left	07:49
	→ dege joined	07:51
	→ foul_owl joined	07:52
	→ keepLearning512 joined	07:54
	→ alex_pa joined	07:54
	→ chele joined	07:56
	← andyhuzhill left	07:58
	← foul_owl left	07:58
tsdh	locrian9: I think in your use-case, you just want a patch and no git-patch (including metadata like author, commit message), right	08:02
	?	08:02
	→ jast joined	08:03
	→ andyhuzhill joined	08:03
	← dreiss left	08:04
	→ forrestv joined	08:06
	← forrestv left	08:06
	← andyhuzhill left	08:07
	← gitinfo left	08:08
	→ andyhuzhill joined	08:08
	→ dminuoso joined	08:08
	→ Makaveli7 joined	08:10
	→ interrobangd joined	08:11
	← awalvie_ left	08:11
	→ foul_owl joined	08:11
tsdh	locrian9: I guess running multiple "git diff 'rev^!' >> combined.patch" for each commit rev you're interested in (in the order from old to new) might work.	08:12
locrian9	tsdh: Sorry, I was on another screen. I'm back.	08:13
	→ inkbottle joined	08:13
dminuoso	Say I have a branch X that looks like `B3 <- B2 <- B1 <- A4 <- ...` and I want to rebase the last three commits onto another branch Y `A6 <- A5 <- A4 <- ... ` so that my branch `X` now looks: `B3 <- B2 <- B1 <- A6 <- A5 <- A4 ...`.	08:13
	My question now is: While I can just use a plain `git rebase X Y`, how would I specify the exact commit to rebase if I wanted to do so?	08:14
	That is, how do state "rebase this part of the branch starting at commit B1 from X onto commit A6 of branch X"	08:15
	That last X should have been a Y of course.	08:15
	→ bsaboia joined	08:17
	→ Silmarilion joined	08:18
	← andyhuzhill left	08:18
tsdh	dminuoso: You could name A6 instead of Y which you probably know. But B1 is inferred by "all commits on X that are not in Y/A6".	08:18
	→ andyhuzhill joined	08:18
	→ forrestv joined	08:18
	→ crmaurei joined	08:19
	→ apoos_maximus joined	08:20
_ikke_	dminuoso: You can use the --onto argument to specify where to rebase onto, then the base (the first argumetn) is the parent of the first commit you want to rebase	08:20
	← andyhuzhill left	08:22
	→ andyhuzhill joined	08:23
dminuoso	_ikke_: So I can pass any <tree-ish> to either?	08:24
_ikke_	yes	08:25
	comittish in this case, but comes down to the same	08:25
dminuoso	_ikke_: Ohh right, tree-ish would also allow for <rev>:<path> right?	08:26
	So how can I know whether git accepts a committish in some argument position or not?	08:26
	The documentation seems less than clear.	08:27
_ikke_	Right, just think about what a certain command operates on	08:27
	git rebase works with commits, so it makes sense you give it a comittish	08:27
	a random tree does not make sense	08:27
	← prakashdanish left	08:28
	← Makaveli7 left	08:29
	→ prakashdanish joined	08:31
	→ Makaveli7 joined	08:32
dminuoso	_ikke_: well to me `git rebase` had this "figure things out automatically based on branches" feeling, so it seemed as if it asked for a <refname>.	08:32
	It didn't even occur to me that it could be a committish, which is why I didn't even try it.	08:33
	→ gitinfo joined	08:34
	ChanServ set mode: +o	08:34
_ikke_	git rebase -i HEAD~5 works for example :)	08:34
guardian	hello, I'm a bit confused: git rev-parse --git-path hooks resolves to the global hooks path when it exists. It seems to contradict manual that says "Resolve "$GIT_DIR/<path>"	08:34
dminuoso	_ikke_: Oh.. point taken.	08:34
guardian	or maybe it's covered by the other part of the sentence that says "and takes other path relocation variables"?	08:34
	while not explicitly mentioning it?	08:34
	← prakashdanish left	08:37
_ikke_	guardian: Yes, I would assume that	08:38
	that's the case	08:38
	← gitinfo left	08:39
	← jast left	08:40
	← dermoth left	08:40
	← andyhuzhill left	08:41
	→ pfleck joined	08:42
	→ aw1 joined	08:42
	← YuGiOhJCJ left	08:43
	→ andyhuzhill joined	08:43
	← andyhuzhill left	08:48
	→ andyhuzhill joined	08:48
	→ manuelschneid3r joined	08:52
	→ blackmesa joined	08:52
	← andyhuzhill left	08:56
	→ dermoth joined	08:57
	→ andyhuzhill joined	08:58
	→ libertyprime joined	09:00
	← Silmarilion left	09:01
	→ moritz joined	09:01
	→ Silmarilion joined	09:02
	→ mikecmpbll joined	09:03
	→ Silmarlion_ joined	09:04
	← pfleck left	09:06
	→ pfleck joined	09:07
	← navidr left	09:07
	← Silmarilion left	09:07
	→ blackmesa1 joined	09:09
	← goiko left	09:11
	← blackmesa left	09:11
	← RustyShackleford left	09:15
	← heftig left	09:15
	← Silmarlion_ left	09:17
	→ lss8 joined	09:17
	→ Silmarilion joined	09:18
	← pfleck left	09:18
	→ pfleck joined	09:19
	← cdown left	09:19
	← lss8 left	09:20
	→ venmx joined	09:24
	→ Puffball joined	09:27
	→ heftig joined	09:30
	→ yyy joined	09:31
	← andyhuzhill left	09:31
	← rewt left	09:32
	→ rewt`` joined	09:32
	← SCHAPiE left	09:33
	rewt`` → rewt	09:33
	→ stitched_unicorn joined	09:35
	→ metrixx_ joined	09:35
	metrixx → Guest33851	09:35
	→ prakashdanish joined	09:36
	→ Zexaron joined	09:37
	→ SCHAPiE joined	09:37
	← fdwh left	09:38
	← Guest33851 left	09:39
	→ kerframil joined	09:40
	→ elichai2 joined	09:40
	← prakashdanish left	09:43
	← kapil____ left	09:43
	→ MACscr joined	09:45
	→ prakashdanish joined	09:45
	← Makaveli7 left	09:47
	← pfleck left	09:47
	→ Makaveli7 joined	09:47
	→ blackntan joined	09:49
	← blackmesa1 left	09:49
	→ gitinfo joined	09:51
	ChanServ set mode: +o	09:51
guardian	thanks _ikke_	09:53
	→ jast joined	09:53
	← LogicAside left	09:58
	← prakashdanish left	10:02
	← jast left	10:04
	→ prakashdanish joined	10:05
	← tsdh left	10:06
	→ LogicAside joined	10:06
	← gxt left	10:11
	← Puffball left	10:11
	← alex_pa left	10:14
	← stitched_unicorn left	10:15
	→ alex_pa joined	10:15
	← alex_pa left	10:15
	→ alex_pa joined	10:16
	← prakashdanish left	10:17
	← alex_pa left	10:17
	← catsup left	10:17
	→ alex_pa joined	10:17
	→ catsup joined	10:17
	→ Puffball joined	10:18
	← catsup left	10:18
	→ catsup joined	10:19
	← gitinfo left	10:19
	→ btree_ joined	10:20
	← btree left	10:20
	→ gloomy joined	10:21
gloomy	Hi there	10:21
	→ prakashdanish joined	10:21
	→ goiko joined	10:22
	← alex_pa left	10:23
gloomy	I fucked up a rebase and need some help recovering :-) So, a while ago I made a fork of a repository (https://github.com/Jermolene/TiddlyWiki5) in order to contribute to it. I worked on my branch for a relatively long time, made a pull request, and then rebased on upstream/master to remove conflicts. So far so good.	10:23
	→ alex_pa joined	10:23
	← alex_pa left	10:24
	→ stitched_unicorn joined	10:25
	→ alex_pa joined	10:25
	← alex_pa left	10:26
gloomy	But then I realised that the maintainer now required pull requests for documentation changes (which is what I was working on) to be made to a different branch than master, so I tried to change the base of my PR to that branch (see the PR: https://github.com/Jermolene/TiddlyWiki5/pull/3339 ). The problem is there were now commits from the `master` branch that got included in my pull request. Being a noob I tried to	10:26
	rebase again, this time on `upstream/tiddlywiki-com` - which didn't help anything.	10:26
	← Kaisyu left	10:27
	→ alex_pa joined	10:27
	← alex_pa left	10:27
gloomy	So now I have this list of commits: https://github.com/Jermolene/TiddlyWiki5/pull/3339/commits in which there are a bunch of commits that are not from me (I'm ldorigo), and I need to "remove" them from the PR. How do I do that?	10:28
	→ flashmozzg joined	10:28
flashmozzg	Hello. Is there an easy way to cherry-pick the range of commits and automatically squash them (preserving some sort of history message, i.e. at least log the squashed commit names)?	10:29
gloomy	I guess I could make a new branch and cherry-pick only my own commits ?	10:30
aw1	gloomy, can't you do an interactive rebase and drop the commits that you don't want	10:30
gloomy	rebase on what?	10:30
	← waterCreature left	10:31
aw1	on the same branch to a previous commit	10:31
gloomy	(and yes I can probably do that - I just don't know how ;-) )	10:31
aw1	git rebase -i HEAD~n (where n is large enough to include all the commits that you want to cover + 1)	10:31
gloomy	So just to make sure I understand: on my own fork, I do git rebase -i HEAD^36?	10:32
	ah, ok :) (you're faster at typing than me :p )	10:32
	→ zivanovicb joined	10:32
aw1	yes. but please read up on interactive rebase first.	10:32
gloomy	yup. Will do	10:32
	Didn't even know you could rebase on current branch :]	10:33
aw1	that is very nice. I am messy when I develop on personal branch. But before merging I rebase and clean up	10:33
	← nowhere_man left	10:35
	→ nowhere_man joined	10:37
gloomy	So just to make sure I understand: If I have the commits with hashes mine01, mine02, mine03, notmine01, notmine02, mine04, mine05, I only need to do `git rebase -i mine03` and delete the lines that say "pick notmineXX" ?	10:39
	→ pfleck joined	10:44
	→ afuentes joined	10:45
aw1	yes	10:47
	→ lss8 joined	10:47
	→ Noti joined	10:48
aw1	gloomy, better to experiment in a copy branch first (git checkout -b dangerous_experiment mybranch)	10:49
gloomy	yup that's what I'm doing	10:49
	→ Kaisyu joined	10:51
	→ IZh joined	10:53
	← apoos_maximus left	10:53
IZh	Hi! Is it possible to provide a path to a config file to 'git' command? I.e. command line oprion or environment variable like GIT_CONFIG?	10:54
	→ Moult joined	10:55
gloomy	Ok so I did the tests on the test_branch and it worked out, is there a simple way now to make my actual_branch into the test_branch, or should I just repeat the process on actual_branch?	10:55
Moult	i have forked a repo, and instead of creating a new branch to do my work for a PR, i have committed directly to master and pushed to my fork's origin already. how do i undo this mess?	10:55
gloomy	Moult What mess? If you open a PR on the upstream repository it doesn't matter if it's on the 'master' branch of your fork	10:57
_ikke_	if you want to make multiple PRs, it better to keep master alone	10:57
	s/keep/leave/	10:57
Moult	_ikke_: oh hey _ikke_ long time no see	10:57
	_ikke_: yeah i know that was what i intended, to leave master alone, but i accidentally didn't :)	10:58
GoGi	Say I have two branches stable and unstable. Now I want to "backport" some fixes from unstable to stable. How can I add a commit to stable such that git knows that those changes do not have to be applied again when merging unstable later?	10:58
Moult	gloomy: yeah as _ikke_ suggests i want to make multiple PRs	10:58
gloomy	Can't you just make a new fork for that?	10:58
Moult	gloomy: i can, but next time i pull master to get in upstream's changes, my master is contaminated, so i can't branch off that	10:59
	gloomy: instead i'll need to, uh, i guess branch off master before i added my commits, then pull upstream into that branch, then all future PRs go from that new clean master branch?	10:59
	← Makaveli7 left	11:00
gloomy	Or make a new branch from your fork's master (that includes your commits), then revert master to upstream/master I guess	11:00
Moult	gloomy: that sounds good, how do i do that?	11:01
gloomy	But probably wait for someone more experienced to give you advice as I just came here to fix my own mess :-)	11:01
	→ blackmesa1 joined	11:01
gloomy	probably something like `git checkout -b "your_branch_name"`, then `git remote update` and `git reset --hard upstream/master --`	11:03
	uh, first `git checkout master` before the `git reset`	11:04
	See here https://stackoverflow.com/questions/8134960/how-to-revert-master-branch-to-upstream	11:05
	← Puffball left	11:06
Moult	gloomy: ah yeah, git push --force	11:06
	gloomy: that solves it :) should've used the duck-fu :)	11:07
	thanks for the help!	11:07
IZh		11:07
	← IZh left	11:07
gloomy	:)	11:08
	And, aw1, I fixed my mess too, so thanks :-)	11:09
aw1	congrats! :)	11:09
	← pfleck left	11:09
	→ Makaveli7 joined	11:10
	← locrian9 left	11:17
	→ pfleck joined	11:19
	→ Essadon joined	11:20
	← kjartan left	11:20
flashmozzg	Hello. Is there an easy way to cherry-pick the range of commits and automatically squash them (preserving some sort of history message, i.e. at least log the squashed commit names)?	11:20
	← Essadon left	11:20
flashmozzg	Basically something like cherry-pick tag1..tag2, rebase -i tag1, squash everything, but all automated	11:21
	→ Essadon joined	11:21
	→ apoos_maximus joined	11:22
	← esrse left	11:22
dminuoso	flashmozzg: git rebase -i, then do some quick `:%s/pick/s/` in vim?	11:22
osse	flashmozzg: something like: git cherry-pick --no-commit tag1..tag2 && git commit -e -m "$(git log --format=%s tag1..tag2)"	11:22
dminuoso	I know its not exactly a git solution, but it is a solution.. :)	11:23
_ikke_	Moult: hi	11:23
	→ kjartan joined	11:23
	→ aw1_ joined	11:23
	← libertyprime left	11:23
flashmozzg	dminuoso: I't should be run by a script. No human interaction	11:23
dminuoso	Ah then osse's solution would work. :)	11:24
flashmozzg	osse: thanks, looks liek this could work. Does it produce the same description as default squash during rebase? (I guess I'll find out when I try ;P)	11:24
	← aw1 left	11:25
	← Essadon left	11:25
	→ Essadon joined	11:26
	← MACscr left	11:27
	← mona_x left	11:27
	→ MACscr joined	11:28
	→ yvz joined	11:28
	← xcm left	11:28
	→ xcm joined	11:29
	← yvz left	11:32
	→ yvz joined	11:33
	→ jubal_ joined	11:33
	← atrigent left	11:34
	← jubal left	11:35
	← random_yanek left	11:36
	→ random_yanek joined	11:38
	→ KeyJoo joined	11:44
	← lss8 left	11:45
	→ gxt joined	11:47
osse	flashmozzg: no	11:49
	the message is far from complete. if you want this automated thnen maybe something like: -m $'Squash of the following commits:\n\n'"$(git log ...)"	11:50
	← stitched_unicorn left	11:51
	→ setre joined	11:53
setre	how can I begin tracking files hidden with "git update-index --assume-unchanged file	11:53
_ikke_	git update-index --no-assume-unchanged <file>	11:54
setre	I tried git update-index --no-assume-unchanged but the files didn't appear	11:54
	not when I type git status anyway	11:54
_ikke_	Are you sure they have differences	11:54
setre	yeah they do	11:54
_ikke_	git ls-files -v <filename>	11:55
setre	it appears with an S in front of it	11:56
_ikke_	That means skip-worktree	11:56
	← brandonkal left	11:56
_ikke_	so git update-index --no-skip-worktree <file>	11:56
setre	thanks!	11:56
	→ ch1pp0 joined	11:59
	← Zexaron left	12:00
	→ lss8 joined	12:05
	← Makaveli7 left	12:06
	← lss8 left	12:07
	→ lss8 joined	12:08
	← apoos_maximus left	12:12
	→ qswz joined	12:16
qswz	when I do: git log --format=%B origin/master..HEAD	12:16
	there are empty lines	12:16
	how to skip those?	12:17
	← yvz left	12:19
	→ yvz joined	12:19
	← mobile_c left	12:20
qswz	ok my end goal is to have a bash array of those commit messages	12:20
	→ mobile_c joined	12:21
	→ gitinfo joined	12:22
	ChanServ set mode: +o	12:22
	← hofmann3900 left	12:22
	← pfleck left	12:24
	→ nurdie joined	12:24
	← yvz left	12:24
	→ mona_x joined	12:26
	→ yvz joined	12:28
j416	qswz: --log-size is handy for parsing messages	12:30
	not sure whether or not you can easily make use of it in bash.	12:30
_ikke_	j416: TIL	12:31
j416	\^^/	12:31
	← mobile_c left	12:31
_ikke_	You probably can use head -c	12:31
	← shabius left	12:32
	→ mobile_c joined	12:32
j416	ah, yes. perhaps.	12:32
	→ shabius joined	12:32
	→ T_UNIX joined	12:35
	bluesmon1 → bluesmonk	12:36
	← mobile_c left	12:37
osse	qswz: while IFS= read -rd '' msg; do msgs+=("$msg"); done < <(git log --pretty=tformat:%B -z origin/master..HEAD)	12:38
	the message always ends with a newline, though...	12:38
	← prakashdanish left	12:40
osse	maybe you want --format=%s ?	12:40
	→ pfleck joined	12:42
qswz	thanks good point	12:42
	mapfile -t cs < <(git log --format=%s origin/master..HEAD); declare -p cs	12:44
	← Noti left	12:44
	→ TJ- joined	12:44
	→ sylr joined	12:45
	← blackmesa1 left	12:46
sylr	Hi	12:46
	Is there a way to have git describe format output using a semver convention ?	12:47
	v1.0.4-14-g66666f -> v1.0.4+14.g66666f	12:47
	→ mobile_c joined	12:48
qswz	that + is standard?	12:48
	I think - works too	12:48
sylr	To me the "-" represents tags before the v1.0.4	12:50
	like v1.0.4-rc.1	12:50
	I might be wrong though	12:50
	https://semver.org/#spec-item-11	12:52
	1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.	12:52
	0	12:52
karoshii	Hey all - I'm running test.py against all commits on a repo. Runs on mine fine, but I've ran my pals and it's not picking up the latest 3 commits even though I can see them on github? Saying there's only 9 commits when there is infact 12 - anyone think of a reason that would cause this?	12:53
	→ Olipro joined	12:54
	← lss8 left	12:56
	← pfleck left	12:57
karoshii	ah, figured it out nvm.	12:58
	→ niko joined	13:03
	← gloomy left	13:05
	→ Tawonga joined	13:06
	→ blackmesa1 joined	13:09
	→ prakashdanish joined	13:12
	→ gloomy joined	13:12
	→ irrgit joined	13:13
	← inkbottle left	13:15
	→ soee joined	13:17
soee	hi if i rever merge that add 1 new commit to branch do i also have to revfer that commit or reverting merge is enpugh ?	13:18
osse	sylr: I think you have to either do search and replace, or build the string yourself.	13:18
	→ prakashd1 joined	13:19
osse	Even git.git does that	13:19
	I wish git-describe took a small format string	13:19
	← prakashdanish left	13:20
osse	revert is enough	13:21
	→ cfoch joined	13:22
	← blackmesa1 left	13:24
	→ blackmesa1 joined	13:24
	→ Noti joined	13:26
	→ kp__ joined	13:26
	→ pfleck joined	13:28
	→ courrier joined	13:28
	← nurdie left	13:29
	→ nurdie joined	13:30
	→ donofrio joined	13:30
	← blackmesa1 left	13:32
	→ dawik joined	13:32
dawik	hi... how do i reset/revert/checkout a whole directory to a specific specific?	13:32
	any of those would do	13:33
osse	dawik: git checkout commit -- dir	13:33
dawik	thank you -_-	13:33
	← nurdie left	13:34
	← sphalerite left	13:37
	→ fission6 joined	13:37
	← prakashd1 left	13:41
	← pfleck left	13:42
	→ carissimo joined	13:44
	→ nurdie joined	13:49
	→ jast joined	13:50
jast	sorry for another gitinfo downtime, I'm currently working on plans to migrate to different hosting infrastructure but it'll be a few days probably until I can get it done	13:51
	← fakenerd left	13:54
	← nurdie left	13:55
	→ CodeSlingerPaul joined	13:55
	→ sieve joined	14:03
sieve	I am creating new branches with git checkout -b <branch> but I need to check if I am getting a collision with origin.	14:03
	"git fetch —all" is not helping here	14:03
	← n3wborn left	14:04
jast	sieve: do you want to check manually or in a script?	14:05
sieve	jast: in a script	14:05
	→ amosbird joined	14:06
	→ pfleck joined	14:12
	← xcm left	14:13
osse	jast: i demand reparations	14:14
	→ xcm joined	14:14
jast	sieve: you can either: a) fetch and check `git rev-parse --verify -q refs/remotes/origin/mylittlebranch`; b) check whether this outputs anything: `git ls-remote origin refs/heads/mylittlebranch`	14:15
	osse: okay, I'll refund you 20% of this month's payments you made to me	14:15
osse	Sounds good	14:16
jast	done!	14:16
osse	hey waaaaaaaiiit a minute	14:16
	why you little..! {homer voice}	14:16
	← tchan left	14:16
jast	you get what you pay for!	14:16
	← sieve left	14:21
	→ ansyeb joined	14:22
ansyeb	hello. anyone using gitlab here? gitlab IRC channel is pretty much dead	14:22
jast	no promises we can help :)	14:22
	← andrzejv left	14:23
	→ tmm88 joined	14:23
ansyeb	) I am changing my gitlab-ci, syntax is fine it gets commited. but when i "retry" failed job it still tries to execute "old" actions	14:23
	as if it were using old gitlab-ci ..?	14:24
	→ blackmesa1 joined	14:25
	→ jesopo joined	14:25
jast	have you pushed the new CI config? normally that should automatically trigger a new build	14:25
ansyeb	well when I press commit changes, doesnt it automatically do that?	14:28
	it start a job that succeeds	14:28
jast	oh, you edited it directly on the gitlab website?	14:28
	yeah, that's the same as committing and pushing in a local repo	14:28
	← mobile_c left	14:28
jast	anyway, AFAIK "retry" on a old job re-uses the old repo contents	14:29
	basicaly "repeat the exact same thing as before"	14:29
	→ mobile_c joined	14:29
ansyeb	so how do I test old job but with the new ci config?	14:30
jast	what's different in the old job, apart from the old config?	14:30
ansyeb	I guess nothing	14:31
jast	I don't think the idea behind gitlab's CI is to let you retroactively "fix" an old job	14:31
	other CI systems like Jenkins don't really do it that way, either... if a job failed, you fix stuff and then start a new job	14:32
_ikke_	Right, you need to start a new job, the retry is more when external factors caused the build to fail	14:32
	coldaemon1 → coldaemon	14:33
	→ ngui_ joined	14:33
ansyeb	oh, ok	14:34
	→ czart joined	14:34
ansyeb	can I copy old job somehow?	14:34
	to quickly be able to start new ones etc	14:35
jast	I don't know, I've never used gitlab CI that way	14:35
	← ngui left	14:36
	ngui_ → ngui	14:36
	→ sphalerite joined	14:36
_ikke_	copying a job does not really make sense	14:36
	→ tchan joined	14:36
_ikke_	You can manually start a job based on a certain branch or commit	14:37
ansyeb	kk	14:37
	← yyy left	14:41
	→ yyy joined	14:41
	→ jungsubk joined	14:42
	← keepLearning512 left	14:44
	← staafl left	14:47
	← SpeakerToMeat left	14:47
	← KeyJoo left	14:48
ansyeb	ok, i have red https://docs.gitlab.com/ee/ci/pipelines.html and watched a video. still didnt get it. how do I start a job for a given branch?	14:48
	→ staafl joined	14:48
_ikke_	A job starts when you push new changes to that branch	14:48
ansyeb	found pipeline with a number, that failed stage. I can press "retry" there too. and it still uses old config ....	14:49
	but what if I dont have any changes. can I emulate that? is that the only way to start a job?	14:49
_ikke_	ansyeb: You can go to pipelines, there is a green button called 'Run Pileline'	14:49
ansyeb	is there a search?	14:50
_ikke_	But like jast said, running the pipeline again with the same configuration and commit won't fix it	14:50
	search?	14:50
ansyeb	oh, then that makes no sence	14:50
	sense*	14:50
	I need to fix	14:50
	→ lacrymology joined	14:50
ansyeb	so only pushing new changes will creatre new job?	14:50
	and theres literally no other way to test new gitlab-ci.yml config??	14:51
	← jungsubk left	14:51
	← courrier left	14:52
	← Noti left	14:53
ansyeb	I need to install git, make a repo clone on my machine etc etc?? all that to just fix the config lol?	14:54
	→ mikecmpb_ joined	14:55
	← mikecmpbll left	14:55
j416	where's gitlab-ci.yml stored?	14:55
dawik	isn't the config versioned?	14:55
j416	^	14:55
	so you'd need a new commit to update the config anyway.	14:56
	> From version 7.12, GitLab CI uses a YAML file (.gitlab-ci.yml) for the project configuration. It is placed in the root of your repository and contains definitions of how your project should be built. ( https://docs.gitlab.com/ee/ci/yaml/ )	14:57
	→ boombatower joined	14:57
	→ fakenerd joined	15:04
	← rafalcpp left	15:04
	← queip left	15:04
	← gloomy left	15:06
_ikke_	correct	15:07
	→ mobile_c_ joined	15:08
jast	ansyeb: no, editing the config on the gitlab website will create a commit there and should launch a job, too	15:08
	← mobile_c left	15:08
	← pfleck left	15:08
ansyeb	oh man	15:11
	I actually just pulled the project locally	15:11
	added a file, committed, git push origin BRANCH	15:11
	it gave me a link to gitlab	15:11
	I entered, made a "manual action"(accepted merge request?)	15:12
	aaaaand .. in log it still tried to use olg gitlab-ci.yml wtf	15:12
	← yvz left	15:12
	→ gloomy joined	15:12
ansyeb	oh wait	15:13
	each branch has its own gitlab-ci.yml????	15:13
_ikke_	more or less, yes	15:13
ansyeb	omg	15:13
	man	15:13
	that clarifies alot, but wow	15:13
	is it cloned from the main repo when branch is first created?	15:14
_ikke_	There is not need for cloning	15:14
	no*	15:14
	when you create a branch, you start with the same set of files	15:14
	Then you make changes to files, which only happen on that branch	15:14
	so when you push that branch, it uses the .gitlab-ci.yml as it is in that branch	15:15
	but the one from master remains unchanged	15:15
j416	ansyeb: each branch will have its own gitlab-ci.yml; when you create a branch it will get the same config as whatever branch you based it off of; if you merge a branch into another the config will merge too.	15:15
_ikke_	untill you merge back	15:15
ansyeb	oh. thanks alot	15:15
j416	ansyeb: it's just like any other file.	15:15
ansyeb	for the explanatinos	15:15
	← fission6 left	15:16
ansyeb	so If I change that file now	15:17
	can I retry job for this branch?	15:17
	will it use the new one?	15:17
	→ Silenced joined	15:17
	← tmm88 left	15:19
	← sylr left	15:21
_ikke_	If you change the file, commit it, and push that commit, yes it will use that version	15:21
	→ pfleck joined	15:24
mns	There is a new branch in the remote, and I want to check that out, how do I do that ? git checkout -b origin/new-brnach ?	15:25
	← TJ- left	15:25
	→ rafalcpp joined	15:25
ansyeb	even without origin and -b it should work?	15:26
	→ fission6 joined	15:27
_ikke_	git checkout new-branch	15:28
	is what ansyeb refers to	15:28
	← apteryx left	15:28
	→ cswl joined	15:28
	→ TheRuckus joined	15:29
	← T_UNIX left	15:29
	→ novum joined	15:29
	→ queip joined	15:30
	← kjartan left	15:31
	← TheRuckus left	15:32
	→ renich joined	15:32
mns	_ikke_: thanks. do I need to do a "git fetch" before the checkout ?	15:33
	→ TheRuckus joined	15:33
_ikke_	if you didn't do that already, yes	15:34
mns	_ikke_: got it, thanks.	15:34
	← gloomy left	15:35
_ikke_	mns: note that this is git basically automatically guessing what you mean	15:36
	→ kjartan joined	15:36
_ikke_	if you have more than one remote with the same branch name, it won't work for example	15:36
	→ darkbit joined	15:37
mns	In that case I would need to specify which remote I'm working with so it would be "git fetch ; git checkout remote/new-branch" ye s?	15:40
_ikke_	no	15:40
	→ thiago joined	15:40
_ikke_	git checkout -b new-branch remote/new-branch or git checkout -t remote/new-branch	15:40
mns	ahh ok	15:41
	← fission6 left	15:42
mns	got it. thanks.	15:42
_ikke_	git checkout remote/new-branch would checkout that commit (detached HEAD)	15:43
	← blackmesa1 left	15:44
	→ keepLearning512 joined	15:45
	← fakenerd left	15:45
	← interrobangd left	15:47
	→ millerti joined	15:47
	→ gloomy joined	15:47
	→ Envil joined	15:48
	→ tmm88 joined	15:49
	→ yvz joined	15:51
	← igemnace left	15:51
	→ fission6 joined	15:51
	→ moei joined	15:52
	→ mizu_no_oto joined	15:53
	← sQVe left	15:53
	← pfleck left	15:54
	→ pfleck joined	15:54
	← keepLearning512 left	15:55
	← tmm88 left	15:56
	→ GreenJello joined	15:57
	→ gloomy_ joined	15:58
	← gloomy left	15:58
	← novum left	15:58
	← mizu_no_oto left	15:59
	→ jungsubk joined	16:01
	→ musclez joined	16:02
	← jungsubk left	16:04
	← fission6 left	16:04
	← mona_x left	16:05
	→ apoos_maximus joined	16:05
ansyeb	@_ikke_, hard to believe but I fixed everything, all the branches, deploys etc. thank you guys	16:07
	→ fission6 joined	16:07
_ikke_	ansyeb: \o/	16:09
	← sanscoeur left	16:10
	→ LissajousPattern joined	16:14
j416	\^^/	16:15
	← jast left	16:17
	→ sieve joined	16:17
	← LissajousPattern left	16:20
	→ jast joined	16:20
	← cd left	16:22
	→ Toadisattva joined	16:23
	← Toadisattva left	16:24
	→ jordanthedev joined	16:25
	→ AbleBacon joined	16:25
	→ orbyt_ joined	16:26
	→ cd joined	16:26
	→ Regon joined	16:27
	← Silmarilion left	16:29
	→ gloomy joined	16:30
	← gloomy_ left	16:30
	← pfleck left	16:31
	→ Inline joined	16:33
	← chele left	16:34
	← Inline left	16:34
	← thiago left	16:34
	→ Inline joined	16:35
	renich → Renich	16:37
	Renich → renich	16:37
	→ al-damiri joined	16:41
	← afuentes left	16:42
	→ Mattiaslndstrm joined	16:42
	→ pfleck joined	16:45
	→ cagmz joined	16:45
	→ mona_x joined	16:47
	→ lucasb joined	16:51
	→ \void joined	16:51
cagmz	I've branched off of master and commits A -> B -> C -> D. I'd like to create a new branch off of master containing only changes from commits C and D. How would I do this?	16:53
_ikke_	Do you want C and D to also remaint in that first branch?	16:53
GreenJello	cagmz, you can make a new branch off master and cherry-pick the desired commits into it	16:54
	you just need their sha's	16:54
	→ nurdie joined	16:55
cagmz	_ikke_: yeah, I want the first branch to stay as-is	16:55
_ikke_	then what GreenJello suggests	16:55
	→ gloomy_ joined	16:59
	← Mattiaslndstrm left	17:00
	← Revan- left	17:00
	← gloomy left	17:01
	→ Revan- joined	17:01
	→ AtumT joined	17:06
	→ Mattiaslndstrm joined	17:08
	← mooasaurus left	17:09
	→ mimajof joined	17:11
tobiasBora	Hello,	17:13
	I need in a script to simulate a fetch. So I would like to find a way to temporary work on another branch without disturbing the current work, is that possible?	17:14
	← netj left	17:14
tobiasBora	I was thinking to use "git stack push" and "git stack pop" before/after my git checkout, but I don't know if it's the best way to proceed.	17:14
	→ netj joined	17:15
	← pfleck left	17:15
tobiasBora	stash*	17:15
	← jgkamat left	17:15
tobiasBora	However, I'm affraid to have "dirty cases" where the file that I may touch in the other branch may edit the file on the initial working directory...	17:17
_ikke_	tobiasBora: a fetch does not touch 'local' ranches	17:17
	branches*	17:17
tobiasBora	_ikke_: ok, then maybe in fact this branch also simulate the fetch... But I'm not sure. To put thing easier, let's just say that I'd like my script to edit some other branch, and come back to the initial branch afterward, without modifying anything on the working tree	17:19
	→ mat001 joined	17:19
	← blackntan left	17:23
	→ thiago joined	17:23
	→ cdown joined	17:24
	→ keepLearning512 joined	17:25
	← fission6 left	17:25
	→ blackntan joined	17:25
	→ blackmesa1 joined	17:25
mimajof	Hello everybody, I need to install git 2.20.1 for Windows silently on some workstations and have two questions regarding the default installer: 1) can I somehow disable the installation of the (deprecated) git-cmd.exe? Didn't find any option in the grafical installer nor for the inf-file. 2) the Git-GUI isn't in system language (and I didn't find any 'msgs'-folder in the installation path. Is there support for languages other than english i	17:27
	n git 2.20.1 and how can I enable it?	17:27
	← Revan- left	17:27
	← blackmesa1 left	17:29
	→ Revan- joined	17:29
	→ remcycles joined	17:30
	→ gloomy joined	17:30
	→ blackmesa1 joined	17:30
	← Kaisyu left	17:30
	← gloomy_ left	17:31
	← blackntan left	17:31
	← sieve left	17:33
	→ blackntan joined	17:34
	← blackntan left	17:35
	→ blackntan joined	17:35
	→ sieve joined	17:36
	← blackntan left	17:38
tobiasBora	Ok, so I've an example where stash push/pop does not behave as expected	17:39
	If on master I create a file a.txt, and put some stuff inside	17:39
	but I don't add this file	17:39
	, after a git stash push, nothing happens	17:40
	git checkout myotherbranch	17:40
	va alors m'envoyer sur l'autre branche, et si je modifie a.txt + ajoute à cette branche, un git checkout master + git stash pop va me faire disparaitre le fichier	17:40
	← musclez left	17:42
dminuoso	tobiasBora: You can use '--all' if you want to include absolutely everything, including untracked files	17:42
	→ mowcat joined	17:42
tobiasBora	dminuoso: where?	17:42
	on stash?	17:42
flashmozzg	Hello. Anyone familiar with git-p4?	17:42
_ikke_	never used perforce, let alone git-p4	17:43
tobiasBora	dminuoso: that works great thanks!	17:44
	← mikecmpb_ left	17:47
	← dex1983 left	17:49
	→ jrnieder joined	17:51
	→ fission6 joined	17:52
	→ sanscoeur joined	17:56
	← sanscoeur left	17:56
	→ sanscoeur joined	17:56
	← yyy left	17:57
	→ gloomy_ joined	17:58
	← flashmozzg left	17:58
	← benharri left	17:59
	← mowcat left	18:00
	← gloomy left	18:00
	← ChrisLane left	18:03
	→ sanscoeu_ joined	18:03
	→ ChrisLane joined	18:04
	← alyptik left	18:05
cagmz	Say I have commits A -> B -> C -> D on master. If I want to cherry pick C and D, does the order matter if they are atomic (not related to each other)?	18:07
	← sanscoeur left	18:07
	← BrainWork left	18:08
	→ dex198316 joined	18:10
	→ LionsMane joined	18:11
	← gxt left	18:11
	→ BrainWork joined	18:11
	← keepLearning512 left	18:12
	← fission6 left	18:12
	← yvz left	18:12
tobiasBora	Is it possible to force a git stash push even if no modification were made?	18:12
	→ wootehfoot joined	18:13
	← LionsMane left	18:14
	→ dmc joined	18:15
	← eset left	18:15
	← dex198316 left	18:20
	→ TJ- joined	18:23
	→ courrier joined	18:23
	→ pfleck joined	18:25
	→ Nixew joined	18:26
	→ fission6 joined	18:28
	← sieve left	18:29
nedbat	cagmz: you can cherry-pick them in either order	18:30
	→ leeN joined	18:32
	← leeN left	18:33
	← mimajof left	18:33
	← apoos_maximus left	18:34
	← venmx left	18:34
_ikke_	tobiasBora: no, that does not make sense	18:37
	→ leeN joined	18:37
	← qqx left	18:39
	→ inkbottle joined	18:39
	→ qqx joined	18:39
	← pfleck left	18:39
	→ freeman42x joined	18:40
	← dmc left	18:42
	← mona_x left	18:42
	← zivanovicb left	18:43
	→ brainproxy joined	18:43
	→ pfleck joined	18:44
	→ dmc joined	18:46
	← kerframil left	18:48
nedbat	tobiasBora: tell us more about why you'd want an empty stash?	18:50
	→ sauercrowd joined	18:52
	→ r1ch joined	18:52
	→ mona_x joined	18:52
	→ gxt joined	18:53
	→ Siecje joined	18:55
Siecje	How do you specify a file has been moved when you have also modified it.	18:55
	→ libertyprime joined	18:55
	→ Darcidride joined	18:56
j416	you don't	18:56
	if you move it first, commit that, then modify it, that'll give git a better chance at figuring out it was moved.	18:57
osse	changing a few lines should be ok. for example if the file has some relative paths in it	18:57
j416	if you modify it just a little then that'll be fine mostly. You can specify the rename detection threshold using the -M flag for git-diff and friends.	18:57
osse	any way, to answer the question: git mv	18:58
Siecje	Well I commented out a large part of it.	18:58
	← AtumT left	18:58
	← sauercrowd left	18:58
j416	then that'd probably mess up the rename detection a bit	18:58
	try making logical commits	18:58
	remarking code and renaming a file seems like two separate things.	18:58
	→ AtumT joined	18:59
	← TheRuckus left	19:00
	→ ngui_ joined	19:01
	→ sauercrowd joined	19:02
	← quite left	19:03
	← ngui left	19:03
	ngui_ → ngui	19:03
	→ quite joined	19:04
	→ Sasazuka joined	19:04
	→ akushner joined	19:07
	← Regon left	19:09
	→ AtumT_ joined	19:12
	← AtumT left	19:13
wadadli	how do I move the base of a branch to be a new commit?	19:15
	→ AtumT joined	19:15
wadadli	say I was workin gon a branch, did some prs and then merged it	19:15
	if I go do further work on that branch and then open a pr it has all the commits.	19:15
	I wanna move the base of the branch to be the HEAD on master	19:16
_ikke_	git checkout <branch>; git merge --ff-only master	19:16
	← AtumT_ left	19:17
wadadli	hm..	19:17
	← AtumT left	19:18
	← manuelschneid3r left	19:18
	→ manuelschneid3r joined	19:18
	→ AtumT joined	19:19
	← furrymcgee left	19:19
	← BrainWork left	19:19
	← manuelschneid3r left	19:22
	→ errst joined	19:22
errst	hi everyone	19:22
gitinfo	errst: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	19:22
	→ plexigras joined	19:22
	→ manuelschneid3r joined	19:22
errst	how can i see only commit differences between two branches? e.g., which commits that i've in develop but not in the master branch	19:23
	→ aw1__ joined	19:23
	← aw1__ left	19:24
errst	i've tried git log but it didnt work for me	19:24
_ikke_	git log --oneline master..develop	19:24
	→ Arcaelyx joined	19:24
errst	at work, we do git rebase and when we'd like to deploy changes we do cherry pick from develop to master	19:25
	_ikke_, it didnt work, i've saw multiple same commit messages when doing so	19:25
	← aw1_ left	19:26
	→ mra90 joined	19:26
errst	i've tried git log --no-merges develop ^master, again it didnt work	19:26
	← Trieste left	19:26
_ikke_	9Is your history that complex?	19:27
	← bwn left	19:27
errst	yes _ikke_	19:27
	→ alyptik joined	19:27
	← r1ch left	19:28
	→ Trieste joined	19:29
	← pfleck left	19:30
	→ kerframil joined	19:33
	→ r1ch joined	19:33
	← gthm left	19:33
	← dilfridge left	19:35
	← kerframil left	19:38
	→ dilfridge joined	19:38
	← AtumT left	19:38
	← czart left	19:39
	→ pfleck joined	19:41
	← gxt left	19:42
	→ mikepack joined	19:42
	← mikepack left	19:43
	→ AtumT joined	19:44
	→ gxt joined	19:44
	← bluesmonk left	19:44
	→ Dougie187 joined	19:45
tobiasBora	_ikke_: nedbat : Well I would like to do an empty stash for the following reason:	19:45
	← libertyprime left	19:46
tobiasBora	I have an external website that I need to follow, but with "as it" it does not provide a git bridge	19:46
	← Envil left	19:46
	← AtumT left	19:47
	→ AtumT joined	19:47
tobiasBora	so the idea is to have a branch for this website, and when the user type a given command, my script stash everything, goes to the website branch, download the content from the website, add/commit it, comes back to the original branch, and stash pop to come back to the original state	19:47
	→ basteh joined	19:48
nedbat	tobiasBora: your script can check if there is anything to stash	19:48
tobiasBora	but there is a problem here: if nothing has been modified by the user, "git stash push --all" won't produce any stash, and therefore stash pop will either fail, or pop a wrong and older stash	19:48
	nedbat: I wanted to avoid to parse git command, but if it's the only solution I'll go for that	19:49
	nedbat: by the way what is the good way (I'm using GitPython if it can help) to check if "git stash push --all" will push something? I was thinking to first run "git stash list", then run the push, and run again with "git stash list" to see if anything changed, but maybe there is a better way?	19:50
nedbat	tobiasBora: i would think a "git status" would be the way to see if files are changed	19:50
	← inkbottle left	19:51
nedbat	tobiasBora: google indicates that this is what you want: https://gitpython.readthedocs.io/en/stable/tutorial.html#obtaining-diff-information	19:51
	→ LionsMane joined	19:55
	← sanscoeu_ left	19:55
tobiasBora	nedbat: well it seems that this diff does not take into account the files that are not added in git already...	19:56
	→ sanscoeur joined	19:56
	→ libertyprime joined	19:56
tobiasBora	like git status gives me "Untracked files: hello.txt"	19:56
	← alyptik left	19:56
tobiasBora	but r.index.diff(None) is []	19:56
	maybe repo.untracked_files	19:57
	→ inkbottle joined	19:57
	← Mattiaslndstrm left	19:58
tobiasBora	So I guess that both "repo.untracked_files + repo.index.diff(None)" should be enough... But how can I be sure that I didn't forgot anything?	19:58
grawity	diff always ignores untracked files, but you can track placeholders with `git add --intent-to-add`	19:58
	← xcm left	19:59
	→ xcm joined	19:59
	← qswz left	19:59
	→ Silmarilion joined	20:00
	→ Mattiaslndstrm joined	20:00
tobiasBora	nedbat: another example where this does not work: "git mv" is not displayed in r.index.diff(None) but it seems to appear in repo.head.commit.diff(None)	20:00
	and actually I don't get the difference between the two files	20:00
nedbat	tobiasBora: i don't know much about GitPython	20:01
	← cdown left	20:01
nedbat	tobiasBora: i know that git can be used from programs, and that you are looking for something like "git status"	20:01
grawity	`git status --porcelain`, if you're doing it from a script	20:02
tobiasBora	nedbat: Ok thanks. But maybe you can help me to understand the sentence "diff tree against working tree" vs "diff index against working copy"	20:02
nedbat	tobiasBora: working tree and working copy are the same.	20:03
	tobiasBora: do you know what the index is?	20:03
	→ cdown joined	20:03
	← pfleck left	20:07
tobiasBora	nedbat: I used to know, but I forgot a bit, if I'm right it's like the list of all files and the associated hash for all the three "version" that may be in staging area, HEAD, and working copy?	20:08
	← staafl left	20:10
	→ atrigent joined	20:12
	← Mattiaslndstrm left	20:12
	→ sieve joined	20:12
	→ Mattiaslndstrm joined	20:12
	→ kerframil joined	20:13
	← cagmz left	20:14
	→ Wetmelon joined	20:16
	← devster31 left	20:16
	← carissimo left	20:16
	→ alyptik joined	20:17
	→ fstd_ joined	20:21
	→ staafl joined	20:23
	← inkbottle left	20:23
	← cswl left	20:24
	← fstd left	20:25
	fstd_ → fstd	20:25
	→ _noblegas joined	20:25
	← sjoshi left	20:27
	→ sjoshi joined	20:29
	→ devster31 joined	20:29
	← dilfridge left	20:29
	← errst left	20:30
	→ fattredd joined	20:32
	→ yyy joined	20:34
	→ ah364 joined	20:38
	← Mattiaslndstrm left	20:39
	← geekodour08 left	20:39
	← ah364 left	20:39
	→ geekodour08 joined	20:39
	← r1ch left	20:40
	→ dilfridge joined	20:40
	← Nixew left	20:41
	→ ah364 joined	20:44
	→ mowcat joined	20:44
	→ Regon joined	20:45
	← averell left	20:45
fattredd	I'm trying to setup a submodule that is nested inside of my working dir. Here's the issue I'm having: http://ix.io/1z3D	20:46
	→ m0viefreak joined	20:47
	→ averell joined	20:48
fattredd	crap. I meant this: o/1z3D	20:48
	http://ix.io/1z3F	20:48
	← ah364 left	20:48
fattredd	good lord. I'm falling apart	20:48
	→ ah364 joined	20:49
	← jstimm left	20:50
	→ sanscoeu_ joined	20:51
	← lucasb left	20:51
mra90	is there a difference between git add and git -a	20:53
	?	20:53
	→ vavkamil joined	20:53
kadoban	mra90: Other than the second one doesn't seem to exist?	20:54
	→ navidr joined	20:54
	← sanscoeur left	20:54
	← kerframil left	20:56
	← bsaboia left	20:56
	→ bsaboia joined	20:56
	← PacKetSlayer left	20:57
	← bookworm left	20:58
	→ PacKetSlayer joined	20:58
	→ bookworm joined	20:58
	→ pfleck joined	20:59
	← plexigras left	20:59
	← random_yanek left	20:59
	→ Whiskey joined	21:00
	→ hofmann3900 joined	21:00
	→ plexigras joined	21:00
	→ kerframil joined	21:02
	→ n3wborn joined	21:03
	→ mdk joined	21:04
	← n3wborn left	21:04
	→ n3wborn joined	21:04
	← satifant left	21:09
	← Silenced left	21:09
	← mat001 left	21:10
	→ random_yanek joined	21:11
	← devster31 left	21:12
	→ mat001 joined	21:12
	→ mobile_c joined	21:15
	← mobile_c_ left	21:16
	← mona_x left	21:17
	← ah364 left	21:17
	← pfleck left	21:18
	→ YuGiOhJCJ joined	21:19
	← elichai2 left	21:20
	← errr left	21:23
	← fattredd left	21:24
	← mobile_c left	21:24
	→ devster31 joined	21:26
	→ mooasaurus joined	21:29
	← blackmesa1 left	21:32
	← flying_sausages left	21:33
	← leeN left	21:34
	→ metrixx joined	21:35
	← akushner left	21:37
	← metrixx_ left	21:39
	→ satifant joined	21:39
	→ akushner joined	21:39
	→ mat001_ joined	21:41
	← Silmarilion left	21:44
	← mat001 left	21:44
	← sanscoeu_ left	21:46
	→ sanscoeur joined	21:47
	← sieve left	21:47
	← im0nde left	21:47
	← cdown left	21:47
	→ cdown joined	21:48
	→ errr joined	21:48
	→ snowgoggles joined	21:53
	← courrier left	21:54
tobiasBora	Hello,	21:54
	← lacrymology left	21:56
tobiasBora	I'd like to know, I'd like to "git rm" all the files that are tracked, what is the best way to do that?	21:57
	→ brandonkal joined	21:59
	→ flying_sausages joined	21:59
tobiasBora	(I don't have a single shot command, that does not involve bash like https://superuser.com/questions/442625/git-delete-all-tracked-files)	21:59
	← hofmann3900 left	22:01
	← plexigras left	22:01
	→ im0nde joined	22:01
	→ henriquev joined	22:01
	→ fragamus joined	22:04
	← Siecje left	22:08
	→ venmx joined	22:10
	→ r1ch joined	22:12
	← xcm left	22:13
	→ xcm joined	22:13
	← Dougie187 left	22:13
	← kerframil left	22:13
	→ Mattiaslndstrm joined	22:15
	→ sieve joined	22:15
	→ hofmann3900 joined	22:20
	← cfoch left	22:21
	← sieve left	22:21
	← diogenese left	22:26
	← Mattiaslndstrm left	22:26
	← Darcidride left	22:27
	← nurdie left	22:28
	← AbleBacon left	22:29
	→ nurdie joined	22:29
	→ benharri joined	22:29
	→ diogenese joined	22:29
	→ Zexaron joined	22:32
	← _noblegas left	22:33
	← nurdie left	22:34
j416	tobiasBora: git rm -r .	22:34
	make sure you have a backup just in case.	22:35
	← keiser left	22:38
	← fragamus left	22:40
	← n3wborn left	22:41
	→ n3wborn joined	22:43
	← dilfridge left	22:43
	← atrigent left	22:45
	← metrixx left	22:47
	→ RoriconKnight joined	22:49
tobiasBora	j416: great thank you!	22:49
	Can I join that with "git add -A"	22:49
	(after a cp)	22:50
	→ dilfridge joined	22:50
	← wootehfoot left	22:50
j416	what would you expect that to do	22:51
	you just remove the files	22:51
	removed*	22:51
	you probably mean 'git reset --hard'.	22:51
	← gloomy_ left	22:53
tobiasBora	j416: Well basically I have a zip file that contain the new "version"	22:54
	and I'd like to remove all files from the current version, and then move the files from the zip file on the working tree and all them all	22:55
	the only thing is that the zip file may be already in the working tree under ".svg", so I don't want 'git reset --hard' to remove this folder, that's why I was doing "git rm -r ."	22:56
	→ gloomy joined	22:57
j416	I don't follow.	22:57
	← justanotheruser left	22:57
j416	as we learnt just a few hours ago in this channel, don't have untracked files that you care about.	22:57
	and definitely don't add them to your ignore/exclude list.	22:58
	as long as you have a backup all is ok, no?	22:58
	just try.	22:58
tobiasBora	j416: Well I've a given project on my repo. I received a new version from a zip file. I put this zip file in .svg and extract here there. I would like to keep this .svg in case of a bug that would lose everything.	22:59
j416	a new version of what	22:59
	and how did you put a zip file in an svg	22:59
tobiasBora	j416: Well I'm asking because it's for a script, so if I try manually I may forget some special cases	22:59
j416	sorry I don't follow	22:59
tobiasBora	j416: oh ^^	22:59
	.svg is the name of the folder where I put my saved files	22:59
	maybe the name is not clear, it's derived from french ^^	23:00
j416	commit it then	23:00
	if you care about it	23:00
	if it's committed it'll be easier to get back if you do something wrong	23:00
tobiasBora	j416: I don't really care. I just want to have a backup in case something goes wrong, and this may not be located directly in the repo...	23:00
j416	if it's not committed, most of the time you're out of luck unless you have a backup outside of git	23:00
	!backup	23:01
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	23:01
tobiasBora	j416: The thing is that this zip files will be already in git, so I don't see the point to have two differents backups in git.	23:01
	But I want to keep them in case something goes wrong during the sync, so that I have very small changes to lose stuff	23:02
	→ justanotheruser joined	23:03
j416	so commit it or take a backup of the entire repo and work tree	23:03
	← iam730 left	23:03
j416	or both for that matter	23:03
tobiasBora	and also the second reason why I don't want to git them is that in my project design, the branch are synced with an online service, and this service won't accept too large files, so no zip basically.	23:03
	← navidr left	23:04
	← TikityTik left	23:04
tobiasBora	but for now I don't have any valuable items, I'm just testing my script	23:04
	and trying to find efficient way to proceed that won't break if someone uses the script in an unusual manner.	23:05
	→ iam730 joined	23:05
j416	you don't need to push the ref just because you committed something	23:06
	→ TikityTik joined	23:06
j416	commits are local.	23:06
	unless you have a weird commit hook, of course.	23:07
	← dilfridge left	23:07
tobiasBora	j416: sure, but my process is a bit more complicated, and the whole goal of this project is exactly to do this push at some point.	23:09
	← iam730 left	23:09
tobiasBora	but actually if I can do that then I may be interested to git them:	23:09
	← MACscr left	23:09
tobiasBora	nevermind	23:10
	well, if I could have an equivalent of releases (like in github) inside git, it could be interesting, else it won't fit in my project smoothly	23:11
	← TJ- left	23:11
j416	I don't understand what you want to do.	23:11
	I thought you wanted to try something out and have a plan B in case it doesn't work out. A backup seems like it'd provide that plan B perfectly.	23:12
	← sauercrowd left	23:12
	← Phylock left	23:13
	← r1ch left	23:14
	→ iam730 joined	23:15
tobiasBora	j416: no no	23:15
	I don't mind plan B	23:15
	I just want to find the easier way to replace basically a project with another	23:16
	so for now I'm planning to do "git rm -r -f ."	23:16
	then copy the new project	23:16
	and then:	23:16
	→ blackntan joined	23:16
	→ Kaisyu joined	23:17
	← blackntan left	23:17
tobiasBora	"git add --all -- :!.svg"	23:17
	→ r1ch joined	23:17
tobiasBora	sorry:	23:17
	"git add --all -- :!.svg"	23:17
	"git add --all -- :!.svg/*"	23:17
	is it a good way to proceed or not?	23:18
	← Zexaron left	23:18
	← iam730 left	23:19
j416	sorry, I don't understand what you're trying to do.	23:20
	→ iam730 joined	23:20
j416	make a backup, try it.	23:20
	← iam730 left	23:20
tobiasBora	ok nevermind, thanks anyway	23:20
	← fission6 left	23:21
	→ iam730 joined	23:21
	→ igemnace joined	23:23
	→ kerframil joined	23:23
	← dege left	23:24
	← r1ch left	23:25
	← CodeSlingerPaul left	23:27
	→ r1ch joined	23:27
	← iam730 left	23:27
	→ iam730 joined	23:27
	← r1ch left	23:30
	→ pionen joined	23:30
	← mra90 left	23:31
	← venmx left	23:32
	→ irqq joined	23:35
	← cliluw left	23:35
	← irqq left	23:35
	→ irqq joined	23:37
	→ cliluw joined	23:37
	← basteh left	23:38
	← mat001_ left	23:45
	← Regon left	23:48
	← shabius left	23:49
	→ mat001 joined	23:50
	← orbyt_ left	23:50
	→ shabius joined	23:51
TikityTik	how do i move my working directory to an existing branch?	23:52
	← kjartan left	23:52
TikityTik	so i can make a commit there?	23:53
	→ kjartan joined	23:57
tobiasBora	TikityTik: I'm not a professionnal, but I'd use stash	23:58
	git stash push --all	23:58
	git checkout <your branch>	23:59
TikityTik	too much wasted movements, i want to move my changes to an existing local branch	23:59
tobiasBora	git stash pop	23:59

Logs Search ←Prev date Next date→

Channels Documentation