IRCloggy #git 2016-04-09

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.

2016-04-09

fstd joined00:00
fuchstronaut joined00:00
imachuchu left00:01
jimmychoo left00:03
elastix joined00:03
dopesong left00:04
NeverDie joined00:04
Noldorin joined00:04
ekinmur joined00:05
ekinmur left00:05
SwiftMatt left00:06
SwiftMatt joined00:07
Limes_ left00:07
dreiss left00:10
joufflu joined00:10
kg6hum joined00:12
noteness joined00:13
jstimm left00:16
realz left00:16
ensyde__ joined00:17
kus left00:20
imacinto joined00:21
sgen left00:22
ajf- joined00:23
MattMaker left00:23
whitby left00:24
vkngpmhc left00:25
gsingh left00:25
imacinto left00:26
NeverDie_ joined00:26
hwrdprkns Hi - just recently started using gpg verification for my commits - does anyone know how I can store my password in my mac keychain so I don't have to enter it everytime?00:26
mwhooker left00:27
MattMaker joined00:27
cagmz left00:28
cagmz joined00:28
felipedvorak left00:28
NeverDie left00:29
elastix left00:30
abc123_ left00:30
Corosus left00:30
abc123 joined00:30
_ikke_ hwrdprkns: Not sure if it works for GPG too, but git has credential helpers00:30
man gitcredentials00:31
gitinfo the gitcredentials manpage is available at http://jk.gs/gitcredentials.html00:31
kfpratt left00:31
bremner on linux I'd say use gpg-agent. But perhaps OSX does it's own thing00:32
SmileMZ joined00:32
poerror joined00:32
cagmz left00:32
SmileMZ Hi people. I have setup "gitblit", when I create there a repository the branches are not being displayed.00:33
_ikke_ What branches do not show up?00:34
nevyn SmileMZ: !transcript00:34
gitinfo SmileMZ: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see00:34
thinkdoge joined00:34
_ikke_ When do they not show up00:34
kfpratt joined00:34
SmileMZ when I say "git checkout develop" and add a file.... and say git push it isn't displayed on gitblit...00:35
durham_ joined00:35
MattMake_ joined00:35
SmileMZ only the branch "master" is being displayed.00:35
BSaboia left00:35
akiva left00:35
SmileMZ _ikke_: only master is being displayed.00:36
I have the feeling "develop" is not pushed remotely....00:36
only master...00:36
MattMake_ left00:36
SmileMZ can I set a remote branch like "develop" ?00:36
MattMake_ joined00:37
nevyn git push remote localbranch:remotebranch00:37
poerror left00:37
nevyn git push gitblit develop:develop00:37
durham left00:38
MattMaker left00:38
mischat_ left00:39
durham_ left00:39
hwrdprknshwrd[away]00:39
GodFather joined00:39
mischat joined00:39
hwrd[away] left00:40
felipedvorak joined00:41
xaa joined00:41
hwrdprkns joined00:43
mischat left00:45
apprentice joined00:45
hwrdprknshwrd[away]00:46
hwrd[away] left00:47
ajf- left00:47
NeonSynth left00:47
daito joined00:48
SmileMZ i read the entire git documentary.00:48
it makes no sense....00:48
it's time to get with git really familiar.00:49
leeN left00:50
leeN joined00:51
daito left00:52
bruce_lee left00:53
bremner SmileMZ: !book00:56
gitinfo SmileMZ: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable00:56
bremner is that what you already read? or every manpage?00:56
vervet joined00:57
SmileMZ yeah I will read that one.00:58
MattMake_ left00:59
EvilPeng1 left01:00
italoacasas joined01:00
hwrdprkns joined01:01
clemf joined01:02
Literphor left01:02
clemf_ joined01:03
PryMar56 joined01:04
italoacasas1 joined01:05
abc123 left01:05
abc123_ joined01:05
italoacasas left01:05
samw left01:05
joufflu left01:05
italoacasas1 left01:06
jottr joined01:06
italoacasas joined01:06
clemf left01:06
italoacasas left01:07
johnwhitton left01:07
fracting left01:08
thinkdoge left01:09
mischat joined01:10
vervet_ joined01:10
Noldorin left01:10
vervet_ left01:10
hwrdprknshwrd[away]01:10
piling left01:11
jottr_ joined01:11
hwrd[away] left01:11
ochorocho__ left01:11
diegoaguilar left01:12
vervet left01:13
jottr left01:14
clemf_ left01:15
clemf joined01:16
italoacasas joined01:16
italoacasas left01:16
hanthings_ joined01:17
ekinmur joined01:17
amdi_ joined01:18
apotry joined01:19
apotry left01:19
mischat left01:20
sangy left01:20
hanthings left01:20
GodFather left01:21
clemf left01:21
Sasazuka joined01:22
mischat joined01:22
clemf joined01:22
pks left01:23
_nadim left01:24
pks joined01:24
mellernoia left01:25
fracting joined01:25
_nadim joined01:25
salamanderrake left01:28
joki left01:28
fuchstronaut left01:28
apprentice left01:29
akushner left01:29
nandi_ge___ joined01:30
poerror joined01:31
michelangelo joined01:31
eletuchy joined01:32
nevyn SmileMZ: I like !gcs01:32
gitinfo SmileMZ: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html01:32
hanthings_ left01:34
joki joined01:34
donmichelangelo left01:35
fracting left01:35
jagob joined01:35
poerror left01:35
mizu_no_oto left01:38
Corosus joined01:39
m0viefreak left01:39
SimonNaa joined01:40
flopsec left01:40
jottr_ left01:40
clemf left01:42
jstimm joined01:43
SimonNa left01:43
ojdo left01:45
Goplat joined01:47
fracting joined01:48
SmileMZ left01:49
Sasazuka left01:51
ojdo joined01:51
mischat left01:52
xaa left01:53
theskillwithin joined01:53
samw joined01:54
Vampire0_ joined01:55
mablae_ joined01:56
jeffreylevesque left01:56
Asiajey joined01:58
Vampire0 left01:59
Kallis left01:59
mischat joined02:00
mablae left02:00
cdg joined02:00
pwnz0r joined02:02
jstimm left02:03
hwrdprkns joined02:04
ahmed_elgabri left02:04
dstegelman joined02:05
salamanderrake joined02:05
freddymungo joined02:06
clemf joined02:06
Guest72 joined02:07
fracting left02:07
SwiftMatt left02:07
clemf left02:07
pwnz0r left02:07
sthns^ left02:08
nilsi joined02:09
ochorocho__ joined02:09
shmuli left02:10
bq left02:10
imacinto joined02:11
chachasmooth left02:12
SwiftMatt joined02:12
ochorocho__ left02:13
chachasmooth joined02:13
kfpratt left02:14
imacinto left02:15
iMiiTH left02:16
Bruce____ left02:16
hwrdprknshwrd[away]02:20
iMiiTH joined02:20
Guest9063 left02:20
kfpratt joined02:20
hexagoxel left02:21
hwrd[away] left02:21
fracting joined02:23
hexagoxel joined02:24
abc123 joined02:27
abc123_ left02:27
abc123abc123_02:27
kfpratt left02:27
rubie left02:28
imacinto joined02:28
jaafar left02:28
clemf joined02:28
dstegelman left02:29
clemf left02:32
imacinto left02:32
Anupkumar left02:32
daito joined02:34
clemf joined02:34
iMiiTH left02:35
clemf left02:35
bronson joined02:35
Asiajey left02:37
kfpratt joined02:37
vervet joined02:38
iMiiTH joined02:38
mischat left02:38
daito left02:38
kam270 left02:39
NeverDie joined02:39
bronson left02:40
italoacasas joined02:40
mischat joined02:41
freddymungo left02:41
kaiza left02:41
NeverDie_ left02:41
Guest72 left02:42
abc123 joined02:42
Guest72 joined02:43
vervet left02:43
abc123_ left02:43
leeN left02:44
Bruce____ joined02:44
daito joined02:44
dstegelman joined02:45
dstegelman left02:45
abc123 left02:46
abc123_ joined02:46
dstegelman joined02:46
dstegelman left02:47
clemf joined02:47
dstegelman joined02:47
kfpratt left02:47
gusto left02:47
strayPuppy joined02:48
a_thakur joined02:48
Bruce____ left02:49
hwrdprkns joined02:50
daito left02:50
hwrdprkns left02:51
kaiza joined02:52
cagedwisdom joined02:53
phoe6 joined02:55
digidog left02:56
abc123_ left02:56
sylario left02:56
abc123 joined02:57
pwnz0r joined02:57
jimmychoo joined02:58
rubie joined02:58
bb010g left02:59
abc123 left03:00
abc123_ joined03:00
black_13 joined03:01
a_thakur left03:01
rubie left03:01
pwnz0r left03:02
rubie joined03:02
ensyde__ left03:03
jimmychoo left03:03
black_13 how do revert a file03:03
bq joined03:04
_ikke_ To where?03:04
abc123 joined03:05
abc123_ left03:05
abc123abc123_03:05
Dro left03:05
boombatower joined03:05
cagedwisdom left03:07
ochorocho__ joined03:10
cdg left03:10
italoacasas left03:11
black_13 what does "old mode 100644 new mode 100755" mean03:12
madewokherd` joined03:12
_ikke_ That the executable bit has changed03:13
madewokherd left03:14
ochorocho__ left03:14
ash_workz joined03:17
cagmz joined03:18
black_13 git is still not my forte03:18
harish_ left03:20
cagedwisdom joined03:20
phoe6 left03:20
Guest72 left03:21
clemf left03:23
black_13 _ikke_: how do you revert to a previous version of a file if that makes sense03:23
fracting left03:23
thiago black_13: just that file? Or the full tree?03:25
hwrdprkns joined03:25
black_13 just a file03:25
Limes_ joined03:26
thiago git checkout versionyouwant -- filename03:26
gfixler joined03:29
ekinmur left03:31
SimonNaa left03:33
dstegelman left03:36
fracting joined03:37
qhp left03:38
qhp joined03:38
qhp left03:38
Bruce____ joined03:39
qhp joined03:41
qhp left03:41
dstegelman joined03:44
SwiftMatt left03:45
LaT0rtue left03:45
nettoweb joined03:45
user083 left03:46
aidalgol joined03:46
abc123 joined03:47
LaT0rtue joined03:48
abc123_ left03:49
abc123abc123_03:49
abc123_ left03:49
Literphor joined03:50
CheckDavid left03:51
morenoh149 joined03:53
_nadim left03:55
plong0 left03:55
dstegelman left03:56
voice_of_me joined03:56
dstegelman joined03:57
_nadim joined03:57
tlolczyk left03:57
D-Boy left03:58
fracting left03:58
mehola left04:00
mischat left04:01
sdothum left04:03
ToBeCloud left04:04
NeverDie left04:04
NeverDie joined04:05
nettoweb left04:05
mischat joined04:08
nilsi left04:09
HenriettaSalt joined04:09
Arsonide left04:09
black_13 left04:10
Arsonide joined04:10
hide_ left04:10
ochorocho__ joined04:11
dstegelman left04:12
rkazak left04:12
crameth joined04:12
hide joined04:12
fscala left04:14
ochorocho__ left04:15
fracting joined04:15
fscala joined04:17
neca joined04:20
D-Boy joined04:20
AHemlocksLie left04:21
Cabanossi left04:21
LaT0rtue left04:21
lucasem joined04:22
cagedwisdom left04:22
rkazak joined04:22
Cabanossi joined04:23
eletuchy left04:24
eletuchy joined04:24
neca left04:24
nydel07 joined04:24
mehola joined04:25
mikr_ joined04:26
mike_r_ left04:26
Rodya_ joined04:27
dreiss joined04:27
dstegelman joined04:28
imacinto joined04:29
Rodya_ left04:30
Rodya_ joined04:30
daito joined04:32
slightlyAjar joined04:34
imacinto left04:34
mischat left04:34
daito left04:36
bronson joined04:36
mehola left04:37
Rodya_ left04:38
slightlyAjar left04:38
eletuchy left04:39
hwrdprkns left04:40
eletuchy joined04:40
bronson left04:41
Rodya_ joined04:42
mehola joined04:43
eletuchy left04:44
Literphor left04:44
rubie left04:44
dstegelman left04:45
clemf joined04:45
mischat joined04:46
kesenai joined04:46
rkazak left04:46
slightlyAjar joined04:47
voice_of_me left04:47
Literphor joined04:49
phaleth joined04:55
avarsh joined04:56
aj__ joined04:56
eletuchy joined04:58
cdg joined05:01
MrWoohoo left05:01
amdi_ left05:01
hwrdprkns joined05:02
wrouesnel1 joined05:06
cdg left05:06
rkazak joined05:06
voice_of_me joined05:08
hwrdprknshwrd[away]05:12
hwrd[away] left05:13
sauvin joined05:13
CubiK joined05:16
Fullma left05:17
johnwhitton joined05:19
SwiftMatt joined05:20
hwrdprkns joined05:23
dreiss left05:23
sauvin left05:23
fracting left05:24
cagmz left05:25
sauvin joined05:26
fuchstronaut joined05:26
tarkus joined05:26
mischat left05:26
ochorocho__ joined05:28
subhojit777 joined05:29
mischat joined05:29
hwrdprkns left05:30
fuchstronaut left05:31
ochorocho__ left05:32
Fullma joined05:33
arooni joined05:33
OnBrokenWings joined05:35
clemf left05:36
fracting joined05:36
Bruce____ left05:37
cdg joined05:38
Literphor left05:39
madewokherd` left05:40
clemf joined05:40
Literphor joined05:40
voice_of_me left05:42
arooni left05:43
Bruce____ joined05:50
kkspy joined05:53
wlemuel joined05:53
rkazak left05:53
samw left05:55
emPi joined05:55
SwiftMatt left05:57
PryMar56 left05:59
jimmychoo joined06:00
dermoth left06:00
dermoth joined06:00
mikr_ left06:02
slappymcfry left06:03
morenoh149 left06:03
jimmychoo left06:04
SwiftMatt joined06:07
SwiftMatt left06:09
slightlyAjar left06:10
voice_of_me joined06:10
Bruc_____ joined06:13
rkazak joined06:15
strayPuppy left06:15
kkspy left06:16
Bruce____ left06:17
tildes joined06:18
sauvin left06:19
sauvin joined06:21
Literphor left06:22
niko left06:23
garyserj left06:24
Goplat left06:25
garyserj joined06:25
Macaveli joined06:26
Bruc_____ left06:27
niko joined06:28
imacinto joined06:29
rkazak_ joined06:30
dopesong joined06:31
voice_of_me left06:31
lucasem left06:32
rkazak left06:32
rkazak_rkazak06:32
daito joined06:33
fracting left06:33
imacinto left06:34
dreiss joined06:34
infra-red joined06:35
Sazhen86 joined06:35
mischat left06:35
Literphor joined06:35
roentgen joined06:36
daito left06:37
bronson joined06:37
Anupkumar joined06:38
dopesong left06:39
nadim joined06:40
vervet joined06:41
rehat left06:41
_nadim left06:42
jon-mac left06:42
bronson left06:42
diegoaguilar joined06:45
harish joined06:45
_xor left06:48
shinnya left06:48
fracting joined06:50
harish left06:52
subhojit777 left06:52
harish joined06:54
Lyqyd left06:54
Macaveli left06:55
Rodya_ left07:00
Rodya_ joined07:04
Rodya_ left07:06
armyriad left07:07
voice_of_me joined07:07
fracting left07:08
neca joined07:08
dopesong joined07:10
slightlyAjar joined07:11
CubiK left07:11
jaafar joined07:13
ShapeShifter499 left07:14
steven_a_s joined07:14
King_Hual joined07:14
King_Hual left07:14
King_Hual joined07:14
slightlyAjar left07:15
David1977 joined07:16
dopesong left07:17
radsy joined07:18
MrWoohoo joined07:20
fracting joined07:20
AndroidVaan left07:21
kam270 joined07:22
ericvw left07:22
cagedwisdom joined07:23
stoopkid joined07:24
astrofog joined07:26
cyphase left07:27
fuchstronaut joined07:27
cagedwisdom left07:28
thiago left07:29
ochorocho__ joined07:29
aj__ left07:30
avarsh left07:30
slightlyAjar joined07:30
steven_a_s left07:31
timotheus-booth left07:31
ahr3n joined07:31
fuchstronaut left07:32
ochorocho__ left07:33
muthu joined07:35
johnwhitton left07:35
cdg left07:36
johnwhitton joined07:36
johnwhitton left07:36
voice_of_me left07:37
diogenese left07:38
stoopkid left07:39
jagob left07:39
stoopkid joined07:39
stoopkid left07:40
cagedwisdom joined07:41
dreiss left07:43
subhojit777 joined07:43
samw joined07:45
GT4066 joined07:45
nilsi joined07:45
tristanp left07:47
tristanp joined07:47
ignatenkobrain joined07:48
vervet left07:49
samw left07:49
nilsi left07:49
diogenese joined07:51
crameth left07:51
tristanp left07:52
crameth joined07:52
crameth left07:52
crameth joined07:53
Macaveli joined07:54
govg joined08:06
cdg joined08:07
davisonio joined08:07
clemf left08:07
Lomex joined08:08
netj left08:09
FunkyAss joined08:09
netj joined08:09
samw joined08:10
voice_of_me joined08:11
cdg left08:11
ochorocho__ joined08:12
subhojit777 left08:12
pantsman- joined08:14
samw left08:15
OnBrokenWings left08:16
fracting left08:17
fracting joined08:20
r0ry joined08:21
fees joined08:23
r0ryy left08:24
p4trix joined08:25
apotry joined08:26
mischat joined08:27
apotry left08:28
apotry joined08:28
armyriad joined08:29
neca left08:29
imacinto joined08:30
davisonio left08:30
mischat left08:32
daito joined08:33
PCatinean joined08:35
imacinto left08:35
acetakwas joined08:36
acetakwas left08:37
daito left08:38
bronson joined08:38
subscope joined08:39
freimatz joined08:40
aj__ joined08:40
avarsh joined08:41
bronson left08:43
govg left08:43
acetakwas joined08:44
boombatower left08:45
nnyk joined08:46
rkazak left08:46
noogler67 left08:46
noogler67 joined08:48
jaafar left08:50
samw joined08:52
neca joined08:55
acetakwas left08:56
fracting left08:57
subhojit777 joined08:58
samw left09:00
jimmychoo joined09:01
Guest62945 joined09:01
nnyk left09:02
ocbtec joined09:02
jimmychoo left09:05
mehola left09:09
acetakwas joined09:10
diogenese left09:10
cyan__ joined09:11
robotroll joined09:12
tildes left09:12
piling joined09:12
diogenese joined09:13
fracting joined09:15
ahmedelgabri joined09:16
Lomex left09:17
dangerousdave joined09:21
radsy left09:23
Lomex joined09:25
govg joined09:25
acetakwas left09:25
avarsh left09:26
aj__ left09:26
gusto joined09:26
fuchstronaut joined09:28
OnBrokenWings joined09:28
mischat joined09:28
Atticfire joined09:29
infra-red left09:30
voice_of_me left09:30
ahmedelgabri left09:31
fuchstronaut left09:32
OnBrokenWings left09:33
voice_of_me joined09:33
mischat left09:33
Atticfire left09:36
kadoban left09:36
Atticfire joined09:36
mikecmpbll joined09:36
aaronthj joined09:38
zso joined09:38
imacinto joined09:38
rolha joined09:38
gitinfo set mode: +v09:39
aaronthj left09:39
cyphase joined09:39
Atticfire Is there someone that could help me with a linux media_tree git merge problem?09:39
subscope left09:39
ahr3n left09:40
Lomex left09:42
imacinto left09:42
BlaXpirit hey09:43
Atticfire, nobody can help with a problem if you don't state it09:44
cyphase left09:45
Atticfire Sorry, if I git clone --depth 1 git://linuxtv.org/media_build.git09:46
cd media_build09:46
Literphor left09:46
Atticfire I then have a basic copy of the tree09:46
I then add a remote tree09:47
git remote add media_tree git://linuxtv.org/media_tree.git09:47
git fetch --depth 1 media_tree09:47
nnyk joined09:47
Atticfire I then add a remote tree with the staging drivers I require09:48
git remote add hverkuil git://linuxtv.org/hverkuil/media_tree.git09:48
git fetch --depth 1 hverkuil09:48
How do I merge the branch of the staging tree?09:48
Without getting CONFLICT (add/add): Merge conflict errors09:49
D-Boy left09:49
Atticfire I've tried git merge remotes/hverkuil/tw686x09:50
I've tried git merge --no-commit remotes/hverkuil/tw686x09:50
Is there a simple way to merge to repository trees together?09:51
Mitaka89 joined09:51
elastix joined09:52
voice_of_me left09:52
Anupkumar left09:52
weox left09:54
j416 Atticfire: get the full history09:55
netj left09:55
netj joined09:55
govg left09:56
radsy joined09:56
ahmedelgabri joined09:57
Atticfire Trying again09:57
sthns joined09:58
cyphase joined10:00
kkspy joined10:01
tildes joined10:01
kam270 left10:02
D-Boy joined10:02
crameth left10:03
subscope joined10:04
leeN joined10:07
Sazhen86 left10:07
MaHoArCa joined10:07
Rish joined10:07
elastix left10:08
Atticfire j416 no didn't merge conflicts, trying a different approach cloning media_build, cd media_build, then cloning media_tree adding remote version of media_tree and only merging the two trees10:09
mehola joined10:10
fracting left10:11
jottr_ joined10:13
mehola left10:14
tildes left10:15
cyphase left10:15
tildes joined10:16
glebihan left10:17
glebihan_ joined10:17
glebihan_ left10:18
fuchstronaut joined10:18
Lomex joined10:19
Macaveli left10:19
glebihan_ joined10:19
Atticfire git clone git://linuxtv.org/media_tree.git10:20
git remote add hverkuil git://linuxtv.org/hverkuil/media_tree.git10:20
git fetch hverkuil10:20
Then do i merge or only checkout - git merge remotes/hverkuil/tw686x or git checkout -b tw686x remotes/hverkuil/master10:20
slightlyAjar left10:24
Macaveli joined10:24
jottr_ left10:24
fracting joined10:24
acetakwas joined10:27
xaa joined10:27
radsy left10:28
mikecmpbll left10:28
mischat joined10:29
cyphase joined10:30
neca left10:31
aj__ joined10:32
nwkj86 joined10:32
avarsh joined10:32
Rish left10:32
daito joined10:34
zso left10:34
tvw joined10:34
mischat left10:34
samw joined10:34
nitin joined10:36
j416 Atticfire: depends on what you want to achieve10:37
grift left10:38
samw left10:38
daito left10:38
Atticfire I'm trying to build a kernel module driver for tw6869 video chip, I'm using a staging driver, I need to compile a signed module as loadable into the kernel10:40
ahmedelgabri left10:41
grift joined10:41
cyphase left10:41
astrofog left10:41
Atticfire I can get the vanilla kernel rpmbuild the fedora patches but I need to create a patch of the tw6869 driver which is based on the Linux V4L media tree10:42
Imaginativeone left10:42
acetakwas left10:42
Atticfire I can get the media_build to compile the V4L required I can get the media_tree10:43
LaT0rtue joined10:43
neca joined10:44
mashu joined10:44
Atticfire but my problem is to add the GIT repository of hverkuil/media_tree branch tw686x to the linuxtv.org/media_build to create the sources, to create the patch10:44
fuchstronaut left10:44
Atticfire The patch can then be add to the rpmbuild to compile the installable kernel rpm10:45
slightlyAjar joined10:47
nwkj86 left10:47
aidalgol left10:47
digidog joined10:47
jbitdrop joined10:48
nitin left10:49
diegoaguilar left10:49
cyan__ left10:50
ahmedelgabri joined10:52
Discovery joined10:52
Cassiopaya joined10:52
Kicer86 joined10:55
SteffanW joined10:55
cyphase joined10:55
pantsman- left10:55
astrofog joined10:56
nitin joined10:57
subscope left10:57
neca left10:57
neanderslob left10:58
fracting left10:58
weox joined11:00
acton joined11:00
sdothum joined11:01
nilg joined11:05
HenriettaSalt left11:06
ahmedelgabri left11:07
Atticfire left11:08
samw joined11:10
acton left11:12
GodFather joined11:12
GodFather left11:13
subscope joined11:14
samw left11:15
avarsh left11:15
aj__ left11:15
fuchstronaut joined11:16
socketguru_ joined11:17
fracting joined11:17
tildes left11:17
subhojit777 left11:17
cyphase left11:19
ahmedelgabri joined11:21
jottr_ joined11:22
sthns left11:24
almualim left11:29
mischat joined11:30
OnBrokenWings joined11:30
OnBrokenWings left11:30
choki joined11:30
fracting left11:31
fuchstronaut left11:32
cyphase joined11:34
khisanth_ joined11:34
nitin left11:34
Strout left11:35
ochorocho__ left11:36
ochorocho__1 joined11:36
Jackneill joined11:37
Khisanth left11:38
ignatenkobrain left11:38
mischat left11:39
ignatenkobrain joined11:39
imacinto joined11:39
gusto left11:41
imacinto left11:44
fracting joined11:44
sdothum left11:44
uaub joined11:45
uaub left11:45
sdothum joined11:45
nadim left11:47
Strout joined11:48
nilg left11:48
Strout left11:48
Strout joined11:48
jchonig left11:49
ahmedelgabri left11:49
jchonig joined11:50
al-damiri joined11:51
zarel joined11:53
bq left11:54
subscope left11:55
sthns joined11:57
fstd left11:59
fstd joined11:59
quenode left12:00
gusto joined12:00
jchonig left12:01
cyphase left12:01
Aerosonic joined12:02
jimmychoo joined12:02
dangerousdave left12:02
troulouliou_div2 joined12:02
eletuchy left12:03
quenode joined12:03
eletuchy joined12:04
nilg joined12:04
Strout left12:05
jimmychoo left12:06
jchonig joined12:07
eletuchy left12:08
DJ_Spies left12:10
Rish joined12:11
mehola joined12:12
subscope joined12:14
k-man left12:15
moei left12:15
cyphase joined12:16
mehola left12:17
weylin joined12:18
k-man joined12:18
daito joined12:20
tildes joined12:22
daito left12:25
kkspy left12:28
fuchstronaut joined12:33
fuchstronaut left12:33
fuchstronaut joined12:33
liri_ joined12:33
simpbrain left12:35
dstegelman joined12:36
fscala left12:36
fscala joined12:37
fuchstronaut left12:38
nadim joined12:38
D-Boy left12:39
mcptron joined12:40
bronson joined12:40
bitkiller joined12:41
mcptron left12:41
simpbrain joined12:42
cagedwisdom left12:43
bronson left12:45
simpbrain left12:46
bitkiller left12:46
ahmedelgabri joined12:46
Strout joined12:47
cdg joined12:47
D-Boy joined12:47
BlackPanx left12:47
robotroll left12:49
BlackPanx joined12:50
tristanp joined12:50
cdg_ joined12:51
cdg left12:52
ahmedelgabri left12:53
jottr joined12:54
gusto left12:55
tristanp left12:55
twoface88 joined12:55
jottr_ left12:56
ochorocho__ joined12:58
jchonig left12:59
ochorocho__1 left12:59
ochorocho__ left13:01
ochorocho__ joined13:01
jchonig joined13:01
relipse2 joined13:01
jottr left13:02
cyphase left13:02
jottr joined13:06
sylario joined13:07
subscope left13:09
subscope joined13:12
samw joined13:12
salamanderrake left13:15
italoacasas joined13:15
samw left13:16
cyphase joined13:16
salamanderrake joined13:17
mellernoia joined13:17
tarkus left13:17
jottr left13:17
netj left13:18
slayerjain left13:19
stoopkid joined13:19
shymega joined13:21
netj joined13:21
nilg left13:22
st0opkid joined13:23
salamanderrake left13:23
jottr joined13:23
acetakwas joined13:23
stoopkid left13:24
weox left13:24
boombatower joined13:24
tvw left13:24
t0by joined13:24
acton joined13:26
fracting left13:28
st0opkid left13:29
Rish left13:29
jottr_ joined13:30
twoface88 left13:30
maks_ joined13:32
maks_ left13:33
jottr left13:33
jason237 left13:33
johnmilton joined13:33
fuchstronaut joined13:34
jottr_ left13:34
TSS_ joined13:35
maks_ joined13:36
timmu joined13:37
noogler67 left13:38
noogler67 joined13:38
imacinto joined13:40
fuchstronaut left13:40
SwiftMatt joined13:41
autochthon joined13:41
ariel_17 joined13:41
happy-dude joined13:43
imacinto left13:45
redigit joined13:45
maks_ left13:45
fracting joined13:46
redigit left13:47
vitamin_minativ joined13:47
vitamin_minativ Someone asked me to do a simple modification on his code. He said: create a new branch, apply the changes and submit a pull request. Does that mean I have to fork the repository? Or can I send a pull request by just cloning the actual repository?13:47
_ikke_ vitamin_minativ: Depends on if you have push rights on his repository13:48
(ie, you are added as a collaborator to the project)13:49
vitamin_minativ I do13:49
_ikke_ Ok, then you don't have to fork13:49
You can make a pull request within one project13:49
vitamin_minativ So, how do I proceed? I have the changes committed in another branch already. Do I push the branch to the remote repository, then look on github.com's ui for that? Or what?13:50
look on github.com's ui for the pull request into the original branch *13:51
eletuchy joined13:51
_ikke_ yes, you push that branch to github, and then usually github shows a notification that a new branch has been pushed and that you can create a pull-request13:52
vitamin_minativ Got it. Thanks13:53
deepy left13:54
eletuchy left13:56
deepy joined13:57
raininja left13:57
bq joined13:58
thekingofbandit left13:59
DJ_Spies joined14:00
thekingofbandit joined14:00
harish left14:03
tmokros left14:06
apiarian joined14:06
shinnya joined14:07
MaHoArCa left14:09
skul left14:09
Sonicbit joined14:10
apiarian github pull request heads have to be branches (mutable heads) and cannot be tags (immutable pointers). is this a design decision at the github level, or at the git level?14:10
skul joined14:11
Noldorin joined14:12
Ahmed90 joined14:12
ochorocho__ left14:13
osse apiarian: github. git doesn't know what a pull request is14:13
selckin !man git-request-pull14:14
gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?14:14
the git-request-pull manpage is available at http://jk.gs/git-request-pull.html14:14
mikr_ joined14:14
NeonSynth joined14:15
ochorocho__ joined14:15
harish joined14:15
NeonSynth left14:16
ochorocho__ left14:17
ochorocho__1 joined14:17
subscope left14:17
phoe6 joined14:17
weox joined14:17
pantsman- joined14:18
salamanderrake joined14:19
salamanderrake left14:19
madewokherd joined14:19
leeN left14:20
harish left14:21
fracting left14:21
daito joined14:21
leeN joined14:21
mase-tech joined14:22
newke joined14:22
harish joined14:23
ochorocho__1 left14:23
sthns left14:24
d0nn1e left14:25
daito left14:26
AndroidVaan joined14:27
d0nn1e joined14:27
noogler6_ joined14:27
Rudde left14:28
harish left14:28
harish joined14:29
noogler67 left14:31
neca joined14:31
dreiss joined14:31
salamanderrake joined14:32
dstegelman left14:32
diogenese left14:34
SteffanW left14:35
jannik joined14:37
rubie joined14:37
gitinfo set mode: +v14:38
jannik hi14:38
DANtheBEASTman jannik: hi14:38
gitinfo jannik: 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.14:38
troulouliou_div2 left14:39
asultramosesdili joined14:40
mizu_no_oto joined14:41
jannik We have to submit our assignments using git, im kinda stuck at getting the right url for "git remote origin url' ", are you familiar with this design: http://imgur.com/IUBmZNl , and know what the url has to look like?14:42
plong0 joined14:43
fracting joined14:44
plong0 left14:44
fedexo joined14:45
neunon left14:46
neunon joined14:46
jannik anyone?14:46
a_thakur joined14:46
jaafar joined14:48
subscope joined14:48
cagmz joined14:48
t0by left14:49
fracting left14:49
ahmedelgabri joined14:49
diegoaguilar joined14:50
ChrisWarrick jannik: you need to find the remote URL.14:50
acetakwas left14:50
Noldorin left14:50
ChrisWarrick jannik: there are probably some docs at your uni14:50
nnyk left14:50
jstimm joined14:50
jimmychoo joined14:51
tristanp joined14:52
aj__ joined14:53
avarsh joined14:53
SwiftMatt left14:54
ahmedelgabri left14:54
jannik Will do14:54
jstimm left14:55
troulouliou_div2 joined14:55
troulouliou_div2 left14:56
harish_ joined14:56
m0viefreak joined14:56
nydel07 left14:57
tristanp left14:57
subhojit777 joined14:57
^e14:58
harish left14:59
orfeo1orfeo14:59
orfeo Hello!14:59
zarel left15:00
orfeo I am starting to learn git and I am on a Mac where I am facing difficulties to check which version is currently available (Mac or npm) and where to locate the config file (which is not on the path it is supposed to be).15:01
Noldorin joined15:01
orfeo Could someone help me understand that please?15:01
If someone could spare a few minutes. :D15:01
I would be glad!15:01
mand0 joined15:02
orfeo Just starting reading Git Pro online version.15:02
fracting joined15:02
apiarian orfeo: `which git` in your terminal, and `git --version`15:03
slightlyAjar left15:04
jstimm joined15:04
orfeo apiarian: `git --version` gives me `git version 2.6.4 (Apple Git-63)`15:04
apiarian: if I run `npm show git version` it gives me `0.1.5`15:05
fracting left15:06
orfeo So I should be running the Apple install I guess.15:06
subscope left15:06
astrofog left15:06
Balliad joined15:06
rubie left15:06
fracting joined15:06
apiarian_ joined15:06
orfeo I am not sure if that is a good idea (maybe for start) but after I would like to manage myself those installing.15:07
I don't fell comfortable to th git version npm gives me.15:07
nydel07 joined15:07
apiarian left15:07
orfeo Well, I am a bit of confused here if you notice.15:08
diogenese joined15:08
apiarian_ npm as in the javascript repository thing? how is that related to git?15:09
orfeo `which git` gives me `/usr/bin/git` that should correspond to Apple Git15:09
apiarian_apiarian15:09
apiarian it should indeed15:09
choki left15:09
orfeo apiarian: it is a way to INSTALL git and control version on Apple computers to avoid depending on Apple.15:10
apiarian huh. i'm a homebrew guy myself. didn't know that npm could do the same15:10
orfeo Actually I don't even know which version is Git nowadays15:10
apiarian orfeo: see the topic here15:11
orfeo apiarian: Mmmm... yes. Maybe I installed it via homebrew15:11
livingstn joined15:11
apiarian homebrew usually puts things in /usr/local/bin15:11
deavid i'm writting some script and i want a git grep "xxx" to be executed from the git root. I tried adding "-- /" to get results from the git root but that seems to mean "drive root"15:12
orfeo I will check what that 0.1.5 git version of npm means (probably nothing related to what I am looking forward now)15:12
acetakwas joined15:12
orfeo apiarian: is that difficult to switch from Apple Git to Brew Git?15:13
apiarian should be as easy as installing it and making sure /usr/local/bin is higher in your path than /usr/bin15:14
ekinmur joined15:14
apiarian orfeo: npm git looks like a way to interface with the git, not an implementation of git15:14
orfeo apiarian: would you mind giving me a help to check that please?15:14
apiarian orfeo: http://brew.sh15:15
probably this also: https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/README.md#readme15:15
orfeo apiarian: I am currently trying to update brew and it is telling me caskroom/cask couldn't be linked and suggests I use `brew tal --repair` which doesn't seems to be working because it throws an error.15:16
Macaveli left15:16
orfeo apiarian: maybe I should bring it to brew channel, right?15:16
apiarian deavid: probably this: http://stackoverflow.com/questions/957928/is-there-a-way-to-get-the-git-root-directory-in-one-command#957978 ?15:16
Macaveli joined15:16
apiarian orfeo: probably15:16
jannik left15:17
orfeo apiarian: alright, when I get it working I may be back. Thank you for now.15:17
Thank you guys! ;)15:17
nilsi joined15:19
Lyqyd joined15:21
natechan joined15:22
deavid thanks15:22
banister left15:22
nydel07 left15:23
Macaveli left15:24
Goplat joined15:26
mischat joined15:27
nydel07 joined15:27
apprentice joined15:29
acetakwas left15:32
banister joined15:33
rubie joined15:36
Rodya_ joined15:37
eletuchy joined15:39
wlemuel left15:39
imacinto joined15:40
fees left15:41
rkazak joined15:41
livingstn left15:42
ochorocho__ joined15:43
eletuchy left15:43
thiago joined15:43
strayPuppy joined15:44
banister left15:44
rkazak left15:44
livingstn joined15:45
Mikaela joined15:45
Mikaela Hi, if we can now automatically gpg sign all commits, can we also do that to tags?15:45
apiarian commits are signed?15:46
Balliad left15:46
fracting left15:47
apiarian oh, huh, they can be https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work15:47
j416 Mikaela: yes.15:48
Mikaela: man git-tag15:48
gitinfo Mikaela: the git-tag manpage is available at http://jk.gs/git-tag.html15:48
Mikaela "To set all commits in any local repository on your computer to be signed by default, run git config --global commit.gpgsign true." https://help.github.com/articles/signing-commits-using-gpg/ but that doesn't affect tags15:49
thanks, I will read that now15:49
j416 ah.15:49
imacinto left15:49
j416 I misunderstood15:49
al-damiri left15:49
j416 Mikaela: easy to test though :)15:49
Mikaela j416: I don't see anythkng about automatic signing there (and I assume gitinfo is a bot)15:50
dreiss left15:50
Corosus left15:51
mustmodify joined15:51
mustmodify Oh blah.15:51
Rodya_ left15:51
mustmodify oh15:51
nm15:51
j416 Mikaela: set that config and tias15:52
is what I'd do15:52
jimmychoo left15:53
banister joined15:54
samw joined15:55
mustmodify left15:56
mikecmpbll joined15:56
gusto joined15:57
Rodya_ joined15:58
Mikaela j416: I tried, but annotated tags didn't get signed15:58
acetakwas joined15:58
tomog999_ joined15:58
kkspy joined15:59
samw left16:00
j416 Mikaela: then perhaps it is not configurable. You could alias.16:00
Impaloo left16:00
Mikaela :(16:00
Impaloo joined16:01
jimmychoo joined16:01
tomog999 left16:01
dopesong joined16:01
shibly joined16:02
strayPuppy left16:02
j416 Mikaela: read what the git project says about signed commits though16:02
Rodya_ left16:02
shibly Why aren't there issues or tickets in github repository? https://github.com/django/django16:02
j416 Mikaela: determine if it might be overkill :)16:02
shibly for django16:02
j416 signed tags probably makes more sense, though16:03
arup_r joined16:03
Mikaela I think I have done that, but they probably wouldn't add the option withoyt reason.16:03
j416 that's not what I said16:03
nnyk joined16:03
nnyk left16:03
nnyk joined16:03
j416 contrib guidelines explicitly say don't sign commits; for good reason16:03
arup_r Hi. I want to ignore all files inside tmp/ dir but not the folder 'imports' and file inside it. How to do it?16:03
j416 just thought, maybe that's useful for you16:03
PCatinean left16:03
j416 but, tags yes16:04
arup_r what should I write in the .gitignore file16:04
slightlyAjar joined16:04
j416 shibly: ask the django people, this is not a git question16:04
subscope joined16:04
p4trix left16:04
shibly j416, Is there any option in github to create issues/tickets?16:05
arup_r shibly: yes. GitHub has the UI16:05
ignatenkobrain left16:05
pantsman- left16:05
shibly arup_r, So why isn't it here for django?16:05
mashu left16:06
arup_r oh. no idea.16:06
I was saying GitHub has the feature16:06
harish_ left16:06
mohabaks joined16:07
shibly Is github related question allowed here?16:08
Zarthus you're cross posting16:08
is me answering you in #github not sufficient?16:08
shibly Ok, i'm leaving this.16:08
shibly left16:08
fracting joined16:09
mellernoia left16:09
GT4066 left16:09
Ahmed90 left16:10
toogley joined16:10
fracting left16:11
fracting joined16:11
siloxid left16:11
ranguli joined16:12
ranguli left16:12
a_thakur left16:13
relipse2 left16:14
ranguli joined16:14
ranguli left16:14
mehola joined16:14
rubie left16:14
neca left16:15
apprentice left16:16
ranguli joined16:17
ranguli left16:17
rubie joined16:17
harish_ joined16:18
ekinmur left16:19
ranguli joined16:19
ranguli left16:19
mehola left16:19
ranguli joined16:19
ranguli left16:19
ignatenkobrain joined16:20
dopesong left16:20
ranguli joined16:20
ranguli left16:20
dopesong joined16:20
dreiss joined16:20
bq left16:21
daito joined16:22
Macaveli joined16:23
Macaveli left16:23
FunkyAss left16:24
subscope left16:24
harish_ left16:24
tristanp joined16:24
acetakwas left16:25
daito left16:26
muthu left16:27
moei joined16:28
moei left16:28
moei joined16:28
WizJin joined16:28
Noldorin left16:29
Rodya_ joined16:30
arand joined16:31
jason237 joined16:32
banister left16:32
subscope joined16:33
livingstn left16:35
flopsec joined16:37
Sasazuka joined16:37
jfelchner joined16:37
banister joined16:40
acetakwas joined16:40
ignatenkobrain left16:40
mizu_no_oto left16:41
bronson joined16:42
dimi1947 joined16:43
toothe joined16:43
toothe how do I do a diff comparison with a remote server?16:44
relipse2 joined16:45
mohabaks left16:45
raijin joined16:45
bronson left16:46
gamelaster joined16:46
GodFather joined16:47
rubie left16:48
Macaveli joined16:48
zarel joined16:49
InfoTest joined16:50
ahmedelgabri joined16:50
ays joined16:51
raininja joined16:52
satbyy joined16:52
raijin left16:52
denimsoft joined16:52
subscope left16:53
Literphor joined16:53
rubie joined16:53
zarel left16:54
zarel joined16:54
ahmedelgabri left16:55
natechan left16:56
raininja left16:56
jason237 left16:56
ignatenkobrain joined16:57
fracting left16:58
preaction toothe: you have to fetch, and then you can git diff origin/<branch>16:58
relect joined16:58
relect left16:59
johnwhitton joined16:59
LaT0rtue left16:59
LaT0rtue joined17:00
banister left17:00
ivan_on_trac left17:01
apprentice joined17:04
fuchstronaut joined17:07
arup_r left17:08
rubie left17:08
Literphor left17:09
liamonade joined17:10
InfoTest left17:10
dopesong_ joined17:10
gsingh joined17:10
liamonade left17:12
fuchstronaut left17:12
mischat left17:12
toothe preaction: I see...17:14
dopesong left17:14
Rodya_ left17:15
zarel left17:15
apprentice left17:15
toogley left17:16
freimatz left17:16
Bruce____ joined17:17
Noldorin joined17:18
preaction do you want the actual changes? or do you just want to know if the remote has moved on? git ls-remote is a thing17:18
SteffanW joined17:18
fracting joined17:20
Macaveli left17:21
xcesariox joined17:22
kadoban joined17:23
OnBrokenWings joined17:23
toogley joined17:24
nilsi left17:25
zarel joined17:25
acetakwas left17:28
aj__ left17:28
avarsh left17:28
ToxicFrog joined17:30
SenpaiSilver joined17:30
rubie joined17:32
s841 joined17:33
s84 left17:33
mikecmpbll left17:34
David1977 left17:34
asultramosesdili left17:35
SwiftMatt joined17:35
Bruce____ left17:36
newke left17:36
clemf joined17:36
Bruce____ joined17:37
jimmychoo left17:38
nnyk left17:43
siaw joined17:43
rubidium joined17:44
Bruce____ left17:44
jraccoon joined17:44
rubidium hello, does the GIT abbreviation stand for Global Interface Table?17:45
qsx rubidium: no.17:45
rubidium gnu interactive tools?17:45
qsx git:kernel:git/git::README17:45
gitinfo Git web link: https://git.kernel.org/cgit/git/git.git/tree/README?h=HEAD17:45
qsx !GIT17:45
gitinfo Git is not an acronym, nor a proper noun("git" is equally valid). All-caps is heresy and will be punished with SVN or possibly SCCS. https://git.wiki.kernel.org/index.php/Git_FAQ#Why_the_.27Git.27_name.3F17:45
qsx it isn’t even an abbreviation.17:45
imacinto joined17:46
rubidium path not found17:46
David1977 joined17:46
qsx err17:46
this is new.17:46
https://git.kernel.org/cgit/git/git.git/tree/README.md#n4417:47
rubidium path found17:47
ok, so according to its creator, what it means depends on your mood... excellent :)17:47
thanks for the links17:48
rubie left17:48
Bruce____ joined17:49
SimonNa joined17:49
imacinto left17:51
jeffreylevesque joined17:51
Ahmed90 joined17:52
oich left17:53
jraccoon left17:53
muthu joined17:54
eka_ left17:54
jraccoon joined17:55
MaHoArCa joined17:55
Cassiopaya left17:56
vervet joined17:56
Discovery left17:56
jraccoon left17:57
sangy joined17:57
jeffreylevesque_ joined17:58
fracting left17:58
jraccoon joined17:58
jeffreylevesque left17:58
OnBrokenWings left17:59
akash21 joined17:59
dimi1947 left18:02
troulouliou_div2 joined18:02
jeffreylevesque_ left18:04
KellerFuchs joined18:05
gusto left18:05
KellerFuchs Hi. What constitutes a “trusted signature”, in the context of `git merge --verify-signature` ?18:06
Is it trusted in the sense that GnuPG's ownertrust was set for the key that signed the HEAD of the tree?18:07
KellerFuchs found no explanation for that in the doc18:07
tobiasvl KellerFuchs: yes. not just HEAD though. all commits being merged18:07
socketguru_ left18:07
KellerFuchs tobiasvl: Yes, just saw that by trying18:09
That makes it a tad annoying to deal with external contributors :(18:09
tobiasvl how so18:10
just don't verify signatures then?18:10
KellerFuchs would have to sign all commits before merging, which would change the commits hash and break the git workflow of contributors (i.e., they will get conflicts when pulling from us again)18:10
jraccoon left18:11
gsingh left18:11
paddyez joined18:12
paddyez left18:12
paddyez joined18:12
jraccoon joined18:12
choki joined18:12
KellerFuchs tobiasvl: Basically, I want to keep the head of our “production” branch signed at all times, so that when our automation scripts pull config or code from it, the signature can be checked (and since the tree cannot be changed without changing the HEAD's commit hash and breaking the signature, that should be fine)18:13
rubie joined18:13
Eugene KellerFuchs - you can create a new "sign me" commit before merging instead of rewriting....18:13
grawity well for that you just need to sign your own merges, no?18:13
Eugene Or sign the merge18:13
tobiasvl sign the merge is the correct way18:13
grawity because the contributors' commits are never the head18:13
only your merges are18:13
assuming you --no-ff all the merges18:14
KellerFuchs Eugene: Signing the merge commit is exactly what I want to do, but now I'm trying to figure out how to enforce, when pulling in a script, that the tree is signed18:14
grawity: Yep18:14
Eugene `git show --show-signature HEAD`18:15
jagob joined18:15
Eugene And you shouldn't be pull(fetch+merge)ing in a script18:15
KellerFuchs Eugene: FETCH_HEAD, rather, and this has exit code 0 is the HEAD is not signed18:16
fracting joined18:16
Eugene !xy18:16
gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...18:16
Eugene Start over18:16
grawity `git merge --ff-only` in a script seems fine to me18:16
KellerFuchs grawity: I'm using --ff-only currently18:16
Eugene: So, I have some configuration and some code that is kept in various git repositories18:17
grawity so you merge stuff into 'production' using `git merge --no-ff --sign whatever`18:17
and then your script updates from 'production' using `git pull --ff-only --verify-signatures`18:17
seems okay?18:17
KellerFuchs grawity: Except that I just got told that --verify-signature requires all commits to be signed18:18
Not just the HEAD18:18
grawity oh does it18:18
tobiasvl not sure about that, that's not what I intended to say at least18:18
but it checks the signatures of all commits to be merged18:18
grawity Try It And See™18:19
tobiasvl and those all need to be trusted18:19
yeah !tias18:19
gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.18:19
nwkj86 joined18:19
tobiasvl I don't deal much in signed commits but I don't believe they all need to be signed18:19
just that the ones that are must be trusted18:19
Bruce____ left18:20
gamelaster left18:20
KellerFuchs Yep, currently testing, but I also wanted to check here because I don't want to be bitten in the rear by some weird edge-case18:20
Bruce____ joined18:20
lolmac left18:21
jraccoon left18:21
KellerFuchs Also, I still don't know what a “trusted signature” is, for git. A signature done with a key that GnuPG know? One which has a trust-level set (in GnuPG)? Something else?18:22
ochorocho__ left18:22
bb010g joined18:22
gitinfo set mode: +v18:22
Eugene git doesn't have a WoT itself; it outsources verification to `gpg`18:22
daito joined18:22
garethdaine joined18:23
Sasazuka left18:23
ochorocho__ joined18:23
Eugene I believe it just verifies that the gpg signature is valid, meaning that it was created by the person holding the gpg key18:23
tobiasvl man git merge says: "Verify that the commits being merged have good and trusted GPG signatures". I assume that means they have a trust level set above "none" (or possibly above "marginal")18:23
gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html18:23
Eugene AFAIK it doesn't verify the commit metadata matches the gpg metadata(eg, name+email)18:23
weox left18:24
tobiasvl I don't think they'd use the phrase "good and trusted" if it doesn't check the trust level?18:24
akash21 left18:24
tobiasvl would surprise me18:24
Eugene Beats me; check the code18:24
j416 if the commit is signed than verifying is irrelevant18:24
@ meta18:24
tobiasvl but checking trust level is not irrelevant18:24
j416 nod18:25
Eugene You trust Alice and Bob. Bob submits a commit that he signed, but with Alice's name as the committer ;-)18:25
I don't know if that case is handled or not18:25
(because I've not done gpg-signed commits)18:25
j416 Eugene: then that is what bob signed18:25
Eugene: you cannot cherry-pick and keep a sign18:25
durham joined18:25
j416 afaik18:25
(I don't use gpg signing either)18:25
Eugene shrugs18:26
j416 that's the whole reason git.git discourages signed commits18:26
gusto joined18:26
j416 because there is no use in signing when they apply patches anyway18:26
daito left18:27
slightlyAjar left18:28
durham left18:30
durham joined18:30
slightlyAjar joined18:31
jimmychoo joined18:32
kpease joined18:32
kpease left18:33
durham left18:33
durham joined18:34
mike_r_ joined18:35
slightlyAjar left18:37
jimmychoo32 joined18:37
mikr_ left18:37
diogenese left18:39
diogenese joined18:39
mikecmpbll joined18:40
troulouliou_div2 left18:42
jimmychoo left18:43
KellerFuchs Eugene: Yes, I will check the code18:43
khisanth_ left18:44
gitinfo set mode: +v18:44
grawity j416: well, when you cherry-pick, it marks you as the committer anyway18:44
Literphor joined18:45
PerilousApricot left18:45
natechan joined18:45
slightlyAjar joined18:45
j416 grawity: mm so?18:46
ahmedelgabri joined18:47
KellerFuchs Eugene, tobiasvl: Btw, having the head signed is enough for git pull --ff-only --verify-signature18:47
nicoulaj joined18:47
tobiasvl huh18:47
kinda contradicts man git merge18:48
gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html18:48
tobiasvl but all right18:48
oh no wait, nevermind18:48
KellerFuchs Yes, the head is the commit being merged18:48
clemf left18:48
tobiasvl I read that wrong. that supports my theory then. it only checks signed commits for trust and doesn't care if other commits are not signed.18:48
KellerFuchs but I also found the manpage confusing18:48
tobiasvl yeah18:49
ït's vague18:49
KellerFuchs tobiasvl: I'm not sure I understand your sentence correctly, but git pull --verify-signature will also refuse to merge something that isn't signed18:49
tobiasvl oh ok18:49
that doesn't fit my theory then18:49
KellerFuchs Ok18:49
enkeyz joined18:49
enkeyz hello guys18:50
gitinfo enkeyz: 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.18:50
slightlyAjar left18:50
tildes left18:50
KellerFuchs might submit manpages patches, once they wade through the code to be sure they understand what the signature verification options do18:50
enkeyz I wanna restore on of my vim plugins state to an old state: to the last commit of March 26: https://github.com/Valloric/YouCompleteMe/commits/master18:50
netcarver joined18:50
enkeyz one*18:51
Protron joined18:51
cagmz left18:51
cagmz joined18:51
enkeyz but looks like "git reset --hard 1b76af4" not working18:51
therealGent joined18:52
tobiasvl enkeyz: what do you mean it's not working18:52
dineshp joined18:52
fscala left18:52
enkeyz tobiasvl: http://i.imgur.com/JW1ZVea.png18:54
dineshp left18:54
fscala joined18:55
livingstn joined18:56
khisanth_ joined18:56
KellerFuchs Eugene, tobiasvl : FYI, https://github.com/git/git/blob/master/gpg-interface.c#L27-L61 confirms that the signature must be done by a valid key (not necessarily a trusted one)18:58
mingwandroid_ joined18:58
tobiasvl all right18:58
Tim-SEM joined18:58
tobiasvl maybe the man page should be clarified then18:59
mingwandroid left19:00
Joel left19:03
KellerFuchs tobiasvl: Where is the prefered place to send patches? Is it fine to do a Github PR?19:03
yqt joined19:03
JSharpe joined19:03
Literphor left19:04
KellerFuchs Ah, no, it's a RO mirror19:04
tobiasvl KellerFuchs: no, git uses a kind of archaic (IMO) system with patches via email19:04
KellerFuchs found Documentation/SubmittingPatches19:04
KellerFuchs tobiasvl: Like the kernel, I assume19:04
tobias urgh, time to learn irssi to not highlight on 'tobiasvl'19:04
tobiasvl :)19:04
KellerFuchs apologises to tobias19:05
tobiasvl or just change your nick dude19:05
this town ain't big enough for two tobiases19:05
tobias :-)19:05
nicoulaj left19:06
tobias nah imo irssi should be smart enough. There's somebody else with a similar but not same nick and that one is active and people are quoting that nickname, that should be sufficient to ignore these highlights19:06
rubie left19:06
denimsoft left19:07
tobiasvl that's some heavy AI right there. why not just hilight your whole nick and nothing but your nick?19:07
"tobias" or bust19:07
ignatenkobrain left19:07
mehola joined19:07
rubie joined19:07
Literphor joined19:08
fuchstronaut joined19:08
Bruce____ left19:09
josuebrunel joined19:09
josuebrunel left19:09
jon-mac joined19:09
fracting left19:10
bollullera joined19:11
NeonSynth joined19:12
fuchstronaut left19:13
shymega left19:14
enkeyz left19:14
Tim-SEM left19:14
tildes joined19:14
garethdaine left19:15
hhee joined19:15
Joel joined19:16
blahdodo left19:16
hhee guys, which tutorial can i use for quick basic git understanding?19:16
oich joined19:16
FunkyAss joined19:17
Seveas try the !book19:17
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable19:17
KellerFuchs is tempted to link https://xkcd.com/1597/19:17
pantsman- joined19:17
livingstn left19:18
ahmedelgabri left19:18
Eugene Basically, ye.19:18
SteffanW left19:18
tildes left19:19
masterofdisaste1 joined19:19
masterofdisaste1 left19:20
rubidium left19:21
David1977 left19:22
adamsilver joined19:22
Debyte joined19:23
fracting joined19:24
blahdodo joined19:25
jason237 joined19:25
rubie left19:25
jamick left19:27
zarel left19:27
gitinfo set mode: +v19:27
SwiftMatt left19:28
jamick joined19:28
toothe left19:28
Debyte left19:30
Debyte_ joined19:30
shymega joined19:31
nnyk joined19:31
Sazhen86 joined19:32
Protron left19:32
PryMar56 joined19:34
fling left19:34
fracting left19:35
jamick left19:37
jetpack_joe joined19:38
banister joined19:38
Balliad joined19:38
jamick joined19:38
raijin joined19:39
nnyk left19:40
ahmedelgabri joined19:42
Balliad left19:44
dimi1947 joined19:44
Bruce____ joined19:45
simpbrain joined19:45
jetpack_joe left19:46
slightlyAjar joined19:46
imacinto joined19:46
fracting joined19:47
dimi1947 left19:50
Bruce____ left19:50
mingwandroid_ left19:50
imacinto left19:51
slightlyAjar left19:51
stonerfish joined19:53
cagmz left19:53
elsevero joined19:54
natechan left19:54
vervet left19:55
SwiftMatt joined19:56
ignatenkobrain joined19:57
zarel joined19:59
Bruce____ joined19:59
hhee Seveas, got it!20:00
rubie joined20:00
fedexo left20:01
nadim left20:01
ays left20:02
therealGent left20:04
Heisenberg1276 joined20:06
boombatower left20:06
fedexo joined20:06
thin_tim joined20:07
diegoaguilar left20:08
thin_tim left20:08
Sadeukko joined20:08
daito joined20:08
dstegelman joined20:09
juanpablorochaam joined20:10
multi_io left20:10
dstegelman left20:10
acton left20:11
sangy left20:11
multi_io joined20:12
NeverDie left20:12
daito left20:13
ekinmur joined20:14
netcarver left20:14
stonerfish left20:15
Bruce____ left20:15
Atm0spher1c joined20:18
tildes joined20:18
lolmac joined20:19
daito joined20:19
acton joined20:20
Tetsuo55_ left20:21
tildes left20:23
diegoaguilar joined20:23
armyriad left20:23
armyriad joined20:25
daito left20:26
phaleth left20:28
bb010g left20:29
fracting left20:30
fracting joined20:31
Corosus joined20:36
fr33domlover left20:37
sauvin left20:39
MattMaker joined20:39
juanpablorochaam left20:39
bronson joined20:44
hhee guys, how actually understand this kind of info into git--- @@ -8,7 +8,10 @@20:45
_ikke_ read about unified diff20:45
Sazhen86 left20:46
hhee _ikke_, ok thanks for support20:46
_ikke_ https://en.wikipedia.org/wiki/Diff_utility#Unified_format20:46
It's not unique to git20:46
nevodka joined20:46
King_Hual left20:47
slightlyAjar joined20:47
Heisenberg1276 left20:47
SimonNa left20:47
nnyk joined20:48
therealGent joined20:48
therealGent left20:48
therealGent joined20:48
bronson left20:48
muthu left20:49
clemf joined20:50
slightlyAjar left20:52
jprocha84 joined20:52
nadim joined20:53
elastix joined20:54
raijin left20:56
dopesong_ left20:56
nilg joined20:57
T3ZlckNvZGVymuchachos20:57
muchachosT3ZlckNvZGVy20:57
Lyqyd left20:59
freimatz joined21:00
Corosus left21:01
dreiss left21:03
s841 left21:03
Kicer86 left21:04
eletuchy joined21:04
s84 joined21:04
Mitaka89 left21:04
ignatenkobrain left21:05
toogley left21:07
MattMaker left21:07
subhojit777 left21:07
Sazhen86 joined21:08
mizu_no_oto joined21:08
eletuchy left21:08
emPi left21:08
fuchstronaut joined21:09
ionelmc what's the reason short log only shows 7 chars from the hash? why not 6 or 8?21:09
Bruce____ joined21:09
grawity chosen by dice roll21:10
preaction depends on how many chars it needs to be unambiguous21:10
https://blog.cuviper.com/2013/11/10/how-short-can-git-abbreviate/21:11
ahmedelgabri left21:13
fuchstronaut left21:13
Bruce____ left21:14
mwhooker joined21:15
Sazhen86 left21:15
Zoddo left21:17
Zoddo joined21:18
freimatz left21:18
troulouliou_div2 joined21:19
troulouliou_div2 left21:19
nilg left21:20
jimmychoo32 left21:21
NeonSynth left21:23
nadim left21:23
sword left21:23
Bruce____ joined21:24
johnwhitton left21:25
kkspy left21:25
johnwhitton joined21:26
ToBeCloud joined21:28
gitinfo set mode: +v21:28
vitamin_minativ left21:28
Heisenberg1276 joined21:29
autochthon left21:29
johnwhitton left21:30
pantsman- left21:30
aidalgol joined21:31
nwkj86 left21:32
nnyk_ joined21:32
nnyk left21:33
aidalgol left21:34
dandd322 joined21:35
NeverDie joined21:36
mashu joined21:36
jetpack_joe joined21:38
cagedwisdom joined21:38
Debyte_ left21:39
jstimm left21:40
nnyk_ left21:40
cyan__ joined21:41
jetpack_joe left21:42
nwkj86 joined21:44
grekkos joined21:47
imacinto joined21:47
cdg_ left21:50
n1cky joined21:51
n1cky left21:52
imacinto left21:52
dm7freek joined21:53
Bruce____ left21:54
[cust] left21:55
mashu left21:55
eletuchy joined21:58
ekinmur left22:02
eletuchy left22:02
apotry left22:03
Jackneill left22:03
dandd322 left22:03
choki left22:08
tristanp left22:08
durham left22:12
neca joined22:12
st0opkid joined22:14
ekinmur joined22:16
neca left22:16
mizu_no_oto left22:16
johnwhitton joined22:18
ocbtec left22:18
cagedwisdom left22:18
banister left22:20
paddyez left22:20
banister joined22:21
mizu_no_oto joined22:21
diegoviola joined22:21
ekinmur left22:21
clemf left22:22
daito joined22:22
jbitdrop left22:23
nadim joined22:23
MattMaker joined22:24
italoacasas left22:26
TheVoid left22:26
daito left22:26
italoacasas joined22:27
[cust] joined22:27
Sadeukko left22:28
TheVoid joined22:28
SwiftMatt left22:29
cagedwisdom joined22:31
Atm0spher1c left22:32
alexsystemf_ joined22:34
samw joined22:34
neca joined22:35
Bruce____ joined22:35
siaw_ joined22:37
Strout_ joined22:38
s84 left22:39
siaw left22:39
tterrag left22:39
siaw_siaw22:39
tterrag joined22:39
loglaunch left22:39
s84 joined22:40
kfunk left22:40
elastix left22:40
diegoaguilar left22:40
Strout left22:41
loglaunch joined22:41
FunkyAss left22:41
kfunk joined22:41
boombatower joined22:41
dreiss joined22:43
boombatower left22:45
Bruce____ left22:46
kinlo joined22:46
mellernoia joined22:46
boombatower joined22:46
JSharpe left22:46
chitopunk joined22:47
Bruce____ joined22:48
kinlo is there a way to configure something globally so I am forced to configure user.email per repository again?22:48
rkazak joined22:49
Heisenberg1276 left22:51
hhee left22:51
Bruce____ left22:52
nadim left22:52
eletuchy joined22:52
diogenese left22:54
diogenese joined22:54
osse kinlo: remove the global config22:54
kinlo: Then you'll be reminded each time you try to commit in a new repo22:55
t-mart joined22:55
kinlo osse: no it uses username@machine-hostname instead at that point :/22:55
osse kinlo: huh, mine dorsn't do that22:56
dunno then22:56
eletuchy left22:57
kinlo on some misconfigured hosts it isn't capable of figuring the fqdn of the machine and then it bails out tough22:57
mikecmpbll left22:59
GodFather left23:01
mwhooker left23:05
Strout_ left23:06
Strout joined23:06
liri_ left23:07
MaHoArCa left23:08
aj__ joined23:09
nettoweb joined23:09
avarsh joined23:09
nadim joined23:13
tristanp joined23:14
diegoaguilar joined23:14
ffabi left23:15
NeonSynth joined23:16
johnwhitton left23:17
Limes_ left23:18
GodFather joined23:18
ffabi joined23:19
mase-tech left23:20
ffabi left23:23
tristanp left23:23
johnwhitton joined23:23
Bruce____ joined23:23
MattMaker left23:24
bb010g joined23:24
gitinfo set mode: +v23:24
ffabi joined23:25
cyan__ left23:28
stevenbenner joined23:30
MattMaker joined23:33
Vaelatern left23:34
chitopunk left23:34
cagmz joined23:37
akushner joined23:39
johnwhitton left23:39
cagmz left23:39
acton left23:40
rkazak left23:42
akushner left23:42
akushner joined23:43
Bruce____ left23:44
johnwhitton joined23:45
aidalgol joined23:46
MattMaker left23:47
johnwhitton left23:47
imacinto joined23:48
imacinto left23:48
imacinto joined23:48
rolha left23:51
imacinto left23:53
MattMaker joined23:55
MattMaker left23:56
nettoweb left23:58
jprocha84 left23:59
fstd left23:59
fstd joined23:59

Logs Search ←Prev date Next date→ Channels Documentation