IRCloggy #git 2019-04-24

Logs Search ←Prev date Next date→ Channels Documentation

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-24

← pd09041999 left00:00
← de-facto left00:01
→ de-facto joined00:02
← tm007 left00:04
← Phylock left00:04
← mat001 left00:05
← oatmealraisin left00:06
← gde33 left00:07
→ duckonomy joined00:09
← dfee left00:09
← rafasc left00:10
← jottr left00:12
→ gde33 joined00:13
← Fernando-Basso left00:14
← neunon left00:15
← Anthaas left00:15
→ Anthaas joined00:16
→ neunon joined00:17
← renich left00:19
← downer06 left00:24
→ downer06 joined00:26
→ dfee joined00:27
← bluezone left00:28
← jubal left00:31
→ thiago joined00:36
→ oatmealraisin joined00:36
→ scientes joined00:39
→ causa_sui joined00:41
← justanotheruser left00:41
→ jottr joined00:42
→ macaronus joined00:43
← duderonomy left00:46
← causa_sui left00:46
← igemnace left00:56
→ justanotheruser joined00:56
→ igemnace joined01:01
← jottr left01:06
← oatmealraisin left01:09
← igemnace left01:12
← F0rTex left01:16
← scientes left01:17
→ F0rTex joined01:18
← mooasaurus left01:21
→ mooasaurus joined01:21
→ igemnace joined01:22
→ scientes joined01:24
→ thebope joined01:27
← thebope left01:28
→ thebope joined01:28
← macaronus left01:29
← Mattiaslndstrm left01:37
→ jottr joined01:42
→ mven joined01:43
← mven left01:43
→ austin987 joined01:45
← jcbitter_ left01:47
← voidSurfr left01:52
→ jcbitter joined01:54
→ Goplat joined01:54
← noobineer left01:55
← jottr left01:55
← impermanence left01:56
→ oatmealraisin joined01:57
← dfee left01:57
← oatmealraisin left01:57
→ Bobdude joined01:59
← boombatower left02:04
→ nic-hartley joined02:05
→ dfee joined02:08
→ minimal_life joined02:10
lagothrix → Guest1309402:15
← Guest13094 left02:15
→ lagothrix joined02:15
← alyptik left02:15
← dfee left02:18
← arecaceae left02:23
→ jottr joined02:23
→ arecaceae joined02:23
← minimal_life left02:27
← jottr left02:29
→ duderonomy joined02:29
← kjartan left02:35
→ kjartan joined02:40
→ causa_sui joined02:42
← gordonfish left02:44
← bashfulshell left02:46
← causa_sui left02:47
← Emperor_Earth left02:48
← duderonomy left02:50
→ fphilipe_ joined02:58
← libertyprime left02:58
→ libertyprime joined03:00
→ gordonfish joined03:00
← fphilipe_ left03:02
← paulwood left03:04
→ mat001 joined03:06
→ paulwood_ joined03:07
← dpyro left03:08
← mat001 left03:11
← inkbottle left03:12
→ jottr joined03:16
→ veegee_ joined03:17
← veegee left03:17
→ huatou joined03:17
← Sasazuka left03:18
→ dfee joined03:19
← dfee left03:21
← jottr left03:25
→ SkarmoutsosV joined03:26
→ keepLearning512 joined03:26
← thebope left03:29
→ alyptik joined03:30
→ thebope joined03:30
→ matsaman joined03:30
← matsaman left03:34
← rkta left03:35
← thebope left03:35
→ rkta joined03:35
← troyt left03:36
→ veegee joined03:40
← veegee_ left03:42
→ troyt joined03:45
→ Beam_Inn_ joined03:46
→ jungsubk joined03:46
← cfoch left03:46
← duckonomy left03:48
→ polman joined03:48
← acidjnk left03:50
→ sauvin joined03:51
→ duderonomy joined03:52
← jungsubk left03:52
→ dpyro joined03:54
→ jungsubk joined03:54
← Noldorin left03:56
← keepLearning512 left03:56
→ dre_ joined03:59
→ jottr joined04:00
← duderonomy left04:00
→ kapil____ joined04:01
← jungsubk left04:05
→ czart joined04:10
← al-damiri left04:10
← mud left04:18
← troyt left04:20
← jottr left04:21
→ troyt joined04:21
→ fphilipe_ joined04:22
← fatalhalt left04:30
→ HotBeefDip joined04:37
← nic-hartley left04:39
→ causa_sui joined04:43
← causa_sui left04:49
→ duderonomy joined04:52
→ jubal joined04:53
→ pks_ joined05:02
← pks left05:05
pks_ → pks05:05
← SkarmoutsosV left05:07
← scientes left05:07
← duderonomy left05:13
← hofmann3900 left05:21
→ Sasazuka joined05:26
← yuljk left05:32
← Inline left05:34
← hvxgr left05:38
→ yuljk joined05:38
→ j2mb0 joined05:44
→ hvxgr joined05:45
j2mb0 hey guys, i have a current project locally and i would like to move to on a server where 3 devices pull from that server and push (same user - multiple branches) what is the best way to move the local repo to the server? the internet suggest opening a bare repo on the server but i dont know if this is a good solution.05:45
(thx)05:45
← dre_ left05:51
← yuljk left05:54
→ mven joined05:54
HotBeefDip j2mb0 : I'm a complete novice so don't listen to me...however, I've been learning a lot from the pro git book that you can get for free on the official git website...in it, I think this section outlines exactly what you're trying to do: https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server05:55
specifically the part that starts with "Now, you can set up an empty repository"05:55
→ thefatma joined05:55
HotBeefDip hopefully someone else can confirm that I'm pointing you in the right direction, or tell me why it's a terrible idea05:56
→ g00s joined05:57
→ blackandblue joined05:58
→ gloomy joined06:00
← mven left06:01
→ Beam_Inn__ joined06:03
← gloomy left06:05
→ dfee joined06:05
← Beam_Inn_ left06:06
Beam_Inn__ → Beam_Inn_06:06
→ howdoi joined06:07
← thomasross left06:10
→ SkarmoutsosV joined06:12
← escherial left06:15
→ jottr joined06:17
Whiskey How do i copy my git directory from a git to another...06:18
Whit other words upload every commit to a new locetion whitout doing a new commit06:18
j2mb0 HotBeefDip: thank you :)06:19
← j2mb0 left06:19
← dpyro left06:20
← dfee left06:20
→ dpyro_ joined06:20
← fizzizist left06:22
Whiskey so copy the git from one remote to another remote06:22
← thiago left06:22
igemnace Whiskey: push to the other remote06:22
or if you can, pull the former from the latter06:23
Whiskey lol06:23
that waa easy06:23
thanks06:24
← Goplat left06:24
→ Noti joined06:25
← HotBeefDip left06:31
→ duderonomy joined06:31
← orbyt_ left06:31
← Samian left06:32
→ dfee joined06:33
→ wildermind joined06:36
← fphilipe_ left06:37
← duderonomy left06:38
→ sQVe joined06:42
→ causa_sui joined06:44
← kjartan left06:48
← causa_sui left06:49
→ wateriswet joined06:51
wateriswet → KingOfNorway06:51
KingOfNorway → KingOfNorwaident06:51
← g00s left06:51
KingOfNorwaident → KingOfNorway06:52
→ zonixo joined06:52
KingOfNorway → King_Of_Norway06:52
→ fphilipe_ joined06:52
← libertyprime left06:52
→ kjartan joined06:53
← jottr left06:53
→ jottr joined06:54
→ troulouliou_div2 joined06:57
← zonixo left07:00
→ libertyprime joined07:00
→ duderonomy joined07:00
← duderonomy left07:01
← BlessJah left07:02
← troulouliou_div2 left07:03
→ dege joined07:04
← nowhere_man left07:06
→ mat001 joined07:07
← jottr left07:07
→ BlessJah joined07:08
← Beam_Inn_ left07:08
← paulwood_ left07:08
→ zonixo joined07:10
← mat001 left07:12
→ rba joined07:13
→ paulwood joined07:14
← paulwood left07:19
→ paulwood joined07:20
← dodobrain left07:23
→ fstd_ joined07:25
← rba left07:29
← fstd left07:29
fstd_ → fstd07:29
→ rba joined07:29
→ Darcidride joined07:30
→ pd09041999 joined07:30
← pd09041999 left07:32
→ pd09041999 joined07:32
← victorqueiroz left07:33
→ interrobangd joined07:37
← Bobdude left07:37
→ jottr joined07:38
→ orbyt_ joined07:38
← jast left07:38
→ jast joined07:39
← SkarmoutsosV left07:39
→ mikecmpbll joined07:42
← mikecmpbll left07:43
← staafl__ left07:44
← gxt left07:45
→ tm007 joined07:47
→ savolla joined07:48
← pd09041999 left07:48
→ oxymoron93 joined07:48
→ brethil joined07:49
→ staafl__ joined07:50
← blackandblue left07:50
← jottr left07:50
← Jackneill left07:52
→ Jackneill joined07:53
→ n3wborn joined07:53
→ bashfulshell joined07:53
→ mikecmpbll joined07:54
→ clime joined07:54
→ gloomy joined07:55
→ Mattiaslndstrm joined07:56
→ poniav joined07:56
← zonixo left07:57
dx_ob → OtakuSenpai08:00
→ duderonomy joined08:02
← watabou left08:03
→ KaitoDaumoto joined08:03
← interrobangd left08:04
→ floppydh joined08:05
→ yyy- joined08:07
→ jungsubk joined08:07
← jcbitter left08:09
osse finally found a way to have a private fork of our repo at work wooo08:09
← orbyt_ left08:11
← duderonomy left08:11
← jungsubk left08:12
→ jcbitter joined08:12
→ yuljk joined08:14
← libertyprime left08:15
→ jottr joined08:21
→ zamba joined08:24
zamba every time i issue a git pull i'm prompted with an $EDITOR that has a merge branch master message08:24
how can i remove everything locally? it should basically just be a read-only version of the repo08:25
osse zamba: instead of pull, do git fetch then git reset --hard @{u}08:26
← Ram-Z left08:26
osse you get into this situation if you either have made local commits or if someone else has force pushed08:26
zamba osse: should i continue to use git fetch or git pull?08:26
osse zamba: you can use pull from now on until this happens again08:26
zamba osse: ok, thanks :)08:26
← gloomy left08:27
← zulutango left08:27
→ Ram-Z joined08:27
osse zamba: if you're planning on automating this then don't use pull at all08:27
grawity well, nothing particularly wrong with `git pull --ff-only` if you prefer it to fail hard instead of overwriting stuff08:28
← jottr left08:28
osse ah, that's a good idea08:28
grawity as long as you don't let it do merges08:28
→ elichai2 joined08:31
zamba osse: what should i use if i want to automate it?08:32
← hussam left08:32
osse zamba: depends... If it's a CI thing then you probably are given (via env vars or otherwise) a commit to checkout, so you can just check that out directly08:33
If not, then something like git fetch; git checkout origin/master08:34
→ quxgyver joined08:34
osse because in such a repo it doesn't matter that HEAD is detached08:34
→ keepLearning512 joined08:34
→ gloomy joined08:37
→ libertyprime joined08:37
→ interrobangd joined08:38
→ Beam_Inn_ joined08:39
→ nowhere_man joined08:45
→ causa_sui joined08:45
← yonder left08:47
→ dre_ joined08:49
← causa_sui left08:50
← Sasazuka left08:51
← keepLearning512 left08:52
← nowhere_man left08:58
→ computer2000 joined08:59
← j7k6__ left09:00
← dhollinger left09:00
→ jottr joined09:01
→ dhollinger joined09:01
← dpyro_ left09:02
→ lacrymology joined09:04
→ molusc joined09:10
→ zulutango joined09:12
← dre_ left09:12
← jottr left09:13
→ th3m1s joined09:17
→ T_UNIX joined09:17
→ totte_ joined09:20
totte_ → totte09:22
→ tarNeFyS joined09:28
← Darcidride left09:28
← paulwood left09:29
tarNeFyS Hello, do you have any idea how i could do a git blame on word per word basis. My analysis so far is that i should change the generation of the commits. git config on diff only works for the git diff. I haven't find any way to change the diff algorithm used for the commit generation.09:31
Thanks,09:31
← rba left09:31
→ rba joined09:31
← rba left09:31
→ jottr joined09:32
← clime left09:32
← thefatma left09:34
→ rba joined09:34
← queip left09:38
→ mven joined09:39
← yyy- left09:40
← rba left09:40
→ bumbar_ joined09:40
bumbar_ if i want something to happen on remote machine X after i push from local to git server, is that the post-receive hook i should be looking into?09:41
→ rba joined09:42
← poniav left09:44
← rba left09:44
→ poniav joined09:44
→ rba joined09:45
→ YuGiOhJCJ joined09:46
← zamba left09:47
← mven left09:49
grawity yes, although the older post-update also does the job (with a different API)09:50
← computer2000 left09:51
← jottr left09:51
→ zamba joined09:51
← fakhraee left09:52
→ staafl_ joined09:53
← staafl left09:53
← hsiktas left09:53
← discopatrick left09:53
← hoek left09:53
← cttttt left09:54
← ntrrgc left09:54
← isimulate left09:54
← drupol left09:54
← mrbkap left09:54
← MichaelRomig left09:54
→ discopatrick joined09:54
← AndrewGazelka left09:54
← nezZario left09:55
→ hsiktas joined09:55
→ hoek joined09:56
→ isimulate joined09:56
→ MichaelRomig joined09:57
→ AndrewGazelka joined09:57
→ cttttt joined09:57
→ drupol joined09:57
→ ntrrgc joined09:57
← poniav left09:58
→ mrbkap joined09:58
→ nezZario joined09:58
→ queip joined09:58
← lankanmon left10:01
← bashfulshell left10:03
← alyptik left10:04
← Mattiaslndstrm left10:05
→ thefatma joined10:06
→ ChrisLane joined10:08
← cliluw left10:16
→ rtjure joined10:18
→ yyy- joined10:22
→ llinguini joined10:24
→ jottr joined10:25
→ zonixo joined10:26
→ bsanford joined10:27
→ mimajof joined10:31
→ agowa338 joined10:33
← jottr left10:36
← dfee left10:37
spaceone can i exclude a branch from being pushed to a specific remote?10:41
→ Beam_Inn__ joined10:41
← Beam_Inn_ left10:43
Beam_Inn__ → Beam_Inn_10:43
→ causa_sui joined10:46
← KaitoDaumoto left10:48
← kapil____ left10:50
osse spaceone: a pre-push hook10:50
in it, check if a given branch is among those to be pushed. if it is. abort10:51
s/is. /is, /10:51
← causa_sui left10:51
spaceone osse: ah nice, thanks10:51
→ lankanmon joined10:52
← bsanford left10:53
_ikke_ on the server there is also receive.hideRefs10:53
grawity or a pre-receive hook?10:54
_ikke_ Right, but a config setting is easier than a hook10:55
→ alyptik joined10:56
← molusc left10:57
→ molusc joined10:58
→ Sonderblade joined10:59
← Sonderblade left10:59
→ czart_ joined11:00
spaceone simple hook :-) thx https://bpaste.net/show/7aed45100bc411:01
← kjartan left11:01
osse spaceone: I don't think that would work11:02
spaceone it does11:03
osse :O11:03
git checkout otherbranch; git push extern private11:04
← zonixo left11:04
→ dre_ joined11:04
← czart left11:04
spaceone okay, well, the script has no argument with the current branch name11:05
but i won't push in that way from another branch11:05
osse do do you run this by hand or actually install it as a hook?11:05
spaceone install it as hook11:06
osse the pre-push hook doesn't get the remote passed as as an argument11:06
spaceone btw. are hooks ignore on --force?11:06
hm, it does. at least the example says so11:06
→ kjartan joined11:06
→ emsjessec joined11:06
osse what example?11:06
→ jottr joined11:07
spaceone osse: .git/hooks/pre-commit.sample11:07
.git/hooks/pre-push.sample11:08
→ mat001 joined11:08
osse goddammit why isn't that in the man page11:08
← jottr left11:12
← mat001 left11:12
← dre_ left11:12
→ mowcat joined11:14
osse but I would make it actually use the info on stdin to verify instead of relying on the currently checked out branch11:14
→ kyan joined11:14
← Murr left11:17
← angelo_ts left11:24
→ angelo_ts joined11:24
→ Murr joined11:24
← rtjure left11:28
← sQVe left11:29
→ alfredb joined11:30
← jnewt left11:32
→ jnewt joined11:32
← reactormonk left11:35
→ scientes joined11:37
→ zonixo joined11:39
→ jottr joined11:40
← savolla left11:40
→ savolla joined11:42
→ sQVe joined11:43
← rba left11:46
→ computer2000 joined11:47
→ reactormonk joined11:48
→ CodeSlingerPaul joined11:50
angelo_ts hi, asked already but i retry: getting "fatal: The remote end hung up unexpectedly" on a http based clone over a vpn, if any trick (tried a lot of them) welcome11:51
_ikke_ Do you have other network issues over the VPN?11:52
might be an MTU issue11:52
angelo_ts _ikke_, thanks. It is slow but it works. About http, i am trough a proxy also, so proxy and vpn11:53
my vpn is tcp/tap. i could try to change the mtu11:53
→ azwieg103 joined11:55
← YuGiOhJCJ left11:56
← jottr left11:57
→ andrzejv joined12:05
→ royal_screwup21 joined12:06
→ rsrx joined12:12
→ mven joined12:13
← igemnace left12:16
← alfredb left12:16
← gloomy left12:18
← toothe left12:21
← mven left12:27
← computer2000 left12:28
→ computer2000 joined12:28
← computer2000 left12:28
→ bashfulshell joined12:32
→ Sonderblade joined12:35
← wildlander left12:37
→ rafasc joined12:39
→ Beam_Inn__ joined12:43
→ flavius joined12:44
← Beam_Inn_ left12:46
Beam_Inn__ → Beam_Inn_12:46
→ causa_sui joined12:47
← uebera|| left12:51
→ uebera|| joined12:52
← causa_sui left12:52
← zulutango left12:53
← goiko left12:53
→ fission6 joined12:55
→ gloomy joined12:57
← King_Of_Norway left12:59
← savolla left12:59
→ savolla joined13:00
→ mud joined13:00
→ wateriswet joined13:01
→ nic-hartley joined13:01
→ hussam joined13:02
→ mven joined13:02
← reactormonk left13:02
→ Candescence joined13:05
← mven left13:07
→ zulutango joined13:07
Candescence Hi folks, I'm trying to overcome a missing reference error when pushing using LFS, but I can't figure out how to turn on lfs.allowincompletepush. I'm using Sourcetree, btw.13:10
→ mven joined13:13
→ howell joined13:13
← th3m1s left13:13
→ Atlenohen joined13:17
→ pupsikov joined13:17
← mven left13:17
→ SerialSmile joined13:17
→ cd joined13:21
← howdoi left13:26
→ clime joined13:34
← thefatma left13:38
← Beam_Inn_ left13:39
→ reactormonk joined13:39
← savolla left13:40
← fission6 left13:41
→ Envil joined13:42
← mra90 left13:46
← reactormonk left13:47
← czart_ left13:48
→ Inline joined13:48
← nic-hartley left13:52
→ jottr joined13:53
→ bluezone joined13:53
← Sonderblade left13:53
→ hofmann3900 joined13:54
→ toothe joined14:00
→ greggerz joined14:00
→ fission6 joined14:01
→ lucasb joined14:01
→ boombatower joined14:03
← royal_screwup21 left14:04
← andrzejv left14:06
← wateriswet left14:09
← gloomy left14:16
→ wateriswet joined14:20
← sQVe left14:20
→ keepLearning512 joined14:21
→ mven joined14:23
→ oatmealraisin joined14:25
→ finalbeta joined14:26
← galaxie left14:27
← clime left14:27
→ galaxie joined14:31
← floppydh left14:33
← dege left14:34
← fission6 left14:34
→ inkbottle joined14:35
→ dege joined14:35
→ tmm88 joined14:36
← molusc left14:36
→ Phylock joined14:37
→ orbyt_ joined14:37
← bashfulshell left14:41
→ renich joined14:42
← jottr left14:43
→ thiago joined14:43
← wateriswet left14:45
→ Regon joined14:45
→ causa_sui joined14:48
← rsrx left14:48
→ royal_screwup21 joined14:50
→ sjoshi joined14:51
← causa_sui left14:53
→ jungsubk joined14:55
← thiago left14:55
→ rsrx joined14:57
← mowcat left14:57
← Noti left14:58
→ lmat joined14:58
← xcm left14:59
lmat I'm trying to set stash.showPatch rather than stash.showStat.14:59
I tried git config --global stash.showPatch=1 but that didn't work.14:59
→ xcm joined14:59
lmat didn't work = git stash show; still shows a diffstat.15:00
→ Sonderblade joined15:01
rafasc lmat: git what does git config --show-origin --get-regex 'stash*' say?15:02
maybe you need to also do stash.showStat=015:03
→ tang^ joined15:03
→ Noldorin joined15:04
→ Emperor_Earth joined15:05
← azwieg103 left15:06
→ igemnace joined15:06
lmat rafasc: nothing is returned.15:09
→ dpyro joined15:09
oxymoron93 does that work? shouldn't it be `git config --global stash.showPatch true`15:09
lmat oxymoron93: I was hoping I had a syntax error. I'll try that. Thanks!15:09
→ azwieg103 joined15:09
lmat oxymoron93: Jackpot!15:09
rafasc git config --global stash.showPatch 115:10
← zonixo left15:10
rafasc oxymoron93: yea, true or any truthy value. I totally missed that the problem was on the setting the configuration.15:11
oxymoron93 yeah sure, just not that `=` :D15:11
btw, didn't you get any error lmat while trying to execute the first command?15:12
rafasc it should say something like error: invalid key: stash.showPatch=115:13
→ AtumT joined15:14
lmat oxymoron93: no error15:14
oh...15:14
maybe I did :-S15:15
That would have been a dead giveaway...wonder how I missed that!15:15
OOHH! My *first* command was git config --global stash.showPatch; and I didn't get an error with that.15:15
rafasc because that for is to ask the value of the configuration. And since you you didn't have it configured, it shows nothing.15:16
← jungsubk left15:18
lmat rafasc: :(15:18
→ jottr joined15:18
→ duderonomy joined15:20
rafasc s/for/form15:20
← agowa338 left15:21
rafasc $ git config --global -e; is handy to confirm.15:21
← duderonomy left15:22
← sjoshi left15:22
→ avar joined15:23
→ sjoshi joined15:26
→ th3m1s joined15:28
→ Achylles joined15:30
← oxymoron93 left15:31
← wildermind left15:31
→ opilab joined15:32
← jottr left15:33
→ causa_sui joined15:35
→ mowcat joined15:36
→ duderonomy joined15:37
← cybrNaut left15:37
← sjoshi left15:39
→ thomasross joined15:40
← wolfshappen left15:40
← duderonomy left15:40
→ wolfshappen joined15:42
→ clime joined15:42
→ King_DuckZ joined15:44
King_DuckZ hi, I just ran git fetch my_remote_1, now is there a way to push everything to my_remote_2?15:44
git push --all my_origin_2 says "everything up to date" :/15:45
I want to push tags as well, I'm in detached head and I have no local branches15:45
→ Mr__Anderson joined15:46
_ikke_ You'd have to push remote tracking branches, which git does not do by default15:46
→ thiago joined15:46
_ikke_ git push my_remote_2 refs/remotes/my_remote_1/*:refs/heads/*15:47
Something like that15:47
(not tested)15:47
King_DuckZ hm is it easier if I just add my_remote_2 into the repo I just fetched and push --all from there then?15:47
→ SkarmoutsosV joined15:49
→ jungsubk joined15:49
← tm007 left15:50
← clime left15:51
← Sonderblade left15:53
→ Sasazuka joined15:54
← thomasross left15:55
← King_DuckZ left15:55
→ subopt joined15:55
__infinity → vavkamil15:56
← howell left15:57
→ Ignacy joined16:01
→ savolla joined16:02
→ igi_ joined16:02
→ howell joined16:03
← mven left16:04
→ floppydh joined16:05
← Ignacy left16:05
→ jottr joined16:05
→ sahasatvik joined16:05
← skered left16:06
← orbyt_ left16:09
← interrobangd left16:09
→ interrobangd joined16:09
→ thebope joined16:10
← jottr left16:10
→ matsaman joined16:13
← interrobangd left16:14
← matsaman left16:14
← pupsikov left16:16
← opilab left16:17
← sahasatvik left16:17
→ nerosnm joined16:20
← thebope left16:21
→ mat001 joined16:21
→ skered joined16:21
← yyy- left16:23
→ plexigras joined16:24
→ duderonomy joined16:27
BtbN Can I point a ssh url for git to a specific private key, or do I need to configure that domain in .ssh/?16:28
← fphilipe_ left16:28
← duderonomy left16:30
→ iam730 joined16:30
→ jottr joined16:30
→ duderonomy joined16:31
→ gloomy joined16:32
→ Noti joined16:34
→ clime joined16:34
→ wxg joined16:35
rafasc you answered your own question.16:35
← duderonomy left16:37
→ cybrNaut joined16:38
rafasc BtbN: you can also use configure "core.sshCommand" to specify the full ssh command including the -i key16:38
← keepLearning512 left16:39
→ dfee joined16:40
← Noti left16:40
← mikecmpbll left16:41
← quxgyver left16:43
← wxg left16:44
← Sasazuka left16:45
BtbN rafasc, well, using .ssh has the issue that I can't have different keys for the same host (e.g. github) easily. So using the sshCommand is probably better.16:48
→ SwiftMatt joined16:49
tang^ but you can give different aliases with different keys for the same host16:50
← gloomy left16:50
→ duderonomy joined16:56
← thiago left16:59
→ mikecmpbll joined17:01
← duderonomy left17:01
← howell left17:02
→ wootehfoot joined17:02
→ nightshift joined17:05
→ thiago joined17:05
← n3wborn left17:05
→ n3wborn joined17:06
← tmm88 left17:06
→ howell joined17:09
→ pupsikov joined17:10
→ fphilipe_ joined17:10
← jungsubk left17:13
← fphilipe_ left17:15
← howell left17:16
→ Mattiaslndstrm joined17:19
→ howell joined17:19
← dege left17:20
→ dege joined17:20
→ leeN joined17:23
← mimajof left17:24
→ fphilipe_ joined17:25
← scientes left17:25
← elichai2 left17:25
clime hey, if i run e.g. git for-each-ref --format='%(body)' refs/tags/tagname17:25
it seems one more empty line is printed after the actual body and i have no idea why17:26
- fooo17:26
\n17:26
← sauvin left17:26
clime (the \n isn't actually there, it should have just mean <empty>)17:26
→ al-damiri joined17:27
← Mattiaslndstrm left17:29
→ Mattiaslndstrm joined17:30
→ nowhere_man joined17:30
→ cliluw joined17:32
← Atlenohen left17:33
clime seems there is a trailing new-line but i don't know if it is part of the tag or if it is added by git for-each ref. I creted the tag simply by git tag -a -m "- fooo" tagname17:33
ok sry...17:34
git tag -a -m "subject" -m "body" tagname17:34
git for-each-ref --format="%(body)" refs/tags/tagname17:35
gives:17:35
body17:35
...and empty line17:35
what is the empty line doing there?17:35
ah okay...17:37
git tag -a -m "subject" -m "body" -m "body2" tagname17:37
git for-each-ref --format="%(contents)" refs/tags/tagname17:38
→ triad joined17:38
→ czart joined17:38
clime gives ... subject <empty line> body <empty line> body2 <empty line>. So -m inserts an empty line after each message probably to separate subject from the body.17:38
→ yyy- joined17:39
← jottr left17:39
← Rene left17:39
← triad left17:43
← kezimo left17:46
← Murr left17:46
→ Enphuego joined17:47
→ theoceaniscool_ joined17:49
→ Murr joined17:50
← mowcat left17:53
→ triad joined17:57
→ satifant joined17:59
→ snappy joined18:00
snappy is there a way to have git format-patch generate patches that are similar to "git diff", throwing away the commiter information18:01
_ikke_ Just use git diff>18:01
git diff?18:01
they are valid patches18:01
snappy i want the patches to be split based on commit, the way git format-patch generates them18:03
or to ask another way, is there a way to get git diff to create numbered patches based on the commits18:03
→ Sasazuka joined18:03
← triad left18:05
← nightshift left18:06
← thiago left18:06
→ thiago joined18:07
snappy ah nevermind, looks like git format-patch are compatible with the patch utility18:09
← savolla left18:11
_ikke_ patch just ignores everything that comes before the diff18:11
← Olipro left18:13
→ Olipro joined18:13
→ jottr joined18:14
← azwieg103 left18:15
→ wateriswet joined18:15
→ azwieg103 joined18:15
→ Kaedenn joined18:17
Kaedenn How do I revoke/deny a pull request on github?18:17
as in, "already did that, sorry"18:17
_ikke_ close it?18:17
→ gloomy joined18:17
← cbreak left18:20
→ cbreak joined18:21
← Envil left18:24
← Olipro left18:25
→ scientes joined18:26
← T_UNIX left18:27
→ basiclaser joined18:27
Kaedenn Yea18:29
Zarthus that wasn't a question, it was your answer18:30
Kaedenn Ah, found the close button.18:30
Wasn't looking hard enough.18:31
Zarthus :)18:31
→ duderonomy joined18:34
← igi_ left18:37
→ Ignacy joined18:38
← jstimm left18:40
→ orbyt_ joined18:44
← duderonomy left18:44
← jottr left18:45
← SerialSmile left18:47
OtakuSenpai → dx_ob18:47
→ nic-hartley joined18:48
→ duderonomy joined18:51
← nerosnm left18:54
← Kaedenn left18:57
→ nightshift joined18:59
← clime left19:00
← Pistos left19:03
→ Tiders joined19:09
Tiders Hey guys i'm having a problem. I have a branch off master called X, in X i did a bunch of changes, and merged it into master. Then later made a revert commit in master to undo those changes, then aplied some more commits onto branch X to fix the problems but now when i try to merge master into my branch it's overwriting all of the stuff i still needed with the revert commit which removed it all. What should I do in this19:11
situation?19:11
→ isBEKaml joined19:11
nightshift makes sure irc client is logging, to catch the answer too19:13
rafasc !revert_merge19:13
gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt19:13
→ clime joined19:14
← nic-hartley left19:15
rafasc One option is to revert the revert commit.19:15
→ jottr joined19:16
→ svm_invictvs joined19:18
svm_invictvs Heya19:18
WHy is it when I do a git merge foo, I end up with new changes in in my branch. But if do git merge <commit_id> when I basicaly do git checkout foo, copy the latest git commit from the git log, then switch back to the branch and do git merge <commit_id> it doesn't merge anything in?19:20
→ mowcat joined19:20
← mowcat left19:20
→ mowcat joined19:21
← czart left19:21
← orbyt_ left19:21
← kjartan left19:23
→ nerosnm joined19:25
← Achylles left19:25
subopt → _subopt_in_repos19:26
rafasc svm_invictvs: git merge <something>; merges <something>; into your checked out branch.19:28
svm_invictvs Yeah19:28
→ kjartan joined19:28
rafasc if you checkout foo; git log -1; and do git merge <that hash>;19:28
there's nothing to merge, because you have that checked out.19:28
→ orbyt_ joined19:28
svm_invictvs rafasc No, I check out the other branch19:28
← floppydh left19:29
svm_invictvs rafasc git checkout foo; git log - 1; git checkout bar; git merge <that hash>19:29
That doesn't merge anything.19:29
vishal Tiders: the revert commit on master is just a new commit that happens to undo all the work done in X. If you merge master, you're 'bringing in' this undo into X. If you don't want to undo things in X, don't merge master. I think the question really at this point is what is your end goal? Is it to continue tweaking the feature on X? If so why merge master?19:29
svm_invictvs Or at least it didn't.19:29
rafasc svm_invictvs: that is equivalent of git checkout bar; git merge foo;19:30
svm_invictvs Yeah19:30
rafasc svm_invictvs: The only difference will be in the commit message.19:30
svm_invictvs rafasc This is for CI, so I skip the first step and let the CI system give me the commit hash19:30
vishal svm_invictvs: what does the merge command say?19:31
svm_invictvs And I Override the message w/ "Daily Build" or whatever.19:31
← _subopt_in_repos left19:31
← orbyt_ left19:31
svm_invictvs vishal let's see ... I have to wait for the cron job to process ...19:31
rafasc svm_invictvs: there's no difference for git merge if you give the commit sha, or a branch name.19:32
→ m0viefreak joined19:32
svm_invictvs rafasc That's what I thought.19:33
→ PettanShoutaKun joined19:33
→ subopt joined19:33
rafasc the only difference is when you call merge without arguments.19:33
which defaults to merge the upstream branch.19:34
PettanShoutaKun I'm trying to use git diff on windows and I get an error that it could not access file, and then some long file path for a zip folder... but there's not a ton of information present about this... is it possible this is caused by a long filepath issue?19:34
svm_invictvs https://gist.github.com/ptwohig/4c265798fd9a604b0fc312bef0fb160619:34
← jottr left19:35
svm_invictvs Those are the commands I issue19:36
→ zonixo joined19:38
vishal svm_invictvs: have you verified CIRCLE_SHA1 is indeed the commit you expect?19:38
svm_invictvs vishal Yeah19:38
vishal Well, it is on other jobs.19:38
well ... let's echo it out and see19:39
← Regon left19:39
nightshift Ok. I've got a branch (template) going that isn't ready to be merged anywhere yet. But, I want to create another branch (experiment1) that will need to use some of the code in template (the code experiment1 will use IS ready, but the whole branch isn't). If experiment1 works, I'll want to merge that into either master, or a feature branch that hasn't yet been created. Would branching experiment off template19:41
then merging into a totally different branch be appropriate?19:41
→ jstimm joined19:41
nightshift I'm kinda thinking I could do the experiment1 branch, but, leave it hanging, after finishing it, until after I merge template, then rebase experiment1, but not sure. (sorry, I know that's a little convoluted)19:43
← emsjessec left19:44
← SwiftMatt left19:44
→ Silenced joined19:45
rafasc you can do that, but if you merge 'experiment' that is based on 'template', you'll be indirectly merging template as well.19:45
or at least merging what template was at the time you created 'experiment'.19:46
nightshift that's what I thought.19:46
→ orbyt_ joined19:47
→ moo joined19:47
rafasc nightshift: so this is an experiment that depends on 'template'. right?19:48
vishal I like rebases/cherry-picks for that sort of 'internal' orchestration (i.e. before you make a release)19:48
nightshift rafasc, yes19:48
vishal !post might be a relevant read19:49
gitinfo [!crosspost] Note: The above question was posted in both #git and #github19:49
vishal err19:49
!pp19:49
rafasc I would branch off 'template', do the experiment, and keep rebasing on top of 'template'.19:49
nightshift thanks rafasc!19:49
← wootehfoot left19:50
rafasc the limitation is that you can only merge 'experiment' after 'template' is ready and merged.19:50
vishal !postprod19:50
gitinfo [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.19:50
vishal that's what I was looking for19:50
nightshift then, once template and experiment are doing what I need them to do, or I give up on experiment, I can merge into whatever other branches they need to end up, right?19:50
← jstimm left19:51
rafasc yes, you can just merge 'experiment', and it will bring along the commits from 'template'.19:51
nightshift I can deal with leaving experiment hanging if it is finished before template is, just wanted to make sure things would have worked the way I THOUGHT they'd work, before I started19:52
rafasc a merge is just one commit, that points to two (or more) commits.19:52
→ Olipro joined19:52
nightshift vishal: I will look at the link too, thank you19:52
rafasc nightshift: you can also merge template into your experiment, multiple times even... But the rebase is cleaner in my opinion.19:54
nightshift true on the rebase19:54
rafasc especially if this is an experiment, and you're a are free to !rewrite.19:54
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/waqum19:54
nightshift yes, definitely free to rewrite19:55
rafasc how active is that 'template' branch.19:56
?19:56
nightshift I'm the only developer at this point, haven't put it out publicly yet (and, even if it was public, it's way too soon to take other contributions)19:56
um, when I'm working, it's 3-5 commits a day, sometimes more.19:57
← kyan left19:57
nightshift it's sole purpose is to take 2 static html pages and prepare them for a script to populate certain aspects (aka, putting in references for variables, comments that indicate when loops would be needed, etc)19:59
← zonixo left19:59
→ zonixo joined20:00
svm_invictvs Well20:00
I found the answer, I think20:00
https://gist.github.com/ptwohig/93ee39f8bfc0dd72b85f167aed0ffec420:00
→ mven_ joined20:01
→ LionsMane joined20:02
rafasc svm_invictvs: the merge was able to fast-forward, but you can force the merge with --no-ff, if you want.20:02
← SkarmoutsosV left20:02
svm_invictvs rafasc I dont' follow20:02
Do I need to do another commit on top of the squas merge?20:03
'cause it says doing a squash needs to a subsequent commit20:03
rafasc You don't need to do anything. The branch was updated.20:03
oh, wait not updating HEAD?20:04
→ jottr joined20:04
← Candescence left20:05
svm_invictvs rafasc20:05
rafasc I've not done many squash merges manuall before.20:05
← d^sh left20:05
rafasc let me test something real quick.20:05
← nerosnm left20:06
→ d^sh joined20:06
rafasc I think you need to commit separately.20:08
svm_invictvs Yeah20:09
rafasc --squash kind of is an implicit --no-commit.20:09
← oatmealraisin left20:10
rafasc and your --commit isn't overriding that.20:10
svm_invictvs git merge --squash XXXX && git commit20:10
rafasc So I wasn't completely smoking crack.20:10
→ blackandblue joined20:10
vishal huh, /me didn't know that about squash20:10
→ gxt joined20:10
rafasc I am not sure if that's by design though.20:11
vishal "Produce the working tree and index state as if a real merge happened (except for the merge20:12
information), but do not actually make a commit, move the HEAD, or record20:12
$GIT_DIR/MERGE_HEAD..."20:12
rafasc vishal: --commit Perform the merge and commit the result.20:14
vishal ah you mean the failing override.. tryue20:14
rafasc so, it should 1) commit it, even though --squash by default doesn't. 2) error and complain that it cannot be used with --commit.20:14
svm_invictvs: I am trying to search the !ml, because I have the impression I've read something about --squash before...20:17
but cannot find it. Maybe you can ask on the mailing list.20:19
← zonixo left20:22
vishal if (squash) {20:22
if (fast_forward == FF_NO)20:22
die(_("You cannot combine --squash with --no-ff."));20:22
option_commit = 0;20:22
}20:22
so it just gets silently overwritten20:23
builtin/merge.c:1307 (or thereabouts)20:23
← moo left20:25
rafasc vishal: problem isn't with ff per se, it's about the ambiguity of having --squash and --commit.20:25
vishal rafasc: ignore the ff bitas20:25
bits*20:25
rafasc because in --squash says it will not commit. Think of it like a --squash --no-commit;20:26
vishal option_commit = 0; is the 'culprit'20:26
rafasc --squash --no-commit --commit; should commit, as latter flags usually override ealier ones.20:26
oh, ok. Maybe needs another die() there with another message saying You cannot combine --squash with --commit.20:28
vishal is that sort of ordering explicitly documented/expected? between different options?20:28
i.e. --no commit followed by --commit makes sense, parse-options.c will resolve that20:28
but the if(squash) happens after parse-options20:28
← mven_ left20:28
vishal and it is the merge command overriding whatever parse-options resolved for commit20:29
yeah a die or maybe even a warning seems reasonable20:29
→ mven_ joined20:29
rafasc well, I'd say making a patch adding the die() is good enough to at least start the discussion.20:29
:)20:29
vishal fair enough :)20:29
rafasc are you up to it?20:29
vishal I'm happy to, but I'll give first dibs to svm_invictvs20:29
← boombatower left20:30
→ boombatower joined20:31
← subopt left20:32
→ nerosnm joined20:33
vishal rafasc: hm, this might not be as simple, because option_commit defaults to 120:33
so you can't really if (option_commit) there, that would make squash always fail on its own20:33
and afaict, the option parsing stuff doesn't have a way to tell a default on option vs something that was supplied20:34
sounds more like a documentation patch to me :)20:37
← punto left20:37
→ punto joined20:37
← theoceaniscool_ left20:38
← nickmass left20:40
← alyptik left20:40
→ agowa338 joined20:41
→ in1t3r joined20:41
← jottr left20:42
→ jrnieder joined20:43
← gloomy left20:44
← Olipro left20:45
→ jottr joined20:48
→ Olipro joined20:48
← lacrymology left20:52
← jottr left20:58
← mven_ left20:59
← agowa338 left21:00
rafasc I think it could be more interesting if --squash were compatible with --commit.21:01
→ jottr joined21:01
→ mase-tech joined21:03
← mikecmpbll left21:04
vishal Yeah I can see just using the default message template that lists the commits being useful21:04
→ agowa338 joined21:04
→ SwiftMatt joined21:05
→ stcktrce joined21:06
← jottr left21:06
← SwiftMatt left21:07
← orbyt_ left21:08
← nikivi left21:09
→ Achylles joined21:09
→ nikivi joined21:12
vishal rafasc: I have a documentation patch, can cc you if you want21:15
← fphilipe_ left21:15
rafasc sure. Do you know my adress?21:15
vishal nope, feel free to pm me21:16
or lemme know if there is a commit sha I can pick it up from :)21:16
rafasc 9ab9b5df0ee2a21:17
for example21:17
→ mikecmpbll joined21:18
← Mr__Anderson left21:21
→ greatgatsby joined21:22
→ alyptik joined21:22
← rsrx left21:25
← clime left21:25
← pupsikov left21:26
→ voidSurfr joined21:29
← swalladge left21:30
← leeN left21:34
← libertyprime left21:34
→ oatmealraisin joined21:35
← renich left21:36
→ renich joined21:37
→ fphilipe_ joined21:37
→ codecutter joined21:38
codecutter by mistake i have reset to a an old commit and all the changes I made to the latest commits have now gone. is there a way to get this back?21:38
osse codecutter: where you on a branch at the time you did the faulty reset?21:39
oh never mind21:39
bin_bash codecutter: did you reset --hard21:39
→ jottr joined21:39
osse codecutter: do git reflog HEAD, and find the correct commit. it's probably as easy as git reset --hard HEAD@{1}21:39
mmattice back up your directory before you go poking around in the reflog for the first time.21:40
codecutter osse i did a bunch of revert on panick too21:41
https://pastebin.com/HpFgykYA21:41
osse i'm guessing HEAD@{3} then21:42
codecutter me too21:42
how do i change it to that?21:42
osse first make sure it looks good: git show HEAD@{3}21:42
then you just do a reset again to it21:43
codecutter oh man u guys are awesome21:43
1 sec21:43
← thiago left21:43
← howell left21:44
← fphilipe_ left21:44
codecutter i think thats the one21:44
itb has files that are missing21:44
it*21:44
← edwardly left21:44
← Silenced left21:46
codecutter osee u there?21:46
← nerosnm left21:46
← Ignacy left21:46
← plexigras left21:47
← Phylock left21:47
codecutter is this the command? git reset --hard HEAD@{3}21:47
ok i will do that above command21:49
the*21:49
git reset --hard HEAD@{3}21:49
→ edwardly joined21:49
codecutter ah yes21:50
:)21:50
← hqdruxn08 left21:50
codecutter life savers21:50
peace21:52
← codecutter left21:52
← mikecmpbll left21:53
→ hqdruxn08 joined21:53
yyy- → yyy21:53
← mase-tech left21:54
→ mase-tech joined21:54
← misuto left21:59
← jottr left22:00
← greatgatsby left22:02
→ Ignacy joined22:02
← Peetz0r left22:02
← agowa338 left22:02
← dege left22:02
→ misuto joined22:04
→ hqdruxn08_ joined22:04
← mase-tech left22:04
→ Peetz0r joined22:04
← dfee left22:05
← Sasazuka left22:06
← hqdruxn08 left22:07
→ mase-tech joined22:08
← hqdruxn08_ left22:09
← nightshift left22:10
← veegee left22:10
→ fphilipe_ joined22:12
→ hqdruxn08 joined22:14
← mase-tech left22:16
→ mikecmpbll joined22:16
← greggerz left22:17
→ Sasazuka joined22:18
← Peetz0r left22:20
→ Peetz0r joined22:21
→ jstimm joined22:24
← mikecmpbll left22:24
→ thiago joined22:25
→ Atlenohen joined22:27
→ bionade24 joined22:27
bionade24 Does anyone know a tool to mirror a github organisation to another git server?22:28
← blackandblue left22:28
← CodeSlingerPaul left22:28
vishal bionade24: define another git server? There may be some third party support to migrate things into say gitlab, but github is different from git itself22:29
and the software github runs for their features such as organizations is not open22:29
bionade24 I could store everything between on a server, and it's for a long time22:30
vishal 9and the gitlab thing is just an example, I don't know if such a tool exists for it)22:30
← PettanShoutaKun left22:31
bionade24 vishal: It just needs to fetch the repo names, clone/pull them and push them to the other22:31
vishal I see - there maybe tools - I don't know. Or you might be able to use githb's APIs to write one..22:32
bionade24 I alread wrote something a bit other purpose22:32
→ jottr joined22:33
→ mven_ joined22:33
← mven_ left22:33
bionade24 But I could use it. I just can't believe that there are tons of tools to download all repos of a organization but not to real mirror it.22:33
What are KDE and freedesktop using to mirror their repos22:34
?22:34
I need it for >376 Repos22:34
← nikivi left22:35
→ zonixo joined22:41
→ mikecmpbll joined22:41
← jstimm left22:44
← fphilipe_ left22:45
← Emperor_Earth left22:48
→ nerosnm joined22:49
← jottr left22:50
← mikecmpbll left22:51
← toothe left22:55
rafasc clone --mirror; push --mirror in a loop?22:56
→ mikecmpbll joined22:56
← Ignacy left22:57
svm_invictvs vishal rafasc Wait, is this a bug?22:57
vishal svm_invictvs: I'm treating it as undocumented behavior for now22:58
rafasc svm_invictvs: it's like that by design, but we are questioning the design.22:58
svm_invictvs I see.22:58
vishal would be interesting to see what explodes if we just remove that 'option_commit = 0;' line :)23:00
← tang^ left23:00
→ dre_ joined23:01
← hussam left23:02
bionade24 rafasc: For nearly 400 repos? Maybe a bit slow, but I found a tool I can possibly script23:02
← RustyShackleford left23:03
← random_yanek left23:03
← finalbeta left23:04
svm_invictvs vishal what is git written in?23:04
← mikecmpbll left23:04
vishal svm_invictvs: C, mainly23:04
svm_invictvs I thought so23:04
rafasc bionade24: gnu parallel, or xargs -P23:04
svm_invictvs: git::master23:05
gitinfo svm_invictvs: Git web link: https://github.com/git/git/commits/master23:05
svm_invictvs Please supply the message using either -m or -F option.23:05
uf23:05
← royal_screwup21 left23:06
→ mikecmpbll joined23:06
→ dfee joined23:06
svm_invictvs I thought git commit --squash=xxxxx would do it23:06
← mikecmpbll left23:06
← Habbie left23:09
← orcainbox left23:10
rafasc git commit --squash is something different.23:12
it just modifies the commit message so it can be used with rebase --autosquash.23:13
the xxxx is the commit you want do squash against.23:13
→ nightshift joined23:19
→ Habbie joined23:19
→ random_yanek joined23:20
← random_yanek left23:20
← zonixo left23:20
← Peetz0r left23:21
← nerosnm left23:21
svm_invictvs I see.23:23
rafasc Yeah, but thi sis in a CI environment23:23
→ Peetz0r joined23:24
svm_invictvs rafasc So, I don't want to edit the message. I just want to commit whatever the generated squash message is23:24
rafasc svm_invictvs: git commit --squash doesn't squash anything.23:24
svm_invictvs Right now, I'm doing git merge --squash && git commit23:24
And the problem is that it can't find the editor because, well it's running in a CI environment where there shoouldn't be an editor23:25
rafasc you can try git commit --no-edit23:25
svm_invictvs Ah...23:25
→ violentE joined23:26
svm_invictvs rafasc I thought there was some magic I had to do to generage the message and pipe it into -m or something23:27
rafasc you can do that.23:27
→ howdoi joined23:27
rafasc write a file with the message and do git commit -F file;23:28
← n3wborn left23:29
sangy is git clean -Xn the best way to know if a file that's ignored is a generated one or it is tracked23:30
I guess I could also git ls-tree or so, but I wonder if there's a better way23:31
vishal svm_invictvs: rafasc: git commit -F .git/COMMIT_EDITMSG might be a cute trick :)23:31
rafasc vishal: that's what --no-edit would do.23:32
vishal ahh ok23:32
rafasc sangy: well, you cannot ignore tracked files... So not sure what you are asking.23:35
svm_invictvs heh23:35
rafasc I could run it through a few awk passes first, :P23:35
← kjartan left23:36
nightshift vishal, would that trick allow one to push .git/description to a remote repository?23:36
rafasc sangy: there's $git check-ignore;23:36
vishal nightshift: how do you mean?23:36
rafasc nightshift: no. Anything inside .git/ cannot be committed.23:37
if you mean use .git/description as commit message for a commit, then yes you could do that.23:37
nightshift thanks rafasc, didn't think so, and I already have the work around for that, was just wondering23:37
No, I was wondering if there was a way to edit .git/description locally, and then get it "automatically" sent to the remote. I already have a work around, was just curious. didn't realize what vishal's trick was actually doing23:39
→ random_yanek joined23:39
← random_yanek left23:39
rafasc nightshift: git tag description "$(git hash-object -w .git/description)";23:40
then send the tag instead.23:40
vishal what's .git/description even used by?23:41
→ kjartan joined23:41
vishal has never set it23:41
nightshift vishal: by default? gitweb23:41
I'm wanting to use it under similar circumstances23:41
vishal yeah I figured visualization tools23:42
← alyptik left23:42
sangy rafasc: ah cool23:42
vishal tends to stay away from those23:42
sangy rafasc: yeah so there was this generated file that cuold've been ignored, but I wasn't sure if it was checked in or it was just not being part of git status because it was ignored23:43
one option would've been to edit it to see if it showed up on git status but I wanted to know how to do it right23:43
rafasc sangy: for manual use, ls-tree or even git show HEAD:path/to/file should be enough to check if it's tracked.23:45
sangy rafasc: ah, didn't know about :path/to/file. That's cool. Thanks!23:45
rafasc and check-ignore to see if it's untracked files are ignored or not..23:46
sangy: useful for scripting with $git rev-parse --quiet --verify HEAD:LICENSE23:47
→ random_yanek joined23:47
← random_yanek left23:47
← bionade24 left23:48
← oatmealraisin left23:52
← yyy left23:56
→ random_yanek joined23:56
← random_yanek left23:56
← Peetz0r left23:57
→ nerosnm joined23:57
→ dviola joined23:58
← isBEKaml left23:59
→ Beam_Inn_ joined23:59
← azwieg103 left23:59

Logs Search ←Prev date Next date→ Channels Documentation