IRCloggy #git 2020-05-29

Provider of IRC logs since 2005.

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

	2020-05-29
	← doug16k left	00:00
	← sudomake left	00:02
	→ sudomake joined	00:03
rafasc	Intelo: that should not discard uncommitted changes.	00:03
	← hexnewbie left	00:04
Intelo	rafasc, thats why I am surprised	00:06
	← sudomake left	00:08
	→ doug16k joined	00:10
	← ghost43 left	00:11
	→ ghost43 joined	00:12
	← fission6 left	00:13
	← orbyt_v7 left	00:14
	← g4570n left	00:19
	← tiin57 left	00:19
	→ xerox_ joined	00:19
	→ g4570n joined	00:20
	→ tiin57 joined	00:22
	← xerox_ left	00:24
	→ zalt joined	00:33
	← jstein left	00:34
zalt	this probably sounds weird, but can you push to a local branch?	00:34
	i mean a shortcut for checkout target_branch then merge source_branch	00:34
	← fairuz left	00:34
	← petaflot left	00:36
	← xcm left	00:37
	← robink left	00:38
	→ xcm joined	00:38
	→ robink joined	00:39
rafasc	zalt: you can use . as remote	00:40
zalt	so git push . master?	00:40
	← ar1el left	00:47
	→ petaflot joined	00:48
rafasc	zalt: but for most cases where a merge is actually needed, git needs files in the worktree.	00:49
	← tiin57 left	00:49
rafasc	if you dont need a merge, you can just reset the branch manually with git branch -f branch1 branch2	00:49
zalt	hmm, my use case is a branch that is never checked out, only used for pushing and pulling from other machines	00:50
	← ohmyfromage left	00:50
rafasc	or just create a new worktree, and merge there.	00:50
zalt	i should probably use a --bare repo for that, but i'm lazy	00:50
rafasc	you can do $git push . src:dest	00:51
zalt	Ha!, that works, thanks	00:52
	→ ohmyfromage joined	00:52
	→ tiin57 joined	00:53
	← caffeinatedcode left	00:55
	← Cabanossi left	00:56
	→ Cabanossi joined	01:01
	← forrestv left	01:03
	→ maryo_s joined	01:04
	← maryo left	01:07
	→ przemoc joined	01:08
	← shush left	01:13
	→ shush joined	01:14
	→ ferdna joined	01:18
	← tiin57 left	01:19
	→ causasui joined	01:19
	← shush left	01:20
	→ tiin57 joined	01:23
	→ jaziz joined	01:28
	→ forrestv joined	01:31
	→ albel727 joined	01:37
	← crose left	01:39
	← royal_screwup21 left	01:41
	→ shush joined	01:41
	→ royal_screwup21 joined	01:41
	→ Muimi joined	01:45
	← tiin57 left	01:49
	→ caffeinatedcode joined	01:49
	← opal left	01:50
	→ tiin57 joined	01:52
	← kjartan left	01:56
	← rafasc left	01:57
	← clime left	01:58
	→ kjartan joined	01:58
	← royal_screwup21 left	01:59
	→ royal_screwup21 joined	02:00
	← Decobus left	02:01
	→ Decobus joined	02:04
	← royal_screwup21 left	02:04
	→ opal joined	02:05
	← g4570n left	02:06
	← shush left	02:07
	→ fairuz joined	02:09
	← Decobus left	02:14
	← bitnoize left	02:16
	→ Decobus joined	02:17
	← Sasazuka left	02:17
	← cdown left	02:18
	← tiin57 left	02:19
	lagothrix → Guest61080	02:21
	← Guest61080 left	02:21
	→ lagothrix joined	02:21
	→ tiin57 joined	02:22
	← Cabanossi left	02:24
	← SunRaycer left	02:25
	→ Cabanossi joined	02:28
	→ xerox_ joined	02:33
	← opal left	02:35
	→ opal joined	02:36
	→ SunRaycer joined	02:37
	← xerox_ left	02:37
	→ Benjamin_S joined	02:38
	← fairuz left	02:39
	← opal left	02:41
	→ shush joined	02:42
	→ opal joined	02:43
	← causasui left	02:48
	← tiin57 left	02:49
	← Benjamin_S left	02:51
	→ tiin57 joined	02:53
	← opal left	02:54
	→ bilb_ono joined	02:55
bilb_ono	ok so I have a bunch of code in this project I made. Someone else on my team made a git repo and commited a README. I would like to clone this repo. git add all of the files in my projects, commit, and push back to github. Whats the order of operations for this?	02:56
	do I git clone his existing repository in my directory?	02:56
	or git init in my directory first?	02:57
mackerman	clone will download a repo, needs to be a new directory	02:59
	In this clone, make yourself a new branch, add and commit your stuff. Suggest they pull from you.	03:01
bilb_ono	mackerman: so Ill basically have to move my stuff locally first, clone their repo, move my stuff back, git add it, commit, push	03:03
	?	03:03
	← shush left	03:04
mackerman	More than one way to do it.	03:04
	← mekhami left	03:05
mackerman	git init in your project directory, branch, commit, add the remote.	03:05
	→ shush joined	03:06
mackerman	clone has some very minor advantages like setting up the remote for you	03:06
	← oojacoboo left	03:07
	← shush left	03:07
bilb_ono	ok and then pull request on github once my branch is up there?	03:08
	shentino_ → Shentino	03:10
mackerman	Sure. Whatever process you want.	03:12
	Push your branch to this presumably shared repo, pull request, merge.	03:13
bilb_ono	mackerman: so I did git init, git checkout -b new-branch, git commit stuff, git push	03:13
	but it says: error: src refspec master does not match any	03:13
	ohh I have to push to the branch	03:14
	→ opal joined	03:18
	← tiin57 left	03:19
bilb_ono	what does it mean when Im trying to create the pull request and it says” There isn’t anything to compare. master and alex-branch are entirely different commit histories.”	03:20
	it shows all my changes in the files changed below	03:20
	→ nabil joined	03:21
	→ Goplat joined	03:22
	← NODE left	03:22
	← forrestv left	03:22
	→ tiin57 joined	03:22
	← nabil left	03:23
bilb_ono	it is true that they don’t share any of the same commit histories	03:23
	← jimi_ left	03:23
