IRCloggy #git 2019-04-18

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-04-18
	← de-facto left	00:01
	→ de-facto joined	00:01
	← wald0 left	00:05
	← tuxd00d left	00:19
	→ Valeyard joined	00:20
	→ ferdna joined	00:24
	← fassl left	00:24
	← jrnieder left	00:24
	← jcbitter left	00:24
	← eblip left	00:25
	← eb0t left	00:25
	→ jcbitter joined	00:25
	← steven__ left	00:26
	→ eblip joined	00:27
	→ eb0t joined	00:27
amosbird	Hi, what's the right way to reverse a patch?	00:27
bremner	with git revert, usually	00:28
	← nic-hartley left	00:28
amosbird	https://la.wentropy.com/b5FQ	00:28
	→ libertyprime joined	00:28
amosbird	by reverting, I mean create a new patch reverting this one	00:29
rafasc	amosbird: you can apply -R	00:29
	→ shicks2525 joined	00:30
	← jcbitter left	00:32
	→ jcbitter joined	00:34
	← dpyro left	00:34
	→ dpyro joined	00:35
	← manuelschneid3r left	00:37
	← Valeyard left	00:38
	→ breakingsad joined	00:42
	← PettanShoutaKun left	00:45
	← ayjay_t left	00:48
	← millerti left	00:50
	← duderonomy left	00:50
	→ Enphuego joined	00:50
	→ sunrunner20_ joined	00:53
	→ ghoti_ joined	00:54
	→ Hobbyboy\|BNC joined	00:54
	→ papcx8 joined	00:54
	→ jleclanche_ joined	00:54
	→ palra_ joined	00:55
	→ Fenhl_ joined	00:55
	→ sborza_ joined	00:55
	→ frecklealex_ joined	00:55
	→ kutenai_ joined	00:55
	→ jsatk_ joined	00:55
	← Celelibi left	00:55
	→ Celelibi_ joined	00:55
	→ dustinm- joined	00:55
	→ qqx_ joined	00:56
	Celelibi_ → Celelibi	00:56
	→ Bigcheese_ joined	00:56
	→ AmShaegar_ joined	00:56
	← mat001 left	00:57
	→ nurdie joined	00:57
	← sud0 left	00:57
	→ sud0 joined	00:57
	→ waveclaw_ joined	00:57
	→ j7k6_ joined	00:58
	→ mikap joined	00:58
	← veremitz left	00:58
	→ Peng__ joined	00:58
	→ netwoodle joined	00:59
	→ miczac joined	01:00
	→ hexagoxe- joined	01:01
	→ hexnewbie_ joined	01:01
	→ nextloop_ joined	01:01
	→ lghtstkr joined	01:02
	→ polyrob_ joined	01:02
	← yuriii left	01:02
	← AmShaegar left	01:02
	← waveclaw left	01:02
	← jleclanche left	01:02
	← kutenai left	01:02
	← palra left	01:02
	← frecklealex left	01:02
	← pulkit25 left	01:02
	← jyc_ left	01:02
	← Hobbyboy left	01:02
	← surfist left	01:02
	← dustinm left	01:02
	← hexnewbie left	01:02
	← ribasushi left	01:02
	← hexagoxel left	01:02
	← qqx left	01:02
	← varesa left	01:02
	← Fenhl left	01:02
	← jsatk left	01:02
	← papcx left	01:02
	← ilmostro left	01:02
	← haritz left	01:02
	← brezanac left	01:02
	← polyrob left	01:02
	← sunrunner20 left	01:02
	← j7k6 left	01:02
	← Peng_ left	01:02
	← noodle left	01:02
	← ghoti left	01:02
	← sborza left	01:02
	← Bigcheese left	01:02
	← mika left	01:02
	← nextloop left	01:02
	← Xizor left	01:02
	← erhandsome left	01:02
	← lightstalker left	01:02
	sunrunner20_ → sunrunner20	01:02
	sborza_ → sborza	01:02
	mikap → mika	01:02
	netwoodle → noodle	01:02
	frecklealex_ → frecklealex	01:02
	jleclanche_ → jleclanche	01:02
	palra_ → palra	01:02
	kutenai_ → kutenai	01:02
	jsatk_ → jsatk	01:02
nightshift	untracked files persist across branch changes, right? (assuming I add the file while in master, or does it matter?)?	01:02
	hexagoxe- → hexagoxel	01:02
	→ varesa_ joined	01:02
	← Sasazuka left	01:02
	nextloop_ → nextloop	01:02
	← xcm left	01:02
	polyrob_ → polyrob	01:02
	→ ribasushi joined	01:03
	→ xcm joined	01:03
	← MylesBorins left	01:04
	→ brezanac joined	01:05
	← evanc left	01:05
	← acetakwas left	01:06
	→ evanc joined	01:06
	← AtumT left	01:06
	→ veremitz joined	01:06
rafasc	!float	01:06
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	01:06
rafasc	but once you add it, it becomes tracked.	01:06
	← veremitz left	01:07
	→ MylesBorins joined	01:07
nightshift	not really what I'm after. I want to add a file that is just reference, so that I can refer back to it.	01:08
	Actually, if I put it in the .gitignore, that should have it function the way I want	01:08
	→ acetakwas joined	01:08
	→ pupsikov joined	01:08
vishal	are you talking about add --intent-to-add by any chance	01:09
nightshift	vishal: I don't think so	01:09
	I want a file to exist in my working directory, but I want git to act as though it knows nothing about it	01:10
vishal	ah, yeah, gitignore then	01:10
	→ surfist joined	01:11
vishal	but I rarely bother - not sure it gets you much (at least in my workflow)	01:11
nightshift	That's what I thought. And, it doesn't matter what branch I have checked out when I first place it into the working directory and the gitignore	01:11
	right?	01:11
vishal	nope, untracked files, whether in gitignore or not, don't matter to git. They stay there (unless you use git clean or so)	01:12
rafasc	yes. As long as you never git add it, it should stay where it is.	01:12
nightshift	awesome	01:12
	← nurdie left	01:16
	→ veremitz joined	01:17
	← mowcat left	01:20
	← cdown left	01:22
	← F0rTex left	01:22
	→ finalbeta joined	01:22
	→ F0rTex joined	01:23
	→ alyptik joined	01:27
	→ cdown joined	01:28
	← pupsikov left	01:28
	← kadoban left	01:29
	← cdown left	01:33
	← d^sh left	01:33
	← humanBird left	01:35
	← nightshift left	01:35
	→ nic-hartley joined	01:35
	→ d^sh joined	01:37
	→ gambl0re joined	01:38
	← xcm left	01:39
	→ xcm joined	01:40
	← NightStrike left	01:44
	→ Bobdude joined	01:44
	← al-damiri left	01:44
	← Defcronyke left	01:45
	→ Defcronyke joined	01:46
	← kjartan left	01:47
	← Defcronyke left	01:51
	→ Defcronyke joined	01:51
	→ kjartan joined	01:51
	→ mven joined	01:56
	← rafasc left	02:10
	→ nurdie joined	02:12
	→ thebope joined	02:14
	← lagothrix left	02:20
	→ lagothrix joined	02:20
	→ KeyJoo joined	02:20
	→ Goplat joined	02:21
	← greatgatsby left	02:29
	→ greatgatsby joined	02:29
	← greatgatsby left	02:30
	→ greatgatsby joined	02:30
	← random_yanek left	02:31
	← jim left	02:31
	→ tya99 joined	02:31
	→ jungsubk joined	02:32
