IRCloggy #git 2017-12-06

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.

2017-12-06

Guest34299 left00:00
dvl left00:01
dvl joined00:03
dvl left00:03
dvl joined00:03
akushner left00:03
netlar left00:04
finalbeta left00:04
tmsmith joined00:05
mostlybadfly left00:05
anli joined00:06
dvl left00:07
db8093246 left00:07
durham left00:08
dvl joined00:08
dvl left00:08
dvl joined00:08
durham joined00:09
sanscoeur left00:09
tmsmith left00:10
anli left00:12
dvl left00:13
akushner joined00:13
Zakkor left00:15
dvl joined00:15
dvl left00:15
dvl joined00:15
tmsmith joined00:16
tmsmith left00:17
BrAsS_mOnKeY joined00:17
simon816 joined00:17
dvl left00:19
blackmesa1 left00:19
martinklepsch joined00:20
dvl joined00:20
dvl left00:20
dvl joined00:20
dvl left00:24
Cabanossi left00:25
dvl joined00:26
dvl left00:26
dvl joined00:26
Cabanossi joined00:28
|ifei5good left00:29
dvl left00:30
mniip left00:30
|ifei5good joined00:31
dvl joined00:31
dvl left00:31
dvl joined00:31
ericho left00:33
steeze left00:33
mniip joined00:35
pyfoo left00:36
|ifei5g00d joined00:36
Bercik left00:37
pyfoo joined00:37
|ifei5good left00:37
behr328 joined00:38
behr328 left00:38
steeze joined00:39
dvl left00:40
dvl joined00:40
dvl left00:40
dvl joined00:40
thiago joined00:41
aax left00:43
boombatower left00:44
|ifei5g00d left00:44
Bercik joined00:45
boombatower joined00:45
|ifei5g00d joined00:45
Enphuego joined00:46
dendazen joined00:47
cdg left00:49
ResidentBiscuit joined00:49
cdg joined00:49
durham_ joined00:50
|ifei5good joined00:50
|ifei5g00d left00:51
durham left00:53
peeps joined00:54
durham_ left00:54
cdg left00:54
Cabanossi left00:55
jottr_ left00:55
jottr joined00:55
orbyt_ left00:56
m0viefreak left00:57
luckman212 left00:57
|ifei5g00d joined00:57
Cabanossi joined00:58
tvw left00:58
Murr left00:58
|ifei5good left00:58
Murr joined00:58
jottr_ joined00:59
jottr left01:00
d10n-work left01:00
jameser joined01:00
durham joined01:00
luckman212 joined01:02
pbandark left01:02
upperdeck left01:04
|ifei5g00d left01:05
ph88_ joined01:06
Phylock left01:06
binary106 joined01:06
ejsf_ joined01:06
banisterfiend left01:06
|ifei5g00d joined01:06
ngqrl left01:07
akushner left01:07
madknight left01:07
a--m joined01:07
ohcibi left01:08
pdgwien joined01:08
davimore left01:08
upperdeck joined01:09
kisonecat joined01:09
zizzfizzix joined01:09
zizzfizzix left01:09
zizzfizzix joined01:09
ohcibi joined01:09
akushner joined01:09
Mercury joined01:09
Kuukunen joined01:10
davimore joined01:10
tribly joined01:11
madknight joined01:11
Mike11 left01:12
|ifei5g00d left01:12
|ifei5g00d joined01:12
hue joined01:17
wizardedit joined01:17
wizardedit left01:17
wizardedit joined01:17
|ifei5good joined01:18
|ifei5g00d left01:19
cdg joined01:21
cdown left01:21
wizardedit left01:22
ZexaronS left01:24
wizardedit joined01:24
|ifei5good left01:26
Cabanossi left01:27
|ifei5g00d joined01:27
Cabanossi joined01:28
overlord_tm left01:28
fission6 joined01:29
CheckDavid left01:30
|ifei5good joined01:33
|ifei5good left01:33
filcab left01:33
|ifei5good joined01:33
filcab joined01:33
|ifei5g00d left01:33
filcab left01:34
steeze left01:34
AfroThundr joined01:37
akushner left01:38
upperdeck left01:39
durham left01:39
filcab joined01:39
AfroThundr left01:39
|ifei5g00d joined01:39
|ifei5good left01:40
Gustavo6046 left01:41
Case_Of joined01:42
ngqrl joined01:43
xaxxon joined01:43
upperdeck joined01:43
Case_Of left01:44
Kaisyu joined01:44
slappymcfry joined01:45
slappymcfry left01:45
Case_Of joined01:45
pyfoo left01:45
|ifei5good joined01:46
|ifei5g00d left01:47
Case_Of left01:48
orbyt_ joined01:49
Barrt joined01:50
rchavik joined01:51
Case_Of joined01:51
neil_cn joined01:52
|ifei5good left01:54
VoradorPT left01:55
|ifei5g00d joined01:55
Hello71 left01:56
milli joined01:57
IndianAr_ joined01:58
Hello71 joined01:59
Claw_wolf joined02:00
danieli left02:00
finalbeta joined02:00
ResidentBiscuit left02:00
|ifei5g00d left02:01
tjbp joined02:01
fission6 left02:02
cherry-xw joined02:03
ArcaTech joined02:03
xkr47 left02:03
xkr47 joined02:04
nydel07 left02:04
Zamerick left02:04
shoogz left02:04
netj left02:05
netj joined02:05
shoogz joined02:07
shoogz left02:07
shoogz joined02:07
shoogz left02:07
shoogz joined02:08
shoogz left02:08
shoogz joined02:08
shoogz left02:09
shoogz joined02:09
shoogz left02:09
DolphinDream left02:10
bonerx2k joined02:10
cherry-xw left02:10
jottr joined02:10
jstein left02:11
IndianAr_ left02:13
stduolc1 joined02:13
jottr_ left02:14
cqi joined02:15
spacemud left02:17
stduolc left02:17
salamanderrake left02:20
cust joined02:22
spacemud joined02:23
redj joined02:23
Cabanossi left02:25
xaxxon_ joined02:26
xaxxon left02:27
Cabanossi joined02:28
dhollinger joined02:28
tombusby_ left02:28
tombusby joined02:28
Sasazuka left02:29
devbaka_ joined02:32
kfoonamalik left02:32
DolphinDream joined02:32
dsdeiz joined02:34
maroloccio left02:34
dsdeiz left02:34
dsdeiz joined02:34
davimore left02:35
rm8 left02:35
shinnya left02:35
devbaka left02:35
xaxxon_xaxxon02:38
ShapeShifter499 joined02:42
Bill joined02:42
Bill left02:42
svm_invictvs left02:42
piggah_ left02:44
Bill joined02:45
BillGuest1155102:45
piggah joined02:45
ilbot3 left02:45
davimore joined02:47
dreiss joined02:47
IndianAr_ joined02:47
yu left02:49
d^sh left02:50
albel727 left02:51
d^sh joined02:53
minionofgozer joined02:54
upperdeck left02:54
davimore left02:54
cqi left02:55
cqi joined02:55
Murr left02:58
Murr joined02:58
ilbot3 joined02:58
upperdeck joined02:58
Guest11551 left02:59
QualityAddict joined03:02
prettyrobots joined03:04
in1t3r left03:04
Bill_ joined03:05
davimore joined03:06
lagothri1 left03:08
filcab left03:11
zarzar1 left03:12
Cabanossi left03:12
zarzar1 joined03:12
Cabanossi joined03:13
minionofgozer left03:13
minionofgozer joined03:14
lagothri1 joined03:15
filcab joined03:17
tourdown1nder joined03:17
stutter joined03:18
leprechau left03:19
nydel07 joined03:20
leprechau joined03:20
stutter left03:20
pineappleroads joined03:20
afromankenobi joined03:20
nephyrin left03:20
nephyrin` joined03:20
reliability joined03:21
KeyJoo left03:22
menip joined03:23
reliability left03:25
tunekey left03:27
devbaka__ joined03:27
pineappleroads left03:29
devbaka_ left03:30
stutter joined03:31
Eugene joined03:32
afromankenobi left03:34
lanlink[m] joined03:35
Bill_ left03:36
nephyrin` left03:37
matoro_ joined03:37
chachasmooth_ joined03:38
kfoonamalik joined03:39
pineappleroads joined03:40
chachasmooth left03:40
jstein_ joined03:40
jstein_jstein03:40
yn left03:41
nephyrin joined03:41
Zamerick joined03:42
stutter left03:45
lb1c left03:47
lb1c joined03:47
yanome joined03:47
kfoonamalik left03:47
Andrew_K|1 joined03:47
Bill joined03:47
yanomeyn03:47
BillGuest4339803:47
stutter joined03:48
stutter left03:49
cherry-xw joined03:49
Guest43398 left03:49
zarzar1 left03:54
kculpis joined03:55
mmlb left03:56
nooooone_ left03:56
_flow_ joined04:00
mmlb joined04:00
nooooone__ joined04:00
piggah left04:00
cherry-xw left04:00
dviola left04:00
alias__ joined04:00
mmlb left04:00
zarzar2 joined04:00
kculpis left04:00
mmlb joined04:00
kculpis joined04:00
drupol joined04:00
hsiktas joined04:00
dreiss left04:00
kculpis left04:00
pineappleroads left04:00
Cabanossi left04:00
_xor joined04:00
kculpis joined04:00
Cabanossi joined04:00
mic4ael_ joined04:00
yanbbyan1 joined04:00
jgornick joined04:00
Grum_ joined04:00
msonntag joined04:00
Milos joined04:00
Grum_Grum04:00
patrickr[m] joined04:01
timewalker joined04:01
pks left04:02
alias__ left04:06
timewalker left04:06
timewalker joined04:07
pks joined04:07
jab416171 left04:07
nydel09 joined04:12
ablackack_ joined04:12
Cabanossi left04:12
d-fence joined04:12
alphor joined04:12
Cabanossi joined04:12
shripadr joined04:12
jab416171 joined04:12
cherry-xw joined04:13
PtxDK left04:13
salamanderrake joined04:14
goweol joined04:14
PtxDK joined04:14
cherry-xw left04:15
goweol1 joined04:15
CustosLimen joined04:15
mel00010 left04:17
goweol2 left04:17
goweol left04:18
steeze joined04:19
mel00010 joined04:20
jstein left04:20
goweol joined04:22
goweol1 left04:22
shripadr left04:24
pineappleroads joined04:24
cmonahan joined04:27
svm_invictvs joined04:27
KeyJoo joined04:29
IndianAr_ left04:30
shripadr joined04:30
imack joined04:30
cmonahan left04:31
goweol left04:31
roler joined04:31
roler left04:32
roler joined04:32
AfroThundr joined04:32
pineappleroads left04:33
salamanderrake left04:34
xaxxon left04:35
shripadr left04:35
piggah joined04:36
h12o joined04:37
tarkus joined04:37
tarkus left04:37
bonerx2k left04:39
neel joined04:39
neelGuest5737404:40
jab416171 left04:40
shripadr joined04:40
neil_cn left04:41
h12o left04:41
Enphuego left04:45
jab416171 joined04:45
roler left04:48
abba joined04:50
pineappleroads joined04:52
because left04:53
lkolstad left04:53
because joined04:54
fandi joined04:56
navidr joined04:57
fandi left04:57
fandi joined04:58
rchavik left05:00
yohnnyjoe left05:00
sborza joined05:02
goweol joined05:02
blackwind_123 left05:04
blackwind_123 joined05:06
neil_cn joined05:06
upperdeck left05:06
sborza left05:06
sborza joined05:07
sborza left05:08
Guest57374 left05:09
Guest57374 joined05:09
because left05:10
upperdeck joined05:11
sborza joined05:11
tarkus joined05:11
pineappleroads left05:12
mmlb left05:13
sborza left05:13
mmlb joined05:14
sborza joined05:14
mmlb left05:14
mmlb joined05:15
because joined05:16
sborza left05:16
sborza joined05:16
emg left05:16
mizu_no_oto joined05:17
MACscr left05:18
fatalhalt left05:18
jab416171 left05:19
enzobarrett joined05:20
enzobarrett left05:21
fatalhalt joined05:22
Bill joined05:23
BillGuest2611205:23
jab416171 joined05:24
robotroll joined05:24
shripadr_ joined05:25
cdg left05:25
in1t3r joined05:26
cdg joined05:26
shripadr left05:26
ozcanesen joined05:26
jimmyrcom_ left05:27
Zamerick left05:27
re1 joined05:30
cdg left05:30
xaxxon joined05:31
ArcaTech left05:35
mmlb left05:35
mmlb joined05:36
nd joined05:37
orbyt_ left05:38
neil_cn left05:38
akushner joined05:38
nd- left05:39
Guest57374 left05:39
Guest57374 joined05:40
neil_cn joined05:40
ArcaTech joined05:40
nd- joined05:42
nd left05:43
akushner left05:43
ZyX-I joined05:43
Es0teric joined05:44
dave0x6d left05:44
rajat joined05:46
dave0x6d joined05:46
doug16k left05:51
ozcanesen left05:52
abba left05:53
Guest57374 left05:54
Es0teric left05:54
kpease joined05:55
kpease left05:55
Guest57374 joined05:58
droman0 joined05:59
xxpor joined06:01
govg joined06:01
Guest57374 left06:02
rscata joined06:03
DolphinDream left06:05
ArcaTech left06:06
snowkidind left06:06
shoogz joined06:10
shoogz left06:10
shoogz joined06:10
shoogz left06:10
shoogz joined06:11
roler joined06:12
re1 left06:13
re1 joined06:14
jost joined06:16
Rajeev joined06:16
netj left06:18
netj joined06:18
xaxxon left06:20
jameser left06:23
steeze left06:23
Cabanossi left06:24
Andrew_K|2 joined06:26
Cabanossi joined06:26
roler left06:27
rchavik joined06:28
menip left06:29
Andrew_K|1 left06:29
madewokherd left06:30
neil_cn left06:36
mic4ael_ left06:37
Rajeev left06:39
dendazen left06:40
zarzar1 joined06:42
zarzar2 left06:43
kyan joined06:44
devbaka__ left06:44
SirCmpwn joined06:46
ogny joined06:46
surfist left06:46
akushner joined06:47
neil_cn joined06:47
LocaMocha joined06:48
roler joined06:52
roler left06:53
doug16k joined06:53
dreiss joined06:54
yohnnyjoe joined06:56
Rajeev joined06:58
rscata left06:58
Murr left06:58
devbaka joined06:58
Murr joined06:58
mizu_no_oto left06:58
rscata joined06:58
mud left06:58
Hao_819 joined07:00
yohnnyjoe left07:01
Silmarilion joined07:08
Cabanossi left07:09
Hao_819 left07:11
DvdKhl joined07:11
Cabanossi joined07:12
sea-gull joined07:14
doug16k left07:14
dre_ left07:19
dec0n joined07:19
JeroenT joined07:19
Anja_ left07:20
dege joined07:22
King_Hual joined07:24
King_Hual left07:24
King_Hual joined07:24
rkta joined07:24
jost left07:26
lambdaHash left07:26
devbaka_ joined07:28
doug16k joined07:29
devbaka left07:30
manuelschneid3r joined07:31
JeroenT left07:31
MACscr joined07:32
JeroenT joined07:32
dec0n left07:32
boombatower left07:33
devbaka_ left07:33
devbaka joined07:34
dec0n joined07:34
lkolstad joined07:35
Anja_ joined07:36
JeroenT left07:36
reliability joined07:37
tkore joined07:38
surfist joined07:41
masuberu joined07:45
dviola joined07:45
dreiss left07:48
sea-gull left07:50
nooooone__ left07:52
re1 left07:53
dave0x6d left07:54
ShapeShifter499 left07:54
thiago left07:55
piggah left07:58
alcohol left07:58
alcohol joined07:59
cdg joined07:59
ghost43 left07:59
robotroll left08:00
freimatz joined08:00
robotroll joined08:01
cdg_ joined08:02
rkta left08:02
seschwar joined08:03
cdg left08:03
kculpis left08:04
elfranne left08:05
jameser joined08:06
ghost43 joined08:06
ResidentBiscuit joined08:06
cdg_ left08:06
lebster joined08:06
murii joined08:07
nezZario joined08:08
jameser left08:08
kg4peq joined08:08
ulkesh joined08:08
codedmart joined08:08
justache joined08:09
jleclanche joined08:09
netj left08:10
netj joined08:10
ResidentBiscuit left08:11
adamf joined08:11
h12o joined08:13
cspotcode joined08:13
Travis-42 joined08:14
manuelschneid3r left08:15
devhost joined08:15
noahsussman joined08:16
overlord_tm joined08:17
kyan left08:17
h12o left08:18
Es0teric joined08:19
cqi left08:19
CaptainAmari joined08:21
Raed left08:21
hoek joined08:21
gypsymauro left08:21
jameser joined08:22
Raed joined08:23
JeroenT joined08:23
belak joined08:24
Xrayez joined08:25
Strepsils left08:27
Andrew_K|1 joined08:28
Andrew_K|2 left08:28
jameser left08:28
zefferno joined08:30
last_staff joined08:30
Darcidride joined08:34
Logx joined08:35
schleppel joined08:35
Nizumzen joined08:38
Es0teric left08:38
manuelschneid3r joined08:38
upperdeck left08:39
synthmeat left08:39
Cabanossi left08:39
sea-gull joined08:40
synthmeat joined08:40
[sarri] joined08:41
sarri left08:41
Rajeev left08:41
synthmeat left08:41
Cabanossi joined08:42
filcab left08:42
upperdeck joined08:44
ZyX-I left08:44
dupondje left08:45
dupondje joined08:47
Puffball left08:48
reliability left08:48
filcab joined08:48
volestorm left08:49
Mike11 joined08:50
volestorm joined08:51
reliability joined08:53
abba joined08:53
xaxxon joined08:54
Rajeev joined08:54
AfroThundr left08:57
yohnnyjoe joined08:57
AfroThundr joined08:58
Murr left08:58
Murr joined08:58
dre_ joined08:59
surfist left09:01
kurkale61 joined09:01
fandi_ joined09:01
fandi left09:01
blackwind_123 left09:01
mikecmpbll joined09:01
floppydh joined09:02
yohnnyjoe left09:02
mikecmpbll left09:02
danieli joined09:05
danieli left09:05
danieli joined09:05
miee joined09:05
blackwind_123 joined09:05
kurkale61 left09:05
miee left09:06
reliability left09:06
kurkale61 joined09:06
TomyWork joined09:08
AfroThundr left09:09
DvdKhl left09:10
oxymoron93 joined09:11
texinwien_ left09:11
texinwien_ joined09:11
infernix joined09:12
mikecmpbll joined09:12
mikecmpbll left09:13
johnlage- joined09:13
jcarpenter2 left09:13
johnlage left09:13
robotrolll joined09:13
alcohol left09:13
jcarpenter2 joined09:14
johnlage-johnlage09:14
alcohol joined09:14
reliability joined09:14
Impaloo joined09:16
dec0n left09:16
robotroll left09:17
robotrolllrobotroll09:17
dec0n joined09:18
DevAntoine joined09:19
pbandark joined09:19
Kristjan joined09:19
mikecmpbll joined09:20
reliability left09:21
Kristjan left09:21
ejsf_ejsf09:23
King_Hual left09:23
revoltin1 joined09:23
reliability joined09:23
revoltingPeasant joined09:26
revoltin1 left09:29
sunri5e left09:32
sunri5e joined09:33
dsdeiz left09:33
dsdeiz joined09:34
dsdeiz left09:34
dsdeiz joined09:34
Floflobel joined09:35
reliability left09:38
gxt joined09:41
diqidoq joined09:42
jottr left09:42
DaGoaty joined09:47
ixxie joined09:48
reliability joined09:49
maroloccio joined09:50
diqidoq left09:50
blackmesa1 joined09:51
xaa joined09:52
pijiu joined09:53
chachasmooth_ left09:54
chachasmooth joined09:54
reliability left09:55
yu joined09:55
nakkht joined09:56
nakkht left09:56
Mike11 left09:56
ixxie left09:58
reliability joined09:58
xaxxon left09:59
svm_invictvs left10:00
svm_invictvs joined10:01
fmgt joined10:01
svm_invictvs left10:01
diqidoq joined10:05
reliability left10:05
shripadr joined10:08
tjbp left10:08
JeroenT left10:08
doug16k left10:08
shripadr_ left10:08
infernix left10:09
Cavallari joined10:09
anli joined10:11
energizer left10:14
daxroc joined10:15
igemnace left10:16
anli left10:17
Guest26112 left10:17
upperdeck left10:18
GameGamer43 joined10:18
doug16k joined10:18
yu left10:18
fmgt left10:19
ghost43 left10:19
goweol left10:19
ghost43 joined10:20
synthmeat joined10:21
upperdeck joined10:23
tjbp joined10:25
reliability joined10:25
Cabanossi left10:26
goweol joined10:26
cdg joined10:26
blackwind_123 left10:26
Cabanossi joined10:27
infernix joined10:27
aard_ joined10:29
blackmesa1 left10:29
goweol left10:30
cdg left10:31
reliability left10:31
shodan` joined10:34
ResidentBiscuit joined10:38
stennowork left10:40
Rajeev left10:40
tjbp left10:41
ResidentBiscuit left10:42
reliability joined10:43
gxt left10:43
tjbp joined10:45
v4ult joined10:46
hegge joined10:48
reliability left10:49
[sarri] left10:51
cur8or joined10:53
HcsOmot joined10:53
HcsOmot hi, i need help, please! I managed to do git reset --hard master without commiting and pushing my changes.10:54
grawity have you at least staged / `git add`ed those changes10:55
HcsOmot please, please, please tell me i can have my life back...10:55
no.10:55
grawity well good luck then10:55
Rajeev joined10:56
kurkale61 left10:56
kurkale6ka joined10:56
sarri joined10:57
sarri left10:57
sarri joined10:57
nowhere_man left10:57
last_staff I'm laughing sympathetically10:57
Murr left10:58
last_staff but then working on master is also a bad idea from the get-go10:58
yohnnyjoe joined10:58
Murr joined10:58
_ikke_ HcsOmot: Do you have an editor that keeps track of changes or has the changes still in some kind of buffer?10:58
Sometimes you can use undo to get back the previous version10:59
HcsOmot i'll try, i'm using phpstorm10:59
_ikke_ phpstorm has local hsitory10:59
ghost43 left11:00
ghost43 joined11:00
last_staff also https://stackoverflow.com/questions/5473/how-can-i-undo-git-reset-hard-head1 could possibly help11:00
oxymoron93 this probably applies to stashed changes, or changes being commited before ^11:01
HcsOmot don't know i'll be able to recover anything, since i've switched brach before staging/commiting, and then all the changes were brought over to the new branch, and I fooslishly did git reset --hard master there11:01
codyw left11:01
rajat left11:01
dege left11:02
yohnnyjoe left11:02
oxymoron93 HcsOmot check editor local history as suggested11:03
Spydar007 joined11:03
doug16k it would be cool if reset --hard would implicitly backup unstaged changes, unless you add --reckless :P11:04
robotroll left11:04
robotroll joined11:05
lambdaHash joined11:05
oxymoron93 --yolo11:05
doug16k then I guess someone would come here saying, "How do I backup git reset --hard --reckless" :P11:05
s/backup/undo/11:05
DaGoaty left11:06
DaGoaty joined11:06
MarioBranco joined11:07
cdown joined11:07
DevAntoine left11:07
HcsOmot done.11:09
doug16k left11:09
HcsOmot it's there. thank you very much.11:09
doug16k joined11:11
dre_ left11:11
chele joined11:11
dviola left11:13
cherry-xw joined11:13
robotroll left11:15
robotroll joined11:16
lupine left11:17
cherry-xw left11:17
lupine joined11:18
synthmeat left11:19
_ikke_ HcsOmot: yw11:22
bonerx2k joined11:22
diogenese left11:23
filcab left11:24
doug16k left11:26
filcab joined11:26
diogenese joined11:26
pirocks joined11:30
Andrew_K|2 joined11:31
rasto left11:31
Andrew_K|2 left11:33
Andrew_K|3 joined11:33
Andrew_K|1 left11:33
synthmeat joined11:34
govg left11:34
cqi joined11:36
pbandark left11:36
govg joined11:38
yohnnyjoe joined11:40
DrSlony joined11:41
Logx left11:41
DrSlony Hello, a friend pushed a commit into a new branch which included a lot of whitespace and formatting changes in addition to the simple code changes. I want to merge only the code changes into the main branch. How do I merge only a few hunks?11:42
_ikke_ DrSlony: you first have to fix their commit11:43
banisterfiend joined11:44
grawity or see how far you can get with `git show -w $commit | git apply` >_>11:44
yohnnyjoe left11:45
fuchstronaut I have a repo with just two commits A -> B, now I would like to change the order, so B becomes the root commit, pointing to B,is that possible11:45
*pointing to A11:46
jameser joined11:46
rasto joined11:46
_ikke_ fuchstronaut: git rebase -i --root11:46
fuchstronaut _ikke_: what do I have to checkout?11:47
where does my head has to be11:47
osse B11:47
banisterfiend left11:48
fuchstronaut thank you _ikke_, thank you osse!11:49
Gurkenglas left11:50
Gurkenglas joined11:51
CaptainAmari_ joined11:51
CaptainAmari left11:52
TomyWork has anyone ever built a cyclic git repo?11:53
rasto left11:53
osse TomyWork: it can't be done11:53
because you would have to predict the sha1 of a commit11:53
goweol joined11:54
tvw joined11:55
mecasou_ hi, i have a branch with 10 unsigned commits. Is there a safe and sound way to sign all of them without rebasing on every one?11:57
grawity rebase without changing the base11:58
filter-branch would be nicer but it can't sign commits, apparently11:58
mecasou_ rebase without changing the base?11:58
osse git rebase -i HEAD~10; add a new line 'exec git commit --amend -S' after each 'pick' line11:59
BSaboia joined11:59
grawity hmm12:00
Andrew_K|3 left12:00
grawity if commit.gpgSign is on, that might not be necessary12:00
osse but: technically doesn't signing one commit effectively sign the whole history leading up to it ?12:00
grawity sort-of, but I guess it doesn't necessarily show the intent12:02
mecasou_ hmmm kay... that doesnt feel very safe but i guess ive no other choice12:02
str joined12:02
grawity just what kind of safety belts do you expect from a history rewriting tool12:02
konsolebox left12:02
grawity try once, fail, reset --hard to the good version, try again12:02
bergice_ left12:03
grawity in that regard they're all more or less safe12:03
since none of them can destroy the old commits12:03
cstratak joined12:04
rafalcpp joined12:05
mecasou_ it worked so far not sure how i could reset these changes sounds a bit magical for me since its no code change12:05
grawity it's irrelevant12:05
if you make new commits, you get new commit IDs12:06
Zamerick joined12:06
grawity and altering commits in any way, even signing them, means new commit IDs12:06
wandering_vagran joined12:06
mecasou_ okay and git reset --hard goes back to the previous commit IDs ?12:07
konsolebox joined12:07
grawity if you specify that commit ID, yes12:07
mecasou_ how long are these saved? ill properly need to read into that12:07
osse *minimum* 14 days under any circumstances12:09
unless you actively remove them yourself12:09
DrSlony thank you _ikke_12:10
lufeng joined12:10
nowhere_man joined12:11
mecasou_ thanks for your help :)12:11
fandi_ left12:11
DrSlony left12:11
lufeng left12:11
lufeng joined12:11
pbandark joined12:16
peacememories joined12:18
reliability joined12:18
styler2g- joined12:19
DevAntoine joined12:19
styler2go joined12:23
styler2go left12:23
styler2go joined12:23
styler2g- left12:25
styler2g| joined12:25
Xrayez left12:27
Xrayez joined12:27
styler2go left12:28
selckin left12:29
selckin joined12:29
YuGiOhJCJ joined12:30
xcm left12:32
peacememories left12:32
xcm joined12:33
shripadr left12:35
jameser left12:35
BSab joined12:35
peacememories joined12:35
Chulbul joined12:36
davve 75412:36
BSaboia left12:36
Chulbul Added "config/db.php" inside .gitignore and it's still not ignoring?12:36
BSabBSaboia12:36
jameser joined12:36
rasto joined12:36
peacememories left12:36
phluks joined12:37
Tobbi joined12:38
tobiasvl Chulbul: is the file tracked?12:40
Cabanossi left12:41
Chulbul tobiasvl: yes12:42
Cabanossi joined12:42
tobiasvl Chulbul: then it can't be ignord12:43
!ignore_tracked12:43
gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.12:43
Chulbul tobiasvl: So i have to delete first?12:44
ok got it12:44
tobiasvl you need to untrack it, yes12:44
peacememories joined12:45
peacememories left12:45
Chulbul tobiasvl: should thess config db files be removed from git, as we are working on qa staging and dev servers, having different db credentials. Does it make sense to untrack it or should it be on git, or it's just the matter of choiice> but Im concerned about best practice?12:45
cdg joined12:46
peacememories joined12:46
upperdeck left12:46
tobiasvl Chulbul: depends what kind of config files they are. db credentials should not be in git.12:47
config files probably shouldn't be at all, but that's hard to say. see !config12:48
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas12:48
Rajeev_ joined12:48
Chulbul thanks. :) got it. tobiasvl12:49
cdg left12:50
upperdeck joined12:51
Rajeev left12:52
kurkale6ka left12:53
davimore left12:54
h12o joined12:55
doug16k joined12:55
jeffreylevesque left12:55
kurkale6ka joined12:56
Rajeev_ left12:57
Murr left12:58
Murr joined12:58
worch joined12:59
rominronin joined12:59
kurkale6ka left13:00
worch Where are the "assume unchanged" bits for paths stored that are set by git update-index --assume-unchanged? .git/index?13:01
osse yes13:01
Chulbul tobiasvl: I untracked it using, git rm --cached db.php and it's showing ++ in git desktop app.13:02
fission6 joined13:03
Chulbul tobiasvl: this command, is adding db.php again.13:03
peacememories left13:03
jast "git desktop app" is something from GitHub, I think, not exactly an official tool13:03
tobiasvl yeah, hard to say what it means. ++ in that app could simply mean there's a change to that file to be committed13:04
!gui13:04
gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.13:04
blackmesa1 joined13:04
_rgn how do you reset working tree to branch/commit but not take the commits?13:05
grawity git checkout $commit .13:05
the . meaning "the whole current directory"13:05
Chulbul tobiasvl: Ok, I will use command line.13:06
jast that doesn't remove files that aren't/weren't tracked in $commit, does it?13:06
grawity I don't remember, probably not13:06
_rgn i have a branch that is very complicated to rebase on master, and i'm thinking i have to commit again from scratch13:06
Chulbul tobiasvl: What to do next: git rm --cached db.php13:06
grawity oh well there is also `git read-tree`13:06
tobiasvl Chulbul: what does "git status" say now?13:07
DaGoaty left13:08
DaGoaty joined13:08
Chulbul tobiasvl: https://pastebin.com/9JAig5QP13:09
Barrt left13:09
Chulbul tobiasvl: git status ouput in pastebin13:09
_rgn i'm getting something in git status with git read-tree branch but not really what i expect13:09
Barrt joined13:10
kurkale6ka joined13:10
tobiasvl Chulbul: OK, that first part looks good, and you can just commit those removals like it says. But those files shouldn't appear under "Untracked files" if they were ignored. what does your .gitignore file contain exactly?13:10
davimore joined13:12
pirocks left13:12
Chulbul tobiasvl: I have added, nodatapp/db.php then on seconds line I added membersapi/db.php , now new status = https://pastebin.com/UuFm5Lcp13:12
I added theses inside .gitignore now tobiasvl13:13
DaGoaty left13:13
oxymoron93 well not it is ok13:13
tobiasvl ah, I thought you had ignored them already13:13
oxymoron93 as you wanted?13:13
tobiasvl now it looks good yes13:13
oxymoron93 now*13:13
Chulbul tobiasvl: yeah i did that earlier, but then i removed it. :D13:14
tobiasvl: ok so now i can commit and push and that's all?13:14
tobiasvl Chulbul: yes, and add .gitignore if you want that to be tracked13:14
if you don't want .gitignore to be tracked you could consider ignoring it (ie. adding ".gitignore" inside .gitignore itself)13:14
Chulbul .gitignore oh, it is being tracked so that other developers can use.13:14
diqidoq left13:14
luckman212 left13:15
neil_cn left13:15
zozo joined13:16
Scoop7 joined13:17
Scoop7 What does it mean that when I done "git merge my-branch" from master13:17
I got Fast-forward .... and some info on changes13:17
grawity you merged the branch's contents into master13:17
tobiasvl Scoop7: !ff13:17
gitinfo Scoop7: A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf13:17
Scoop7 but did not get a popup terminal13:17
synthroid joined13:18
Scoop7 usually I get auto-merging~ smth OK reading13:18
tobiasvl so in the long run everything is ok ?13:19
nothing to worry ?13:19
tobiasvl Scoop7: in the long run?13:19
grawity it's a normal result13:19
tobiasvl no, there's nothing to worry about, this is extremely normal13:19
Scoop7 ok13:19
grawity unless you specifically *wanted* to create a merge commit13:19
Tobbi left13:19
oxymoron93 that ^13:19
Scoop7 nah it's ok13:19
supernov1h joined13:19
Scoop7 I can always do some virtual rebasing13:19
to mess up with commit messages or merge them13:20
luckman212 joined13:20
Scoop7 because I am the only one working on this exact project so it's super ok13:20
grawity it's actually one of those cases where you can "fake" a merge later, and reshape history without technically editing it13:20
zozo left13:20
YuGiOhJCJ left13:20
jameser left13:20
Scoop7 fake a merge later ? without technically editing it ?13:21
abender joined13:21
Tobbi joined13:21
Scoop7 without the need of interactive rebasing ?13:21
Eryn_1983_FL joined13:22
abender left13:22
supernov2h left13:22
z0z0 joined13:22
gitinfo set mode: +v13:22
z0z0 Hello guys, I have a problem with a broken repo, which I cant push, nor via ssh, neither via https, could someone assist me?13:22
swalladge joined13:22
tobiasvl z0z0: well, what happens when you try to push?13:23
z0z0 I'm getting error about corrupted commit13:23
remote: error: object 4c073f2bd4807d557a4057426c47efc3e8b1d6ac: badTimezone: invalid author/committer line - bad time zone remote: fatal: Error in object13:23
kurkale6ka left13:24
z0z0 and indeed, timezone is `+37722442`13:24
oojacoboo left13:25
_ikke_ You can set fsck.badTimezone to ignore13:26
jameser joined13:26
_ikke_ If you cannot fix it13:27
or set fsck.skipList to a file that contains hashes of objects13:27
kurkale6ka joined13:28
jeffreylevesque joined13:28
CaptainAmari_ left13:29
z0z0 git config fsck.badTimezone ignore -- doesn't work for me13:29
trying fsck.skipList13:29
_ikke_ z0z0: ah13:29
grawity the config options must be set on the receiving end13:29
_ikke_ it's the remote repo that rejects it indeed13:30
so setting it local does not do anything13:30
Onemorenickname joined13:31
Onemorenickname hello13:31
i'm rebasing, and I have a conflict13:31
z0z0 fsck.skipList -- probably I'm using it wrong, but don't work also13:31
_ikke_ z0z0: like we said, it's the remote repo that is rejecting the object13:32
Onemorenickname I want to tell git "hey, master branch's version is the good version on these files"13:32
_ikke_ z0z0: so setting local configuration is not fixing anything13:32
Onemorenickname how can i tell git so ?13:32
without going in my editor13:32
_ikke_ so you want to ignore anything the other side did to these files?13:32
Onemorenickname to some particular files, yep13:33
tarkus left13:33
_ikke_ and you are rebasing on top of master?13:33
Onemorenickname (i was in a branch, where i added some files, but on the side, i added some debugging messages in original files)13:33
(these files were then modified by master, and i'm rebasing)13:34
(so, i want to tell git that it's safe to keep master's version for these files)13:34
_ikke_ and you are rebasing on top of master?13:34
Claw_wolf left13:34
Onemorenickname in my understanding, yes13:35
shinnya joined13:35
Onemorenickname (i'm not really git fluent)13:35
(what I did : "git checkout master; git pull; git checkout mybranch; git rebase master")13:35
_ikke_ Onemorenickname: did you do something like git rebase master [..]13:35
right13:35
then git checkout --ours <files> will get you masters version of the file13:36
Onemorenickname what is the difference between "--ours" and "--" ?13:36
_ikke_ '--' is your to tell git that what you pass it is in fact a file, not a branch, in cases where it might be ambiguous13:37
v4ult left13:37
Scoop7 left13:37
Onemorenickname i see13:37
thanks :)13:37
(i read "ours" and "theirs")13:37
_ikke_ --ours / --theirs tells git to get a specific version of a conflicted file13:37
Onemorenickname (it's a bit confusing)13:37
(like "ours" keep "theirs" files)13:37
bremner -- is a unix convention about 600 years old13:38
_ikke_ bremner: git gives a special meaning to --13:38
bremner sortof.13:38
dendazen joined13:38
phluks left13:39
tunekey joined13:40
mostlybadfly joined13:41
DaGoaty joined13:43
cstratak left13:43
menip joined13:44
Barrt left13:44
menip left13:45
cstratak joined13:45
Onemorenickname are all git push reversible ?13:45
i mean, can the remote origin always revert a push i've done ?13:46
last_staff no13:46
Onemorenickname ok13:46
last_staff I was safing it13:46
almost every push can be reverted, or at the very least, amended13:46
revoltingPeasant left13:48
cdg joined13:48
Onemorenickname is there a command combining git checkout --ours and git add ?13:48
jeffreylevesque_ joined13:48
rudi_s Onemorenickname: The question is, what do you mean with "revert"?13:48
jeffreylevesque left13:49
Onemorenickname rudi_s, i don't really know how push works. Let's say the remote git repository (comprising all the branches and stuff) was in a state S before the push, and a state S' after, can It always go back to S ?13:50
pyfoo joined13:50
jeffreylevesque_jeffreylevesque13:51
rudi_s Onemorenickname: Yes. Though it's not recommended (as other users might already have fetched the new commits).13:51
Gustavo6046 joined13:51
z0z0 left13:52
Onemorenickname rudi_s, i see, thanks :)13:53
lufeng left13:53
rudi_s np13:53
h12o left13:54
rudi_s Onemorenickname: It's obvious how that works if you understand the fundamental data structure of Git which is DAG and each commit adds new "childs" to the DAG. So you can always go back "up" in the DAG to point the current "version" of a branch to an older version.13:54
!dpc13:54
!doc13:54
gitinfo A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.13:54
rudi_s !cs13:54
gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup13:54
rudi_s Onemorenickname: ^13:55
codepython777 left13:56
Barrt joined13:59
cstratak left14:00
binary106 hi guys, i'm wondering if someone could help a noob. my-feature branch looks like this: https://imgur.com/a/9aJFD - wondering how i would go about merging my work to a prelive branch - and how to skip or ignore those other peoples commits in my branch (accident on my part)14:00
cstratak joined14:01
grawity I'd say first clean it up with `git rebase`14:01
kurkale61 joined14:01
kurkale6ka left14:02
binary106 so just git rebase origin/master whilst on my-feature branch yea?14:02
grawity !postproduction14:02
gitinfo 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.14:02
Nizumzen left14:03
StealthCubz joined14:06
swalladge left14:07
jameser left14:08
swalladge joined14:08
kurkale61kurkale6ka14:08
pyfoo left14:08
binary106 that guide is so much to take in14:08
cdown left14:08
revoltingPeasant joined14:10
gxt joined14:10
Cavallari left14:11
re1 joined14:12
blackmesa1 left14:13
texinwien_ left14:14
Cavallari joined14:14
linuxmodder joined14:14
Onemorenickname rudi_s, I thought that commits could get squashed14:15
or removed and so on14:15
oxymoron93 yes they can14:16
tho what is the question14:16
Plorntus joined14:16
lufeng joined14:16
devbaka left14:17
Es0teric joined14:17
Chulbul left14:19
StealthCubz left14:20
linuxmodder left14:20
finalbeta left14:20
crose joined14:21
tcorneli joined14:21
finalbeta joined14:21
tcorneli left14:21
linuxmodder joined14:22
linuxmodder left14:22
linuxmodder joined14:22
lufeng left14:22
linuxmodder left14:22
linuxmodder joined14:23
linuxmodder left14:23
linuxmodder joined14:23
linuxmodder left14:24
linuxmodder joined14:24
linuxmodder left14:24
linuxmodder joined14:24
linuxmodder left14:25
linuxmodder joined14:26
linuxmodder left14:26
linuxmodder joined14:26
tcorneli joined14:26
linuxmodder left14:27
grawity joined14:27
fahadash joined14:28
Nizumzen joined14:29
Es0teric left14:30
rudi_s Onemorenickname: Yes, they can. But the commits itself (although not referenced) stay in the git repository for some time so you can always go back.14:31
yu joined14:32
grawity left14:32
grawity joined14:33
Onemorenickname rudi_s, oh, I see14:33
pyfoo joined14:35
Es0teric joined14:36
murii left14:37
pirocks joined14:40
webguynow left14:42
cherry-xw joined14:42
webguynow joined14:42
fission6 left14:44
rushi joined14:44
fission6 joined14:45
v4ult joined14:46
devbaka joined14:47
yu left14:48
upperdeck left14:49
cherry-xw left14:50
roundand joined14:50
roundand left14:51
cherry-xw joined14:52
upperdeck joined14:54
shinnya left14:55
KeyJoo left14:56
robotroll left14:56
Murr left14:58
Murr joined14:58
igemnace joined14:59
rscata left14:59
gump_ joined15:00
shodan` left15:03
gump left15:04
peepsalot left15:04
yu_rushi joined15:04
iNCoNFuN joined15:05
goweol left15:05
rushi left15:07
goweol joined15:08
yu joined15:08
AaronMT joined15:08
ghost43 left15:10
cherry-xw left15:10
ghost43 joined15:10
yu_rushi left15:10
Cabanossi left15:11
Cabanossi joined15:12
ogny left15:12
IndianAr_ joined15:12
stutter joined15:12
cqi left15:13
brainproxy left15:14
rushi joined15:14
rchavik left15:15
stutter left15:17
yu left15:17
last_staff left15:18
sosheskaz joined15:18
ResidentBiscuit joined15:19
HcsOmot hi15:19
akyshnik joined15:20
pyfoo left15:20
lmat I think we answer github questions here, too? I have multiple accounts on github, and having trouble juggling them.15:21
stutter joined15:21
lmat One account (A) has private-key access and one doesn't (B). When I want to clone a repository as B, it says "permission denied: publickey"15:21
Expected if it's using A's ssh mechanism.15:21
I need it to prompt for a password and username.15:22
youknow15:22
now that I put it to words... I'll just not use [email@hidden.address] protocol. duh.15:22
https will ask for username I think.15:22
This is called duck debugging.15:22
HcsOmot if someone doesn't clone your gh repo, but just adds it to their local project as a remote, they can't do push -f to your repo, right?15:23
just checking paranoically...15:23
abba left15:24
igemnace left15:25
navidr left15:25
overlord_tm left15:27
brainproxy joined15:29
stutter left15:29
senaps joined15:29
_ikke_ HcsOmot: that's irrelevant15:30
there is no difference between cloning a repo, or just adding a remote and fetching15:30
stutter joined15:32
Gurkenglas left15:32
HcsOmot Ok.thanks15:32
stutter_ joined15:33
flaviodesousa left15:34
L0ki joined15:34
algun left15:34
lmat HcsOmot: It has to do with permissions. If they have permissions, they can.15:36
stutter left15:36
crose left15:36
zefferno left15:38
supernov1h left15:38
dave0x6d joined15:38
supernov1h joined15:41
yohnnyjoe joined15:42
luiz_lha joined15:44
luiz_lhaGuest5269215:44
HcsOmot By default they shouldn't have permissions, right? I've forked repo A from organization A, then person B added my fork to their own fork as a remote. Push to anywhere except their own fork shouldn't be possible, right?15:44
terrierdog joined15:44
Noldorin left15:45
gump_ left15:45
Guest52692luiz_lha15:46
oxymoron93 yes HcsOmot15:46
jceb joined15:46
oxymoron93 unless you gave them permission15:46
yohnnyjoe left15:47
davimore left15:47
tcorneli left15:48
HcsOmot I haven't. So we're cool. Thanks, #git. Again. :)15:48
cagmz joined15:48
KeyJoo joined15:48
robotroll joined15:50
black_13 joined15:52
black_13 how do you show git history of an individual file?15:52
_ikke_ black_13: git log -- <path/to/file>15:52
black_13: or git log --all -- <path/to/file>; to see it for all branches15:53
robotroll left15:53
thiago joined15:54
ForeignBiscuit joined15:55
pks left15:55
ZexaronS joined15:55
v4ult left15:56
black_13 how do you show differences in the file not log commentary15:56
dec0n left15:56
aard_ left15:56
Onemorenickname left15:56
Onemorenickname_ joined15:56
ResidentBiscuit left15:56
sea-gull left15:56
oxymoron93 git show <particular_commit> black_1315:56
Silmarilion left15:56
oxymoron93 or did you meant git diff15:57
but you were asking about history so I assumed you were looking for changes introduced by particular commit ?15:57
black_1315:57
seschwar left15:58
aard_ joined15:58
rushi left15:58
pks joined15:58
Gustavo6046 left16:01
black_13 I am trying to understand what was done to a particular file over its lifetime16:01
sunri5e left16:01
oxymoron93 to check what was introduced in specific commit, git show <specific_commit_sha> is what you need16:02
kculpis joined16:02
imack left16:02
oxymoron93 you use got log -- <file)path> to see what are the commits who introduced changes to particular file16:02
tkore left16:02
oxymoron93 you investigate through commit messages16:03
sunri5e joined16:03
oxymoron93 and when you see something you are interested in do16:03
git show <commit_you_are_interested_in>16:03
oxymoron93 left16:04
jceb left16:04
black_13 the commit is hash associated with that file16:04
TomyWork left16:05
black_13 "commit 86cec5d16d8979678ba6949110972bdb94fb7e33"16:05
Commander_Cody joined16:05
L0ki left16:06
black_13 Commander_Cody: (and the lost planet airmen)16:06
chrisb2017 joined16:06
imack joined16:08
matsaman joined16:08
steeze joined16:08
crtcji joined16:08
jimmyrcom_ joined16:10
IndianAr_ left16:10
sea-gull joined16:11
apurvapavaskar[m joined16:11
gitinfo set mode: +v16:11
chrisb2017 Hello all :) I'm looking through git documentation but am a bit stuck with one thing. 'git blame' shows me, per line in the current version of a file, what commits and by who touched each line last. What I'd like to see, however, is what commits over time all contributed to a given line, including what commit introduced the line originally. I'm finding lots of outdated suggestions on StackOverflow. Am I missing something obvious?16:12
Tobbi left16:14
einnjo joined16:14
kpease_ joined16:14
Kulrak left16:14
shripadr joined16:14
brainpro1 joined16:15
ghost43 left16:15
ghost43 joined16:15
anli joined16:16
brainproxy left16:17
worch that's a lot of info to add per-line16:18
tarkus joined16:18
chrisb2017 I'd mainly just like to find what commit introduced a given line, maybe not all edits to it16:19
moritz chrisb2017: what I do is run "tig blame thefile", navigate to the line, and press , (for "previous commit") until I found the right now16:19
tig is a nice tool, IMHO16:19
the question "which commit introduced this line" is kinda hard to answer when it has undergone change, so it usually requires human judgement16:20
chrisb2017 thanks moritz! I'll give that a go; ideally whatever tig is doing beneath the hood is something that git can do too, given a line number?16:20
moritz and thus interactivity16:20
pyfoo joined16:20
emg joined16:21
thiago it's easy to tell which commit introduced a line, exactly as it is. Or at least ignoring blanks and whitespace.16:21
Plouescat joined16:22
thiago but that's usually not what you want. Do what moritz said.16:22
tmsmith joined16:22
chrisb2017 "it's easy to tell which commit introduced a line, exactly as it is. " this would actually be really useful too16:22
thiago if you want to use git directly, git blame -- filename, find the line, copy the SHA1 of the change, then16:22
git show SHA1, read the change, see if it is what you were looking for. If not,16:23
compilation aborted for compiler/qv4instr_moth.cpp (code 4)16:23
Makefile:15799: recipe for target '.obj/qv4instr_moth.o' failed16:23
make[2]: *** [.obj/qv4instr_moth.o] Error 416:23
oops, bad clipboard16:23
masuberu left16:23
thiago I meant to say: git blame SHA1~ -- filename. Rinse and repeat.16:23
chrisb2017 thanks thiago :)16:23
dsdeiz left16:23
pirocks left16:25
dsdeiz joined16:25
dsdeiz left16:25
dsdeiz joined16:25
moritz ... except that tig makes the same thing much faster16:26
thiago yup16:26
durham joined16:26
thiago uses Qt Creator's built-in blame navigator for that too16:26
durham left16:26
chrisb2017 Ah interesting. I found that pressing `,` in Tig brought me to the parent commit, but doesn't move the cursor to the same line as the line whose history i'm interested in16:27
durham joined16:27
matsaman chrisb2017: what?!16:27
matsaman fires tig16:27
sathed left16:28
Kulrak joined16:28
Kulrak left16:28
Kulrak joined16:28
matsaman left16:30
peepsalot joined16:33
imack left16:33
thiago most likely, it moves you to the same line number, but the lines have moved around16:33
chrisb2017 yeah that's the thing i'd ideally not have to do16:34
Puffball joined16:35
ForeignBiscuit left16:36
madewokherd joined16:36
akushner left16:36
ResidentBiscuit joined16:36
v4ult joined16:37
dreiss joined16:37
pyfoo left16:38
TomyLobo joined16:38
Gustavo6046 joined16:38
ResidentBiscuit left16:39
d10n-work joined16:39
ResidentBiscuit joined16:39
Plouescat left16:40
abba joined16:41
Onemorenickname_ left16:42
maroloccio left16:43
supernov2h joined16:43
robotroll joined16:44
sathed joined16:44
robotroll left16:44
ericho joined16:45
Rajeev_ joined16:45
Commander_Cody The number of different commits between my local branch and the remote branch is far larger than the number of my local commits would suggest.16:45
supernov1h left16:46
Commander_Cody How can I view the differing commits? I suspect I made some mistake while rebasing.16:46
chrisb2017 left16:46
sea-gull left16:46
jceb joined16:47
Argylelabcoat joined16:47
gxt left16:49
thiago left16:49
sanscoeur joined16:51
Floflobel_ joined16:52
_ikke_ Commander_Cody: one thing you can do is show the commits unique to one branch and compare that to the list of unique commits in the other16:52
Floflobel left16:52
_ikke_ Commander_Cody: You can also use git cherry to show what commits git thinks are unique based on the diff, but that fails if the commits have been altered slightly due to conflicts for example16:53
webguynow left16:55
opal left16:55
webguynow joined16:56
ge0man joined16:57
reliability left16:58
Nizumzen left17:00
cdown joined17:00
njbair left17:00
cur8or left17:00
MarioBranco left17:01
opal joined17:02
sanscoeur Commander_Cody: git show-branch some-branch origin/other-branch17:02
ixxie joined17:03
floppydh left17:03
Commander_Cody Doesn't look good at all :|17:04
wohfab joined17:04
sanscoeur If you haven't used `checkout` since the `rebase`, then you could try `git log ORIG_HEAD..`. Might also look at how to use `git reflog`.17:05
rajat joined17:05
DevAntoine left17:06
paul424 joined17:06
sanscoeur If you know the commit-id prior to the rebase (maybe you've created a PR in github/gitlab/etc., or from `git reflog`), then you can do a hard reset; `git reset --hard <commit-id>`.17:06
blackmesa1 joined17:06
njbair joined17:06
mud joined17:06
nowhere_man left17:07
luiz_lha left17:07
Commander_Cody Perhaps it will be fastest to cherry-pick all the ~ 50 commits I want.17:08
raynold ahh it's a wonderful day17:08
Commander_Cody (not best, but fastest).17:08
sanscoeur Do you have changes that you plan on committing upstream?...17:09
alcohol any docker wizards able to debug this with me / for me ? https://forums.docker.com/t/npm-install-inside-alpine-container-with-a-volume-mount-fails-consistently/4251117:10
sanscoeur Going with that strategy,... In the best case you'll be incredibly divergent from the upstream and will annoying to stay up-to-date. In the worst case, you'll be reverting work and recommitting the work that's been done recently. You'll likely introduce regressions in the mix because some cherry-pick went out of order.17:11
alcohol errrr17:11
shit wrong channel17:11
my bad17:11
black_13 left17:14
cdown left17:14
minionofgozer left17:14
yohnnyjoe joined17:16
leeN joined17:16
v4ult left17:17
Floflobel_ left17:17
Nizumzen joined17:18
Nizumzen left17:19
Nizumzen joined17:19
chele left17:20
Kaisyu left17:21
Bilge left17:22
DvdKhl joined17:23
chrisb2017 joined17:24
BrAsS_mOnKeY left17:25
matsaman joined17:25
DaGoaty left17:26
chele joined17:27
DaGoaty joined17:27
MacWinner joined17:27
Es0teric left17:27
Bilge joined17:27
overlord_tm joined17:27
ixxie left17:27
ArcaTech joined17:28
chrisb2017 left17:29
revoltingPeasant left17:29
akushner joined17:30
thiago joined17:31
gxt joined17:31
sea-gull joined17:31
DaGoaty left17:32
supernov2h left17:32
ArcaTech left17:32
cdown joined17:33
supernov1h joined17:34
wandering_vagran left17:34
ResidentBiscuit left17:34
ResidentBiscuit joined17:35
freimatz left17:35
ArcaTech joined17:35
svm_invictvs joined17:35
rajat left17:36
algun joined17:36
chrisb2017 joined17:37
mikecmpbll left17:37
SteffanW2 joined17:38
sanscoeur left17:38
kurkale6ka left17:38
khisanth_ left17:39
enzobarrett joined17:39
Darcidride_ joined17:39
chrisb2017 left17:39
nod left17:39
nod joined17:40
wohfab left17:40
khisanth_ joined17:40
energizer joined17:41
mikecmpbll joined17:45
jamiejackson joined17:46
ArcaTech left17:47
jnavila joined17:47
cdg left17:48
chrisb2017 joined17:48
orbyt_ joined17:48
ArcaTech joined17:48
cdg joined17:49
upperdeck left17:49
kgrimes joined17:50
manuelschneid3r left17:51
rominronin left17:53
Rajeev_ left17:53
upperdeck joined17:54
pyfoo joined17:54
jnavila left17:57
cdown left17:57
cdown joined17:58
m0viefreak joined17:59
ArcaTech left17:59
db8093246 joined18:01
gruetzko-gruetzkopf18:02
db8093246 left18:02
Gurkenglas joined18:02
sea-gull left18:02
sea-gull joined18:02
Xiti left18:02
db8093246 joined18:03
manuelschneid3r joined18:04
enzobarrett left18:05
pirocks joined18:05
chrisb2017 left18:06
h12o joined18:06
cdown left18:07
Xiti joined18:07
revoltingPeasant joined18:08
tkore joined18:08
dreiss left18:09
tkore\ left18:09
h12o left18:11
shripadr left18:12
worch left18:16
leeN left18:16
Acerific joined18:16
leeN joined18:17
jnavila joined18:18
chele left18:21
Es0teric joined18:21
a_ joined18:22
matsaman left18:23
bkhl joined18:23
NeverTired joined18:23
upperdeck left18:24
sasheto left18:25
rkta joined18:27
a_ left18:27
chele joined18:27
upperdeck joined18:28
audriuz joined18:29
audriuz Hi! How to rebase on previous commit from the same branch? I have accidentally rebased on new one and pushed. I just want to rebase back on older commit still maintaining open PR in Github. please help!18:30
_ikke_ !situation18:31
gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d %s"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)18:31
wootehfoot joined18:31
Es0teric left18:31
i7c Probably just rebase -i HEAD~<amount of commits back> and throw out the one that you don’t want in there, if I got you right.18:33
revoltingPeasant left18:34
brainpro1brainproxy18:35
orbyt_ left18:35
enzobarrett joined18:35
akushner left18:35
dreiss joined18:35
cstratak left18:35
i7c Or using your words, rebase -i on the "right" commit and delete the line of the "new" commit.18:35
akushner joined18:36
enzobarrett left18:38
deltam joined18:38
Nizumzen left18:39
enkrypt_ joined18:39
audriuz i7c: it worked. thanks:)18:41
i7c great :)18:41
enkrypt left18:42
Es0teric joined18:42
audriuz left18:42
Commander_Cody left18:45
dreiss left18:46
PaulCapestany left18:47
enzobarrett joined18:48
h12o joined18:48
King_Hual joined18:48
styler2g| left18:50
enzobarrett left18:50
jnavila left18:51
boombatower joined18:52
Acerific left18:52
akyshnik left18:52
h12o left18:52
sasheto joined18:52
PaulCapestany joined18:52
ResidentBiscuit left18:53
re1 left18:54
SteffanW2 left18:55
brainpro1 joined18:56
brainproxy left18:58
tvw left18:58
Murr left18:58
Murr joined18:58
blackmesa1 left18:58
steeze left18:59
energizer left18:59
energizer joined18:59
sathed left19:00
fstd_ joined19:01
Darcidride left19:01
ogny joined19:01
basiclaser joined19:02
King_Hual left19:02
goweol left19:03
BrAsS_mOnKeY joined19:03
orbyt_ joined19:03
ResidentBiscuit joined19:03
fstd left19:04
fstd_fstd19:04
King_Hual joined19:05
zarzar1 hi i am trying to source control all jenkins files, there are submodules, i want to ignore the submodules but still source control the files as part of higher level git repo, is that possible?19:05
dviola joined19:05
sanscoeur joined19:06
_ikke_ so you want to convert a repo with submodules to a 'flat' repo19:06
ResidentBiscuit left19:08
ianp does anyone here think submodules are ever a good idea?19:08
jamiejackson left19:08
_ikke_ Loads of people apparently :-)19:08
sanscoeur left19:08
zarzar1 _ikke_: i don't want to convert but just ignore and pretend the submodule is not there, this is for a jenkins CI server that pulls from a git repo, i am trying to back up the jenkins itself, but i always get errors due to the submodules that are the pulled source code19:08
ianp I'm not a fan, but I'm sure maybe there are some good use cases.19:08
bremner actually I was wondering about a similar topic, subtree merging in a submodule19:09
cdg left19:09
_ikke_ they have their usecases, but people tend to use them for other things mostly19:09
cdg joined19:09
ianp I workd on a project once that used it and promptly converted the submodules to external libraries that link at build time19:09
zarzar1 does it make sense? they are not really submodules, but pulls of source code repo by jenkins CI server19:09
_ikke_ zarzar1: sorry, no, I'm not really following you19:10
Sasazuka joined19:11
zarzar1 ia have made a repo for my ci server config files, the ci server pulls source doe into subdirs of the dirs that contaims the config files, so the config files repo sees the sibdirs that have source code repos as submodules19:11
i'll be back in a few, in case i do not answer right away19:11
rh10 joined19:12
_ikke_ zarzar1: and you are trying to commit that on the CI server?19:12
BrAsS_mOnKeY left19:13
bittyx joined19:13
niven.freenode.net set mode: +v19:13
cdg left19:14
staafl joined19:15
h12o joined19:16
bittyxlevacic19:16
mostlybadfly left19:18
jnavila joined19:19
h12o left19:20
ResidentBiscuit joined19:21
nooooone joined19:22
Nizumzen joined19:23
enzobarrett joined19:24
enzobarrett left19:25
blackmesa1 joined19:26
manuelschneid3r left19:26
chele left19:26
LocaMocha left19:28
Doginal joined19:32
pyfoo left19:34
Guest49905 joined19:35
kfoonamalik joined19:35
enzobarrett_ joined19:37
bs joined19:38
Guest49905 left19:38
joey_ joined19:38
Nizumzen left19:39
Nizumzen joined19:39
enzobarrett_ left19:39
Rajeev joined19:40
[Brain] left19:42
tvw joined19:42
tunekey left19:42
[Brain] joined19:42
tunekey joined19:43
King_Hual left19:45
cdg joined19:45
durham left19:45
wohfab joined19:45
overlord_tm left19:46
chris_j joined19:46
sanscoeur joined19:47
durham joined19:47
in1t3r_ joined19:48
Rajeev_ joined19:49
cdg left19:50
Rajeev left19:50
ogny left19:50
in1t3r left19:51
crose joined19:51
brainpro1brainproxy19:53
gopar joined19:54
albel727 joined19:55
rafasc joined19:55
Rajeev__ joined19:55
Plorntus left19:56
einnjo left19:57
Rajeev_ left19:58
Rajeev_ joined19:58
fission6 left19:58
ZyX-I joined20:00
fission6 joined20:00
orbyt_ left20:01
Rajeev__ left20:02
zarzar1 _ikke_: i am trying to back up the jenkins ci server configuration, that configuration exists in the same directoriy heirarchy as the ci servers workspace into which the ci server pulls the source code repos, ehnce the config repo sees the source doe repos as submodules20:02
supernov1h left20:03
blackmesa1 left20:03
netj left20:03
Cabanossi left20:03
netj joined20:03
zarzar1 _ikke_: Corrections: i am trying to back up the jenkins ci server configuration, that configuration exists in the same directory heirarchy as the ci server's workspace into which the ci server pulls the source code repos, hence the config repo sees the source code repos as submodules20:03
_ikke_ Ok, and what are you trying to do?20:04
sanscoeur Can't you just add the workspace directory to .gitignore?20:04
blackmesa1 joined20:04
crose left20:05
supernov1h joined20:05
Cabanossi joined20:05
fission6 left20:06
steeze joined20:06
crtcji left20:07
sanscoeur Or, otherwise exclude it. Possibly, `rsync -a --exclude ${JENKINS_DIR}/workspace ${JENKINS_DIR} ${JENKINS_BACKUP_DIR}`.20:07
zarzar1 sanscoeur: i would like to add and commit the files as if it is not a submodule, but without converting it manually20:09
sanscoeur: _ikke_: i would like to add and commit the files as if it is not a submodule, but without converting it manually20:09
Alchemical left20:09
Es0teric left20:09
nowhere_man joined20:10
_ikke_ zarzar1: what does git status say?20:11
zarzar1 https://pastebin.com/ahzYu2dp20:12
wohfab left20:12
zarzar1 the 2nd and 3rd entries are the source code repos20:12
iNCoNFuN left20:13
bonerx2k left20:13
safe joined20:13
_ikke_ So to commit the files in those directories, you have to remove the submodule designation for them first20:14
jstein_ joined20:14
_ikke_ git rm --cached <dir> would do that20:14
jstein_jstein20:14
zarzar1 adding files does not work because of the submodules https://pastebin.com/Rc3gFiRX20:14
ruskie left20:14
_ikke_ Yes, I see20:14
mattcen left20:15
zarzar1 not sure how to get around that, would be great to ignore the submodule repo but still commit the files within the repos20:15
durham left20:17
Cavallari left20:17
Rajeev_ left20:17
_ikke_ zarzar1: right now, because it's added as a submodule, the parent repo will ignore everything in there20:17
zarzar1: the only way around that is to remove the submodule from the parent repo (which is just a single entry)20:18
crose joined20:18
zarzar1 oh ok, i guess i can just delete the .git dirs20:18
Gurkenglas left20:19
_ikke_ You still need to do the git rm --cached part20:20
zarzar1 o hok20:20
mattcen joined20:20
zarzar1 in the parent repo?20:20
crose left20:30
jstein left20:30
safe left20:30
Bilge left20:30
volestorm left20:30
msonntag left20:30
drupol left20:30
hsiktas left20:30
ShekharReddy left20:30
SerusWork left20:30
Arcaelyx left20:30
TSS_ left20:30
lanlink[m] left20:30
T4cC0re left20:30
voker57 left20:30
Bombe left20:30
beaky left20:30
duderonomy left20:30
Likulau left20:30
M6HZ_ left20:30
gitinfo left20:30
APic left20:30
sybariten left20:30
nanga left20:30
quite left20:30
Jak_o_Shadows left20:30
vush left20:30
bwn left20:30
brandonw left20:30
BinGOs left20:30
watabou left20:30
petemoore left20:30
Neico left20:30
babilen left20:30
saidelike_ left20:30
ManiacTwister left20:30
SleePy left20:30
ojacobson left20:30
armin left20:30
blackpajamas left20:30
heftig left20:30
sentriz left20:30
ahrs left20:30
cliluw left20:30
Anthaas left20:30
warthog9 left20:30
Richard_Cavell left20:30
w0ng left20:30
Peetz0r left20:30
Juri_Agarin left20:30
robinsmidsrod left20:30
Mrdoor left20:30
BenderRodriguez left20:30
Kazuto left20:30
atomi left20:30
ewitz left20:30
OnkelTem left20:30
ravndal left20:30
justanotheruser left20:30
mar77i left20:30
nkuttler left20:30
tohuw left20:30
bket left20:30
guideline left20:30
ghost43 left20:30
tombusby left20:30
bonface left20:30
exotime left20:30
jnavila left20:30
dviola left20:30
deltam left20:30
sea-gull left20:30
kpease_ left20:30
Xrayez left20:30
sarri left20:30
d-fence left20:30
redj left20:30
SJr left20:30
Masterphi left20:30
mns left20:30
diget left20:30
a3Dman left20:30
Exagone313 left20:30
fscala left20:30
Gianormagantrous left20:30
xeno left20:30
enckse left20:30
olbat left20:30
nunchuck left20:30
tmz left20:30
Ram-Z left20:30
paskl_ left20:30
Cthalupa- left20:30
archheretic left20:30
steeze left20:30
Cabanossi left20:30
blackmesa1 left20:30
ZyX-I left20:30
kgrimes left20:30
nod left20:30
AaronMT left20:30
lambdaHash left20:30
daxroc left20:30
danieli left20:30
belak left20:30
d^sh left20:30
xkr47 left20:30
spaceone left20:30
m0ltar left20:30
raynold left20:30
prettyrobots left20:30
polyrob left20:30
Hedgework left20:30
NightMonkey left20:30
ensign left20:30
troyt left20:30
askb_ left20:30
wget left20:30
nsh left20:30
olivetree_ left20:30
vamiry left20:30
swords left20:30
monokrome left20:30
pepijndevos left20:30
Squarism left20:30
Ricaz left20:30
Werring left20:30
in1t3r_ left20:30
senaps left20:30
jcarpenter2 left20:30
johnlage left20:30
cspotcode left20:30
codedmart left20:30
ulkesh left20:30
nezZario left20:30
computerquip left20:30
rishi` left20:30
aca20031 left20:30
netj left20:31
grawity left20:31
xorex left20:31
d10n left20:31
levacic left20:31
supernov1h left20:31
energizer left20:31
brainproxy left20:31
MacWinner left20:31
ge0man left20:31
tmsmith left20:31
devbaka left20:31
diogenese left20:31
MACscr left20:31
kisonecat left20:31
wgrant left20:31
phinxy left20:31
Tekster left20:31
mda1 left20:31
HedgeMage left20:31
GeraldW left20:31
tabakhase left20:31
prg3 left20:31
skalpin left20:31
armyriad left20:31
Phanes left20:31
kdragon left20:31
neunon left20:31
mr_sm1th left20:31
HcsOmot left20:31
akushner left20:31
bkhl left20:31
cagmz left20:31
fahadash left20:31
dendazen left20:31
rafalcpp left20:31
tjbp left20:31
Travis-42 left20:31
adamf left20:31
kg4peq left20:31
lebster left20:31
CustosLimen left20:31
PtxDK left20:31
alphor left20:31
terrierdog left20:31
stfn left20:31
dsop left20:31
cbreak left20:31
DistantStar left20:31
MeltedLux left20:31
hexagoxel left20:31
dbb left20:31
uso left20:31
Serus left20:31
bs left20:31
kfoonamalik left20:31
Doginal left20:31
staafl left20:31
Sasazuka left20:31
wootehfoot left20:31
m0viefreak left20:31
khisanth_ left20:31
dsdeiz left20:31
anli left20:31
Barrt left20:31
Eryn_1983_FL left20:31
govg left20:31
pijiu left20:31
tourdown1nder left20:31
hue left20:31
Mercury left20:31
ohcibi left20:31
zizzfizzix left20:31
a--m left20:31
ph88_ left20:31
Cork left20:31
ntnn left20:31
Rubin left20:31
Polylith left20:31
jzeus left20:31
zacts left20:31
larsemil left20:31
gurrkiin left20:31
cjohnson left20:31
mattcen left20:31
Nizumzen left20:31
abba left20:31
jimmyrcom_ left20:31
sunri5e left20:31
ZexaronS left20:31
sosheskaz left20:31
BSaboia left20:31
xaa left20:31
nd- left20:31
Milos left20:31
Grum left20:31
Bercik left20:31
TinkerTyper left20:31
esc left20:31
sunrunner20 left20:31
wolfshappen left20:31
jim left20:31
whyme left20:31
pR0Ps left20:31
chrfle left20:31
rnsanchez left20:31
kevr left20:31
tvw left20:31
stutter_ left20:31
finalbeta left20:31
doug16k left20:31
patrickr[m] left20:31
nevodka left20:31
leah2 left20:31
gopar left20:31
fstd left20:31
basiclaser left20:31
Murr left20:31
mikecmpbll left20:31
webguynow left20:31
KeyJoo left20:31
lupine left20:31
Spydar007 left20:31
dupondje left20:31
mel00010 left20:31
ngqrl left20:31
dvl left20:31
martinklepsch left20:31
boutcher left20:31
necrosis left20:31
Zarthus left20:31
jaeckel left20:31
bathtub_shark left20:31
Dragon092 left20:31
hakzsam left20:31
ti2 left20:31
deepy left20:31
hexa- left20:31
parsnip left20:31
souther left20:31
demize left20:31
bronson_ left20:31
rafasc left20:31
sanscoeur left20:31
rh10 left20:31
enkrypt_ left20:31
rkta left20:31
tkore left20:31
svm_invictvs left20:31
thiago left20:31
paul424 left20:31
Puffball left20:31
peepsalot left20:31
pks left20:31
Zamerick left20:31
synthmeat left20:31
Anja_ left20:31
lkolstad left20:31
jab416171 left20:31
lb1c left20:31
matoro_ left20:31
QualityAddict left20:31
dhollinger left20:31
pdgwien left20:31
ejsf left20:31
peeps left20:31
simon816 left20:31
occupant left20:31
austin987 left20:31
bsanford left20:31
sw1m left20:31
Codaraxis left20:31
gruetzkopf left20:31
adamus1red left20:31
cpallares left20:31
sven^_ left20:31
hyperair left20:31
courrier left20:31
rigid left20:31
nivag_ left20:31
eusid left20:31
tijensse left20:31
nadley left20:31
introom left20:31
sitaram left20:31
felixsanz left20:31
jwest left20:31
butterthebuddha left20:31
Whiskey left20:31
mulvane left20:31
immae left20:31
pztrick left20:31
weylin left20:31
kenansulayman left20:31
dcpc007 left20:31
comps left20:31
marienz left20:31
Arguggi left20:31
pax_rhos left20:31
thnee left20:31
guardian left20:31
andres left20:31
Miguelngel[m] left20:31
nowhere_man left20:31
tunekey left20:31
ResidentBiscuit left20:31
PaulCapestany left20:31
NeverTired left20:31
Darcidride_ left20:31
algun left20:31
gxt left20:31
mud left20:31
njbair left20:31
opal left20:31
Gustavo6046 left20:31
TomyLobo left20:31
Kulrak left20:31
kculpis left20:31
dave0x6d left20:31
xcm left20:31
GameGamer43 left20:31
infernix left20:31
chachasmooth left20:31
hoek left20:31
noahsussman left20:31
jleclanche left20:31
justache left20:31
shoogz left20:31
xxpor left20:31
fatalhalt left20:31
ablackack_ left20:31
nydel09 left20:31
jgornick left20:31
yanbbyan1 left20:31
yn left20:31
leprechau left20:31
nydel07 left20:31
lagothri1 left20:31
cust left20:31
Hello71 left20:31
milli left20:31
Case_Of left20:31
madknight left20:31
tribly left20:31
Kuukunen left20:31
binary106 left20:31
irqq left20:31
clickjack left20:31
bigjazzsound left20:31
SpeakerToMeat left20:31
djb-irc left20:31
Sarge9451 left20:31
qqx left20:31
Zimsky left20:31
drakon left20:31
tango_ left20:31
simka left20:31
Orbitrix left20:31
winny left20:31
synchronous left20:31
uebera|| left20:31
steven left20:31
gargola left20:31
dpower left20:31
nixjdm left20:31
dwmw2_gone left20:31
mrkake left20:31
jason237 left20:31
serialoverflow left20:31
mikedd left20:31
Furai left20:31
Iroha left20:31
beuker left20:31
n1ax left20:31
skered left20:31
jstimm left20:31
prg318 left20:31
jrabe left20:31
ShalokShalom left20:31
__main__ left20:31
plitter left20:31
zxd left20:31
whitby left20:31
Sleepy63 left20:31
causasui left20:31
thinkpad left20:31
jimmyrcom left20:31
wcpan left20:31
perrier-jouet left20:31
janx left20:31
tcsc left20:31
cschneid- left20:31
hussam left20:31
gargantua left20:31
midnightmagic left20:31
yourfate left20:31
nooooone left20:31
boombatower left20:31
pirocks left20:31
db8093246 left20:31
DvdKhl left20:31
emg left20:31
tarkus left20:31
swalladge left20:31
jeffreylevesque left20:31
rasto left20:31
Impaloo left20:31
schleppel left20:31
zarzar1 left20:31
sborza left20:31
because left20:31
_xor left20:31
Eugene left20:31
ilbot3 left20:31
spacemud left20:31
wizardedit left20:31
mniip left20:31
Cuzner left20:31
sbeyer left20:31
xaviergmail left20:31
freephile left20:31
skylite left20:31
Soni left20:31
kozy left20:31
satifant left20:31
beerdrop left20:31
Amadiro left20:31
vrc405 left20:31
artgoeshere left20:31
amigara left20:31
nshp left20:31
upperdeck left20:31
leeN left20:31
yohnnyjoe left20:31
madewokherd left20:31
pbandark left20:31
konsolebox left20:31
filcab left20:31
nephyrin left20:31
stduolc1 left20:31
dmc left20:31
Nugget left20:31
catsup left20:31
FilipNortic_ left20:31
Levex left20:31
fuchstronaut left20:31
luckman212 left20:31
d10n-work left20:31
sasheto left20:31
SirCmpwn left20:31
joey_ left20:31
apurvapavaskar[m left20:35
chris_j left20:45
laumann joined20:48
bremner joined20:48
evanc joined20:48
i7c joined20:48
cmn joined20:48
gsingh93 joined20:48
ariver joined20:48
carbolymer joined20:48
VladGh joined20:48
blackbeard420 joined20:48
dilijev joined20:48
psprint joined20:48
dustinm joined20:48
altendky joined20:48
APic joined20:48
gitinfo joined20:48
M6HZ_ joined20:48
Likulau joined20:48
duderonomy joined20:48
Bombe joined20:48
voker57 joined20:48
T4cC0re joined20:48
TSS_ joined20:48
Arcaelyx joined20:48
SerusWork joined20:48
sybariten joined20:48
drupol joined20:48
msonntag joined20:48
volestorm joined20:48
Bilge joined20:48
safe joined20:48
jstein joined20:48
bket joined20:48
wolfshappen joined20:48
ntnn joined20:48
codyw joined20:48
A|TARIS joined20:48
Tobbi joined20:48
TikityTik joined20:48
xcm joined20:48
jrm joined20:48
sunri5e joined20:48
ZexaronS joined20:48
bordeaux_facile joined20:48
joshleeb joined20:48
orbyt_ joined20:48
sns joined20:48
leguin.freenode.net set mode: +o20:48
SirCmpwn joined20:48
beaky joined20:48
Croepha joined20:48
ggherdov joined20:48
beerdrop joined20:48
einnjo joined20:48
BooK joined20:48
jamiejackson joined20:48
d10n-work joined20:48
joey_ joined20:48
hsiktas joined20:48
sasheto joined20:48
BSab joined20:48
beccamorgan joined20:48
luckman212 joined20:48
Werring joined20:48
Strepsils joined20:48
pitastrudl joined20:48
Cu5tosLimen joined20:48
vishal joined20:48
dreiss joined20:48
jimi_ joined20:48
mattcen joined20:48
nowhere_man joined20:48
steeze joined20:48
Cabanossi joined20:48
supernov1h joined20:48
blackmesa1 joined20:48
netj joined20:48
ZyX-I joined20:48
rafasc joined20:48
gopar joined20:48
in1t3r_ joined20:48
sanscoeur joined20:48
tunekey joined20:48
tvw joined20:48
Nizumzen joined20:48
bs joined20:48
kfoonamalik joined20:48
Doginal joined20:48
nooooone joined20:48
ResidentBiscuit joined20:48
staafl joined20:48
rh10 joined20:48
Sasazuka joined20:48
dviola joined20:48
basiclaser joined20:48
fstd joined20:48
energizer joined20:48
Murr joined20:48
brainproxy joined20:48
PaulCapestany joined20:48
boombatower joined20:48
enkrypt_ joined20:48
deltam joined20:48
akushner joined20:48
wootehfoot joined20:48
upperdeck joined20:48
rkta joined20:48
NeverTired joined20:48
bkhl joined20:48
leeN joined20:48
tkore joined20:48
pirocks joined20:48
db8093246 joined20:48
m0viefreak joined20:48
kgrimes joined20:48
mikecmpbll joined20:48
khisanth_ joined20:48
nod joined20:48
Darcidride_ joined20:48
algun joined20:48
svm_invictvs joined20:48
sea-gull joined20:48
gxt joined20:48
thiago joined20:48
MacWinner joined20:48
DvdKhl joined20:48
yohnnyjoe joined20:48
mud joined20:48
njbair joined20:48
paul424 joined20:48
opal joined20:48
ge0man joined20:48
webguynow joined20:48
abba joined20:48
Gustavo6046 joined20:48
TomyLobo joined20:48
Puffball joined20:48
peepsalot joined20:48
Kulrak joined20:48
dsdeiz joined20:48
tmsmith joined20:48
emg joined20:48
anli joined20:48
ghost43 joined20:48
kpease_ joined20:48
jimmyrcom_ joined20:48
kculpis joined20:48
pks joined20:48
KeyJoo joined20:48
cagmz joined20:48
terrierdog joined20:48
dave0x6d joined20:48
stutter_ joined20:48
senaps joined20:48
sosheskaz joined20:48
AaronMT joined20:48
devbaka joined20:48
grawity joined20:48
fahadash joined20:48
finalbeta joined20:48
swalladge joined20:48
Barrt joined20:48
jeffreylevesque joined20:48
dendazen joined20:48
Eryn_1983_FL joined20:48
doug16k joined20:48
rasto joined20:48
Xrayez joined20:48
pbandark joined20:48
konsolebox joined20:48
Zamerick joined20:48
rafalcpp joined20:48
govg joined20:48
synthmeat joined20:48
diogenese joined20:48
filcab joined20:48
lupine joined20:48
lambdaHash joined20:48
Spydar007 joined20:48
sarri joined20:48
HcsOmot joined20:48
tjbp joined20:48
infernix joined20:48
GameGamer43 joined20:48
daxroc joined20:48
chachasmooth joined20:48
xaa joined20:48
Impaloo joined20:48
jcarpenter2 joined20:48
johnlage joined20:48
danieli joined20:48
dupondje joined20:48
schleppel joined20:48
belak joined20:48
hoek joined20:48
noahsussman joined20:48
Travis-42 joined20:48
cspotcode joined20:48
adamf joined20:48
jleclanche joined20:48
justache joined20:48
codedmart joined20:48
ulkesh joined20:48
kg4peq joined20:48
nezZario joined20:48
lebster joined20:48
Anja_ joined20:48
lkolstad joined20:48
MACscr joined20:48
zarzar1 joined20:48
shoogz joined20:48
xxpor joined20:48
nd- joined20:48
jab416171 joined20:48
fatalhalt joined20:48
sborza joined20:48
because joined20:48
mel00010 joined20:48
CustosLimen joined20:48
PtxDK joined20:48
alphor joined20:48
d-fence joined20:48
ablackack_ joined20:48
nydel09 joined20:48
Milos joined20:48
Grum joined20:48
jgornick joined20:48
_xor joined20:48
yn joined20:48
lb1c joined20:48
nephyrin joined20:48
matoro_ joined20:48
Eugene joined20:48
leprechau joined20:48
nydel07 joined20:48
tourdown1nder joined20:48
lagothri1 joined20:48
prettyrobots joined20:48
QualityAddict joined20:48
ilbot3 joined20:48
d^sh joined20:48
tombusby joined20:48
dhollinger joined20:48
redj joined20:48
spacemud joined20:48
cust joined20:48
stduolc1 joined20:48
xkr47 joined20:48
Hello71 joined20:48
milli joined20:48
Case_Of joined20:48
ngqrl joined20:48
wizardedit joined20:48
hue joined20:48
madknight joined20:48
tribly joined20:48
Kuukunen joined20:48
Mercury joined20:48
ohcibi joined20:48
zizzfizzix joined20:48
kisonecat joined20:48
pdgwien joined20:48
a--m joined20:48
ejsf joined20:48
binary106 joined20:48
ph88_ joined20:48
peeps joined20:48
Bercik joined20:48
dvl joined20:48
mniip joined20:48
martinklepsch joined20:48
simon816 joined20:48
spaceone joined20:48
irqq joined20:48
wgrant joined20:48
phinxy joined20:48
clickjack joined20:48
m0ltar joined20:48
bigjazzsound joined20:48
occupant joined20:48
SpeakerToMeat joined20:48
Serus joined20:48
djb-irc joined20:48
gargantua joined20:48
raynold joined20:48
boutcher joined20:48
nevodka joined20:48
Levex joined20:48
austin987 joined20:48
Sarge9451 joined20:48
qqx joined20:48
pax_rhos joined20:48
computerquip joined20:48
bsanford joined20:48
Cork joined20:48
necrosis joined20:48
Cuzner joined20:48
stfn joined20:48
TinkerTyper joined20:48
Zimsky joined20:48
SJr joined20:48
jaeckel joined20:48
Zarthus joined20:48
leah2 joined20:48
Tekster joined20:48
sbeyer joined20:48
mda1 joined20:48
nanga joined20:48
polyrob joined20:48
drakon joined20:48
bonface joined20:48
quite joined20:48
dsop joined20:48
tango_ joined20:48
simka joined20:48
Orbitrix joined20:48
Jak_o_Shadows joined20:48
vush joined20:48
bwn joined20:48
winny joined20:48
brandonw joined20:48
xaviergmail joined20:48
synchronous joined20:48
BinGOs joined20:48
sw1m joined20:48
watabou joined20:48
petemoore joined20:48
Codaraxis joined20:48
dmc joined20:48
Hedgework joined20:48
leguin.freenode.net set mode: +v20:48
HedgeMage joined20:48
NightMonkey joined20:48
GeraldW joined20:48
esc joined20:48
Neico joined20:48
babilen joined20:48
saidelike_ joined20:48
gruetzkopf joined20:48
adamus1red joined20:48
cpallares joined20:48
ensign joined20:48
tabakhase joined20:48
prg3 joined20:48
uebera|| joined20:48
freephile joined20:48
ManiacTwister joined20:48
sven^_ joined20:48
steven joined20:48
SleePy joined20:48
ojacobson joined20:48
gargola joined20:48
Nugget joined20:48
dpower joined20:48
nixjdm joined20:48
dwmw2_gone joined20:48
bathtub_shark joined20:48
amigara joined20:48
armin joined20:48
skylite joined20:48
hyperair joined20:48
mrkake joined20:48
jason237 joined20:48
courrier joined20:48
troyt joined20:48
Masterphi joined20:48
thnee joined20:48
mns joined20:48
blackpajamas joined20:48
heftig joined20:48
rigid joined20:48
sentriz joined20:48
ahrs joined20:48
sunrunner20 joined20:48
cliluw joined20:48
Anthaas joined20:48
warthog9 joined20:48
Dragon092 joined20:48
leguin.freenode.net set mode: +v20:48
serialoverflow joined20:48
diget joined20:48
Soni joined20:48
jim joined20:48
mikedd joined20:48
Furai joined20:48
askb_ joined20:48
Iroha joined20:48
beuker joined20:48
wget joined20:48
nsh joined20:48
Richard_Cavell joined20:48
n1ax joined20:48
hakzsam joined20:48
skalpin joined20:48
nivag_ joined20:48
ti2 joined20:48
skered joined20:48
w0ng joined20:48
Peetz0r joined20:48
jstimm joined20:48
Juri_Agarin joined20:48
robinsmidsrod joined20:48
prg318 joined20:48
Mrdoor joined20:48
jrabe joined20:48
ShalokShalom joined20:48
a3Dman joined20:48
__main__ joined20:48
BenderRodriguez joined20:48
armyriad joined20:48
Kazuto joined20:48
plitter joined20:48
Exagone313 joined20:48
atomi joined20:48
mr_sm1th joined20:48
eusid joined20:48
ewitz joined20:48
tijensse joined20:48
deepy joined20:48
dbb joined20:48
nadley joined20:48
zxd joined20:48
hexa- joined20:48
OnkelTem joined20:48
whyme joined20:48
ravndal joined20:48
olivetree_ joined20:48
whitby joined20:48
catsup joined20:48
cbreak joined20:48
Sleepy63 joined20:48
d10n joined20:48
causasui joined20:48
introom joined20:48
thinkpad joined20:48
pR0Ps joined20:48
kozy joined20:48
jimmyrcom joined20:48
zacts joined20:48
wcpan joined20:48
satifant joined20:48
justanotheruser joined20:48
perrier-jouet joined20:48
mar77i joined20:48
fscala joined20:48
vamiry joined20:48
archheretic joined20:48
xorex joined20:48
sitaram joined20:48
FilipNortic_ joined20:48
felixsanz joined20:48
nkuttler joined20:48
larsemil joined20:48
tohuw joined20:48
Rubin joined20:48
swords joined20:48
parsnip joined20:48
Phanes joined20:48
chrfle joined20:48
DistantStar joined20:48
janx joined20:48
tcsc joined20:48
souther joined20:48
kdragon joined20:48
Gianormagantrous joined20:48
MeltedLux joined20:48
rishi` joined20:48
rnsanchez joined20:48
demize joined20:48
cschneid- joined20:48
nshp joined20:48
xeno joined20:48
Polylith joined20:48
jwest joined20:48
neunon joined20:48
guardian joined20:48
enckse joined20:48
bronson_ joined20:48
aca20031 joined20:48
uso joined20:48
hussam joined20:48
monokrome joined20:48
jzeus joined20:48
butterthebuddha joined20:48
Whiskey joined20:48
guideline joined20:48
nunchuck joined20:48
kevr joined20:48
pepijndevos joined20:48
Squarism joined20:48
andres joined20:48
Arguggi joined20:48
marienz joined20:48
comps joined20:48
dcpc007 joined20:48
kenansulayman joined20:48
weylin joined20:48
pztrick joined20:48
immae joined20:48
mulvane joined20:48
Ricaz joined20:48
Amadiro joined20:48
tmz joined20:48
midnightmagic joined20:48
vrc405 joined20:48
artgoeshere joined20:48
Ram-Z joined20:48
paskl_ joined20:48
Cthalupa- joined20:48
bond joined20:48
Gabemo_ joined20:48
f3r70rr36f joined20:48
led_belly_ joined20:48
fcanela joined20:48
mecasou_ joined20:48
harmaahylje joined20:48
lu_zero joined20:48
Aichan joined20:48
dougquaid joined20:48
robattila256 joined20:48
marlinc joined20:48
infinisil joined20:48
grumble joined20:48
silverdust joined20:48
mekhami joined20:48
raffo joined20:48
Garen joined20:48
katana_ joined20:48
Cerise joined20:48
ribasushi joined20:48
BackEndCoder joined20:48
uptime joined20:48
jimInDevNull joined20:48
freakyy joined20:48
nickenchuggets joined20:48
fowlduck joined20:48
nikow joined20:48
kini joined20:48
freekevin joined20:48
yaiyan joined20:48
trondth joined20:48
MatthewAllan93 joined20:48
Deflate joined20:48
blahdodo joined20:48
tobiasvl joined20:48
JanC joined20:48
tg joined20:48
WhitePhosphorus joined20:48
fuzzmz joined20:48
berndj joined20:48
habbasi joined20:48
Virox joined20:48
BlessJah joined20:48
PeterReid_ joined20:48
toydestroyer_ joined20:48
oprypin joined20:48
sonOfRa joined20:48
murr4y joined20:48
treefrob joined20:48
kdeal joined20:48
LionsMane joined20:48
daynaskully joined20:48
Olipro joined20:48
byte512 joined20:48
tchan joined20:48
CalimeroTeknik joined20:48
ePirat joined20:48
Walex joined20:48
osse joined20:48
hfp_work joined20:48
valkyr2e joined20:48
hays joined20:48
hunterlabs joined20:48
bipolar joined20:48
styx_ joined20:48
M6HZ joined20:48
boshhead joined20:48
ski7777 joined20:48
sim590 joined20:48
worstadmin joined20:48
ianp joined20:48
brwoods joined20:48
frobnic joined20:48
Smarticles101 joined20:48
POQDavid joined20:48
cyberz joined20:48
juvenal joined20:48
markmarkmark joined20:48
rebrec joined20:48
Celelibi joined20:48
d1b joined20:48
matthiaskrgr joined20:48
bauruine joined20:48
MaekSo joined20:48
Bajax joined20:48
swift1 joined20:48
rjsalts joined20:48
bambams joined20:48
Trel joined20:48
Kiruwa joined20:48
hanna joined20:48
utrack joined20:48
Blkt joined20:48
_Patrick_ joined20:48
amosbird joined20:48
perlpilot joined20:48
ketas joined20:48
nimbleark joined20:48
Tee_Pee joined20:48
phtes joined20:48
Bigcheese joined20:48
sostenuto joined20:48
teej joined20:48
Meow-J joined20:48
Captain_Beezay joined20:48
boxrick joined20:48
ghormoon joined20:48
discopatrick joined20:48
cstrahan joined20:48
kireevco joined20:48
auv joined20:48
tharuin joined20:48
omnigoat joined20:48
da5id joined20:48
FabTG joined20:48
fxrs_ joined20:48
vith joined20:48
MrC joined20:48
tomaw joined20:48
johnw joined20:48
k joined20:48
SCHAPiE joined20:48
spark` joined20:48
Arokh joined20:48
ktwo joined20:48
hvxgr joined20:48
Someguy123 joined20:48
AKPWD joined20:48
rxo joined20:48
preaction joined20:48
daurnimator joined20:48
eb0t_ joined20:48
eb0t joined20:48
hanneso joined20:48
ephemer0l joined20:48
chu joined20:48
[Kid] joined20:48
ArKane joined20:48
aspiers joined20:48
f0rks joined20:48
Lunatrius joined20:48
giraffe joined20:48
thekingofbandit joined20:48
nixdork joined20:48
gusnan joined20:48
Nevik joined20:48
telephone joined20:48
adray joined20:48
MuffinMedic joined20:48
nutron|w joined20:48
Ranhir joined20:48
leguin.freenode.net set mode: +v20:48
Kestrel-029 joined20:48
Karazhan joined20:48
Zialus joined20:48
Sigma joined20:48
rewt joined20:48
viric joined20:48
lohfu joined20:48
lucasem joined20:48
OMGOMG joined20:48
nitemare joined20:48
martybr joined20:48
hurricanehrndz joined20:48
miklcct joined20:48
reu joined20:48
Pilfers joined20:48
maxb joined20:48
heinrich5991 joined20:48
uidzer0 joined20:48
quizzi joined20:48
oelewapperke joined20:48
robogoat joined20:48
dysfigured joined20:48
thallada joined20:48
_cyril_ joined20:48
mika joined20:48
groundnuty joined20:48
Ekho joined20:48
AlHafoudh joined20:48
ashnur joined20:48
sim642 joined20:48
xPucTu4 joined20:48
Hobbyboy joined20:48
ThiefMaster joined20:48
nexxus6 joined20:48
barteks2x joined20:48
Nickeeh joined20:48
robin joined20:48
tinanoo1 joined20:48
Guest32854 joined20:48
javaJake joined20:48
wagle joined20:48
jp joined20:48
Ankhers joined20:48
ajb-linaro joined20:48
absolutejam joined20:48
Ragnor joined20:48
Guest55057 joined20:48
leguin.freenode.net set mode: +v20:48
HM joined20:48
jscob joined20:48
kballou joined20:48
MacGyver joined20:48
planigan joined20:48
cebor joined20:48
trelane joined20:48
zeroed joined20:48
MikeChernev joined20:48
Jackneill joined20:48
madduck joined20:48
wrouesnel joined20:48
jerome joined20:48
m712 joined20:48
sweatsuit joined20:48
meZee joined20:48
evie_hammond joined20:48
tejasmanohar joined20:48
gildarts joined20:48
mattp_ joined20:48
surial joined20:48
Neo joined20:48
Shayan-To joined20:48
cybrNaut joined20:48
tsia joined20:48
waveclaw joined20:48
marahin joined20:48
ikonia joined20:48
disi joined20:48
up_the_irons joined20:48
todder joined20:48
infinite joined20:48
Phlogistique joined20:48
angular_mike joined20:48
tanuki joined20:48
Calinou joined20:48
zifnab joined20:48
cworth joined20:48
SporkWitch joined20:48
huhlig joined20:48
EgS joined20:48
duckydan joined20:48
MarkusDBX joined20:48
greenbagels joined20:48
cmosguy joined20:48
rudi_s joined20:48
kanzure joined20:48
leguin.freenode.net set mode: +vvv20:48
cxreg joined20:48
adymitruk joined20:48
HalfEatenPie joined20:48
chrisml joined20:48
leguin.freenode.net set mode: +vvvv20:48
shakalaka joined20:48
crater2150 joined20:48
moritz joined20:48
blueyed joined20:48
leguin.freenode.net set mode: +vvvv20:48
incredible_ joined20:48
atrus joined20:48
Tykling joined20:48
fk joined20:48
leguin.freenode.net set mode: +vvvv20:48
dsnow_ joined20:48
AndreSomers joined20:48
macskay joined20:48
abec0 joined20:48
leguin.freenode.net set mode: +vvvv20:48
thoros joined20:48
imMute joined20:48
liori joined20:48
Bubo joined20:48
leguin.freenode.net set mode: +vvvv20:48
avar joined20:48
blunaxela joined20:48
zululee joined20:48
catern joined20:48
holodoc joined20:48
LeMike_ joined20:48
solos joined20:48
traxo-xx joined20:48
Hogofwar joined20:48
RiPer joined20:48
chamunks joined20:48
Stravy joined20:48
lukasdboer joined20:48
suy joined20:48
Xarodon joined20:48
evil-god joined20:48
biertie joined20:48
JrCs_ joined20:48
pasky_ joined20:48
Mixologic joined20:48
kriskropd joined20:48
danemacmillan joined20:48
Ionic joined20:48
johnny56_ joined20:48
ash_workz joined20:48
ws2k3 joined20:48
ExeciN joined20:48
Ducky^^ joined20:48
sangy joined20:48
Chaser joined20:48
orzo joined20:48
strugee joined20:48
xtore joined20:48
xtheosirian joined20:48
Timvde joined20:48
Ratler joined20:48
rcn joined20:48
dilfridge joined20:48
blackwell joined20:48
Guest90336 joined20:48
jdiez joined20:48
bartman joined20:48
rideh joined20:48
EvilJStoker joined20:48
_rgn joined20:48
asd5a joined20:48
wwalker joined20:48
tomek joined20:48
supercool joined20:48
barq joined20:48
timwis joined20:48
bjoe2k4_ joined20:48
meLon joined20:48
Kartagis joined20:48
jkx joined20:48
lmat joined20:48
FIQ joined20:48
pewpew joined20:48
fieldmapper joined20:48
WakiMiko_ joined20:48
suchar joined20:48
BlackPanx joined20:48
Rhonda joined20:48
nicoulaj joined20:48
scarcry joined20:48
Jguy joined20:48
tapout joined20:48
everbird joined20:48
tureba joined20:48
rossome joined20:48
Foxboron joined20:48
devster31 joined20:48
revolve joined20:48
jesk joined20:48
thejoecarroll joined20:48
StephenS joined20:48
gk joined20:48
przemoc joined20:48
DistantS1ar_ joined20:48
MrMagic joined20:48
c^ joined20:48
vedu joined20:48
tazle__ joined20:48
snits_ joined20:48
kloeri joined20:48
__name__ joined20:48
arooni joined20:48
^MillerBoss joined20:48
ujjain joined20:48
XDS2010|AFK joined20:48
kutenai joined20:48
ixian joined20:48
Iacobus joined20:48
dzho joined20:48
Aaeriele joined20:48
quadz joined20:48
mfiano joined20:48
pandem1 joined20:48
Persikka joined20:48
roger_raymond joined20:48
AciD` joined20:48
destiny_ joined20:48
TooLmaN joined20:48
caffeinatedcode joined20:48
plasticboy joined20:48
PaulePanter joined20:48
sejo joined20:48
noteness joined20:48
msp301 joined20:48
maestrojed joined20:48
dmarr joined20:48
mage_ joined20:48
Kobaz joined20:48
shymega joined20:48
no_maam joined20:48
bitslip joined20:48
lukky513 joined20:48
twisted` joined20:48
wizonesolutions joined20:48
trig-ger joined20:48
elmcrest joined20:48
zmachine joined20:48
lolmac joined20:48
leguin.freenode.net set mode: +vvvv20:48
mroth joined20:48
theresajayne joined20:48
notbenh_ joined20:48
sfan786_ joined20:48
leguin.freenode.net set mode: +vvvv20:48
Sargun joined20:48
cymen joined20:48
mmattice joined20:48
Stummi joined20:48
leguin.freenode.net set mode: +vvvv20:48
bcc joined20:48
pavelz joined20:48
tokkee joined20:48
hagabaka joined20:48
leguin.freenode.net set mode: +vvvv20:48
JoshL joined20:48
vrishab joined20:48
roflin joined20:48
malt3 joined20:48
j416 joined20:48
thecomedian joined20:48
fcrick joined20:48
moop joined20:48
Incepti0n joined20:48
Whisket joined20:48
ephemera_ joined20:48
pfg joined20:48
SegFaultAX joined20:48
nopf joined20:48
talin joined20:48
l2y joined20:48
dogmatic69 joined20:48
SebastianFlyte joined20:48
GGMethos joined20:48
Seveas joined20:48
awygle joined20:48
Derperpe- joined20:48
Mathiasdm joined20:48
weltall joined20:48
johtso joined20:48
ScalaWilliam joined20:48
KnownSyntax joined20:48
contracode joined20:48
Lowell joined20:48
leguin.freenode.net set mode: +vvv20:48
hlieberman joined20:48
AndrewGazelka joined20:48
Bengi joined20:48
Onionnion joined20:48
mithro joined20:48
teadrop_ joined20:48
asedeno joined20:48
dtype joined20:48
Matsv joined20:48
aleb joined20:48
wloncom joined20:48
holdsworth joined20:48
antismap joined20:48
themill joined20:48
joeytwiddle joined20:48
Peng joined20:48
noodle joined20:48
bluepixel joined20:48
edvb joined20:48
muep_ joined20:48
stux|RC joined20:48
canton7 joined20:48
MonsterKiller joined20:48
karstensrage joined20:48
MLM joined20:48
Guest41171 joined20:48
qgTG joined20:48
andschwa joined20:48
tterrag joined20:48
SlashLife joined20:48
seitensei joined20:48
arand joined20:48
Awesomecase joined20:48
kwmiebach joined20:48
ToeSnacks joined20:48
zeller joined20:48
r3c0d3x joined20:48
McKraken_zzzzz joined20:48
rancyd joined20:48
Orphis joined20:48
MerinoBailon joined20:48
kba joined20:48
nyuszika7h joined20:48
tec___ joined20:48
tonyj joined20:48
theskillwithin joined20:48
trobotham joined20:48
Klumben joined20:48
marvi joined20:48
Xe joined20:48
torshido joined20:48
Bucciarati joined20:48
Muzer joined20:48
hdon joined20:48
qsx joined20:48
s17 joined20:48
sword joined20:48
scorphus joined20:48
WebDawg joined20:48
gnarf joined20:48
maqr joined20:48
nikivi joined20:48
danmackay joined20:48
msm joined20:48
seanBE joined20:48
axisys joined20:48
knittl joined20:48
RichiH joined20:48
danielglh joined20:48
leguin.freenode.net set mode: +vvvv20:48
argoneus joined20:48
gkatsev joined20:48
kgz joined20:48
shalok joined20:48
leguin.freenode.net set mode: +vvvv20:48
batrick joined20:48
Kamilion joined20:48
timthowtdi joined20:48
Forkk joined20:48
leguin.freenode.net set mode: +vvvv20:48
Graypup_ joined20:48
bibek22 joined20:48
avrdude joined20:48
erhandsome joined20:48
leguin.freenode.net set mode: +vvvv20:48
halftroll joined20:48
kent\n joined20:48
ninsei joined20:48
Slush- joined20:48
leguin.freenode.net set mode: +vvvv20:48
wouter0100 joined20:48
stux|RC-only joined20:48
nedbat joined20:48
linuxdaemon joined20:48
leguin.freenode.net set mode: +vvvv20:48
Peng_ joined20:48
ccaione joined20:48
leguin.freenode.net set mode: +vv20:48
DuncanT joined20:48
jorj joined20:48
BytesBacon joined20:48
veremitz joined20:48
leguin.freenode.net set mode: +vvvv20:48
monty joined20:48
idmistir joined20:48
ColdKeyboard joined20:48
minibar joined20:48
leguin.freenode.net set mode: +vvvv20:48
milki_ joined20:48
Chinorro joined20:48
mcfrisk joined20:48
tilpner joined20:48
leguin.freenode.net set mode: +vvvv20:48
davve joined20:48
markus-k joined20:48
anbz joined20:48
manveru joined20:48
leguin.freenode.net set mode: +vvvv20:48
CEnnis91 joined20:48
stealthii joined20:48
WillMoogle joined20:48
flupke joined20:48
leguin.freenode.net set mode: +vvvv20:48
SirFunk joined20:48
Learath2 joined20:48
unlord joined20:48
Pomidora joined20:48
leguin.freenode.net set mode: +vvvv20:48
Jiffy joined20:48
d-k joined20:48
krainboltgreene joined20:48
ntrrgc joined20:48
leguin.freenode.net set mode: +vvvv20:48
tobie joined20:48
nemesit|znc joined20:48
gmh joined20:48
Mekkis joined20:48
leguin.freenode.net set mode: +vvvv20:48
Loomaanaatii joined20:48
cttttt joined20:48
Saturn812 joined20:48
saurik joined20:48
leguin.freenode.net set mode: +vvvv20:48
tang^ joined20:48
FluffyFoxeh joined20:48
kashike joined20:48
sebhoss joined20:48
leguin.freenode.net set mode: +vvvv20:48
ahf joined20:48
tafa2 joined20:48
Sornaensis joined20:48
leguin.freenode.net set mode: +vvv20:48
pelegreno_ joined20:48
jrahmy joined20:48
DelTree joined20:48
gyre007 joined20:48
leguin.freenode.net set mode: +vvvv20:48
terrorjack joined20:48
sparr joined20:48
rodarmor joined20:48
_ikke_ joined20:48
leguin.freenode.net set mode: +vvvv20:48
Willis joined20:48
lus joined20:48
prosody joined20:48
ELLIOTTCABLE joined20:48
leguin.freenode.net set mode: +vvvv20:48
[diecast] joined20:48
graingert joined20:48
bbhoss joined20:48
ReenignE joined20:48
leguin.freenode.net set mode: +vvvv20:48
yena joined20:48
Giant81 joined20:48
bitonic joined20:48
n-st joined20:48
leguin.freenode.net set mode: +vvvv20:48
joel135 joined20:48
zapb_ joined20:48
ses1984 joined20:48
_W_ joined20:48
leguin.freenode.net set mode: +vvvv20:48
singlerider joined20:48
ericnoan joined20:48
jantje joined20:48
RunThroughMedia joined20:48
leguin.freenode.net set mode: +vvvv20:48
nuck joined20:48
elricsfate joined20:48
nioncode joined20:48
rockfruit joined20:48
leguin.freenode.net set mode: +vvvv20:48
krabat joined20:48
Soliton joined20:48
AlexanderS joined20:48
Nothing4You joined20:48
leguin.freenode.net set mode: +vvvv20:48
musca joined20:48
Paparaciz joined20:48
ahammond joined20:48
Cathy joined20:48
leguin.freenode.net set mode: +vvvv20:48
anderson joined20:48
qassim joined20:48
djh joined20:48
leguin.freenode.net set mode: +vvv20:48
musl_ joined20:48
deltab joined20:48
bl0m1 joined20:48
rubenb joined20:48
leguin.freenode.net set mode: +vvvv20:48
harv joined20:48
SupaHam joined20:48
doppo joined20:48
colona joined20:48
leguin.freenode.net set mode: +vvvv20:48
LVK267 joined20:48
msev- joined20:48
levacic joined20:48
unholycrab joined20:48
leguin.freenode.net set mode: +vvvv20:48
rfv joined20:48
Ownix joined20:48
errr joined20:48
nellicus_ joined20:48
leguin.freenode.net set mode: +vvvv20:48
Odd_ joined20:48
Davey joined20:48
jor joined20:48
GingerGeek joined20:48
leguin.freenode.net set mode: +vvvv20:48
fury joined20:48
justinmrkva joined20:48
jlewis joined20:48
Dyonisos joined20:48
leguin.freenode.net set mode: +vvvv20:48
Xethron joined20:48
armenb joined20:48
tcp_j joined20:48
varesa| joined20:48
leguin.freenode.net set mode: +vvvv20:48
Kronuz joined20:48
pizzaops joined20:48
murph joined20:48
gurrkiin joined20:48
leguin.freenode.net set mode: +vvvv20:48
yourfate joined20:48
hexagoxel joined20:48
cjohnson joined20:48
fuchstronaut joined20:48
leguin.freenode.net set mode: +vvvv20:48
freeside joined20:48
abra0 joined20:48
mdk joined20:48
Dewin joined20:48
leguin.freenode.net set mode: +vvvv20:48
Sc0rpius joined20:48
diginaut joined20:48
joes joined20:48
leguin.freenode.net set mode: +vvv20:48
zachary12 joined20:48
eldritch joined20:48
Esya joined20:48
ollien joined20:48
leguin.freenode.net set mode: +vvvv20:48
AlgorithmWizard joined20:48
hiroki joined20:48
cybergeeek joined20:48
leguin.freenode.net set mode: +vvv20:48
mmlb left20:48
devhost left20:48
timvisher left20:48
synthroid left20:48
michael_mbp left20:48
exotime joined20:48
Arcaelyx left20:48
altendky left20:48
drupol left20:48
APic left20:48
pgimeno joined20:48
ghoti joined20:48
mmlb joined20:48
altendky joined20:48
drupol joined20:48
devhost joined20:49
timvisher joined20:49
jnavila joined20:49
svm_invictvs left20:49
michael_mbp joined20:49
ruskie joined20:49
synthroid joined20:49
Arcaelyx joined20:49
dmj` joined20:49
_ikke_ IT'S ALIVE!20:49
andy4rp joined20:50
sat-aton joined20:51
pgimeno I have a .gitattributes with a line like: * text=auto eol=lf and then a line like: bin/* binary, but all files seem to be treated as text. Is there any workaround so that people cloning the repository have the defaults as set by the * line?20:51
Bobdude joined20:51
APic joined20:52
_ikke_ pgimeno: what does git ls-files --eol bin/* say?20:52
pgimeno _ikke_: "unknown option `eol'"20:53
I can switch to another machine with a newer git20:53
minionofgozer joined20:54
satifant left20:54
durham joined20:55
_ikke_ ok, you can also try git check-attr --all bin/(*20:55
khisanth_ left20:56
andy4rp left20:56
blitz206 joined20:56
jimi_ left20:57
pgimeno _ikke_: the first command says a bunch of lines like: i/-text w/-text attr/text=auto eol=lf bin/libstatus.a20:58
Murr left20:58
Murr joined20:58
_ikke_ right20:58
sanscoeur zarzar1: I'm confused. The workspaces, themselves, should be `git clone`'s of some projects already, so you shouldn't need to back them up. ... I suppose that my experience might be different. We only used pipeline jobs that pulled git projects with `Jenkinsfile`'s.20:58
exotime left20:59
exotime joined21:00
_ikke_ pgimeno: hold on, trying to verify how I should interpret that21:00
olbat joined21:00
olbat left21:00
olbat joined21:00
zarzar1 sanscoeur: the Ci server runs unity tests and static analysis scripts and those files end up in the subrepos, so it would be nice to save them, but i could just add a script to move them outside of the jenkins dirs21:00
Es0teric joined21:00
pgimeno _ikke_: if it helps, check-attr spits the file names with things like: text: auto, eol: lf21:00
sathed joined21:01
_ikke_ looks like the bin/* attributes are not appliied21:01
applied21:01
pgimeno _ikke_: yeah, hence why I'm asking how. It seems that when you have a * you can't override it with a bin/*21:01
orbyt_ left21:02
_ikke_ pgimeno: let me check, I would expect it to work21:02
Gurkenglas joined21:02
heroux joined21:03
rkta left21:03
_ikke_ pgimeno: seems to work for me21:04
sanscoeur zarzar1: I have no idea if this will work, but adding `**/.git` to the .gitignore directory. Maybe git's internals will stop recognizing those directories as submodules. It all depends on at what point does git internally prunes the work tree. ¯\_(ツ)_/¯21:04
pgimeno _ikke_: uh, weird21:04
sanscoeur Rather, `*/**/.git`.21:05
_ikke_ .gitattributes: http://tpaste.us/JMoV21:05
git ls-files --eol: http://tpaste.us/8QnO21:05
zarzar1 sanscoeur: ok i'll try that21:05
m_ joined21:05
sathed left21:06
sathed joined21:06
db8093246 left21:07
cdg joined21:07
_ikke_ pgimeno: what version of git?21:08
orbyt_ joined21:09
khisanth_ joined21:09
pgimeno _ikke_: hold a min, let me see if I can make a repro. I am using 2.11.0 in the newer machine and 1.7.10.4 in the older one.21:10
gopar left21:11
gopar joined21:11
lu_zero left21:11
sathed left21:12
lu_zero joined21:13
lu_zero left21:13
lu_zero joined21:13
codyw left21:14
_ikke_ pgimeno: just verified and the binary attribute was supported 'from the very beginning'21:15
m_ left21:16
gopar left21:16
Pulp joined21:16
jceb left21:16
rosco_y joined21:16
gitinfo set mode: +v21:16
blitz206 Hey all.21:17
ph88^ joined21:17
bergice_ joined21:17
blitz206 https://www.irccloud.com/pastebin/WKJaMA4L/Your%20branch%20is%20ahead%20of%20'origin%2Fmaster'%20by%2033%20commits.21:17
dustinm left21:18
jaeckel I've git 2.7.4 installed and I just realized that it seems like the --ignore-space-change etc. options aren't applied when invoked via git difftool, do I do something wrong?21:18
dustinm joined21:19
kpease_ left21:19
orbyt_ left21:20
_ikke_ git difftool means you are running an external diff21:20
ph88_ left21:20
_ikke_ so git does not perform the diff itself21:20
paul424 left21:21
Briefs joined21:22
jaeckel ah okay, I thought git does that21:22
_ikke_ not when you run git diftool, then you are deferring to create the actual diff to another program21:22
Briefs left21:22
jaeckel but that worked before when git diff still had the --tool option, right?21:23
Mike11 joined21:23
orbyt_ joined21:25
_ikke_ I don't see how that would have worked21:25
Es0teric left21:25
_ikke_ Only the tool that does the actual diff can take these kinds of options into account21:26
Noldorin joined21:26
_ikke_ (I don't recall git diff having a --tool option)21:26
db` joined21:27
jeffreylevesque_ joined21:27
jeffreylevesque left21:27
AciD` something weird is happening; whenever I try to `git add` a file, a new lock file is created, but then I get a lock error and git says it cannot add the file21:27
wth21:28
_ikke_ what kind of lock file?21:28
pgimeno _ikke_: I think I've found the issue. The files in nested subdirs are the ones that aren't binary. That's what I'm having trouble with, which is annoying because *.bin matches files in any subdir, which made me think that * crossed subdirs.21:29
rosco_y left21:29
_ikke_ * does cross subdirs21:30
* means all files21:30
pgimeno _ikke_: I mean, bin/* does not match bin/subdir/myfile.bin21:31
stutter_ left21:31
oelewapperke left21:31
stutter joined21:32
oelewapperke joined21:32
Gurkenglas left21:32
_ikke_ it follows the same rules as .gitignore21:32
mmlb left21:32
devster31 left21:32
Rhul joined21:32
Strepsils left21:32
stutter left21:32
filcab left21:32
_ikke_ which indeed says that * does not match /21:32
rh10 left21:33
_ikke_ pgimeno: so you want bin/**21:33
pgimeno _ikke_: that doesn't work for me either21:33
let me try in the newer git21:33
_ikke_: ah, that was the issue, the older version of git doesn't recognize **21:34
hellux joined21:34
mmlb joined21:34
Doginal_ joined21:35
Doginal left21:35
Doginal_Doginal21:35
_ikke_ was introduced in v1.7.11.721:36
Es0teric joined21:36
_ikke_ sorry, 1.8.2 actually21:37
akushner left21:37
pgimeno just a bit after 1.7.10.4 so I'm out of luck :)21:37
thanks, mystery solved21:37
devster31 joined21:38
cdg_ joined21:38
filcab joined21:38
dreiss left21:38
mattcen left21:38
Nizumzen left21:38
abba left21:38
jimmyrcom_ left21:38
sosheskaz left21:38
xaa left21:38
nd- left21:38
Milos left21:38
Grum left21:38
Bercik left21:38
TinkerTyper left21:38
esc left21:38
sunrunner20 left21:38
jim left21:38
whyme left21:38
pR0Ps left21:38
chrfle left21:38
rnsanchez left21:38
kevr left21:38
nikow left21:38
oprypin left21:38
Walex left21:38
hays left21:38
lucasem left21:38
waveclaw left21:38
todder left21:38
strugee left21:38
nicoulaj left21:38
gk left21:38
MrMagic left21:38
pandem1 left21:38
Persikka left21:38
roger_raymond left21:38
AciD` left21:38
holdsworth left21:38
antismap left21:38
Xe left21:38
axisys left21:38
hdon left21:38
ses1984 left21:38
anderson left21:38
halftroll left21:38
jantje left21:38
nellicus_ left21:38
jlewis left21:38
varesa| left21:38
matsaman joined21:38
ahrs left21:39
cdown joined21:39
ahrs joined21:40
cdg left21:40
jnavila left21:40
blitz206 Okay - further along now.21:41
tang^ out of luck? install a newer version, eh?21:41
CheckDavid joined21:41
blitz206 Say I started on a dirty master that diverged from origin/master21:41
I am ready to land my feature, but now there are noisy files in my diff. How do I eliminate this noise?21:41
kevr joined21:42
_ikke_ git stash?21:43
whyme joined21:43
oprypin joined21:43
blitz206 Stashing is for uncommitted files, correct?21:44
ZyX-I left21:44
blitz206 My issue is that I started with master being ahead of origin/master21:44
senaps left21:45
blitz206 so now, there are more changes than there are meant to be21:45
jeffreylevesque_ left21:45
_ikke_ yeah, stash is for uncomitted files indeed21:45
blitz206: what do you imagine to happen to those changes?21:45
stutter joined21:46
blitz206 To provide the simplified scenario.. Master is ahead of origin/master by ten commits. Feature is branched off of master. Feature is done, but now contains master's divergence as well.21:47
_ikke_ ah21:48
blitz206 I updated master to have parity with origin/master, and rebased my feature branch, but those initial changes still exist.21:48
cdown left21:48
cdown joined21:48
_ikke_ blitz206: easiest is to rebase again with -i and drop the commits that you don't want in your feature branch21:48
Do you want to keep those changes?21:48
McKraken_zzzzzMcKraken21:49
blitz206 What does the -i flag do?21:49
_ikke_ interactive21:49
svm_invictvs joined21:49
sanscoeur blitz206: Do something with your dirty files; stash, commit, revert them. Then, create a feature branch `git checkout -b my_feature_branch`, then `git checkout master` and `git reset --hard origin/master`.21:49
_ikke_ sanscoeur: it turned out not to be a dirty working tree21:50
blitz206 Yeah, sorry for the terminology.21:50
It's a branch off of a diverged master21:50
basiclaser left21:50
madewokherd joined21:51
_ikke_ blitz206: so git rebase -i master feature21:52
then remove the lines of the commits you want to get rid of21:53
sanscoeur Right. Did you get it sorted? The `git reset` stands. You're on your own with the feature branch. :D21:53
_ikke_ sanscoeur: the reset has already happened21:53
blitz206 Not yet :) afraid I may mess something up.21:53
_ikke_ blitz206: the reflog has your back21:53
Rhul left21:54
blitz206 You guys/girls are the best.21:54
schoolTOYboy joined21:54
sanscoeur I feel like the most common problem I see involves people pulling the upstream into their feature branch. You really _cannot_ rewrite history at all after that.21:54
Err, where the "upstream" is a common/shared branch.21:55
_ikke_ I don't think that matters a lot21:55
gopar joined21:55
_ikke_ It would be if you merged into the common/shared branch21:55
blitz206 all I see upon interactive rebasing is:21:56
https://www.irccloud.com/pastebin/Yd0Nn18G/21:56
synthroid left21:56
_ikke_ but if you merged into the feature branch, you can always drop the merge again (that is, if you feel you can rewrite the feature branch in the first place)21:56
sanscoeur What branch are you in??21:56
blitz206 feature21:56
_ikke_ what commmand did you run?21:57
schoolTOYboy left21:57
JanC left21:57
blitz206 git rebase -i feature/track-app-usage master21:57
JanC joined21:57
sanscoeur It looks like the upstream branch already has all the feature branch commits, so rebase is showing them as deleted/unnecessary.21:58
_ikke_ blitz206: you switched the order21:58
blitz206: git rebase -i master feature21:58
sanscoeur And, that somehow (git commit --amend, git rebase) the local feature branch has been rewritten.21:58
Ah, right! What he said.21:58
akushner joined21:59
blitz206 That's better :) Let's take a look.21:59
zarzar1 how should i handle creating and managing a git repo for another user on ubuntu server? i have jenkins ci server running, it is another user, so i need to figure out how to manage a repo of jenkins config files as my user21:59
_ikke_ zarzar1: do you expect more users to use repositories on that server/22:01
blackmesa1 left22:01
dreiss joined22:02
mattcen joined22:02
abba joined22:02
jimmyrcom_ joined22:02
sosheskaz joined22:02
xaa joined22:02
nd- joined22:02
Milos joined22:02
Grum joined22:02
Bercik joined22:02
TinkerTyper joined22:02
esc joined22:02
sunrunner20 joined22:02
jim joined22:02
pR0Ps joined22:02
chrfle joined22:02
rnsanchez joined22:02
nikow joined22:02
Walex joined22:02
hays joined22:02
lucasem joined22:02
waveclaw joined22:02
todder joined22:02
strugee joined22:02
nicoulaj joined22:02
gk joined22:02
MrMagic joined22:02
pandem1 joined22:02
Persikka joined22:02
roger_raymond joined22:02
VACPYQN joined22:02
holdsworth joined22:02
antismap joined22:02
hdon joined22:02
axisys joined22:02
halftroll joined22:02
ses1984 joined22:02
jantje joined22:02
leguin.freenode.net set mode: +vvvv22:02
anderson joined22:02
nellicus_ joined22:02
jlewis joined22:02
varesa| joined22:02
leguin.freenode.net set mode: +vvvv22:02
spacefan2 joined22:02
Siren joined22:02
nicoulaj left22:02
nicoulaj joined22:03
sunrunner20 left22:03
CheckDavid left22:03
CheckDavid joined22:03
tombusby left22:03
pgimeno left22:05
tunekey left22:05
Puffball left22:05
blitz206 Almost there...22:06
error: could not apply 257a56b8a5... implemented requested changes22:06
zarzar1 _ikke_: no its really just me and jenkins for this repo22:07
Puffball joined22:07
sunrunner20 joined22:07
_ikke_ zarzar1: You can create a 'git' system user, add an ssh key for both you and jenkins to it22:07
create the repo there22:07
sosheskaz left22:07
zarzar1 jenkins won't know anbout the repo, but jenkins is owner of the files that will be in the repo22:08
ResidentBiscuit left22:08
Xe joined22:09
zarzar1 its more like a linux user issue maybe, jenkins owns its config files, but i want to back them upo using git22:09
aard_ left22:09
ResidentBiscuit joined22:09
zarzar1 _ikke_: should i just sudo and manage the directory is there a better way?22:10
highkix joined22:10
fission6 joined22:10
Argylelabcoat left22:11
joey_ left22:11
joeyy joined22:11
PresidentBiscuit joined22:13
Xrayez left22:13
zarzar1 _ikke_: i'm not that savvy22:13
ResidentBiscuit left22:13
tombusby joined22:13
sosheskaz joined22:14
raynold ahh it's a wonderful day22:15
sosheskaz left22:16
sosheskaz joined22:16
PresidentBiscuitResidentBiscuit22:17
hellux left22:19
fuchstronaut left22:19
blitz206 Thanks guys, my issue is solved :)22:19
The interactive rebase is a godsend.22:19
Do you recommend any general git tutorials for getting me up to speed?22:19
shinnya joined22:20
tarkus joined22:20
WhitePhosphorus left22:21
str left22:21
Mike11 left22:21
relacio joined22:22
pandem1 !tutorial22:22
gitinfo A list of interactive git tutorials: http://try.github.com22:22
mud blitz206: Pro Git is a decent start, it's a free book on the website !progit22:23
gitinfo blitz206: [!book] 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 !parable22:23
h12o joined22:23
upperdeck left22:24
wget left22:24
stutter left22:24
blitz206 Sweet! Appreciated.22:25
h12o left22:28
upperdeck joined22:28
phluks joined22:29
_ikke_ raynold: it certainly is22:29
cdg_ left22:30
WhitePhosphorus joined22:30
cdg joined22:31
greenbagels left22:33
ResidentBiscuit left22:34
pkx2__ joined22:35
greenbagels joined22:35
pijiu joined22:35
pkx2__ left22:36
jeffreylevesque joined22:36
cust left22:37
pkx2 joined22:38
pirocks left22:38
matsaman left22:39
jamiejackson left22:40
cdown left22:40
pirocks joined22:41
einnjo left22:41
lafleurdubien joined22:42
ahrs left22:43
ahrs joined22:44
fission6 left22:44
justanotheruser left22:45
cust joined22:45
wootehfoot left22:46
clickjack left22:48
jceb joined22:48
fission6 joined22:49
cdg_ joined22:49
whitby left22:51
pkx2 left22:51
w0ng left22:52
codyw joined22:52
whitby joined22:52
cdg left22:52
pkx2 joined22:53
pirocks left22:53
plitter left22:53
steeze left22:53
cdg_ left22:53
pirocks joined22:54
tg left22:54
tarkus left22:55
sea-gull left22:56
Pulp left22:56
pkx2 left22:57
steeze joined22:57
Murr left22:58
Murr joined22:58
ResidentBiscuit joined22:58
pkx2 joined22:59
w0ng joined23:01
cagomez joined23:02
Siren left23:02
ResidentBiscuit left23:03
fission6 left23:03
tmsmith left23:03
sasheto left23:04
pirocks left23:04
blackmesa1 joined23:05
goweol joined23:06
blahx joined23:06
goweol1 joined23:06
vush left23:06
Doginal left23:08
Doginal joined23:08
fission6 joined23:08
matsaman joined23:10
goweol left23:10
Nizumzen joined23:12
ixian left23:12
dreiss left23:13
matsaman left23:13
mac- joined23:13
mac- hey23:13
I'm reading git fetch manual now, they mentioned sth about optional '+' in front of src:dst23:14
syntax23:14
highkix heyyyeeeeyyyy23:14
mac- what is this optional '+' ?23:14
highkix git suck + .23:15
svn rocks!23:15
dsdeiz left23:15
dsdeiz joined23:16
dsdeiz left23:16
dsdeiz joined23:16
tang^ man git-fetch23:16
gitinfo the git-fetch manpage is available at https://gitirc.eu/git-fetch.html23:16
mud mac-: It mentions what it does briefly in the <refspec> part23:16
(at the very end of the "OPTIONS" section23:16
jceb left23:19
pkx2 left23:21
pkx2 joined23:23
fission6 left23:25
dendazen left23:27
orbyt_ left23:27
jost joined23:28
VoradorPT joined23:30
18VACPYQN hey guys, I have two directories 'one' and 'two' which are both a git repo. Now, I moved the 'two' folder inside one of the 'one' repo subdirectory (ie. /one/path/to/two)23:30
gopar left23:30
Kaisyu joined23:31
gopar joined23:31
AciD` when I'm in /one, a git status shows me that I added all the files from '/one/path/to/two', however when I commit, thoses files are not included inside said commit23:31
thiago left23:31
AciD` how do you managed nested repo 'after the fact'? Should I `git submodule add /one/path/to/two`?23:32
from `/`23:32
oprypin you just can't add a repository like that, it's behaving broken23:33
you either add it to gitignore or use submodule (not recommended)23:33
AciD` (why is that not recommanded?)23:34
mda1 left23:34
oprypin and iirc submodule needs to be a remote URL23:34
upperdeck left23:34
Gustavo6046 left23:34
highkix svn rocks23:34
Gustavo6046 joined23:34
Gustavo6046 left23:34
Gustavo6046 joined23:34
AciD` not necessarily23:34
oprypin you have to try submodules to see how badly made they are23:34
Darcidride_ left23:35
oprypin well it could be a file URL but that makes it not portable at all23:35
AciD` I haven't had the occasion so far, but am considering it23:35
I think I read that the file url is relative23:35
highkix COBOL rocks23:35
sosheskaz left23:36
DvdKhl left23:36
mud highkix: Stop that please, that's not very interesting.23:38
highkix :D23:38
phinxy left23:39
upperdeck joined23:39
Cabanossi left23:40
oprypin AciD, if you want to upload a path to a file on your computer to GitHub or whatever, that's your choice, just be aware of that23:40
phinxy joined23:40
highkix slaps mud around a bit with a large trout23:41
oprypin it's not a reference to a repository, it's a reference to a commit at a remote, that's all23:41
AciD` mud -> long time since I used an ignore on irc. today is the day23:41
AaronMT left23:41
AciD` I guess I should go read the doc about submodule, since I though otherwise23:41
highkix AciD` dick23:41
Cabanossi joined23:42
NeverTired left23:42
pkx2 left23:43
highkix #drugs23:43
#elvis23:44
ChanServ set mode: +o23:44
pkx2 joined23:44
highkix git bisect reset HEAD will leave you on the current bisection commit and avoid switching commits at all23:46
haha im the king of bamako23:46
mud set mode: +b23:46
mud kicked highkix (bye)23:46
salamanderrake joined23:47
ChanServ set mode: -o23:47
highkix joined23:48
xaa left23:48
mda1 joined23:48
phluks left23:48
ChanServ set mode: +o23:49
dreiss joined23:49
phinxy left23:50
phinxy joined23:52
tango_ during a 3-way merge with conflicts, is there a way to ask git to save to disk the left, right and base as separate files?23:56
the ones that would eventually get passed to mergetool, to wit23:56
jost left23:56
schleppel left23:57
tg joined23:57
rafasc tango_: yes23:57
kgrimes left23:58
blahx left23:58
rafasc tango_: something like git show n:filename23:58
tango_ ah23:58
rafasc where n 1,2,3 depending23:58
gopar left23:59
gopar joined23:59

Logs Search ←Prev date Next date→ Channels Documentation