bilb_ono	but thats the whole point	03:23
	→ nabil joined	03:23
	← cgi left	03:23
	→ NODE joined	03:24
	→ oojacoboo joined	03:25
mackerman	Do you care about any history in the master branch?	03:26
	→ durham joined	03:28
bilb_ono	no	03:29
mackerman	Might as well merge into your master and push origin master	03:30
robertparkerx	Why when I add a file to gitignore it is still in the repository	03:30
mackerman	Although, without any history yet might be simpler to go back to the clone the remote as a new repo, branch, and add. Then they have the same history.	03:31
bilb_ono	mackerman: Im lost. So I should go, clone the remote as a new repo in my project directory? Rather than git init’ing?	03:35
	I also dont understand the point of the branch	03:35
	→ forrestv joined	03:35
bilb_ono	can’t I just git clone, and that creates the history, then add my files to a new git commit, and then push that to github?	03:36
	so hopefully in the end there is a history of 2 commits - one that the original repo had and mine	03:36
	← chiastre left	03:37
mackerman	bilb_ono: cloning ensures they start from the same history.	03:37
	→ jimi_ joined	03:37
mackerman	I neglected that as there really isn't history in the remote to preserve, but it makes things messier.	03:38
	The branch is just the habit of doing everything as branches and PRs.	03:38
	Push directly into the one branch if you wish.	03:38
	← jimi_ left	03:39
bilb_ono	mackerman: ok I don’t care about preserving the remote’s history. So the simplest way to do it is to clone from the remote in my projecty dir as the first step?	03:39
mackerman	robertparkerx: Ignore is not remove. You can rm or clean ignored files.	03:39
robertparkerx	how do I remove just one file?	03:41
	→ chiastre joined	03:41
mackerman	bilb_ono: Yes, simplest is to clone	03:41
robertparkerx	It is trying to remove a lot	03:41
	git rm -r --cached some-directory	03:41
	← omar_trisquel left	03:41
bilb_ono	mackerman: when I try and git clone in my existing project dir (after doing rm -rf .git), it says: fatal: destination path 'tap-distru' (my repo name) already exists and is not an empty directory.	03:45
robertparkerx	I got it	03:45
bilb_ono	how does it know about this if I rm -rf’d .git ?	03:45
	→ shush joined	03:46
	← tiin57 left	03:49
mackerman	bilb_ono: Clone creates a new directory. Simply not being a git repo is not enough.	03:50
	← bilb_ono left	03:50
	→ bilb_ono joined	03:50
bilb_ono	oh it has to be a new one	03:50
	idk. ill try again later	03:50
	← bilb_ono left	03:51
	→ bilb_ono joined	03:51
	→ tiin57 joined	03:53
	← shush left	03:54
	← bilb_ono left	03:56
	← kjartan left	04:02
	→ kjartan joined	04:02
robertparkerx	git rm -r --cached some-directory ( why did it delete so many files when I ran this )	04:06
	← ferdna left	04:07
mackerman	Because you asked it to? git rm delets every pathspec you give it.	04:11
robertparkerx	oh I thought it would delete all that the gitignore said to	04:11
mackerman	git clean -X --dry-run	04:12
	→ vdamewood joined	04:13
robertparkerx	what does that do	04:13
	I'm trying to learn more sorry	04:13
mackerman	man git clean	04:13
gitinfo	the git-clean manpage is available at https://gitirc.eu/git-clean.html	04:13
robertparkerx	ty	04:15
	← tiin57 left	04:19
	→ supernovah joined	04:20
	← fattredd left	04:20
	→ Guest20 joined	04:21
	→ tiin57 joined	04:23
	← xcm left	04:27
	→ xcm joined	04:28
	→ fstd_ joined	04:28
	→ fairuz joined	04:28
robertparkerx	mackerman will I have to add + commit ?	04:31
	← fstd left	04:32
	fstd_ → fstd	04:32
mackerman	Yes, you'll need to add deletes you want to commit.	04:34
	If the files are gone from the working tree but still in the index, consider git add -u	04:34
	← orbyt_ left	04:35
	→ orbyt_ joined	04:37
	← dedowsdi left	04:42
supernovah	if I've got a server with a receive.denycurrentbranch ignore enabled, and I commit to it, it stays checked out wherever I had it, and my pushes stack on top of it right, so what command do I run in that working-tree to move it to the latest commit	04:43
	because whenn I looked at it, it said HEAD -> master, (the latest commit) but I ran my deployment scripts in it and they were clearly building the older software	04:43
	and no matter what I ran, it seemed to stay that way, I ended up having to clean -f -d -x and reset --hard which meaning reinstalling a lot of software	04:44
	→ causasui joined	04:47
	← Hello71 left	04:48
	← xcm left	04:48
	→ xcm joined	04:48
	→ Hello71 joined	04:48
	← tiin57 left	04:49
	→ tiin57 joined	04:52
	← durham left	04:54
	→ Phylock joined	04:55
	→ benyoo joined	05:03
benyoo	Can I deactivate the warning: LF will be replaced by CRLF.. without getting a problem?	05:04
	← is_null left	05:11
	← hbautista left	05:12
	→ bettencb joined	05:13
	← opal left	05:19
	← tiin57 left	05:19
	← bettencb left	05:21
	→ tiin57 joined	05:23
	← cliluw left	05:24
	→ calcul0n joined	05:27
	← k3yp left	05:29
	→ sauvin joined	05:31
	→ k3yp joined	05:31
	→ opal joined	05:33
	→ dedowsdi joined	05:34
	→ Newami joined	05:36
	← Newami left	05:40
	← gordonfish left	05:49
	← tiin57 left	05:49
	→ z8z joined	05:51
	← Codaraxis left	05:52
	→ bilb_ono joined	05:52
	→ tiin57 joined	05:53
	→ Codaraxis joined	05:54
	← Betal left	05:56
	← bilb_ono left	05:57
	← hurfdurf left	06:06
	→ hurfdurf joined	06:06
	→ Rick8024 joined	06:08
	← KnoP left	06:09
	Rick8024 → KnoP	06:09
	← theorangeone left	06:10
	← g00s left	06:11
	→ theorangeone joined	06:11
	← tiin57 left	06:19
	← gxt left	06:23
	→ tiin57 joined	06:23
	← Ignacy left	06:24
	← causasui left	06:24
	← thiago left	06:24
	→ Ignacy joined	06:24
	→ shush joined	06:26
	→ gxt joined	06:27
	→ akem_ joined	06:27
	→ hqdruxn08_ joined	06:28
	← Goplat left	06:29
	← CCR5-D32 left	06:29
	← akem left	06:30
	← shush left	06:31
	← hqdruxn08 left	06:32
	→ xerox_ joined	06:39
	← z8z left	06:41
	← Trieste left	06:43
	xcm → Guest13200	06:43
	← Guest13200 left	06:43
	→ xcm joined	06:43
	← xerox_ left	06:44
	→ g00s joined	06:44
	← maryo_s left	06:44
	→ maryo_s joined	06:44
	→ Trieste joined	06:45
	← tiin57 left	06:49
	→ mightyjens joined	06:50
	→ tiin57 joined	06:53