tya99	can i merge with a specific timezone?	02:32
	for example I used:	02:32
	git config alias.utccommit '!git commit --date=\"$(date --utc +%Y-%m-%dT%H:%M:%S%z)\"'	02:32
	for commits	02:32
	i want to do the same for merge commits	02:32
	i tried: git config alias.utcmerge '!git merge --date=\"$(date --utc +%Y-%m-%dT%H:%M:%S%z)\"'	02:33
	but that didn't seem to work	02:33
	← jungsubk left	02:33
	→ random_yanek joined	02:33
	← random_yanek left	02:33
tya99	https://saebamini.com/Git-commit-with-UTC-timestamp-ignore-local-timezone/	02:34
	→ random_yanek joined	02:35
	→ bambanx joined	02:35
	→ matelot_ joined	02:39
	← bluezone left	02:40
	← Copenhagen_Bram left	02:41
	← nurdie left	02:44
	→ jim joined	02:48
	← clime left	02:53
	→ spacesuitdiver joined	02:53
	→ Copenhagen_Bram joined	02:56
	→ jubal joined	02:56
	← KeyJoo left	02:57
	← miczac left	03:00
tya99	mm maybe i want to rebase	03:04
	that will avoid creating the extra commit	03:04
	yes that's what i want	03:05
	← Cabanoss- left	03:06
	→ RustyShackleford joined	03:09
RustyShackleford	so I committed these files a few commits ago.	03:09
	waveclaw_ → waveclaw	03:09
RustyShackleford	let me start over lol	03:09
	so I deleted these files a few commits ago.	03:10
	and I want to bring them back	03:10
	← Spacew00t left	03:11
	→ justanotheruser joined	03:13
	→ Cabanossi joined	03:17
tya99	i can use TZ=UTC that works	03:25
	→ RoriconKnight joined	03:28
amosbird	hi, does git checkout change file modtime?	03:28
	→ nurdie joined	03:29
	← thiago left	03:32
	← arecacea1 left	03:33
	→ arecacea1 joined	03:33
	← fatalhalt left	03:42
	→ rominronin joined	03:47
	← MACscr left	03:47
	→ dre_ joined	03:49
	← veegee left	03:51
	← rominronin left	03:52
	← voidSurfr left	03:52
	→ alex_pa joined	03:53
	→ veegee joined	03:56
	→ maryo joined	03:56
	← mven left	03:58
	→ Mattiaslndstrm joined	04:03
	← Mattiaslndstrm left	04:08
	← maryo left	04:08
	← alex_pa left	04:12
	→ mven joined	04:13
	← Ignacy left	04:15
	← Tawonga left	04:15
	→ Tawonga joined	04:16
	← mven left	04:18
	→ g00s joined	04:26
	→ fstd_ joined	04:28
	→ duderonomy joined	04:29
	← duderonomy left	04:31
	← fstd left	04:32
	fstd_ → fstd	04:32
	← nic-hartley left	04:33
	← bambanx left	04:35
	→ veegee_ joined	04:36
	→ duderonomy joined	04:37
	← veegee left	04:37
	← gambl0re left	04:54
	← ferdna left	05:02
	→ pks_ joined	05:02
	→ Mattiaslndstrm joined	05:04
	← pks left	05:05
	pks_ → pks	05:05
	← RoriconKnight left	05:09
	→ RoriconKnight joined	05:10
	→ veegee joined	05:11
	← veegee_ left	05:12
	← matelot_ left	05:13
	← Inline left	05:13
	← YuGiOhJCJ left	05:14
	← ajain left	05:20
	← gde33 left	05:21
	← victorqueiroz left	05:22
	→ ajain joined	05:23
	← Copenhagen_Bram left	05:29
	→ kapil____ joined	05:31
	→ Beam_Inn_ joined	05:32
	← pR0Ps left	05:32
	→ pR0Ps joined	05:33
	← jcbitter left	05:33
	→ sauvin joined	05:35
	→ Copenhagen_Bram joined	05:35
	← Beam_Inn__ left	05:35
	Beam_Inn_ → Beam_Inn__	05:35
	← oojacoboo left	05:36
	← sunrunner20 left	05:36
	→ sunrunner20 joined	05:36
	← Copenhagen_Bram left	05:37
	→ gde33 joined	05:39
	Fenhl_ → Fenhl	05:41
	→ mat001 joined	05:45
	← libertyprime left	05:46
	← dre_ left	05:46
	→ Copenhagen_Bram joined	05:46
	→ thiago joined	05:49
	← mat001 left	05:50
	hexnewbie_ → hexnewbie	05:53
	→ thefatma joined	05:53
	← WhiskerBiscuit left	05:54
	← NccT left	05:55
	→ thebope_ joined	06:02
	← thebope left	06:04
	→ tuxd00d joined	06:04
	← nurdie left	06:10
	→ yuriii joined	06:15
	← kerframil left	06:15
	→ mshadle joined	06:16
mshadle	can someone here help me? i'm on a local branch "dev" it says it's up to date with "origin/dev" yet when i "git push" or "git push origin dev" etc ... it keeps telling me about master. i've tried git branch --set-upstream-to=origin/dev also. no dice.	06:16
	← planigan left	06:17
ajain	mshadle: what is the exact error message?	06:19
mshadle	let me obfuscate this quick	06:20
	← thiago left	06:20
mshadle	@ajain: https://upaste.de/kze	06:20
	← Beam_Inn__ left	06:21
	→ Beam_Inn__ joined	06:21
	→ ricekrispie joined	06:21
ajain	mshadle: can you share the output of git branch -vv	06:22
	← breakingsad left	06:22
mshadle	ajain: https://upaste.de/dqS	06:23
	← ricekrispie2 left	06:23
ajain	mshadle: as I see, git push origin dev is working as expected --> Everything up to date	06:25
	only git push is throwing an error	06:26
mshadle	okay here's the real need: i have individual directories with work done in them, and i want to merge them into one repository with different branches for both	06:26
	so i have domain.com, dev.domain.com and beta.domain.com	06:26
ajain	ok. So you can commit these directories in their respective branches	06:28
mshadle	i checked out the git repo to "tmp", then cd tmp/ ; git checkout master ; rsync --delete --filter '- .git' ../domain.com/ ../tmp/ ; git add -A . ; git commit -a -m "up to date" ; git push origin master ; git checkout dev ; rsync again from dev.domain.com to tmp ; git add -A . ; git commit -a -m ; git push origin dev	06:28
ajain	git checkout beta	06:28
	git add beta-dir ; git commit	06:28