Guest20	i did a git add	06:53
	and it added few files	06:53
	now i want to remove a particular file	06:53
	how do i do that	06:53
GreateSMB1	git rm --cached filename.ext	06:56
	→ hexnewbie joined	06:58
	← waveclaw left	06:58
	→ waveclaw joined	06:58
	← jaziz left	06:59
	→ chele joined	07:00
	→ quetz joined	07:01
	← random_yanek left	07:02
	← thansen left	07:04
	→ jaziz joined	07:04
	← DarthRadar left	07:07
	→ mns_ joined	07:08
	→ rfuentess joined	07:08
	→ DarthRadar joined	07:08
	← mns left	07:08
	→ random_yanek joined	07:09
	→ mr_shaman joined	07:14
	→ linuxdogXdog joined	07:15
linuxdogXdog	hello to All here,	07:16
	I am a new comer here	07:16
ikke	welcome	07:16
linuxdogXdog	Because this channel need a registerd account	07:16
	bill@b450:~/ALL_GTSDK/rk3326/rk3326-android8.1.pub/kernel$ git show 180ac2759bc8d94de46aa868c03e94110e8cbde2 --name-status	07:17
	commit 180ac2759bc8d94de46aa868c03e94110e8cbde2	07:17
	Author: Bill Zhao [email@hidden.address]	07:17
	Date: Tue Dec 3 14:31:49 2019 +0800	07:17
	rotate logo 90 degree	07:17
		07:17
	Change-Id: Id17199c2da9301cde9b6de6177ee71b778fe7aea	07:17
	T logo.bmp	07:17
	A logo.bmp.ori	07:17
	T logo_kernel.bmp	07:17
	A logo_kernel.bmp.ori	07:17
ikke	linuxdogXdog: please use a paste service	07:17
linuxdogXdog	A logo_kernel_r90.bmp	07:17
	A logo_r90.bmp	07:17
	Can somebody here can tell me what does it mean by "T"	07:17
	@ikke are you refering to the pastebin	07:18
	?	07:18
	→ thansen joined	07:18
ikke	some kind of pastebin	07:19
	!paste	07:19
gitinfo	Please use a pastebin for snippets longer than one line. Persistent and can be used with a GitHub account: https://gist.github.com/ - one hour auto-delete: https://upaste.de/	07:19
	← tiin57 left	07:19
ikke	I don't think that git uses T for status	07:20
linuxdogXdog	@gitinfo good!	07:20
ikke	Cannot find a reference to it	07:20
	!botsnack	07:20
gitinfo	Om nom nom	07:20
ikke	!bot	07:20
gitinfo	[!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see https://gitirc.eu/bot for more information about how to (ab)use me.	07:20
ikke	linuxdogXdog: is this comming from gerrit?	07:21
	← waveclaw left	07:21
linuxdogXdog	@ikke The documentation of git status didn't mention it, but I have just see it in my kernel project	07:22
ikke	Is it using gerrit?	07:22
	Change-Id is something gerrit uses	07:22
	→ tiin57 joined	07:23
linuxdogXdog	the project belong to a repo projects group (Android )	07:23
	← sunri5e left	07:23
ikke	ok, then look at the specific documentation	07:24
linuxdogXdog	no gerrit info in my projects repo	07:25
	→ sunri5e joined	07:25
ikke	yeah, I don't think android is using gerrit	07:25
	→ fabs joined	07:26
	→ muhaha joined	07:29
muhaha	guys? i need help, any idea how can i git diff changes if they are from specific folders ( there will be json with defined projects with dest dir) ? I need to get which project is impacted by diff. its monorepo with multiple projects :X	07:31
	→ oxymoron93 joined	07:33
	← Rav3n left	07:37
muhaha	something like https://github.com/simplesurance/baur -> define projects and locations a be able to get which project has changed	07:41
	then i want to trigger command, instead of build	07:41
linuxdogXdog	@ikke In the google aosp, .repo/manifest.xml does have a line of "review="https://android-review.googlesource.com/" />"	07:42
	the "android-review" should be gerrit , I am not sure!	07:43
	@likke but the android project I am using is customized by hip vendor, it don't have the line of review= ...	07:44
	← green- left	07:45
	← orbyt_ left	07:45
	→ clara97 joined	07:46
	← g00s left	07:46
	→ green- joined	07:46
	← ncdulo left	07:47
	← tiin57 left	07:49
	→ tiin57 joined	07:52
	← mat001_ left	07:57
	← varesa left	07:59
	→ varesa joined	08:01
	← cebor left	08:04
	→ cebor joined	08:05
	← Eryn_1983_FL left	08:09
	← linuxdogXdog left	08:10
	→ Eryn_1983_FL joined	08:11
	→ xerox_ joined	08:16
	→ rsrx joined	08:17
	← tiin57 left	08:19
	← xerox_ left	08:20
	→ jellium joined	08:21
	← fairuz left	08:21
	→ jellium_ joined	08:21
	← jellium_ left	08:21
	→ jellium_ joined	08:22
	→ ShapeShifter499 joined	08:22
	← jellium_ left	08:22
	→ jellium_ joined	08:22
	→ tiin57 joined	08:23
jellium	hi	08:24
gitinfo	jellium: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	08:24
	← jellium_ left	08:24
	→ jellium_ joined	08:24
	← jellium_ left	08:25
	→ ncdulo joined	08:26
	← jellium left	08:27
	→ shush joined	08:27
	→ xerox_ joined	08:28
	← shush left	08:31
	→ realloc joined	08:37
realloc	hi, in our repository we have some files which look like textfiles but which actually can not be merged manually in case of conflict because they are too complex. There is a special merging tool for them. Hence, I configured a [merge "toolname"] entry in my .gitconfig for them and set merge=toolname in the gitattributes file for the affected filetype. This works well with "git merge", however, "git	08:40
	rebase" seems to ignore the merge=... setting of the gitattributes file. Do you know how I can fix this? Thank you very much	08:40
	← dedowsdi left	08:41
	→ dedowsdi joined	08:42
	→ Ploppz joined	08:44
	→ T_UNIX joined	08:44
	→ is_null joined	08:46
	← tiin57 left	08:49
	→ tiin57 joined	08:52
	← syr left	08:55
	→ syr joined	08:56
	← rsrx left	08:58
	← dedowsdi left	08:59
	→ dedowsdi joined	08:59
	→ linuxdogXdog joined	09:01
	← cebor left	09:03
	→ cebor joined	09:04
	← Muimi left	09:10
	← Ploppz left	09:16
	← dedowsdi left	09:17
	← GreateSMB1 left	09:19
	← tiin57 left	09:19
	→ rsrx joined	09:19
	→ tiin57 joined	09:23
	← zalt left	09:35
	→ Muimi joined	09:36
	→ zalt joined	09:39
	← ChrisLane left	09:41
	→ Ploppz joined	09:42
	→ ChrisLane joined	09:43
	→ planetcall\|work joined	09:44
	← R2robot left	09:46
	→ cdown joined	09:46
	← Guest20 left	09:48
	→ bitnoize joined	09:48
	→ BPL joined	09:49
	← tiin57 left	09:49
	→ tiin57 joined	09:52
	← clara97 left	09:55
	→ lesshaste joined	09:57
lesshaste	sorry my nick broke.. I was asking about image licenses	09:58
	← maryo_s left	10:01
	vals_ → tango_	10:02
	→ maryo joined	10:02
	← zalt left	10:03
	← maryo left	10:03
	→ maryo joined	10:03
	→ zalt joined	10:03
	→ cadmio joined	10:04
cadmio	does anyone know how can I create a deb package from sources download with git ?	10:04
ikke	Something like https://github.com/goreleaser/nfpm	10:06
	← cim209 left	10:07
	→ garrettw joined	10:10
	→ cim209 joined	10:10
cadmio	when I do apt-get --build source package_name, what should I put in the place of "source" ?	10:13
	← opal left	10:13
cadmio	my repository?	10:13
ikke	cadmio: no	10:13
	→ cdown_ joined	10:13
ikke	afaik, that's for building source packages	10:13
	ie, prepared packages that have build instructions inside	10:14
	← cdown left	10:14
ikke	https://blog.serverdensity.com/how-to-create-a-debian-deb-package/	10:14
	→ crose joined	10:15
ikke	https://www.man7.org/linux/man-pages/man1/dpkg-deb.1.html	10:15
	You need to do a little bit more preparation	10:15
	→ cdown joined	10:15
	← ajbura left	10:16
ikke	If you don't use something like (n)fpm, then you need to create a control file with metadata	10:16
	you also need to create the directory structure as it should end up on the target system	10:17
	← zalt left	10:18
cadmio	so I need : 1) The upstream tarball with .tar.gz ending and 2) A description file with .dsc ending.	10:18
	← cdown_ left	10:19
	← tiin57 left	10:19
	← cadmio left	10:21
	→ tiin57 joined	10:22
	→ rafasc joined	10:27
	→ opal joined	10:27
	→ cadmio joined	10:28
michele	is there any git GUI for linux or macOS that shows the diff between branches?	10:28
	→ shush joined	10:28