mshadle	i would love to git clone (but not really) and just git add the directory as-is, git push -f origin branchname	06:28
	← thefatma left	06:29
ajain	looks like what you are doing is correct, only question is when are your branching off to dev?	06:31
mshadle	right now, just having separate branches, not tracking each other... although i guess that's not a good idea.	06:31
	because then they won't be able to merge properly, right?	06:32
	→ thefatma joined	06:32
ajain	probably	06:32
	→ jungsubk joined	06:33
mshadle	like should i do git checkout -b beta origin/master	06:33
	but that is LOCAL beta tracking REMOTE master	06:33
ajain	in that casse, your beta branch will have master directory	06:34
	tracking will not be set, you will have to add it later when you push using -u switch	06:34
mshadle	i swear i used to make this work properly.	06:34
ajain	let me try this quickly	06:35
mshadle	or is git subtree something i should look at	06:36
	nevermind, i think my friend was thinking of something else :)	06:38
	← jungsubk left	06:38
	→ __rohit joined	06:42
mshadle	i think "git push -u origin dev" when i go to do a push was what i wanted?	06:44
ajain	yes	06:44
mshadle	then moving forward "git push" is smart	06:45
	i thought that's what git branch --set-upstream-to would do though... as well	06:45
	→ oxymoron93 joined	06:45
ajain	IRRC it does the same thing	06:46
	← kjartan left	06:46
ajain	-u just feels simpler to me	06:46
oxymoron93	yes, `-u` is shorthand for `--set-upstream`	06:47
ajain	mshadle: I tried what you are doing, while merging, git will refuse.	06:48
	→ MACscr joined	06:48
ajain	fatal: refusing to merge unrelated histories	06:48
	→ planigan joined	06:50
	→ kjartan joined	06:51
	→ clime joined	06:53
	→ T_UNIX joined	06:54
	→ rominronin joined	06:55
	← xcm left	06:56
	→ xcm joined	06:56
	← Enphuego left	07:00
	← Jackneill left	07:01
	→ n3wborn joined	07:02
	← dodobrain_ left	07:02
	← d^sh left	07:04
	→ d^sh joined	07:05
	→ theoceaniscool joined	07:09
	→ TomyLobo joined	07:10
	→ nindustries joined	07:10
	→ Jackneill joined	07:10
nindustries	Hi, when pushing from a worker, we receive a "You can only push your own commits in this repository". We do a git config --local user.name, git config --local user.email, checkout and git push	07:11
	checkout works, push returns that error	07:11
	The SSH keys are added to the account with user.email	07:12
	→ learningc joined	07:12
nindustries	Commit X was committed by X [email@hidden.address] matches git config	07:12
	← dpyro left	07:13
	← g00s left	07:13
	→ dege joined	07:15
nindustries	log: https://hastebin.com/eruyecevic.coffeescript	07:15
	varesa_ → varesa	07:16
nindustries	Any ideas?	07:18
	→ jungsubk joined	07:19
	← jungsubk left	07:19
learningc	How can I merge a branch onto master with that merging commit replacing the master's last commit (like amend but results from a merge)	07:20
	← planigan left	07:23
_ikke_	First reset master back, and then merge that branch?	07:25
nindustries	Perhaps because i'm cloning as user git?	07:26
	← cbreak left	07:27
	→ cbreak joined	07:27
	← TomyLobo left	07:28
	→ nurdie joined	07:28
circuitbone	nin git config --global user.name	07:29
	→ gloomy joined	07:29
learningc	_ikke_, then I do a squash? Is there a simpler way?	07:29
	← RustyShackleford left	07:30
	← xcm left	07:31
	→ xcm joined	07:32
	→ TomyLobo joined	07:33
	← nurdie left	07:34
nindustries	circuitbone: why --global?	07:34
	since --local should work in the repo, no?	07:34
circuitbone	dunno, its always the way I have gotten the name.	07:34
oxymoron93	it does no matter, .git/config (local) has precedence over global configuration	07:35
	→ bergercookie joined	07:36
oxymoron93	still, what does "own commit" mean? Have you tried asking maintainer? nindustries	07:36
	→ planigan joined	07:36
	→ nast joined	07:36
nindustries	since the commit author matches my git config --local user..	07:37
	→ Mr__Anderson joined	07:40
	→ z\|bandito joined	07:40
	← mshadle left	07:47
	← TomyLobo left	07:48
	→ TomyLobo joined	07:51
	→ computer2000 joined	08:02
	← __rohit left	08:06
	→ floppydh joined	08:07
	→ esrse joined	08:09
	← gloomy left	08:12
	→ mven joined	08:15
	→ ppang joined	08:16
	← mven left	08:19
	← TomyLobo left	08:24
	→ libertyprime joined	08:25
	→ TomyLobo joined	08:33
	→ pulkit25 joined	08:36
	→ mven joined	08:36
	→ jottr joined	08:41
	← mven left	08:42
	← alyptik left	08:46
	← nast left	08:46
	→ jas4711 joined	08:47
	→ savolla joined	08:47
	← xcm left	08:49
	→ xcm joined	08:49
	← Caterpillar left	08:50
	→ WhiskerBiscuit joined	08:50
	← bergercookie left	08:52
	→ Elon_Satoshi joined	08:52
	→ yyy joined	08:53
	→ bruhbruh joined	08:53
	← Copenhagen_Bram left	08:54
	← WhiskerBiscuit left	08:55
	← computer2000 left	08:57
	→ SkarmoutsosV joined	09:00
	→ yyy- joined	09:01
	← yyy left	09:02
	← yyy- left	09:02
	→ yyy joined	09:02
	→ borkr joined	09:05
	→ gloomy joined	09:07
	→ mimajof joined	09:10
	← libertyprime left	09:12
	→ royal_screwup21 joined	09:13
	→ libertyprime joined	09:13
	← Goplat left	09:15
	← Raimondi left	09:15
osse	nindustries: Commit authorship is usually completely irrelevant for authentication	09:15
	Oh... That's some custom thing then	09:16
	→ pie_ joined	09:21
	← catsup left	09:21
	→ catsup joined	09:22
	← catsup left	09:22
	→ catsup joined	09:22
	→ Thanatermesis joined	09:27
Thanatermesis	what happens when there's a commit with a fix in a "fixes" branch, and later the master branch includes the same code ? more exactly, what happens when you rebase master later into your "fixes" branch	09:29
DevAntoine	Hi	09:29
	When I try to pop my stash "error: Your local changes to the following files would be overwritten by merge:"	09:30
	Is there a way to pop it and resolve conflicts?	09:30
	I don't want to commit my changes yet.	09:30
	← hussam left	09:30
	→ alyptik joined	09:30
	→ nurdie joined	09:31
	→ manuelschneid3r joined	09:32
	← thefatma left	09:34
	← profmac left	09:34
	→ thefatma joined	09:34
	← xcm left	09:34
osse	Thanatermesis: Usually the change in the rebased branch is automatically dropped. If they are slightly different in some way you get a conflict, which should be trivial to resolve	09:35
	→ xcm joined	09:35
	→ Beam_Inn_ joined	09:35
	← nurdie left	09:36
	← thefatma left	09:36