moldy	i'd be surprised if there is one that does not do that	10:30
rafasc	!guis	10:30
gitinfo	Popular GUIs for Git are listed on the website: http://git-scm.com/downloads/guis	10:30
	← benyoo left	10:31
	→ zalt joined	10:31
	← shush left	10:32
	← ChrisLane left	10:40
	→ ChrisLane joined	10:44
	← bdeshi left	10:49
	← tiin57 left	10:49
	→ bdeshi joined	10:49
	← zalt left	10:51
	→ vicfred_ joined	10:51
	→ tiin57 joined	10:53
	← akem_ left	10:53
	→ zalt joined	10:53
	← vicfred left	10:54
	← muhaha left	10:54
	← zalt left	10:56
	→ zalt joined	10:58
	→ akem joined	11:00
	→ akem_ joined	11:00
	← akem_ left	11:00
	← lesshaste left	11:09
	→ geowiesnot joined	11:10
	← vdamewood left	11:11
	← foul_owl_ left	11:15
	→ mac_ified joined	11:15
	← zalt left	11:16
	→ foul_owl_ joined	11:16
	← tiin57 left	11:19
	→ zalt joined	11:20
	← Kaivo left	11:21
	→ Kaivo joined	11:21
	← SunRaycer left	11:21
	→ tiin57 joined	11:23
	← BPL left	11:23
	→ akem_ joined	11:24
	← akem left	11:27
	← ChrisLane left	11:30
	→ ChrisLane joined	11:31
	← zalt left	11:35
	← dumb_moth left	11:47
	← _Warl0ck left	11:47
	→ zalt joined	11:47
	→ perrier-jouet joined	11:48
	→ _Warl0ck joined	11:49
	← tiin57 left	11:49
	→ dumb_moth joined	11:50
	→ tiin57 joined	11:52
	← mr_shaman left	11:53
	← cadmio left	11:54
	← dumb_moth left	11:55
	→ dionysus69 joined	11:57
	← n000g left	11:57
	→ dumb_moth joined	11:57
	→ n000g joined	11:59
	→ muhaha joined	12:04
	→ gp5st_ joined	12:09
	← Tahvok left	12:10
	← Muimi left	12:11
	← perrier-jouet left	12:12
	→ tchan joined	12:13
	← jaziz left	12:13
	← gp5st_ left	12:13
	← ezakimak left	12:15
	← yonder left	12:16
	→ ezakimak joined	12:17
	← tiin57 left	12:19
	→ yonder joined	12:21
	→ tiin57 joined	12:23
	→ shush joined	12:29
	→ Tahvok joined	12:29
	→ cgi joined	12:32
	← shush left	12:33
	← gavlee left	12:35
	→ mr_shaman joined	12:37
	→ fission6 joined	12:40
	← fission6 left	12:41
	→ Aattas joined	12:41
	← Jck_true left	12:41
	→ Maxattax joined	12:42
	→ Jck_true joined	12:42
	→ fission6 joined	12:43
	→ CodeSlingerPaul joined	12:43
	← axisys left	12:43
	← tiin57 left	12:49
	→ tiin57 joined	12:53
	← planetcall\|work left	12:53
	← oprypin left	12:55
	→ Betal joined	12:55
	→ oprypin joined	12:55
	→ gitoso joined	12:56
	← gitoso left	12:58
	→ cdown_ joined	13:02
	← cdown left	13:03
	cdown_ → cdown	13:03
	← Intelo left	13:05
	→ maryo_s joined	13:05
	→ bettencb joined	13:05
	← bettencb left	13:05
	← gxt left	13:07
	→ gxt joined	13:07
	→ feriman joined	13:07
	← maryo left	13:08
	← xcm left	13:09
	→ xcm joined	13:10
	→ mat001 joined	13:11
	→ troulouliou_div2 joined	13:12
	← troulouliou_div2 left	13:17
	→ gavlee joined	13:17
	← tiin57 left	13:19
	← Betal left	13:20
	→ lmurar1 joined	13:22
	→ tiin57 joined	13:22
	← is_null left	13:24
	→ is_null joined	13:25
	← lmurar1 left	13:25
	→ durham joined	13:25
	→ lmurar178 joined	13:28
	← lmurar178 left	13:28
	→ lmurar1 joined	13:29
	← durham left	13:30
	← is_null left	13:30
	← mightyjens left	13:31
	→ is_null joined	13:33
	→ CCR5-D32 joined	13:35
	← is_null left	13:37
	→ is_null joined	13:40
	→ Betal joined	13:42
	← feriman left	13:43
	→ aliss joined	13:45
	→ dedowsdi joined	13:46
	← tiin57 left	13:49
	→ tiin57 joined	13:52
	← KnoP left	13:54
	← diogenese left	13:56
	→ diogenese joined	13:56
	→ Newami joined	13:57
	← Newami left	13:57
	→ axisys joined	13:58
	← axisys left	14:02
	→ hbautista joined	14:02
	← oojacoboo left	14:03
	→ santosh26 joined	14:05
	→ oojacoboo joined	14:08
	← santosh26 left	14:08
	→ cd joined	14:09
Nickeeh	I'm trying to find the introduction of a line, so I used 'git log --all -G FooLine', but the first result is a removal of that line. I don't get it.	14:13
ikke	Nickeeh: try to add --full-history	14:14
	→ shush joined	14:14
	→ zalt_ joined	14:15
	← floatingman left	14:15
Nickeeh	ikke: ah.. thanks but it turned out to be the order I think? The git log order is different from the 'git log --graph' order.	14:16
	← zalt left	14:16
Nickeeh	eh.. no that's still a removal	14:16
	'git log --all --graph --full-history -p -G mRotationPointFunc'	14:17
	that's the actual executed command.. no weird things in there right?	14:17
	→ NeoCron joined	14:18
	← Xiti left	14:18
	← tiin57 left	14:19
	← shush left	14:19
ikke	Doesn't look like it	14:19
	← dedowsdi left	14:20
	→ netz_ joined	14:20
	← netz left	14:21
	netz_ → netz	14:21
	→ lucasb joined	14:21
	→ dedowsdi joined	14:22
	→ tiin57 joined	14:22
	→ Xiti joined	14:24
	← geowiesnot left	14:24
	← gpanders left	14:25
realloc	hi, in our repository we have some files which look like textfiles but which actually can not be merged manually in case of conflict because they are too complex. There is a special merging tool for them. Hence, I configured a [merge "toolname"] entry in my .gitconfig for them and set merge=toolname in the gitattributes file for the affected filetype. This works well with "git merge", however, "git	14:26
	rebase" seems to ignore the merge=... setting of the gitattributes file. Do you know how I can fix this? Thank you very much	14:26
	← oxymoron93 left	14:26
	← Xiti left	14:26
	→ gpanders joined	14:28
	→ z3t0 joined	14:31
z3t0	hi all, I am learning about git rebase and trying to clean up a branch by rewriting the history but having some weird issue with commits disappearing	14:31
	I am doing an interactive rebase say I have commit A B C D.	14:32
	→ Xiti joined	14:32
	← muhaha left	14:33
z3t0	What I am trying to do is re order it to A (squash B) C D.	14:33
	For some reason commit C gets deleted and doesn't show up in the rebase. Now C has files related to D. So then D complains that a file was deleted by us... I'm new to rebase so am really confused whats happening	14:33
	I would appreciate any help, and can provide more info!	14:33
	→ gordonfish joined	14:34
z3t0	Hmm, the problem seems to have disappeared. Odd	14:36
	→ thiago_ joined	14:37
	← netz left	14:38
	→ netz joined	14:40
	← netz left	14:40
	→ netz joined	14:41
	← netz left	14:43
	← Xiti left	14:44
	← is_null left	14:45
	→ netz joined	14:46
	← SpeakerToMeat left	14:48
	→ Lucas_Gray joined	14:48
	← tiin57 left	14:49
	→ SpeakerToMeat joined	14:50
	← dedowsdi left	14:52
	→ tiin57 joined	14:53
	→ dedowsdi joined	14:53
	← netz left	14:54
	→ geowiesnot joined	14:54
	→ dfee joined	14:55