Thanatermesis	thanks! sounds good :)	09:36
	← SkarmoutsosV left	09:37
	← learningc left	09:37
	← Beam_Inn__ left	09:37
	Beam_Inn_ → Beam_Inn__	09:37
	→ thefatma joined	09:37
	→ learningc joined	09:37
	→ sz0 joined	09:38
	→ SkarmoutsosV joined	09:38
	← learningc left	09:38
	→ learningc joined	09:39
	← Bobdude left	09:40
	← R2robot left	09:46
	← manuelschneid3r left	09:46
	→ profmac joined	09:47
	→ R2robot joined	09:49
	← rkta left	09:52
	→ rkta joined	09:53
	→ hussam joined	09:55
	→ orbitex joined	09:59
	← borkr left	10:00
	← lankanmon left	10:00
	← kapil____ left	10:01
	→ midnightmagic joined	10:02
	← learningc left	10:03
	← gloomy left	10:07
	← xcm left	10:07
	← cbreak left	10:07
	→ xcm joined	10:08
	→ cbreak joined	10:08
	← finalbeta left	10:16
	→ finalbeta joined	10:16
	→ gloomy joined	10:18
	→ learningc joined	10:25
	→ pie__ joined	10:27
	← pie_ left	10:30
	← learningc left	10:30
	→ learningc joined	10:31
	→ nurdie joined	10:32
	← rkta left	10:33
	→ rkta joined	10:33
	← nurdie left	10:36
	← learningc left	10:36
	→ slartie joined	10:37
	→ learningc joined	10:38
	← slartie left	10:46
	← thefatma left	10:46
	→ thefatma joined	10:48
	→ bruhbruh_ joined	10:49
	← bruhbruh left	10:51
	→ lankanmon joined	10:52
	→ Bizkit joined	10:52
	→ ilmostro joined	10:52
	→ rominron_ joined	10:57
	← rominronin left	11:00
	→ Phylock joined	11:01
	→ pie_ joined	11:02
	← pie__ left	11:04
	→ borkr joined	11:07
	→ emsjessec joined	11:09
	→ figuinhas joined	11:13
	← bruhbruh_ left	11:15
	→ reactormonk joined	11:30
reactormonk	How would I query git for the current tag, and if none exists, error out? git describe --tags gives you the lastest tag that matches, but if the tag isn't exactly HEAD, I would like it to error out.	11:30
_ikke_	reactormonk: --exact-match	11:33
	← uptime left	11:34
	→ apoos_maximus joined	11:34
reactormonk	nice, thanks!	11:38
	← RoriconKnight left	11:39
	→ apoos_maximus_ joined	11:40
	← apoos_maximus left	11:43
	→ thiago joined	11:50
	← Bizkit left	11:51
	← HyP3r left	11:51
	→ azwieg103 joined	11:55
	→ kapil____ joined	12:01
	← azwieg103 left	12:09
	→ Lucas_Gray joined	12:11
	← finalbeta left	12:12
	→ finalbeta joined	12:13
	ghoti_ → ghoti	12:18
	→ nic-hartley joined	12:20
	← SkarmoutsosV left	12:25
	→ boombatower joined	12:27
	→ mven joined	12:39
	← Mattiaslndstrm left	12:40
	← esrse left	12:40
	→ mohsen_1 joined	12:43
	→ mowcat joined	12:43
	← mven left	12:43
	→ m1sosoup joined	12:44
	← oprypin left	12:44
mohsen_1	Hello, I have been pushing to the master branch, how do I push to a different branch from now?	12:44
	← yyy left	12:45
	→ oprypin joined	12:47
	→ yyy joined	12:50
	→ SuperL4g_ joined	12:50
kernel-sanders	git push remote localbranch:remotebranch	12:51
	→ Bizkit joined	12:51
	→ victorqueiroz joined	12:51
	← Lucas_Gray left	12:53
	← SuperLag left	12:54
	→ quackgyver joined	12:55
	→ Lucas_Gray joined	12:55
	→ mven joined	12:56
	← mven left	12:56
	← m1sosoup left	12:56
	→ Regon joined	12:56
	→ m1sosoup joined	12:57
	← Lucas_Gray left	12:57
	← moldybits left	12:59
	→ TingelTangelBob joined	13:01
	→ moldybits` joined	13:02
	→ veegee_ joined	13:02
	← veegee left	13:02
	← gxt left	13:04
	← Tobbi_ left	13:04
mohsen_1	kernel-sanders: I was not creating the same branch on the local	13:05
	so created it with `git checkout dev` and then `git push origin dev`	13:06
	→ student_A joined	13:08
	← mohsen_1 left	13:08
student_A	hi	13:09
	bit newbie - testing out git svn (for svn migration to git)	13:09
	we have a big repo	13:09
	we tried git svn clone (non-standard layout)	13:10
	→ CodeSlingerPaul joined	13:10
student_A	and it failed due to gc failure	13:10
	→ mohsen_1 joined	13:10
	← spacesuitdiver left	13:10
	← oprypin left	13:11
	→ oprypin joined	13:11
	→ rafasc joined	13:11
	← oprypin left	13:12
	→ oprypin joined	13:12
	← oprypin left	13:12
	→ oprypin joined	13:12
student_A	we tried git svn clone -r222:500000 repo-url -T <dir>/trunk --author-file=file.txt --no-minimal-url repoDir	13:13
	→ Raimondi joined	13:15
	← thefatma left	13:19
	← nic-hartley left	13:20
	← thiago left	13:20
	← pie_ left	13:21
	→ thiago joined	13:21
	→ opilab joined	13:23
student_A	anyone	13:24
	?	13:24
	← Elon_Satoshi left	13:24
	← oprypin left	13:25
	← ppang left	13:25
	→ Copenhagen_Bram joined	13:25
	← mowcat left	13:28
	← opilab left	13:31
	← thebope_ left	13:31
	→ thebope joined	13:32
student_A	is there a way to unignore files and directories shown in git svn show-ignore list ?	13:34
	→ rominronin joined	13:35
	→ oprypin joined	13:36
	← mohsen_1 left	13:36
	← mimajof left	13:38
	← thebope left	13:38
	← rominron_ left	13:39
	← thiago left	13:39
	→ Beam_Inn_ joined	13:39
Kartagis	student_A: if it's like .gitignore, taking the file out of ignore file should unignore it.	13:40
	← floppydh left	13:40
	→ minimal_life joined	13:42
	→ floppydh joined	13:42
	→ nic-hartley joined	13:42
	← Beam_Inn__ left	13:42
	→ computer2000 joined	13:43
	Beam_Inn_ → Beam_Inn__	13:43
	← Bizkit left	13:44
	→ Silenced joined	13:44
	← savolla left	13:45
	→ thefatma joined	13:53
	→ SerialSmile joined	13:53
	→ m0rph joined	13:57
	← gloomy left	13:58
	← m1sosoup left	13:58
	→ gloomy joined	13:58
	→ orcainbox joined	13:58
	→ orcacomputers joined	13:59
	← gloomy left	13:59
	→ gloomy joined	14:01
	← gloomy left	14:01
	← yuriii left	14:03
	→ Envil joined	14:04
	→ gloomy joined	14:04
	→ dpyro joined	14:05
	← dpyro left	14:05
	← Silenced left	14:07
	← gloomy left	14:08
	→ __rohit joined	14:09
	→ greggerz joined	14:09
	→ rohit[m] joined	14:10
	← duderonomy left	14:11
	← rominronin left	14:11
	→ rominronin joined	14:11
	→ bluezone joined	14:11
	← nindustries left	14:13
	← Beam_Inn__ left	14:14
	→ Beam_Inn__ joined	14:15
	← rominronin left	14:16
	→ thebope joined	14:16
	→ rominronin joined	14:16
	← rominronin left	14:16
	→ rominronin joined	14:17
	→ nowhereman joined	14:17
	moldybits` → moldybits	14:18
	← nic-hartley left	14:19
	← floppydh left	14:20
	→ mhinz joined	14:21
	← rominronin left	14:21
	→ gloomy joined	14:22
	← oxymoron93 left	14:23
	→ Silenced joined	14:26
	→ blackandblue joined	14:28
	→ rominronin joined	14:29
	← tuxd00d left	14:29
	← rominronin left	14:30
	→ nurdie joined	14:31
	→ flaviodesousa joined	14:31
	← Silenced left	14:32
	→ gumnos joined	14:33