Nickeeh	ikke: ah, -m	14:56
	→ fitzgerald1337 joined	14:57
	← gpanders left	14:58
	→ netz joined	14:59
	→ gpanders joined	14:59
	← tanuki left	15:00
	← dedowsdi left	15:01
	← dionysus69 left	15:01
	→ tanuki joined	15:01
	→ Xiti joined	15:03
	→ dedowsdi joined	15:05
	→ fattredd joined	15:05
	← dedowsdi left	15:09
	→ g4570n joined	15:12
	→ R2robot joined	15:12
	← fflam left	15:18
	← ChrisLane left	15:18
	← tiin57 left	15:19
	→ fflam joined	15:20
	→ ChrisLane joined	15:20
	→ tiin57 joined	15:23
	→ jor joined	15:24
	← gpanders left	15:24
	→ durham joined	15:26
	← durham left	15:31
	→ faceface joined	15:32
faceface	hi	15:32
	I'm in a pickle...	15:32
	I did git init / git remote add backup gitrepo/config.git/ / git fetch backup	15:32
	I saw * [new branch] master -> backup/master	15:32
	but git branch shows me nothing	15:32
	git branch -a shows me remotes/backup/master (in red)	15:33
	I thought init would create master...	15:33
davve	hey, im in a pear. I thought I had made a commit but it was failed due to a pre-commit hook without noticing, then i made some more work and --amended it, but it got amended to somoene elses commit. how do i get back to before doing that and restoring my work? :o	15:33
faceface	What I want to do is compare a version of a file in that remote to the version currently in my cwd	15:33
	davve: ensuring you have a backup first... git reset	15:34
	davve: ensuring you have a backup first... git reset commit-before	15:34
	→ Ownix joined	15:35
davve	thanks, making a backup to try :+1+	15:35
	← nikivi left	15:35
	→ nikivi joined	15:35
Ownix	I am migrating to a new remote git repo, will it hurt anything if I just change the URL for origin and push?	15:36
davve	ambiguous argument 'commit-before'	15:37
	→ Muimi__ joined	15:37
	→ gpanders joined	15:38
Bombe	faceface, without a commit you don’t have a branch, that’s why there’s no master after git-init.	15:38
	faceface, git-status should tell you you’re on master.	15:39
	← Trieste left	15:44
	→ Trieste joined	15:46
	← tiin57 left	15:49
	→ tonyj joined	15:50
	→ deathwishdave joined	15:50
	→ tiin57 joined	15:53
davve	i worked it out	15:54
	← z3t0 left	15:54
	← aliss left	15:55
	→ bolovanos joined	15:55
	→ Brainium joined	15:58
	→ bolovanos_ joined	16:02
	← bolovanos left	16:06
	→ Guest20 joined	16:06
	← Lucas_Gray left	16:08
	→ onizu joined	16:09
	← deathwishdave left	16:11
	→ shush joined	16:15
	← tiin57 left	16:19
	← netcrash left	16:22
	→ tiin57 joined	16:23
	← justanotheruser left	16:24
	← vicfred_ left	16:26
	→ vicfred joined	16:27
	→ aliss joined	16:28
	→ deathwishdave joined	16:33
	← shush left	16:34
	→ shush joined	16:35
	← rfuentess left	16:38
	→ justanotheruser joined	16:39
	→ thomasross_ joined	16:43
	← thomasross left	16:43
	thomasross_ → thomasross	16:43
	→ zen_coder joined	16:48
zen_coder	how can I get the print the current branch name?	16:49
	-the	16:49
	← tiin57 left	16:49
ikke	git symbolic-ref HEAD	16:49
zen_coder	in front of it, I get a `refs/heads/`	16:49
	what is this? how can I remove it?	16:50
	← ChrisLane left	16:50
ikke	git git rev-parse --abbrev-ref HEAD	16:50
	zen_coder: that's the full branch name	16:50
zen_coder	will this solution works in all cases?	16:51
	→ ChrisLane joined	16:51
ikke	yes, unless HEAD is detached	16:51
zen_coder	is there a solution, when head is detached?	16:52
ikke	no	16:52
	because there is no branch checked out then	16:52
	→ tiin57 joined	16:53
	← gxt left	16:54
	← opal left	16:54
	→ rewrited joined	16:55
	→ orbyt_v7 joined	16:56
	→ gxt joined	16:56
	→ opal joined	16:56
	→ clara97 joined	17:08
	→ perrier-jouet joined	17:09
	← T_UNIX left	17:13
	← deathwishdave left	17:14
	← tiin57 left	17:19
	← fission6 left	17:19
	→ clime joined	17:19
	→ Metalsutton joined	17:20
	→ fission6 joined	17:22
	→ tiin57 joined	17:23
	→ causasui joined	17:24
	← kashike left	17:24
	← rsrx left	17:28
	← CCR5-D32 left	17:37
	← theorangeone left	17:39
	← Muimi__ left	17:39
	→ theorangeone joined	17:40
	← bolovanos_ left	17:46
	→ bubble01_ joined	17:48
	bubble01_ → bubble02	17:48
	← tiin57 left	17:49
	← chele left	17:50
	→ tiin57 joined	17:52
	→ tangerinelaborat joined	17:53
	→ iffraff joined	17:57
	→ bilb_ono joined	17:59
	← ChrisLane left	18:04
	→ ChrisLane joined	18:06
	← bitnoize left	18:08
	→ mehwork joined	18:09
	→ troulouliou_div2 joined	18:14
	← ttoocs left	18:14
mehwork	when i do 'git co origin foo' does that mean it tries to fetch and checkout from the remote server?	18:15
	reason i ask is when i create a ticket from Stash/bitbucket's website, i can't 'git co origin foo'. Instead i have to 'git fetch && git co foo'	18:16
	not sure what the distinction is	18:16
	→ cdown_ joined	18:18
	← iffraff left	18:19
	← tiin57 left	18:19
	← g4570n left	18:19
	← cdown left	18:21
	cdown_ → cdown	18:21
	→ tiin57 joined	18:22
	→ bitnoize joined	18:26
	← sauvin left	18:29
	→ g00s joined	18:29
	← foul_owl_ left	18:31
	← Guest20 left	18:32
	← justanotheruser left	18:35
	← maryo_s left	18:37
	→ omar_trisquel joined	18:39
	→ justanotheruser joined	18:42
	→ Lucas_Gray joined	18:43
	→ foul_owl_ joined	18:45
	← wootehfoot left	18:46
	→ cliluw joined	18:47
	← tiin57 left	18:49
	→ tiin57 joined	18:53
	→ Xiti` joined	18:54
	→ maryo_s joined	18:56
	← Xiti left	18:57
	← orbyt_v7 left	19:05
dob1	what is a similar client to git extension on linux?	19:07
	← Aattas left	19:10
	→ davispuh joined	19:13
	← tiin57 left	19:19
rafasc	mehwork: to fully understand, you need to be aware of the concept of remote tracking branches: !rtp	19:22
	!rtb	19:23
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'	19:23
	→ tiin57 joined	19:23
mehwork	thanks	19:23
rafasc	mehwork: that is, origin/master isn't the 'branch master from the remote, it is a copy of the branch master from the remote at the time you last contacted the server (either directly via fetch, or indirectly via pull which does a fetch internally)	19:24
	The second part is that checkout has some builtin magic that tries to guess what you mean.	19:24
	→ muhaha joined	19:25
	← xcm left	19:25
rafasc	mehwork: for example. if you try: git checkout mybranch; and mybranch doesn't exist, but origin/mybranch does.. git creates a local branch 'mybranch', makes it track 'origin/mybranch', and checks it out.	19:25
	→ wootehfoot joined	19:26
	→ xcm joined	19:26
rafasc	but checkout itself never talks to the sever. It uses the local "mirrors".	19:26
	It can be confusing because a "remote tracking branch" is a local branch.	19:27
	← rewrited left	19:27
rafasc	[local]master (tracks)-> [local]origin/master (mirrors)-> [server]master	19:29
	← Trieste left	19:29
	→ Trieste joined	19:32
mehwork	ok	19:33
	→ BPL joined	19:35
	← wgrant left	19:35
	→ benyoo joined	19:37
	→ cdown_ joined	19:40
	→ orbyt_v7 joined	19:41
	← cdown left	19:42
	cdown_ → cdown	19:42
	← Lucas_Gray left	19:44
	← xcm left	19:44
	→ xcm joined	19:45
	→ NewToThisV21 joined	19:46
NewToThisV21	I accidentally deleted a file in file changes section on my pull request in GitHub. Is there a way I can undo this file deletion?	19:46
	← mr_shaman left	19:47
	← tiin57 left	19:49
rafasc	NewToThisV21: you need to add it again.	19:49
	Something like git checkout origin/master -- filename;	19:50
NewToThisV21	I was trying to pull from the remote branch which is where the file was deleted, but it gave me "tip is ahead of branch" message, so since I knew the file still existed on my local branch I just did a git push origin head --force, hopefully I didn't destroy anything	19:50
	git still perplexes me at times	19:51
	→ chele joined	19:52
	→ tiin57 joined	19:52
	← linuxdogXdog left	19:53
	← zen_coder left	19:53
	← chele left	19:54
	← omar_trisquel left	19:55
rafasc	push head --force did destroy something.	19:55
	it destroyed whatever was making the remote ahead of you.	19:55
NewToThisV21	I am pretty sure it was just the file I deleted on the remote which I needed back, I guess time will tell, lol	19:56
rafasc	NewToThisV21: In other words, the remote had a commit you didn't have. And with that force push you said: forget about that, I have the real history, just take it. I don't care what happens to others.	19:56
NewToThisV21	Okay nice, nice, that is what I wanted	19:57
	My local was correct	19:57
rafasc	Is someone else using this repo as well?	19:57
NewToThisV21	No, it's my own feature branch I was working on	19:57
rafasc	you'll need to warn them. Because they might still have the old history.	19:58
	than good	19:58
NewToThisV21	I hastily do stuff in git and I really need to stop and think before running commands	19:58
	← clara97 left	20:08
	← ShapeShifter499 left	20:08
	→ ShapeShifter499 joined	20:09
	→ systemparadox joined	20:09
	← troulouliou_div2 left	20:11
	← geowiesnot left	20:11
systemparadox	Hi. Can anyone point me in the direction for some tips about how to set git up for use with github? I'm a pro mercurial user, but I'm having trouble figuring out how I'm supposed to set up remotes/branches	20:11
	One of my main issues is what to call everything. Currently I've added a remote for my fork on github as "origin", and a remote for the official repo as "upstream"	20:13
	So branch master is pointing as origin/master and that all works ok	20:14
ikke	sounds good so far	20:14
	← lmurar1 left	20:15
systemparadox	ok that's good, although I must say it's a bit frustrating that no tutorial mentions this anywhere, even github specific ones only deal with your own fork	20:15
	it's literally taken me months to figure out that I should call the other one "upstream"	20:16
	If I checkout upstream/master it goes into detached head mode	20:17
ikke	Yes, these are so called remote tracking branches	20:17
	← maryo_s left	20:17
ikke	their only purpose is to keep track of what you fetched from the remote	20:17
systemparadox	right I'm mostly understanding this, but I now have collaboration access to the primary repository	20:17
	so I feel like I need to add a local branch that tracks upstream/master?	20:18
	← tiin57 left	20:19
systemparadox	so that it won't go into detached head mode and I can work on it directly?	20:19
	I tried adding an "upstream" branch, but I got into a right mess because of the naming conflict with the "upstream" remote	20:20
	← Xiti` left	20:20
ikke	I think it makes sense for your local master to track upstream master	20:20
	in most cases, your forks master does not really mastter	20:20
	← nikivi left	20:20
systemparadox	ah that might help	20:20
	← zalt_ left	20:21
systemparadox	am I right in thinking then that I can't have a branch with the same name as a remote?	20:21
	→ HumanGeek joined	20:21
ikke	practically no	20:21
	like you said, it's confusing	20:22
	→ zalt_ joined	20:22
	→ tiin57 joined	20:23
systemparadox	It would be useful to see what others are doing whenever they have more than just "origin". Are there any conventions for this described anywhere?	20:23
	→ nikivi joined	20:24
	→ mowcat joined	20:25
	← nikivi left	20:25
	← Human_G33k left	20:25
	→ smitop joined	20:26
ikke	Not aware of any articles or so	20:27
	→ nikivi joined	20:28
	→ Xiti joined	20:29
	← nikivi left	20:29
systemparadox	is it possible to work in detached head mode? If I checkout upstream/master and then change a file, git status says "nothing to commit, working tree clean". I don't understand that. I know I'm in detached head mode, but I have changed something, so why does git say it's clean?	20:30
	← duderonomy left	20:30