gumnos	Is there a way to configure dynamic commit templates? I can point commit.template to a static file, but it treats it as a fixed filename, not allowing things like "commit.template='!generate_template.sh'"	14:34
	→ rominronin joined	14:34
_ikke_	gumnos: perhapse a prepare commit hook?	14:35
	← mooasaurus left	14:36
	→ mooasaurus joined	14:36
	gumnos reading about the prepare hook...	14:36
	← borkr left	14:37
gumnos	looks like it should do the trick. Thanks!	14:37
	→ al-damiri joined	14:39
	← n3wborn left	14:40
	→ Inline joined	14:43
	← kjartan left	14:44
	→ fission6 joined	14:44
	→ kadoban joined	14:45
	nabil_ → nabil	14:48
	→ lucasb joined	14:48
	← thebope left	14:49
	→ kjartan joined	14:49
	minimal_life → seaef	14:50
	→ achen_ joined	14:50
	seaef → seaef-tnw	14:52
	→ achen__ joined	14:53
	← thefatma left	14:53
	→ onmeac joined	14:54
	← achen_ left	14:56
	← seaef-tnw left	14:56
	→ seaef-tnw joined	14:58
	→ pupsikov joined	14:59
	← achen__ left	14:59
	← __rohit left	15:01
	← orbitex left	15:03
	← seaef-tnw left	15:04
	→ seaef-tnw joined	15:06
	← rohit[m] left	15:07
	← random_yanek left	15:07
	→ tang^ joined	15:07
	→ random_yanek joined	15:08
	← random_yanek left	15:08
	→ orafu joined	15:09
	← libertyprime left	15:11
	→ random_yanek joined	15:15
	→ jungsubk joined	15:15
	← orafu left	15:16
	← palra left	15:16
	→ Beam_Inn_ joined	15:16
	→ orafu joined	15:18
	← Beam_Inn__ left	15:19
	→ AbleBacon joined	15:19
	Beam_Inn_ → Beam_Inn__	15:19
	← Beam_Inn__ left	15:21
	→ borkr joined	15:22
	→ thebope joined	15:24
	← learningc left	15:24
	← SerialSmile left	15:24
	← orafu left	15:24
	← jottr left	15:25
	→ orafu joined	15:25
	→ faLUCE joined	15:25
	→ csd_ joined	15:26
faLUCE	Hello. I sent (to myself) a mail produced with git send-email, containing a patch. I can see the patch in the body of the email. Now, How can I apply it to a project inside "some_project" dir ?	15:27
	← computer2000 left	15:28
	→ Es0teric joined	15:28
	← seaef-tnw left	15:29
	← csd_ left	15:30
_ikke_	use git am	15:31
rafasc	faLUCE: you download the email, and apply it with $git am <file>	15:31
	be sure that the method you use to download doesn't mungle white space.	15:32
	→ rsrx joined	15:33
rafasc	for gmail, there's a 'show original' in the ⋮ menu.	15:33
faLUCE	ok, let's try	15:33
	thnx	15:33
	← orafu left	15:33
rafasc	from there you can either copy paste or click download original.	15:34
	→ mohsen_1 joined	15:34
nedbat	faLUCE: i'm just curious: why use an email workflow?	15:34
rafasc	I know stuff: he wants to contribute to ffmpeg.	15:34
	← xcm left	15:36
rafasc	The good old you need to adapt to the project your working for. And self emailing and trying to apply is one of the things you end up doing when you have problems with send-email, to make sure all is good before the oficial submission.	15:37
	← Shentino left	15:37
	← quackgyver left	15:37
	← thebope left	15:39
faLUCE	rafasc: yes :-)	15:39
	but I'm also curious to see how efficient is the email workflow	15:40
	← Raimondi left	15:42
benharri	https://git-send-email.io	15:42
	→ leeN joined	15:43
rafasc	already aware of that, but looks like his account had extended security features that didn't allow setting up an app password.	15:43
	→ xcm joined	15:43
benharri	ahhh	15:44
faLUCE	rafasc: at the end I used a "yandex" account, which has app password	15:44
	→ Mattiaslndstrm joined	15:44
faLUCE	but, other than that, I'm seeing how useful/efficient is the email workflow	15:44
rafasc	whatever it works.	15:44
faLUCE	the only problem is that it's not very easy to learn	15:45
rafasc	webgmail sucks for email-workflow	15:45
faLUCE	it's very restrictive	15:45
	← kusmario left	15:45
	← kus_ubuntui686 left	15:45
	← secretmessage left	15:45
	← philippirrip left	15:45
	← borkr left	15:45
rafasc	no way to read a thread, they only have their own flattened 'conversation' view.	15:46
	→ Shentino joined	15:46
	→ duderonomy joined	15:48
	→ jottr joined	15:49
	→ millerti joined	15:51
	→ miczac joined	15:52
	→ charking joined	15:54
charking	Hello. I created an experimental branch and made 3 commits. I like them and want to also commit them on master. What's the proper way to do it?	15:55
	git cherry-pick?	15:55
	← yyy left	15:56
Zarthus	why not just git-merge?	15:56
rafasc	you can merge the branch to master, or rebase the feature branch.	15:56
	← reactormonk left	15:56
	→ ivaat joined	15:57
ivaat	hi	15:57
charking	Zarthus: Is merge possible if you don't want to merge every commit from the topic (experimental) branch?	15:57
Zarthus	a cherry pick would probably be more appropriate depending on the size/scale of things	15:58
	← orcacomputers left	15:58
charking	OK, thanks. I wasn't sure about merge versus cherry-pick versus rebase	15:59
rafasc	The downside is that your history will have two commits with the same changes.	15:59
	← Anthaas left	15:59
rafasc	because cherry-pick makes a copy of the commit, but since the parents change, the sha will change.	15:59
	→ Anthaas joined	16:00
	← onmeac left	16:01
	→ Silenced joined	16:01
charking	rafasc: so is it better not to use cherry-pick then?	16:02
	← Mattiaslndstrm left	16:02
rafasc	it's your preference, I prefer not having "duplicate" commits.	16:03
	you can cherry-pick the commits to master, then rebase your experimental on top of master.	16:03
	git rebase should notice the changes are already there and skip the commits.	16:03
	← RandomGuyOnIrc left	16:04
	← iam730 left	16:04
charking	rafasc: after that, it will look like the commits are made to both branches at once? Instead of duplicate commits on each branch?	16:05
	→ no_gravity joined	16:06
rafasc	it will look like the commits were made on master, and you branched after they were made.	16:06
	← apoos_maximus_ left	16:06
rafasc	it's a !rewrite operation.	16:06
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	16:06
no_gravity	Does "git diff origin" compare my current branch to the same branch on the origin?	16:07
rafasc	but as long as you are not sharing the 'experimental' branch with anyone else, you're free to rewrite.	16:07
	→ Raimondi joined	16:07
charking	rafasc: I see	16:07
	Thanks!	16:07
	← charking left	16:07
rafasc	no_gravity: no. It will compare against the default branch, the one that is automatically checked out when you clone, usually master.	16:08
	→ gambl0re joined	16:09
	→ voidSurfr joined	16:09
no_gravity	rafasc: I see. That explains what I see :) Thanks!	16:09
	→ reactormonk joined	16:09
	← jottr left	16:10
	← OtakuSenpai left	16:10
rafasc	no_gravity: has to do with what's explained at man git remote; search for set-head;	16:13
gitinfo	no_gravity: the git-remote manpage is available at https://gitirc.eu/git-remote.html	16:13
	→ OtakuSenpai joined	16:13
	← duderonomy left	16:16
	← Silenced left	16:16
	← alyptik left	16:16
	← miczac left	16:20
	← noodle left	16:20
	→ maarhart joined	16:21
	→ ozcanesen joined	16:22
	← maarhart left	16:26
	→ maarhart joined	16:29
	← maarhart left	16:29
	→ maarhart joined	16:29
	← maarhart left	16:29
	→ mat001 joined	16:29
	← rominronin left	16:29
	→ rominronin joined	16:30
	→ maarhart joined	16:30
	← jungsubk left	16:33
	→ rominron_ joined	16:34
	← rominronin left	16:34
	→ rohit[m] joined	16:35
	← no_gravity left	16:36
	→ duderonomy joined	16:36
	← maarhart left	16:38
	← leeN left	16:38
	← cd left	16:39
	← rominron_ left	16:44
	→ rominronin joined	16:45
	SuperL4g_ → SuperLag	16:46
	← rominronin left	16:47
	→ rominronin joined	16:47
	← powerbit left	16:49
	→ subopt joined	16:51
	→ mat001_ joined	16:52
	← mat001 left	16:55
	→ Mattiaslndstrm joined	16:56
	→ assemblyman joined	16:57
	→ styler2go joined	17:02
	← m0rph left	17:04
	← Krenair left	17:05
	← MACscr left	17:06
	← gambl0re left	17:07
	← fission6 left	17:08
	← duderonomy left	17:09
	→ alyptik joined	17:11
	→ altgray joined	17:13
	← ozcanesen left	17:16
	← Revan- left	17:20
	→ fission6 joined	17:21
	← royal_screwup21 left	17:21
	← gumnos left	17:21
	→ Revan- joined	17:22
	← F0rTex left	17:23
	→ tuxd00d joined	17:23
	→ F0rTex joined	17:24
	→ duderonomy joined	17:24
	← rominronin left	17:25
	→ rominronin joined	17:25
	← ivaat left	17:25
	← reactormonk left	17:27
	← duderonomy left	17:30
	← rominronin left	17:30
	← T_UNIX left	17:32
	← assemblyman left	17:37
	→ iam730 joined	17:38
	← flaviodesousa left	17:39
	→ Sasazuka joined	17:39
	← nowhereman left	17:41
	→ nowhere_man joined	17:42
	→ reactormonk joined	17:43
	← fission6 left	17:43
	→ fission6 joined	17:49
	→ gambl0re joined	17:50
	← figuinhas left	17:51
	← gambl0re left	17:51
	→ gambl0re joined	17:51
	→ royal_screwup21 joined	17:52
	→ czart joined	17:53
	← iam730 left	17:55
	→ beastd joined	17:55
	← beastd left	17:55
	← jab416171 left	17:56
	→ Silenced joined	17:56
	→ iam730 joined	17:57
	← mohsen_1 left	17:57
	→ rominronin joined	17:58
	→ duderonomy joined	17:59
	→ jstein joined	18:00
	← duderonomy left	18:01
	→ interruptinuse joined	18:02
	→ hofmann3900 joined	18:02
	← rominronin left	18:02
	← watabou left	18:05
	→ ozcanesen joined	18:06
	← faLUCE left	18:06
	← ozcanesen left	18:06
Ori_B	Hey, quick question on the git protocol -- for git+ssh://, how do the extensions (ofs-delta, etc) end up getting passed?	18:07
	← nowhere_man left	18:07
Ori_B	for git://, it's done with a '/repo/path\0extension list', but you can't exactly do that when exec'ing.	18:08
	oh. found it.	18:09
	GIT_PROTOCOL environment variable.	18:10
	← Silenced left	18:11
student_A	hi Kartagis thx for responding "if it's like .gitignore, taking the file out of ignore file should unignore it." - we couldnt find any ignore in .gitignore in that git directory that we clone to.	18:12
	is there a default set of files that git ignores after a fresh git installation ?	18:13
Kartagis	nope, there is a gitignore generator though	18:13
	← bashfulshell left	18:14
	→ plexigras joined	18:14
kadoban	student_A: You can have a "global" (really per-user usually) git ignore. Check the output of 'git config core.excludesfile'	18:16
student_A	kadoban thx for responding - nod - will check -	18:16
kadoban	That's probably not set up by any kind of default installation, but you can have it set up beforehand and a newly installed git would use it.	18:17
	→ powerbit joined	18:17
	→ jcbitter joined	18:18
Kartagis	oh, I had no idea you could have a global gitignore	18:20
	← jubal left	18:20
	→ jubal joined	18:21
	→ duderonomy joined	18:22
bin_bash	when you say install, do you mean installing the git package on a system or setting up a git repo	18:22
	because it seems bizarre that you'd want a git ignore that's identical for EVERY project	18:23
kadoban	It's typically used for things that are always ignored. Like throwing .o files in a global gitignore is rarely going to hurt anything.	18:23
	You can pretty much put every programming language default ignore stuff you use in there and save yourself a bunch of creating the same .gitignore in every repo.	18:24
	← rohit[m] left	18:24
tang^	however, if you use that and share your project with another developer, they may end up commiting stuff you're ignoring	18:24
kadoban	Once per developer always made more sense to me than once per project.	18:25
	→ rohit[m] joined	18:25
	← duderonomy left	18:25
	→ bashfulshell joined	18:25
	→ mohabaks joined	18:25
kadoban	Especially if there's the possibility of different build tools doing different artifacts.	18:25
	→ Noti joined	18:25
	→ jcbitter_ joined	18:29
	← sauvin left	18:30
	← gloomy left	18:30
	→ nic-hartley joined	18:30
	← rohit[m] left	18:31
	← jcbitter left	18:31
	→ plongshot joined	18:31
	← surfist left	18:31
	← justanotheruser left	18:32
Ori_B	so, now.. the other thing: should I expect offset delta packs to be identical when cloning?	18:32
	becasue I'm getting different pack contents each time.	18:33
	→ gloomy joined	18:34
	→ surfist joined	18:34
Ori_B	oddly enough, a quick sampling is showing the differences start at the same point each time.	18:35
	oh. never mind.	18:35
	but I'm definitely seeing different pack contents.	18:35
	← plongshot left	18:37
Ori_B	ok, yeah -- happens with the actual git client as well as mine.	18:39
	so, I feel a little less concerned :P	18:39
	← Raed left	18:40
	→ Anthaas_ joined	18:42
	← Anthaas left	18:42
	→ Raed joined	18:44
	OtakuSenpai → dx_ob	18:47
	→ jab416171 joined	18:48
	← blackandblue left	18:50
	← tsdh left	18:50
	← rafasc left	18:56
	← kjartan left	18:57
	← czart left	19:01
	→ kjartan joined	19:02
	← altgray left	19:02
	→ nly joined	19:03
	→ m0viefreak joined	19:09
	→ Silenced joined	19:09
	→ jungsubk joined	19:10
	← jab416171 left	19:11
	→ duderonomy joined	19:13
	→ SkarmoutsosV joined	19:16
	→ simon_weber joined	19:19
	→ thiago joined	19:20
	→ chiasmata joined	19:22
	← simon_weber left	19:23
	← duderonomy left	19:24
	← fission6 left	19:30
	← cbreak left	19:32
	→ rohit[m] joined	19:32
	→ fission6 joined	19:33
	← jas4711 left	19:33
	→ cbreak joined	19:33
	← rohit[m] left	19:36
	← gloomy left	19:36
	← lucasb left	19:38
	← rsrx left	19:41
	← iam730 left	19:43
	→ jas4711 joined	19:43
	← emsjessec left	19:45
	→ maryo joined	19:47
	← jayjo left	19:48
	→ iam730 joined	19:48
	→ jayjo joined	19:48
	← moldybits left	19:54
	← random_yanek left	19:55
	← chiasmata left	19:56
	→ random_yanek joined	19:56
	← random_yanek left	19:56
	→ random_yanek joined	19:59
	← random_yanek left	19:59
	→ moldybits joined	19:59
	→ buhm4nn joined	19:59
vishal	is there a way to git log --grep all branches of a given remote?	20:04
	← buhm4nn left	20:05
	→ random_yanek joined	20:09
osse	vishal: --remotes=a-remote/*	20:11
	← iam730 left	20:12
osse	vishal: There's also --glob which takes a pattern. Something like that should work. See the manual	20:12
	→ cfoch joined	20:13
	→ iam730 joined	20:14
vishal	osse: thanks, --remotes was perfect	20:15
	← Shentino left	20:15
vishal	I was going down a silly path of git grep and rev-list, but this is much cleaner	20:15
	→ rohit[m] joined	20:15
	← Iroha left	20:25
	→ Iroha joined	20:28
	← kapil____ left	20:30
	→ n3wborn joined	20:32
	→ duderonomy joined	20:32
	← Silenced left	20:32
	→ maryo_ joined	20:32
	→ maryo__ joined	20:32
	← duderonomy left	20:33
	→ Shentino joined	20:33
	← Phylock left	20:35
	← maryo left	20:36
	← iam730 left	20:36
	→ kapil____ joined	20:36
	→ duderonomy joined	20:37
	→ iam730 joined	20:39
	← maryo__ left	20:40
	← maryo_ left	20:40
	← n3wborn left	20:40
	→ fassl joined	20:43
	← bashfulshell left	20:44
	← Noti left	20:44
	← Envil left	20:45
	← theoceaniscool left	20:45
	← subopt left	20:47
	← jungsubk left	20:48
	→ azwieg103 joined	20:58
	← clime left	21:01
	← mat001_ left	21:02
	→ Enphuego joined	21:02
	→ MACscr joined	21:03
	→ clime joined	21:04
	→ Fernando-Basso joined	21:06
	← sz0 left	21:07
	→ mat001 joined	21:08
	→ maryo joined	21:10
	← SkarmoutsosV left	21:12
	→ freeman42x joined	21:13
	→ nabil_ joined	21:15
	← fission6 left	21:17
	← nabil left	21:18
	→ cdown joined	21:20
	← iam730 left	21:21
	→ gloomy joined	21:21
	← nly left	21:21
	→ fatalhalt joined	21:21
	→ iam730 joined	21:23
	← rohit[m] left	21:24
	← gambl0re left	21:33
	→ faLUCE joined	21:33
	← plexigras left	21:36
faLUCE	if I rebase my_branch against origin/master, does it mean that origin/master's history will be the base before all the commits of my_branch?	21:36
vishal	faLUCE: yes	21:37
faLUCE	ok, now: if someone touches a file which is in origin/master which I touched too in my_branch, what does it happen when I try to rebase?	21:38
vishal	faLUCE: a conflict, which git may be able to resolve, but if not, you will have to step in	21:40
	once you resolve it, git add the files, and git rebase --continue	21:41
faLUCE	vishal: does git resolve it automatically if it resolvable? (for example: user1 modifies a line that I don't modify)	21:41
vishal	yes	21:42
faLUCE	vishal: so it prompts me to resolve manually only when me and user1 are modifying the same lines, or when me or him deleted some lines?	21:43
	← pupsikov left	21:43
vishal	if both deleted the same lines, that might get auto resolved too, but generally, yes	21:44
	← iam730 left	21:44
faLUCE	so, this prompt happens only in case of deletion or modifying the same line	21:45
	I see	21:45
	thanks	21:45
	→ iam730 joined	21:46
faLUCE	now, given that I rebase, is it necessary to use "origin/master..HEAD" token in: git format-patch -o patches_dir origin/master..HEAD for submitting the modifications I made in HEAD compared to origin/master until now?	21:48
vishal	you can use any of the means used to specify revision ranges. i.e. A..B, or a specific commit, or -3 for the last three commits..	21:49
	I find myself mostly using the -N way to pick the last N commits for submission	21:50
faLUCE	vishal: so, if I made only one commit before rebasing it's the same thing as "format-patch -o patches_dir -1" ?	21:50
vishal	correct	21:51
faLUCE	great thanks	21:51
	← AbleBacon left	21:52
	← nurdie left	21:58
	← SirFunk left	22:04
	← tang^ left	22:04
	← faLUCE left	22:05
	← iam730 left	22:05
	→ iam730 joined	22:08
	→ yyy joined	22:09
	← newton left	22:09
	→ SirFunk joined	22:11
	← greggerz left	22:14
	← dege left	22:16
	← gloomy left	22:18
	← vbgunz left	22:20
	→ thebope joined	22:21
	← thebope left	22:21
	→ thebope joined	22:22
	← cdown left	22:25
	← thebope left	22:26
	→ dpyro joined	22:28
	→ aert joined	22:29
	← iam730 left	22:32
	← yyy left	22:32
	→ iam730 joined	22:36
	← random_yanek left	22:37
	← troido left	22:37
	← Regon left	22:39
	← xcm left	22:40
	→ bashfulshell joined	22:41
	→ nurdie joined	22:41
	→ random_yanek joined	22:45
	← nurdie left	22:46
	→ justanotheruser joined	22:48
	→ paws_ joined	22:51
	← justanotheruser left	22:51
	← Revan- left	22:53
	← clime left	22:53
	→ justanotheruser joined	22:53
	← freeman42x left	22:55
	→ freeman42x joined	22:55
	← justanotheruser left	22:59
	→ rominronin joined	23:00
	→ faLUCE joined	23:01
	→ justanotheruser joined	23:02
faLUCE	In this example of patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2018-December/237019.html I see that there are two lines before "---" : "Fixes #4517." and "Signed-off-by: ..." Does it mean that git am ignores all the tokens before "---" ?	23:03
	← finalbeta left	23:04
	← rominronin left	23:05
	← kjartan left	23:10
	→ kerframil joined	23:10
vishal	faLUCE: no - it ignores all lines after --- and before the first hunk (starting with diff..)	23:11
	indeed, the lines before --- are the body of the commit message	23:11
	and the signoff is part of that	23:11
	so in that example, the two lines ignored are configure \| 4 ++-- and 1 file changed..	23:12
	That space between --- and the first hunk is often used to add other context about the patch, that is not suitable to go into the git history	23:13
	e.g. "v2 refactors foo() to barfoo() and bazfoo()"	23:13
	or "patch applies to X branch, passes unit tests"	23:14
	→ kjartan joined	23:15
	← hofmann3900 left	23:15
	← greatgatsby left	23:15
faLUCE	vishal: when I executed "git commit" it prompted a text editor to insert a comment of the commit. Then I added "my comment", but I see that "my comment" appears as the subject of the email, not in the body	23:16
vishal	faLUCE: a good commit has a subject and a body, with a blank line separating them. git format-patch (and am) treat the commit subject as the Subject: header of the email, and the rest of the commit body goes in the email body, before the ---	23:17
	https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html	23:17
	So in your case, "my comment" if just a one liner, became the subject line (of both the commit and the email)	23:19
	and since it was lacking a body, the email just started with ---	23:19
	I'd expect ffmpeg will want you 'signing off' on your commits, so you can commit with commit -s	23:20
	← kapil____ left	23:20
vishal	after setting your name and email in git config	23:20
	← thiago left	23:20
	← faLUCE left	23:20
	→ faLUCE joined	23:22
faLUCE	vishal: sorry, I had connection problems but I read your msgs	23:22
	vishal: when I executed "git commit" it prompted a text editor to insert a comment of the commit. Then I added "my comment", but I see that "my comment" appears as the subject of the email, not in the body	23:22
	so I wonder how to add a body comment like the one in the link I pasted	23:23
vishal	faLUCE: http://dpaste.com/2XMYN0X	23:23
faLUCE	vishal: so, if the comment in the commit has two or more lines, it becomes the body of the mail?	23:25
vishal	Right. The blank line after the first subject line in the commit message is important though	23:25
faLUCE	vishal: ok. Now: instead of the "signed-off" line, in my email I see: "From: my name [email@hidden.address]	23:26
vishal	signoff lines are added by using git commit -s, or manually at the bottom of the commit body	23:27
faLUCE	is it automatically replaced if I sign off my coimmit?	23:27
	ok	23:28
	so, the "From: my_name etc." line appears if I don't sign off the commit?	23:28
vishal	No the From: appears if you're sending a patch authored by someone else, usually	23:29
	it should be harmless	23:29
	also see section 8, bullet 3 of https://ffmpeg.org/developer.html#Contributing	23:29
	→ ferdna joined	23:29
vishal	(and indeed, read the whole thing carefully too)	23:30
faLUCE	vishal: I see, then I have to sign-off	23:31
	damn... I already create the patch... can I manually replace the "from" line with "signed-off " line?	23:32
	(with a text editor)	23:33
	→ RustyShackleford joined	23:33
	← galaxie left	23:33
vishal	You should probably recreate it with a proper commit body, and add the signoff then. It is just two commands, git commit -s --amend; git format-patch -1	23:33
	(and helps you get into the right habits)	23:34
faLUCE	vishal: which is the global field taken by -s ?	23:35
	(I have to re-edit it)	23:35
	→ galaxie joined	23:35
vishal	global field?	23:35
faLUCE	in git config	23:35
	so that signed-off shows my correct name and my correct mail	23:35
vishal	git config --global user.name and user.email	23:36
	You should've had this set before making the commit also	23:36
	for correct authorship	23:37
	That's probably why the From: line got added	23:37
	→ thebope joined	23:37
faLUCE	thanks, let's try all	23:39
	→ libertyprime joined	23:41
	← iam730 left	23:42
	← al-damiri left	23:43
	→ iam730 joined	23:44
	→ dre_ joined	23:45
	← bluezone left	23:46
	← Noldorin left	23:49
faLUCE	vishal: I can see the signed off line, but, unfortunately, I see the "from " line with a wrong email address too. The output of send-email says: "(mbox) Adding cc: my name [email@hidden.address] from line 'From: my name [email@hidden.address]	23:50
vishal	faLUCE: paste the file generated by format-patch somewhere	23:51
	→ rafasc joined	23:55
vishal	faLUCE: it /sounds/ like you didn't --amend the commit after setting your user.name/email, but would have to look at things to confirm what's going on	23:56
faLUCE	vishal: http://paste.ubuntu.com/p/JBTRGQg2CB/	23:56
	→ nurdie joined	23:56
faLUCE	(I replaced the email address with "wrong-email" and "correct-email" for avoiding spam	23:57
	→ perrier-jouet joined	23:57
vishal	how did you add that signoff line?	23:57
	manually or -s?	23:57
faLUCE	-s	23:57
	I executed git commit -s --amend	23:57
	vishal perplexes	23:58
vishal	also your subject line is far too long	23:58
	read https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html again	23:58
faLUCE	ok	23:58
vishal	try git commit --amend -s --reset-author	23:59
rafasc	you may need to use --reset-author	23:59
	← student_A left	23:59
	← ferdna left	23:59

Logs Search ←Prev date Next date→

Channels Documentation