ikke	if you actually changed something, git should show it	20:31
	← xcm left	20:31
ikke	Commits created in a detached HEAD will not belong to any branch	20:31
	← Trieste left	20:31
	→ xcm joined	20:31
ikke	So, in practice, you should always be on a branch if you plan to commit	20:32
	→ nikivi joined	20:32
ikke	(git does not work with anonymous heads like mercurial does)	20:32
	→ Trieste joined	20:33
ikke	in git, it's quite common to work with feature branches	20:33
systemparadox	Am I right in thinking that branches are just bookmarks that point to a specific revision, and normally if you are "on" a branch and add a new commit, it automatically advances the branch pointer to the revision you just added?	20:34
ikke	yes, exactly	20:34
systemparadox	ok, so if I checkout a specific revision and go into detached head mode and then change something and commit, it should work and add the commit with a parent of the revision I checked out, but just won't update the branch pointer?	20:36
ikke	Yes, that precisely how it works	20:36
systemparadox	ok now I just need to figure out why it says "nothing to commit, working tree clean" even after changing some files	20:37
	→ Sasazuka joined	20:40
doug16k	systemparadox, .gitignore?	20:44
	→ CCR5-D32 joined	20:46
	→ deathwishdave joined	20:47
	← tiin57 left	20:49
	← vicfred left	20:50
	→ tiin57 joined	20:52
systemparadox	aha that's hilarious, I used "npm version" and didn't realise it does a git commit automatically!	20:53
	→ vicfred joined	20:55
systemparadox	ok so next question is why "git log" doesn't show this? Do I have to do something to get a full log?	20:56
	→ Enphuego joined	20:56
	← benyoo left	20:56
	← vicfred left	20:56
	→ jstein joined	20:56
	→ vicfred joined	20:56
	← vicfred left	20:57
	→ vicfred joined	20:58
systemparadox	ok it's shown in "git log --all". Does this mean that "git log" only shows ancestors of HEAD by default?	20:58
	← onizu left	21:00
	→ geowiesnot joined	21:00
systemparadox	ah found it in the docs, that appears to be a yes	21:01
	→ nly joined	21:02
systemparadox	ikke, thanks very much for your help, I feel like I have a much clearer understanding now	21:02
	mns_ → mns	21:03
	← HourGate left	21:04
	→ duderonomy joined	21:04
	← deathwishdave left	21:05
	→ HourGate joined	21:05
	← Elodin left	21:06
	→ m0viefreak joined	21:07
	← Ploppz left	21:07
	← HourGate left	21:12
	→ HourGate joined	21:13
ikke	systemparadox: np	21:14
	← BPL left	21:16
	← tiin57 left	21:19
	← muhaha left	21:22
	→ tiin57 joined	21:23
	→ g4570n joined	21:23
	← Maxattax left	21:26
	← tangerinelaborat left	21:26
	← aliss left	21:29
	→ flex14 joined	21:29
	→ aliss joined	21:29
	← flex14 left	21:33
	← Trieste left	21:35
	→ Trieste joined	21:36
	← Brainium left	21:40
	← Shentino left	21:41
	→ shentino joined	21:43
	← chiastre left	21:46
	← tiin57 left	21:49
	→ chiastre joined	21:49
	← Metalsutton left	21:49
	← quetz left	21:50
	→ tiin57 joined	21:53
	← CodeSlingerPaul left	21:53
	→ jaziz joined	21:59
	→ wildlander joined	22:01
	← nly left	22:02
	→ wgrant joined	22:04
	← bubble02 left	22:05
	← Phylock left	22:11
	← jstein left	22:12
	→ ethernether joined	22:15
	← Zialus left	22:17
	← split_horizon left	22:18
	← tiin57 left	22:19
	→ tiin57 joined	22:22
	← wootehfoot left	22:28
	← systemparadox left	22:32
	← sphalerite left	22:34
	← calcul0n left	22:38
	← fission6 left	22:38
	→ sphalerite joined	22:43
	thiago_ → thiago	22:45
	→ SmashingX joined	22:48
	← SmashingX left	22:48
	→ voidSurfr joined	22:48
	← voidSurfr left	22:49
	← tiin57 left	22:49
	← orbyt_v7 left	22:50
	← aliss left	22:50
	← duderonomy left	22:51
	→ tiin57 joined	22:52
	← NeoCron left	23:01
	← CCR5-D32 left	23:01
	← bakadesusenpai left	23:03
tonyj	is there anyway (git log -S etc) to find what commit deleted a blank line	23:04
nedbat	tonyj: an interesting challenge	23:06
	→ troulouliou_dev joined	23:09
	→ duderonomy joined	23:09
	← perrier-jouet left	23:14
	← jwest left	23:14
	→ jwest joined	23:14
	→ perrier-jouet joined	23:14
	→ bakadesusenpai joined	23:15
	← ethernether left	23:15
	← smitop left	23:15
	← justanotheruser left	23:16
	xcm → Guest97965	23:17
	← Guest97965 left	23:17
	→ xcm joined	23:17
	← duderonomy left	23:18
	← tiin57 left	23:19
	→ tiin57 joined	23:22
	← oojacoboo left	23:23
Marmotte	tonyj: you search for a precise blank line, or any blank line in a file ?	23:27
tonyj	former	23:27
Marmotte	if you have line numbers, you can try git log -L first,last:file	23:27
	with current line numbers, git will follow the "block" if it moves	23:28
tonyj	Marmotte: thanks I'll give it a try	23:28
	I basically have a patch that fails to apply as the patched file has two blank lines and the context in the patch only expects 1. Somewhere between the two commits (later is cherry picked) the line was removed	23:29
	→ justanotheruser joined	23:32
	→ flex14 joined	23:35
Marmotte	tonyj: it seems that the best answer is git llog --pickaxe-regex -S '^$'	23:36
	(oops, llog is an alias to log in my own config :D)	23:36
	→ duderonomy joined	23:40
	← flex14 left	23:41
	→ flex14 joined	23:42
	← irrgit left	23:45
	← tiin57 left	23:49
	← mowcat left	23:50
	← thansen left	23:51
	→ tiin57 joined	23:53
	→ thansen joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation