IRCloggy #git 2015-09-07

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.

2015-09-07

dtrott left00:00
bollullera joined00:01
ghostlines left00:05
cdown joined00:05
znabavi left00:09
jonno11 left00:09
cdown left00:10
otter768 joined00:11
michael_mbp left00:12
michael_mbp joined00:12
Mega joined00:13
zumba_addict left00:15
otter768 left00:15
kadoban joined00:16
jmpp joined00:18
sssilver joined00:19
sssilver left00:21
madebymarkca left00:22
illizit left00:25
jteneyck left00:27
thiago left00:28
sssilver joined00:29
fracting left00:30
mezod left00:33
hamster left00:34
deathslocus joined00:35
Mega help00:37
K1du joined00:37
gitinfo set mode: +v00:37
deathslocus anyone able to help me with some weird git commands00:37
faux___ joined00:38
happy-dude left00:41
sssilver left00:41
zumba_addict joined00:41
nvahalik left00:41
deathslocus anyone able to help me with some weird git commands00:42
Lyqyd left00:42
kadoban deathslocus: Just ask your real question.00:42
faux___ left00:43
Mega deathslocus: Meow?00:46
nvahalik joined00:47
Mega deathslocus: what should u get eventually?00:47
K1du left00:48
devoldmx joined00:51
githogori left00:51
linux-modder joined00:53
emulator_ joined00:54
sparetire_ left00:55
monkieking left00:55
linux-modder left00:56
harish left00:57
dreiss left00:57
CheckDavid joined00:58
githogori joined00:58
pm90_ left01:00
githogori left01:01
rchavik joined01:01
githogori joined01:02
SimonNa joined01:02
Klumben left01:04
NightMonkey left01:05
Mega left01:05
Guest87570 left01:06
zumba_addict left01:09
leeN left01:10
jmpp left01:10
sinknode joined01:10
NimeshNeema left01:10
AridBullet joined01:11
linux-modder joined01:11
ahr3n left01:12
daito joined01:12
mingwandroid_ left01:13
linux-modder left01:14
Lyqyd joined01:16
firebirds joined01:17
cheesymonkey joined01:19
cheesymonkey left01:25
crash\ left01:27
deathslocus I want to add ./x/* to ./*01:27
without x01:27
devoldmx left01:27
DonVitoCorleone left01:27
deathslocus so /x/y becomes /y01:28
mablae_ joined01:30
DonVitoCorleone joined01:32
sgen joined01:32
jmpp joined01:32
crash\ joined01:32
mablae left01:33
durham joined01:33
durham left01:35
durham joined01:35
devoldmx joined01:36
harish joined01:37
dadamssg joined01:40
lapilofu left01:40
lapilofu joined01:40
lapilofu left01:41
xudongz joined01:41
lapilofu joined01:42
s8321414 joined01:43
dadamssg left01:44
bollullera left01:46
ahr3n joined01:47
pks left01:47
tmillc joined01:48
murph joined01:48
pks joined01:48
mostlybadfly left01:49
murphGuest6989001:49
faux___ joined01:49
tmillc anyone feel like helping a noober understand pull requests, branching, merging, rebasing, etc? https://github.com/tmillc/git_experimenting01:50
gpdev joined01:50
tmillc I just feel like I need some hands-on, but I don't know anyone who uses git01:50
linuxmint2 joined01:50
msonntag left01:51
Klumben joined01:52
Vampire0_ joined01:53
msonntag joined01:54
Kallis left01:54
faux___ left01:56
sctskw joined01:57
Vampire0 left01:57
nvahalik left01:57
Noldorin left01:58
joo-_ left02:00
joo-_ joined02:00
michael_mbp left02:01
pm90_ joined02:01
sctskw left02:01
sctskw joined02:02
sgen left02:02
faux___ joined02:03
phroa tmillc: !workflow might help. other than that, what specifically do you need help grokking?02:04
gitinfo tmillc: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.02:04
michael_mbp joined02:04
pm90_ left02:05
irwiss`` joined02:05
sross07 joined02:05
t-mart__ joined02:06
felixjet_ joined02:06
rvsjoen_ joined02:06
daito_ joined02:06
mehola_ joined02:06
devoldmx left02:06
xmj_ joined02:06
mage_ joined02:07
sctskw left02:07
BullHorn- joined02:07
[cust] joined02:07
sctskw joined02:07
VampiricPadraig_ joined02:08
CussBot_ joined02:08
synchron- joined02:08
Andre_work joined02:09
mek42_ joined02:09
CEnnis91_ joined02:09
Nizumzen left02:09
Kuukunen- joined02:09
zack6849_ joined02:10
shauna_ joined02:10
bobdobbs` joined02:10
sickn3ss_ joined02:10
sickn3ss_ left02:10
sickn3ss_ joined02:10
tmillc phroa: I don't know, I just want to be more comfortable with it. I could set up a second account and play with branching and stuff I guess.02:10
FabTG_ joined02:10
souther_ joined02:10
mikkom_ joined02:10
heroux_ joined02:10
davidstrauss_ joined02:10
poi_ joined02:10
darkbit joined02:10
yousef_ joined02:10
mikap joined02:10
PaulePan1er joined02:10
thorie_ joined02:10
mischat_ joined02:10
tonyj_ joined02:11
MikeSeth_ joined02:11
tmillc I just recently landed a sort of internship and I don't want to be suddenly thrust into a situation where git is important and I'm not comfortable with it, and I'm not sure how to do that on my own since it's such a collaborative tool.02:11
phroa tmillc: perhaps https://github.com/git-game/git-game and it sequel would be helpful? I don't know exactly what the first episode covers, though. the second one actually gives a list of topics.02:11
tmillc oh this looks good, thanks!02:12
otter768 joined02:12
phroa some of !book s may appeal to you02:12
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable02:12
dgutierrez1287 joined02:13
tmillc eh I feel like I'd get more out of just experimenting than reading about it, with this specific tool02:13
jokajak` joined02:13
tmillc I "read about" rebasing and yeah... -_-02:13
phroa not the lightest topic02:13
HedgeMage_ joined02:13
HedgeMag- joined02:13
tmillc right but it gave me the impression that if I did it a bit, I'd grok it02:13
sfr^^ joined02:13
aseidl1 joined02:13
Timvde| joined02:13
preston_ left02:14
kisonecat_ joined02:14
bandroidx_ joined02:14
LHL_Jordan joined02:14
jfive_ joined02:14
devsterknight|ZN joined02:14
tmillc but git-game looks good, I'll give that a shot02:14
Olipro- joined02:14
specing_ joined02:14
cschneid- joined02:14
ozymandias_ joined02:14
bremner` joined02:14
bremner` left02:14
bremner` joined02:14
Olipro-Guest98702:14
JeremyD joined02:14
sadmac2 joined02:14
murph- joined02:14
D30 joined02:15
SleePy left02:15
iooner- joined02:15
JeremyDSleePy02:15
msonntag left02:15
Klumben left02:15
pks left02:15
Guest69890 left02:15
daito left02:15
sinknode left02:15
irwiss` left02:15
t-mart_ left02:15
BullHorn left02:15
mehola left02:15
tobiasvl left02:15
fahadash left02:15
jokajak left02:15
CEnnis91 left02:15
ShapeShifter499 left02:15
pR0Ps left02:15
kriskropd left02:15
sparr left02:15
Guest67904 left02:15
Nikhil_D left02:15
raven-au left02:15
spriz left02:15
sjLonghorn left02:15
felixjet left02:15
Guest98477 left02:15
sfr^ left02:15
tmz left02:15
CussBot left02:15
DSH105 left02:15
Shentino left02:15
jfive left02:15
PaulePanter left02:15
mage__ left02:15
maxorator left02:15
TheMoonMaster left02:15
aseidl left02:15
Rubin left02:15
souther left02:15
synchronous left02:15
rvsjoen left02:15
ada left02:15
zack6849 left02:15
cust_ left02:15
blackjid left02:15
mmattice left02:15
Fissure left02:15
markelite left02:15
DrNick left02:15
saidelike left02:15
Timvde left02:15
jason237 left02:15
mek42 left02:15
Jeroen left02:15
MikeSeth left02:15
sross_work|2 left02:15
poi left02:15
FabTG left02:15
w00die left02:15
bandroidx left02:15
ariver left02:15
sadmac left02:15
Vorisi left02:15
jgornick left02:15
davidstrauss left02:15
Hedgework left02:15
cschneid left02:15
bremner left02:15
Guest74353 left02:15
mika left02:15
shauna left02:15
linuxmodder left02:15
heroux left02:15
j416 left02:15
winny left02:15
nioncode left02:15
iooner left02:15
HedgeMage left02:15
c0ded left02:15
ozymandias left02:15
devster31 left02:15
someplace left02:15
VampiricPadraig left02:15
killerpty left02:15
Eryn_1983_FL left02:15
mischat left02:15
Mocramis left02:15
yousef left02:15
jaeckel left02:15
kisonecat left02:15
thorie left02:15
tonyj left02:15
xmj left02:15
ShibMcNe left02:15
totte left02:15
lamont left02:15
Kuukunen left02:15
mikkom left02:15
AndreSomers left02:15
specing left02:15
sickn3ss left02:15
specing_specing02:15
mikapmika02:15
heroux_heroux02:15
souther_souther02:15
c0d3d joined02:15
sadmac2sadmac02:15
Jeroen joined02:15
ariver joined02:15
Guest57774 joined02:16
ariverGuest8800702:16
saidelike_ joined02:16
Xiti left02:16
HedgeMag- left02:16
HedgeMage joined02:16
Xiti joined02:16
sgen_ joined02:16
pR0Ps joined02:17
otter768 left02:17
HedgeMage left02:17
TheMoonMaster_ joined02:17
Kamran joined02:17
HedgeMage joined02:17
sjLonghorn joined02:17
KamranGuest2070402:17
dgutierrez1287 left02:17
tvl joined02:18
tvltobiasvl02:18
devoldmx joined02:18
CEnnis91_CEnnis9102:18
Papabear left02:19
DSH105 joined02:19
nvahalik joined02:20
fahadash joined02:21
ada joined02:21
ShibMcNe joined02:21
fahadashGuest1539402:21
Eryn_1983_FL joined02:21
Mocramis joined02:21
someplace joined02:22
jgornick joined02:22
Fissure joined02:22
nioncode joined02:22
tmillc left02:22
Guest67904 joined02:22
jason237 joined02:22
sparr joined02:22
winny joined02:22
linuxmodder joined02:22
DrNick joined02:23
ShapeShifter499 joined02:23
tmz joined02:23
jaeckel joined02:23
bhws joined02:23
Nikhil_D joined02:24
devoldmx left02:24
w00die joined02:24
s00pcan joined02:24
nvahalik left02:24
Shentino joined02:24
mmattice joined02:24
kriskropd joined02:25
DoniRS joined02:25
Udenslashed_ joined02:25
Papabear joined02:27
marvi_ joined02:27
phantombeta_ joined02:27
CKyle left02:28
dharriga1 joined02:28
chadi_ joined02:28
darkbit left02:28
devoldmx joined02:29
lfod left02:29
anth0ny_ joined02:29
kgirthofer_ joined02:29
lfod joined02:29
tokik_ joined02:30
AlHafoudh_ joined02:30
deltab_ joined02:30
Joseph_Silber joined02:31
EvanDotP1o joined02:31
_W joined02:31
faux___ left02:31
scrubbrush_ joined02:31
skoopty joined02:32
[epitron] joined02:32
sinknode joined02:32
schlumpi_ joined02:32
cerulean__ joined02:33
wilornel_ joined02:33
tristanseifert left02:33
qpdb left02:33
Nikoli_ joined02:33
qpdb_ joined02:34
cerulean__ left02:34
disfigure joined02:34
zipcrackbumm__ left02:34
marvi left02:34
chadi left02:34
dharrigan left02:34
phantombeta left02:34
tokik left02:34
DARSCODE left02:34
BombStrike left02:34
anli left02:34
anth0ny left02:34
deltab left02:34
systmkor left02:34
EvanDotPro left02:34
_W_ left02:34
epitron left02:34
scrubbrush left02:34
Cydrobolt left02:34
schlumpi left02:34
skoop left02:34
gusnan left02:34
kgirthofer left02:34
mattcen left02:34
wilornel left02:34
Joseph__Silber left02:34
jeadre left02:34
qsuscs left02:34
gusnan joined02:34
githogori left02:34
mozzarella left02:34
MrCupp left02:34
qsusxs joined02:34
AlHafoudh_AlHafoudh02:34
gusnan left02:34
gusnan joined02:34
qsusxsqsuscs02:34
cvadict left02:35
Cydrobolt joined02:35
Cydrobolt left02:35
Cydrobolt joined02:35
fold1 joined02:35
preaction joined02:35
BombStrike joined02:35
gtmanfred joined02:35
cerulean__ joined02:35
mizu_no_oto joined02:36
Nikoli left02:36
BombStrikeGuest2979602:36
systmkor joined02:36
mattcen joined02:36
s8321414 left02:37
s8321414 joined02:38
githogori joined02:38
mezod joined02:39
mizu_no_oto left02:39
plasticboy joined02:40
tristanseifert joined02:42
blackjid joined02:43
githogori left02:43
githogori joined02:44
mezod left02:45
JackFruh joined02:46
Radivarig left02:46
githogori left02:47
SimonNa left02:47
githogori joined02:47
gopar joined02:49
Nikhil_D1 joined02:50
githogori left02:50
Klumben joined02:51
githogori joined02:51
mischat joined02:51
MrWoohoo left02:51
iml_ joined02:51
CKyle joined02:52
killerpty joined02:52
gusnan_ joined02:53
pigeon_ joined02:53
githogori left02:54
utanapischti joined02:54
terminal_echo left02:55
systmkor left02:57
Guest29796 left02:57
gusnan left02:57
Nikhil_D left02:57
mischat_ left02:57
iml left02:57
tg left02:57
bioomboom left02:57
BeerSerc left02:57
Thr3d left02:57
jab416171 left02:57
pigeon left02:57
tterrag left02:57
drawkula left02:57
githogori joined02:57
mozzarella joined02:58
Thr3d_ joined02:58
fscala left02:58
systmkor joined02:59
tg joined02:59
fscala joined02:59
githogori left02:59
bhws left03:00
githogori joined03:00
nerd joined03:00
BombAw joined03:02
jab416171 joined03:02
bioomboom joined03:02
BeerSerc joined03:02
same_ol_geez joined03:02
nvahalik joined03:02
BombAw left03:02
Tesseract85 left03:02
BombAw joined03:03
faux___ joined03:03
githogori left03:03
ilogger2 joined03:22
Strat joined03:22
lfod joined03:30
ghostlines joined03:30
tachoknight joined03:38
dadamssg joined03:41
jzk joined03:41
dadamssg left03:45
bhws joined03:46
cerulean__ joined03:49
MasterPiece joined04:00
marjory joined04:01
lfod left04:03
lfod joined04:03
lfod left04:04
ghostlines left04:04
cagedwisdom joined04:05
a3Dman joined04:05
gambl0re joined04:07
MrWoohoo joined04:07
MasterPiece left04:08
checkItOut joined04:09
gopar joined04:12
calrik joined04:12
otter768 joined04:13
faux___ joined04:15
howdoi joined04:15
Phoenixz joined04:17
fedexo joined04:17
otter768 left04:18
Oog_ joined04:18
faux___ left04:21
daito joined04:24
linuxmint2 joined04:25
daito left04:28
Dragooon joined04:30
elsevero joined04:30
maxorator joined04:30
spriz joined04:30
Dazzyp joined04:30
Rubin joined04:31
elsevero left04:31
j416 joined04:31
raven-au joined04:31
pks joined04:31
msonntag joined04:31
boombatower joined04:33
boombatower left04:33
boombatower joined04:33
Chaser joined04:34
Dragooon left04:36
ome joined04:37
bobdobbs joined04:37
faux___ joined04:37
cagedwisdom left04:38
c0ded joined04:38
skorgon joined04:38
bobdobbs left04:39
Oog_ left04:39
dgutierrez1287 joined04:39
faux___ left04:42
ehmatthes joined04:43
cvadict joined04:44
dgutierrez1287 left04:44
arescorpio joined04:44
Oog_ joined04:48
eggoez joined04:48
cagedwisdom joined04:51
darkbit joined04:51
jceb joined04:51
fedexo left04:56
faux___ joined05:01
arescorpio left05:02
faux___ left05:06
linux-modder joined05:07
linux-modder left05:08
fullstack joined05:08
MechtiIde joined05:09
JackFruh joined05:10
gpdev joined05:10
Oog_ left05:11
Oog_ joined05:12
Oog_ left05:12
sssilver joined05:12
kgirthofer joined05:14
zumba_addict joined05:14
nilg joined05:14
linux-modder joined05:15
marjory is anyone there?05:16
ayaz joined05:18
tachoknight left05:20
Raging_Hog joined05:24
znabavi joined05:24
Guest32_ joined05:24
Oog_ joined05:25
vikas027 joined05:26
Guest32_ left05:29
pyrobottom joined05:30
scarabx joined05:30
jrahmy joined05:31
preaction just ask. if someone is available, and can help, they'll answer05:32
pyrobottom left05:34
pyrobottom joined05:34
sinkensabe joined05:34
fullstack left05:35
fullstack joined05:35
pyrobottom left05:38
JackFruh left05:39
fracting joined05:39
michael_mbp joined05:39
faux___ joined05:40
dreiss joined05:41
pantsman- joined05:41
dadamssg joined05:42
mostlybadfly joined05:42
pyrobottom joined05:43
daito joined05:44
dadamssg left05:46
sinknode joined05:48
dotpot joined05:48
checkItOut left05:49
nurupo_ joined05:50
nurupo_nurupo05:51
d0p joined05:52
sinknode left05:52
sinknode joined05:53
MechtiIde left05:55
zoso joined05:55
totte joined05:56
deathslocus joined05:56
deathslocus left05:56
Manikandan joined05:58
sinknode left05:58
sinknode joined05:59
sinknode left06:00
scarabx left06:01
sinknode joined06:01
boombatower left06:02
dionysus69 joined06:05
dreiss left06:05
NeverDie joined06:06
ghostlines joined06:07
ghostlines left06:08
preston_ joined06:08
temmi_hoo joined06:09
sinkensabe left06:09
jrahmy left06:13
spinningarrow joined06:13
otter768 joined06:14
nilg left06:15
acolson joined06:17
nilg joined06:17
otter768 left06:19
NeverDie left06:19
pyrobottom left06:20
roelmonnens joined06:20
nilg left06:20
durre joined06:20
MrWoohoo left06:20
epic joined06:21
Godfather_ joined06:21
Klumben joined06:23
msm joined06:23
michael_mbp left06:23
Eugene joined06:23
dmarr joined06:23
fracting left06:24
cmyers joined06:24
cpw joined06:24
fracting joined06:24
SleePy joined06:24
cpw left06:24
heroux joined06:25
michael_mbp joined06:25
elsevero joined06:26
Ipno joined06:28
sukesh joined06:29
joo-_ joined06:29
Ipno left06:29
michael_mbp left06:31
sontek joined06:32
gpdev left06:32
astrofog joined06:32
sontek left06:32
sontek joined06:32
yisthat joined06:32
s8321414 joined06:32
gitinfo set mode: +v06:33
michael_mbp joined06:34
yisthat Hi. Can you explain me why "git fetch" automatically forces to update my remote-tracking branches? I thought that there is the "force" option for.06:35
(2.1.4)06:35
skynxnex joined06:36
Seveas yisthat: because that's what remote-tracking branches are for...06:37
skylite joined06:37
elsevero left06:38
yisthat Seveas: But in some situations I have to explicitly force the update via "-f" option.06:38
makesoda joined06:39
osse yisthat: that's for pushing, or when you've set fetch's refspec to something non-default06:39
yisthat Seveas: So what's the "force" option good for?06:39
Seveas check the refspec. The leading '+' is the equivalent of the force option.06:39
jceb_ joined06:39
elsevero joined06:39
arup_r joined06:39
PCatinean joined06:40
makesoda left06:40
eGGsha joined06:41
durre left06:42
jceb_ left06:43
Salehi joined06:45
Sceorem joined06:46
skullcrasher joined06:46
cvadict left06:47
jteneyck joined06:47
ashokrajar joined06:47
yisthat left06:48
sinknode left06:48
gopar left06:48
gitinfo set mode: +v06:49
dionysus69 left06:50
iokill joined06:50
Alienpruts joined06:51
turlutton joined06:51
spinningarrow yisthat: the force option force updates the local branches if you specify the rbranch:lbranch form of refspec06:51
jteneyck left06:52
flughafen joined06:52
jceb left06:52
cerulean__ left06:53
flughafen question, i have a repo that for some reason i get errors occasionally when trying to pull saying "unable to update local ref" , once I do a chown -R to the whole dir, it works, but it'll happen again eventually06:53
joo-_ left06:53
ferhaty joined06:54
jceb_ joined06:56
nitrix joined06:56
tapout_ joined06:57
linux-modder left06:57
reim joined06:57
jonno11 joined06:57
astrofog left06:58
ferhaty left06:58
Seveas flughafen: do you share the repo with other local users?07:00
flughafen not on my machine.07:01
settermjd joined07:02
tapout_ left07:02
gambl0re left07:02
tvw joined07:02
tapout_ joined07:02
Seveas is the repo on a shared filesystem? (nfs, samba, ...)07:03
lb1a joined07:04
skynxnex left07:04
lamont joined07:04
flughafen github Seveas07:06
dgutierrez1287 joined07:06
nnyk joined07:08
skynxnex joined07:09
pantsman- left07:09
ehmatthes left07:10
Seveas flughafen: no, I mean your clone. Is it on an nfs share or something?07:10
dgutierrez1287 left07:11
flughafen Seveas: no07:11
fscala joined07:12
Seveas strange. Next time it happens do an ls -laR .git/refs and come back :)07:12
flughafen ok, tahnks :)07:12
darkbit left07:15
znabavi left07:16
nitrix left07:17
ashokraj_ joined07:19
jagob joined07:19
hyperair joined07:19
mikoni joined07:20
skorgon left07:21
ashokrajar left07:22
adadada joined07:23
cerkauskas joined07:24
Dro__ joined07:25
durre joined07:26
cvanball joined07:28
devoldmx joined07:31
znabavi joined07:33
cerulean__ joined07:33
reim left07:33
Balliad joined07:34
Balliad_ joined07:35
devoldmx left07:36
skullcrasher left07:37
bhws left07:37
jast joined07:37
Balliad left07:38
vikas027 left07:38
spykins joined07:38
reim joined07:39
bonswouar joined07:39
dc5ala joined07:42
dadamssg joined07:42
Hounddog joined07:43
skullcrasher joined07:44
skullcrasher left07:45
skullcrasher_ joined07:46
dadamssg left07:47
jteneyck joined07:48
Hounddog left07:48
Hounddog joined07:48
maxorator left07:50
cerkauskas left07:51
maxorator joined07:52
kurkale6ka joined07:53
jteneyck left07:53
nitrix joined07:53
MrWoohoo joined07:54
eGGshaeGGshke07:56
Alienpruts left07:57
mjrcox joined07:59
bernardio joined07:59
joel_falcou joined08:00
robbyoconnor joined08:00
arup_r left08:00
mikoni left08:01
mikoni joined08:02
ywin joined08:02
eGGshkeeGGsha08:02
ywin left08:02
bongjovi joined08:03
robbyoconnor left08:04
robbyoconnor joined08:04
leeN joined08:05
arup_r joined08:05
joo-_ joined08:05
mive joined08:05
jmpp joined08:06
mive left08:06
MrWoohoo left08:06
MrWoohoo joined08:07
darkbasic joined08:07
King_Hual_ joined08:07
rchavik joined08:09
t4nk519 joined08:09
Oog_ left08:09
marcogmonteiro joined08:09
t4nk519 left08:10
jmpp left08:10
durre left08:11
tumulte_ joined08:13
darkbasic left08:13
otter768 joined08:15
spinningarrow left08:15
darkbasic joined08:15
sagittarian joined08:16
tanuck joined08:17
TomyWork joined08:18
darkbasic_ joined08:19
otter768 left08:19
darkbasic left08:20
addshore joined08:24
addshore left08:24
addshore joined08:24
zacts joined08:24
tomog999 joined08:25
MrWoohoo left08:29
sdfgsdfg joined08:30
darkbasic joined08:31
nicechap joined08:31
nnyk left08:31
darkbasic_ left08:31
znabavi left08:31
nilg joined08:32
_noblegas joined08:32
tumulte_ left08:34
spinningarrow joined08:34
mostlybadfly left08:39
ome left08:40
_noblegas left08:40
reim left08:41
rchavik left08:42
bernardio left08:43
nnyk joined08:44
ggherdov Hello. If I use "git cherry-pick" without the -x option, there is no easy way to infer what was the original commit I grafted, correct?08:47
doener joined08:49
jteneyck joined08:49
andyr joined08:49
denimsoft joined08:51
SubZeroFX joined08:52
bernardio joined08:52
nnyk left08:52
comps ggherdov: correct08:52
ggherdov comps: thanks08:52
achadwick joined08:52
jteneyck left08:54
sinkensabe joined08:55
Manikandan left08:55
nnyk joined08:57
ggherdov still on cherrypicks: if my HEAD is commit A, and I cherrypick commit B from somewhere else in the history onto A, it's possible that B doesn't apply cleanly.08:57
The doc says that at this point git does a 3-way merge. Question: what does git uses as a "merge-base"? A "real" (topological) common ancestor between A and B, or something else?08:57
s8321414 left08:59
s8321414 joined08:59
nilg left09:01
rchavik joined09:01
skullcrasher_ left09:02
abc_ joined09:03
jost joined09:03
abc_ left09:04
nilg joined09:04
jost_ joined09:07
jmpp joined09:07
cdown joined09:09
jiggerypokery joined09:10
GT4066 joined09:10
jost left09:10
dc5ala left09:11
reim joined09:11
jmpp left09:11
eGGshaeGGshke09:12
arup_r left09:12
X67r joined09:12
Walex joined09:14
cbreak ggherdov: see man git-patch-id09:14
gitinfo ggherdov: the git-patch-id manpage is available at http://jk.gs/git-patch-id.html09:14
cbreak ggherdov: I think it'll create a synthetic merge base09:16
since patches contain the hashes of the original base blobs09:16
reim left09:17
aard joined09:19
rasto joined09:19
tarkus joined09:20
ggherdov thanks cbreak09:21
ome joined09:25
Manikandan joined09:26
faux___ left09:27
Khisanth joined09:27
wxg joined09:28
KhisanthGuest7799509:28
arup_r joined09:30
bvtton joined09:31
arup_r left09:31
eGGshkeeGGsha09:32
devoldmx joined09:32
jokester joined09:32
aard left09:33
daito left09:33
daito joined09:34
Nizumzen joined09:34
arup_r joined09:35
pm90_ joined09:36
freestyl3r joined09:36
devoldmx left09:37
spykins left09:38
daito left09:39
pm90_ left09:41
tinajohnson joined09:43
dadamssg joined09:43
chimay joined09:43
eatsfoobars joined09:45
bernardio left09:46
bernardio joined09:47
scrubbrush_ joined09:47
dadamssg left09:48
linux-modder joined09:48
CustosLimen joined09:49
jteneyck joined09:50
joki joined09:50
nnyk left09:52
rjc joined09:52
aard joined09:53
eGGshaeGGshke09:53
jteneyck left09:54
halabund joined09:54
halabund Hi all09:54
UmbraMalison joined09:55
halabund How can I fully reset a git working directory? I thought git clean -fd would remove things that don’t belong there but it seems to still leave some files behind.09:55
dotpot left09:56
Seveas halabund: -x for removing ignored files09:56
h4ml3t joined09:59
halabund Seveas: That was it! Great! Thank you!09:59
Seveas halabund: at that rate you'll run out of exclamation points before the day is out :)09:59
elsevero left10:01
eGGshkeeGGsha10:01
cagedwisdom left10:01
halabund Well, I didn’t actually know what was left behind, I only saw that sometimes the build process of this package got mysteriously broken after changing options. So I was really frustrated.10:03
And I’m really happy it works now.10:03
weox joined10:03
s8321414 left10:04
cerulean__ left10:06
cbreak halabund: no make clean?10:09
halabund cbreak: Apparently it doesn’t clean everything. Actually the problem was with unit tests failing (incorrectly), not the build itself.10:10
reim joined10:10
Nizumzen left10:11
reim left10:12
reim joined10:12
linuxmint2 left10:14
otter768 joined10:16
MrWoohoo joined10:16
spykins joined10:17
rodrigograca31 joined10:17
reim left10:17
reim_ joined10:17
ChanServ set mode: +v10:18
elsevero joined10:18
voodo joined10:19
sparetire_ joined10:20
otter768 left10:20
Suganthi joined10:20
notebox joined10:21
cagedwisdom joined10:22
nnyk joined10:24
joel_falcou left10:25
neunon joined10:26
Junior joined10:26
ashokraj_ left10:26
chimay left10:26
ashokrajar joined10:26
thaw joined10:29
thaw hi guys10:29
Im using git clone in a bash script ; and I would like to go to the freshly cloned directory after its execution10:30
_rgn cd10:30
veganista joined10:30
thaw and I cannot find any plumbing commands in order to get the name of the destination directory10:30
osse thaw: best thing to do is to decide the destination directory yourself10:31
git clone url destination10:31
thaw I dont want to do that ; I am doing a wrapper of git clone and I would like to support the same arguments as git clone10:31
osse thaw: that said, I've never seen Git name the destination something other than the stuff after the last slash with .git removed10:31
i have a clone wrapper myself10:32
thaw hm ok10:32
I thought about that but didnt know if it was a safe assumption10:32
thanks osse , I will do that then10:32
osse thaw: http://sprunge.us/JdAf10:33
thaw and thanks _rgn for the cd command btw.10:33
joo-_ left10:33
devoldmx joined10:33
osse the stuff in the else part10:33
thaw nice osse, thanks10:33
dancinggrass joined10:34
joo-_ joined10:35
rally joined10:36
d0p left10:37
devoldmx left10:37
wrouesnel1 joined10:38
joo-_ left10:41
jeadre joined10:42
wxg left10:44
Allegiant joined10:45
rchavik left10:49
skylite left10:50
jteneyck joined10:50
stamina joined10:50
newstime joined10:52
newstime left10:53
jmpp joined10:55
jteneyck left10:55
faux___ joined10:57
mezod joined10:57
eGGsha left10:58
Kartagis hi10:58
osse my name is10:58
kolobyte_ joined10:59
Kartagis why isn't git push {origin,github} master supported?10:59
blehblah joined10:59
Kartagis it is supported in bash10:59
blehblah test10:59
cdown left11:00
blehblah I've got a question11:00
Kartagis I could do a loop, but still...11:00
jmpp left11:00
blehblah I modified FileA and FileB. I created a new BranchA, and then commited FileA.11:00
arup_r left11:01
p4trix joined11:01
blehblah How do I checkout my previous commit, without losing the changes on FileB?11:01
bipolar joined11:01
arup_r joined11:02
wxg joined11:02
cdown joined11:02
Brando753 joined11:02
ColdKeyboard joined11:03
blehblah would that be "git reset --mixed" ?11:04
ffledgling How do I get the diff of the file and it's previous version? (Whatever commit # or date that might've been on?)11:04
Kartagis ffledgling: git log -p file11:05
ffledgling I tried something like |git diff HEAD@{2015-07-26}:<path/to/file>|, but I got an error saying HEAD doesn't go back that far11:05
ffledgling tries.11:05
wwalker joined11:06
Kartagis brb, lunch11:06
osse blehblah: check it out as usual11:06
!float11:07
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.11:07
ffledgling Kartagis: that works great, thanks!11:07
Gonzo89 joined11:08
ffledgling wait, -p means generate patch? wut, this doesn't look like a patch...11:08
bvtton left11:13
macabre joined11:14
Salehi left11:16
voodo left11:17
bongjovi left11:18
durre joined11:19
eatsfoobars left11:23
halabund left11:24
eatsfoobars joined11:26
halabund joined11:26
halabund left11:26
halabund joined11:26
eatsfoobars left11:26
dansmith_ joined11:27
adadada left11:27
GT4066 left11:28
adadada joined11:30
eGGsha joined11:31
avar Anyone know offhand how to manually run git-upload-pack in such a way that it doesn't return "you don't speak the protocol"11:33
i.e. echo -n | git-upload-pack <path>11:33
I'm trying to debug a case where it might be returning the wrong status code due to a bug...11:33
choki joined11:33
cagedwisdom left11:34
choki How do I ignore any *.xml.gz files in a subfolder and all its subfolders as well? weechat/*.xml.gz doesnt work for weechat/scripts/plugins.xml.gz11:34
adadada left11:35
avar create a .gitignore in weechat/ with *.xml.gz11:35
choki got it weechat/**/*.xml.gz11:36
pm90_ joined11:36
choki i dont like the idea of multiple gitignore. looks more like an anti-pattern :)11:37
Sceorem left11:37
pigeon joined11:37
osse why?11:38
avar It's a good pattern, especially on big repos, because you don't have to parse .gitignore files not relevant to you on certain paths11:38
mezod left11:38
ayaz left11:40
sdothum joined11:40
pm90_ left11:41
choki and when you need to change something you'd have to look on multiple places11:41
or use some grep magic :D11:41
osse git check-ignore -v11:42
choki no path11:42
osse and when I run grep magic my terminal just hangs11:43
choki lol11:43
Kartagis why isn't git push {origin,github} master supported?11:43
it is supported in bash11:43
I could do a loop, but still...11:43
osse because not enough people want it11:43
dansmith_ left11:44
devoldmx joined11:44
dadamssg joined11:44
dansmith_btc joined11:44
ifra201 joined11:45
osse my guess is it qould require some larger changes in git push11:45
Nick-S joined11:46
avar Kartagis: that expands to: git push origin github master11:46
So how is that supposed to work in bash?11:46
Kartagis avar: that expands to git push origin master && git push github master11:47
osse no11:47
dansmith_btc left11:47
dansmith_btc joined11:47
dansmith_btc Hi, I have a weird behaviour for a file which i marked --assume-unchanged. When i try to save my interactive rebase I get "error: Your local changes to the following files would be overwritten by checkout: manager_test.js Please, commit your changes or stash them before you can switch branches." The problem is there is nothing to stash my working tree is clean. manager_test.js is deffinitely mark assume-unchanged, I checke11:47
d with git ls-files -v11:47
Kartagis it doesn't?11:47
osse try echo {origin,github}11:47
frobware joined11:48
denimsoft left11:48
devoldmx left11:48
dadamssg left11:49
Kartagis I ended up doing git config alias.pall 'for r in origin github;do git push $r;done'11:49
bongjovi joined11:49
avar To the extant that that might have worked you would have been pushing to the github branch on origin11:49
denimsoft joined11:49
Sceorem joined11:50
bvtton joined11:50
osse dansmith_btc: --assume-unchanged is not a good solution.11:50
!assume_unchanged11:50
gitinfo git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.11:50
ffledgling joined11:50
ayaz joined11:51
eGGshaeGGshke11:51
eGGshkeeGGsha11:51
jteneyck joined11:51
eGGshaeGGshke11:51
eGGshkeeGGsha11:51
eGGshaeGGshke11:51
linux-modder left11:52
calrik left11:52
mezod joined11:53
dansmith_btc oh, cheers, that explains it11:53
frobware left11:53
freestyl3r left11:54
ffledgling I just ran into http://stackoverflow.com/questions/26046698/git-refname-origin-master-is-ambiguous11:55
I had something called refs/heads/origin/master ; what I can't figure out is how11:55
beckyconning_ joined11:56
ffledgling Might anyone here know?11:56
osse you screwed up the arguments to git branch -u11:56
jteneyck left11:56
noisebleed joined11:56
thaw left11:56
ffledgling Hm, I don't think I've ever run that command11:57
ffledgling checks what -u does11:57
ffledgling I did run |git branch --set-upstream libffi origin/master| which seems to be the closest thing to that11:59
Is that incorrect? It was suggested by git itself11:59
qsuscs Kartagis: git config --global alias.push-all "!git remote | xargs -L1 git push"11:59
fstd joined11:59
moritz ffledgling: does 'git branch' list any branch with "origin" in the name?12:00
ah, I see you did12:00
dionysus69 joined12:00
moritz ffledgling: maybe 'git reflog refs/heads/origin/master' gives you a clue how it came to be12:01
Darcidride joined12:01
ffledgling moritz: let me try12:02
moritz: says "fatal: ambiguous argument 'refs/heads/origin/master': unknown revision or path not in the working tree."12:04
I didn't find it by search the reflog either12:04
moritz ffledgling: what does `git branch|grep origin` say?12:05
(nopaste it please if it's more than one line)12:05
ffledgling moritz: I fixed the issue by deleting the extra ref, so it won't say anything now, but I checked it earlier and there was no branch that started with origin/12:06
moritz: The only way it actually showed up was git show-ref master12:06
moritz ffledgling: creepy12:06
ffledgling That's an interesting choice of word, why though?12:06
moritz ffledgling: because so far I've been mostly unaware of the magic that short branch names hide, and what goes wrong when the assumptions behind that magic fail12:08
ffledgling Yeah, I'm getting the feeling I need to start figuring out how the short name lookup works12:09
s8321414 joined12:09
ffledgling Also I have no stinking idea what a ref really is12:09
And how the ref/* namespace works12:09
moritz it seems anything with a name is a ref12:10
sfr^^ joined12:10
moritz like, a branch, a tag, a remote branch, and potentially other stuff12:10
sfr^^sfr^12:10
ffledgling a tree, maybe a sub tree...12:10
moritz stashes12:10
I don't think trees12:10
ffledgling It doesn't help that things like gerrit add their own stuff under /refs/for/<branch-name> either12:11
moritz but my understanding of refs is intuitive at best12:11
ffledgling time to pull out the git-book I guess12:12
Kallis joined12:13
s8321414 left12:15
otter768 joined12:16
arup_r left12:17
mizu_no_oto joined12:17
dytrivedi joined12:18
Dragooon joined12:18
noisebleed left12:18
qsuscs moritz: refs/remotes/origin/master12:18
noisebleed joined12:19
ashokrajar left12:19
cdown left12:20
otter768 left12:22
Dragooon left12:22
arup_r joined12:23
cdown joined12:23
chitopunk joined12:23
notebox left12:24
jagob left12:24
ggherdov Hello. I wanted a command that tells me in which version (tagged commit) a given commit was introduced. "git describe <commit> --contains" is almost ok, but it concatenate the tag name with an expression that represent the path from my commit to the tag.12:25
Can I tell git to remove that suffix? (it's for scripting). Maybe I should use a lower level command?12:25
ProXy joined12:25
aard left12:26
trivedid joined12:26
moritz ggherdov: "man git-describe" has all the options12:26
gitinfo ggherdov: the git-describe manpage is available at http://jk.gs/git-describe.html12:26
ggherdov moritz: ok checking.12:27
ProXy #qt12:27
trivedid left12:27
ProXy ooops. sorry12:27
s8321414 joined12:27
moritz ggherdov: in particular, you might want --abbrev 012:28
notebox joined12:28
tmz joined12:28
ggherdov moritz: thanks, that's it12:28
m0viefreak joined12:28
Godfather_ left12:30
Allegiant left12:30
dytrivedi left12:30
Muzer joined12:30
noisebleed left12:31
mizu_no_oto left12:31
ProXy left12:32
noisebleed joined12:32
ProXy joined12:32
King_Hual_ left12:33
eatsfoobars joined12:34
mikoni left12:36
bernardio left12:37
wxg left12:38
bernardio joined12:39
wxg joined12:39
Phoenixz left12:39
jteneyck joined12:40
mezod left12:41
diegoaguilar joined12:43
ffledgling Silly question -- But there wouldn't happen to be a way to work on two branches in git simultaneously, would there?12:43
jmpp joined12:43
ffledgling I can't think of a way to have two different file system states maintained at the same time, but still...12:43
timmu joined12:44
osse man git-worktree12:44
gitinfo the git-worktree manpage is available at http://jk.gs/git-worktree.html12:44
devoldmx joined12:45
jagob joined12:45
Godfather_ joined12:46
qsuscs when did that come in, 2.5?12:46
zoso left12:47
ffledgling osse: nice, almost exactly what I was looking for12:47
zoso joined12:47
ffledgling Can I checkout different branches etc. as well in a linked worktree, or is a worktree pinned to the branch I give it at creation?12:48
jmpp left12:48
tachoknight joined12:49
Dragooon joined12:49
devoldmx left12:49
voodo joined12:50
skynxnex left12:50
skynxnex_ joined12:50
mostlybadfly joined12:50
jteneyck left12:51
jteneyck joined12:53
sinknode joined12:53
Gamecubic joined12:53
linux-modder joined12:53
nvahalik joined12:54
spykins left12:54
Nick-S left12:55
jagob left12:55
linux-modder left12:55
HeroYoojin joined12:56
m0ltar joined12:56
Dragooon left12:57
tachoknight left12:57
SubZeroFX left12:57
halfamind joined12:57
Nick-S joined12:58
sanketdg joined12:59
linux-modder joined12:59
Manikandan left12:59
cdown left13:00
halabund left13:00
Seveas ffledgling: you can check out any branch, tag or commit you want13:01
qsuscs: 2.5, but 2.6 will see it do more.13:02
darkbit joined13:02
cdown joined13:03
chll joined13:03
osse Seveas: but can you change it afterwards?13:04
BtbN joined13:04
sonOfRa joined13:04
daito joined13:04
victortyau joined13:05
choki left13:07
Darcidride left13:09
daito left13:09
Seveas osse: yeah, you can treat it basically as its own copy of the repo, but sharing objects/* and refs/* (it's a bit more complicated, but not much)13:09
Nick-S left13:09
spykins joined13:09
mezod joined13:09
Seveas you can't however check out the same branch in two places. Unless you really want to (I think you can --force it) or detach at least one of the heads13:09
Joseph_Silber joined13:09
durre left13:10
JackFruh joined13:11
ignas joined13:15
dionysus69 left13:17
PCatinean_ joined13:17
dionysus69 joined13:19
chitopunk left13:20
djwesto joined13:21
PCatinean left13:21
djwesto left13:21
ffledgling Seveas: thanks13:22
chitopunk joined13:22
Phazorx joined13:23
todd_dsm joined13:23
Phazorx is it possible to extrenalize a particular folder of a repo as a new repo, while maintaining root repo as an upstream for future changes?13:24
PersRobot joined13:24
bvtton left13:24
cdown left13:26
fscala left13:26
PersRobot left13:26
PersRobot joined13:26
PersRobot left13:26
PersRobot joined13:26
PersRobot Hi, I'm in a root git folder, let say "~/dotfiles". I've a .gitignore in this git folder containing "*". Will this ignore everything in let say "~/dotfiles/ssh/"?13:26
cvanball left13:27
JohnBje joined13:27
cbreak it will ignore everything that is not already tracked13:27
jast PersRobot: yes (unless, of course, you have a separate rule that unignore ssh/ and everything in it)13:28
cdown joined13:28
ule joined13:28
darkbasic left13:29
ule hi there! Do you guys know if it's possible to set different commit date while doing a commit?13:29
darkbasic joined13:29
ule I want to set an commit here with date with 200913:29
cbreak it is.13:29
jast sure13:29
Darcidride joined13:29
osse ule: GIT_COMMITTER_DATE=foo git commit13:29
fscala joined13:29
cbreak the option is called --date13:29
jast or the --date parameter13:29
ule awesome13:29
Seveas Phazorx: that sounds like git subtree split.13:29
cbreak git commit --date=two.years.ago13:29
PersRobot jast: so it ignores everything even in the deepest subfolder right? (having only one .gitignore at the root with "*")13:29
osse well, he said commit date, not author date, AMIRITE13:29
bvtton joined13:30
spykins left13:30
jast PersRobot: yes. *any* pattern that doesn't begin with a '/' is checked in any dir/subdir13:30
ule thanks guys13:31
bernardio left13:31
jast '/*', for example, ignores only everything in the dir the .gitignore file lives in (but since that matches all the direct subdirs, too, git won't actually bother ever looking at them, so the end result is the same)13:32
ProXy PersRobot: Keep in mind, that every empty directory will not be added too13:32
dytrivedi joined13:32
PersRobot got you ProXy13:32
todd_dsm left13:32
todd_dsm joined13:34
jantje I'd like to do a three way diff with git log for a given file. A user did multiple commits master, which he ported over to X, which eventually goes to branch Y after being approved by someone we did test the changes. So I'd like join all the different commits done on master, and compare them to all commits on branch X, and same for Y13:35
so I need to do some sort of collapsing of multiple commits on a branch, and then use that for comparing13:36
is there a way I can do that easily with just git log, or do I need to do some special tricks13:36
dytrivedi left13:36
trivedid joined13:37
trivediddytrivedi13:37
dytrivedi left13:38
trivedid joined13:38
cdown_ joined13:39
trivediddytrivedi13:39
cdown left13:40
cdown_cdown13:40
wxg left13:41
sdfgsdfg left13:41
bvtton left13:41
nilg left13:43
faux___ left13:43
dytrivedi left13:43
dytrivedi joined13:44
dadamssg joined13:45
devoldmx joined13:45
NeverDie joined13:46
jteneyck left13:46
bvtton joined13:47
noisebleed left13:47
Phazorx Seveas: reading the docs sounds like it's more for keeping upstream up to date with changes from split folder repo, where i'd be interested in reverse of this13:47
todd_dsm left13:48
Phazorx is there somethign similar to subtree but with reversed change flow?13:48
halfamind left13:48
CKyle joined13:49
chitopunk left13:49
devoldmx left13:50
noisebleed joined13:50
dadamssg left13:50
voodo left13:50
bendangelo joined13:52
bitkiller joined13:52
ovidiutk joined13:55
faux___ joined13:55
momken joined13:55
Guest15394 joined13:55
bronson joined13:56
ovidiutk Hey. Just saw one of my colleagues do something like: git merge --ff-only ${push}. Where is this ${push} documented? I don't know what to search for. My colleague didn't know either. :) Thanks.13:56
dancinggrass left13:57
dytrivedi left13:58
Mekkis joined13:58
osse ovidiutk: that's a shell variable13:58
dancinggrass joined13:59
mpathy joined14:00
bronson left14:00
s8321414 left14:00
settermjd left14:01
mpathy Hi there.. I have a problem regarding submodules.. When I try to recursively update my submodules, git tell me about folders - which never were submodules - who doesnt have a submodule entry14:01
infernix joined14:02
darkbasic_ joined14:02
dancinggrass left14:02
darkbasic left14:02
mpathy I found someting out about some 160000 entries.. But I didnt find how to change them that git doesnt think its a submodule (in fact they are just simple folders)14:03
ovidiutk osse: Oh, thanks. I know now how it "works". Empty shell variable = no commit given which makes git merge the remote-tracking branch. He could have used any non-existing variable name. :D14:06
diegoaguilar left14:06
diegoaguilar joined14:08
ovidiutk left14:09
todd_dsm joined14:10
Maroloccio joined14:10
dreiss joined14:12
zoso left14:14
darkbasic_ left14:14
darkbasic joined14:15
Raging_Hog left14:16
daivyk joined14:16
xudongz joined14:16
otter768 joined14:17
beckyconning_ left14:18
eGGshke left14:18
ehmatthes joined14:19
ule left14:19
the_cybersphinx joined14:20
Maroloccio left14:22
otter768 left14:22
jml32ljl2 joined14:22
Maroloccio joined14:23
Phoenixz joined14:23
kukks joined14:24
halfamind joined14:24
livingstn joined14:25
joo-_ joined14:25
Godfather_ left14:26
Maroloccio left14:26
todd_dsm left14:27
ntwari joined14:28
todd_dsm joined14:28
Godfather_ joined14:28
thiago joined14:30
s00pcan joined14:30
mjrcox left14:31
muranjan joined14:31
blackjid joined14:31
gitinfo set mode: +v14:32
jmpp joined14:32
muranjan Hi after I issue command “git push origin master”.. my files on the server ownership change.. so i need to go to server and then issue “chown -R nobody:nobody ~/public_html”…. Is there any solution for this???14:33
skullcrasher joined14:35
osse muranjan: push as the user nobody14:36
jmpp left14:37
halfamind left14:39
durre joined14:40
jteneyck joined14:42
bvtton left14:43
arup_r left14:43
muranjan osse: how can i do that???14:44
osse muranjan: how do you push now14:46
I mean to which URL14:46
(also, why does it matter who owns the files?)14:46
faux___ left14:46
muranjan I cloned to myserver.url.com:/public_html/projectname14:47
then I commit and do “git push origin master"14:47
osse what does git remote -v say14:47
gitinfo set mode: +v14:48
ashokrajar joined14:48
muranjan it matter becuase websever can access only if it is owned by “nobody”14:48
mokopop joined14:49
mokopop is it possible to bypass the git add * stage?14:49
osse commit -a14:49
mokopop i really just want to have a git repo track the state of a directory's full contents14:49
whatever changes there were14:49
livingstn left14:50
grawity alias bake="git add --all && git commit -m Snapshot"14:50
bremner !yolo14:50
gitinfo git config alias.yolo '!git commit -fA -m "Yolo swag!"; git push -f'14:50
muranjan MUKS-M-X010:docwiki muks$ git remote -v14:51
origin docwiki@104.238.91.52:public_html/docwiki (fetch)14:51
origin docwiki@104.238.91.52:public_html/docwiki (push)14:51
this is output osse:14:51
osse change 'docwiki' to nobody14:51
muranjan where??14:51
osse git remote set-url origin [email@hidden.address]14:51
muranjan but docwiki is the user in my server14:51
osse yes I know14:52
but apparently you want it to be nobody instead14:52
muranjan ok14:52
mokopop grawity:so, mkdir proj; cd proj; for l in a b c; do echo $l > $l; done; git init; git commit -am m1; edit_misc_files; commit -am m2; ?14:52
grawity wha14:52
muranjan will it track when I commit as my usernae “muks” not nobody..14:52
osse:14:53
osse Git doesn14:53
Git doesn'cate14:53
shit14:53
jml32ljl2 left14:53
marjory left14:53
osse Git doesn't care14:53
muranjan ok14:53
I am using ssh login password less14:53
osse if you cannot ssh with the user nobody then you have to fix that14:53
btw, have you looked at the contents of that directory? It's not a website14:54
muranjan its a website..14:54
dytrivedi joined14:54
osse go and see14:54
acolson left14:55
durre left14:56
dytrivedi left14:57
Phoenixz left14:57
lg188 joined14:58
mellernoia joined14:59
Darcidride left14:59
nvahalik left15:00
sinkensabe left15:00
roelmonnens left15:00
muranjan osse:15:01
is there any other way like post commit hooks to change chown command???15:01
osse use post-receive on the server15:01
muranjan I am not allowed to connect server as ssh nobody15:01
bonswouar left15:01
skynxnex_ left15:03
mokopop let's suppose i have a git repo on my local hdd and i want to keep a periodical backup on an external drive.15:03
PCatinean_ left15:03
mokopop is there a way to use git almost like rsync?15:03
grawity not really15:03
well there are some wrappers around it15:04
but git is not really suitable for that15:04
mokopop grawity:isn't it made for that?15:04
grawity no15:04
mokopop instead of uploading an incremental/differential backup to github, i want to sync to a clone on my external hard drive.15:05
happy-dude joined15:05
osse mokopop: if you're already using it like that with github and you're happy with it, then add a remote that points to your hard drive and push to that15:06
mokopop osse:i'm not. i just know that people often do.15:06
marjory joined15:06
mokopop osse:i don't even know how to do it. but i'm trying to understand the reason git is suited to that and not my proposed use.15:06
osse mokopop: imho it isn't suited for that either15:07
mokopop osse:use with github?15:07
grawity mokopop: the difference's that usually people 1) want to keep the complete history of what they've ever had on Git, but on the other hand want to periodically prune old backups to preserve space15:07
MatToufoutu I dunno if I did it already, but I think I forgot, so, thanks to everyone here who helped me understanding git internals these last few days :) (even if we ended up with the conclusion that my goal won't be achievable ^^)15:07
grawity mokopop: and 2) most Git repositories contain files which can be delta-compressed very efficiently; most homedirs less so.15:07
osse mokopop: no, use with github is fine. incremental/differential backup to github is not15:07
mokopop osse:no. it's a particular directory for a project i work on.15:08
i want that project's files bot incrementally snapshoted (i intend to program vim to snapshot on every file write)15:09
*both15:09
...as well as less periodically backed up to a different volume.15:09
let's say every two days.15:09
when i plug in the external volume.15:09
but i want it to be quick and painless as possible.15:10
so instead of waiting for a retransfer of everything15:10
dytrivedi joined15:10
mokopop i'd rather have git push the differentials to the ext volume as it would to github, in order to conserve bandwidth in both cases (gh/ext volume)15:11
does that make any sense?15:11
chitopunk joined15:11
scrubbrush_ left15:11
mokopop *grawity *osse15:11
scrubbrush_ joined15:11
mokopop it's mostly text.15:11
mpathy left15:12
mokopop and the larger/uncompressible files typically aren't changed.15:12
northfurr joined15:12
osse mokopop: the issue is not github versus external drive15:12
git does not care15:12
So go ahead15:12
muranjan left15:12
mokopop osse: what's the issue then? and how would i go about doing what i described wishing to do?15:13
osse mokopop: the issue is that git itself is not very useful for this15:13
(in grawity's and my opinion)15:14
Sceorem left15:14
osse but if you're happy with it then go ahead15:14
mokopop osse:git isn't useful for syncing a folder with github?15:14
osse goddammti15:15
depends on what you mean by sync15:15
darkbasic_ joined15:15
mokopop sorry, i'm really just trying to understand.15:15
darkbasic left15:15
ifra201 left15:15
mokopop osse:typical use case: i'm a hacker and work on a project, the source lives in a directory in my ~/projects.15:15
let's call it ~/projects/foo15:16
osse Git is useful for carefully authoring a change to one or more files, record that change with a useful message, and make those changes accessible for others.15:16
it's not useful for *automatically* doing any of that15:16
mokopop i want to share it (opn source the project)15:16
so i start keeping that directory's contents synced with a github repository15:16
yqt joined15:16
mokopop i guess that's called pushing15:16
shiriru joined15:16
mokopop i don't care about sharing the changes with others15:17
i want to keep the state efficiently backed up.15:17
elementalest joined15:18
ayaz left15:18
lb1a left15:18
Guest77995 left15:19
ashokrajar left15:19
ashokrajar joined15:19
s00pcan left15:20
dytrivedi left15:20
wrouesnel1 left15:20
howdoi left15:22
Khisanth joined15:22
sanketdg how is git pull different from git pull --rebase15:23
osse Git is no better than rsync in that respect15:23
sanketdg: pull = fetch + merge, pull --rebase = fetch + rebase15:24
ChanServ set mode: +v15:24
Suganthi left15:24
darkbasic joined15:24
darkbasic_ left15:25
mokopop osse:okay. so i just want to use rsync -avr ~/proj/foo /Volumes/external_drive/foo.bkp then?15:25
sanketdg osse: okay, I knew fetch is a kind of merge?15:25
osse sanketdg: then you know wrong15:26
qsuscs sanketdg: fetch updates !rtb15:26
gitinfo sanketdg: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branc15:26
s00pcan joined15:27
osse mokopop: probably15:27
mokopop osse:thanks.15:27
sanketdg osse: so when I do a git pull, I remember it always rebased15:28
marscher joined15:28
sanketdg osse: there was no commit, it just applied the changes15:28
osse then you've configured pull to do pull --rebase15:28
darkbasic left15:29
pigeon left15:29
ome left15:30
ashokrajar left15:30
pigeon joined15:30
darkbasic joined15:30
frobware joined15:30
qsuscs or you had no changes locally and it was a fast-forward merge15:30
elsevero left15:31
veganista left15:31
sanketdg qsuscs: so a ff-merge would probably appear as the same as rebase.15:31
sorry I am not really strong on what is what in git15:31
veganista joined15:32
reim_ left15:32
jmpp joined15:32
jaafar joined15:32
sanketdg qsuscs: I always pull in before making any changes, so I never had any merge commits15:32
jonno11 left15:32
dionysus69 left15:33
s00pcan left15:33
The_Phoenix joined15:35
m_zr0 joined15:35
m_zr0 left15:35
tanuck left15:36
jmpp left15:36
Suganthi joined15:37
MechtiIde joined15:38
kukks left15:39
ehmatthes left15:40
s00pcan joined15:42
Brain joined15:42
TomyWork left15:43
Balliad_ left15:43
frobware left15:45
vdv joined15:46
frobware joined15:46
dadamssg joined15:46
devoldmx joined15:46
Suganthi left15:46
s00pcan left15:46
darkbasic_ joined15:46
darkbasic left15:47
pandeiro joined15:47
frobware left15:47
Brain left15:47
frobware joined15:47
Kicer86 joined15:48
Godfather_ left15:49
blehblah left15:49
CheckDavid joined15:50
King_Hual_ joined15:50
dadamssg left15:50
devoldmx left15:51
ntwari left15:51
Dougie187 joined15:53
diegoaguilar left15:55
gusnan joined15:55
s00pcan joined15:55
sdothum left15:56
sdothum joined15:57
s00pcan left15:57
diegoaguilar joined15:58
epta is there a way to get a list of remote branches in a given remote name with some given "Author" as an author of the top commit?15:58
h4ml3t left15:59
stamina left15:59
Phazorx left16:00
newbie123 joined16:00
marscher left16:03
ashokrajar joined16:03
Hounddog left16:04
ashokrajar left16:04
notebox left16:04
ascarter joined16:05
Allegiant joined16:05
Nizumzen joined16:05
Phoenixz joined16:06
mokopop left16:06
aspiers inside filter-branch --index-filter, is it possible to get a list of the files which are changed by the commit currently being filtered?16:06
durre joined16:08
canton7 one of the incantations of 'git diff' I suspect?16:08
probably with --cached, maybe with --name-only?16:08
osse epta: via some scripting16:09
not directly16:09
frobware left16:09
s00pcan joined16:11
Suganthi joined16:11
JackFruh left16:11
jonno11 joined16:13
notebox joined16:13
Allegiant left16:14
PersRobot left16:16
AlHafoudh joined16:17
HeroYoojin left16:17
skullcrasher left16:18
skynxnex joined16:18
s00pcan left16:18
durre left16:18
skynxnex left16:18
ashokrajar joined16:18
otter768 joined16:18
Error404NotFound joined16:21
xcesariox joined16:21
otter768 left16:23
veganista left16:23
Goplat joined16:23
basiclaser joined16:23
joel_falcou joined16:24
choki joined16:26
s00pcan joined16:27
mmakunas joined16:28
jceb_ left16:29
troyt joined16:29
shiriru left16:30
Internet13 joined16:32
Gama11 joined16:32
Es0teric joined16:33
TomyLobo joined16:33
kurkale6ka left16:33
mezod left16:34
ascarter left16:35
mezod joined16:36
dreiss left16:36
BeatrixKiddo joined16:36
toothe joined16:37
toothe Hi all! I setup a git repository accessible via ssh. How do I go about sharing it with others?16:37
codetroll joined16:37
toothe https://raymii.org/s/tutorials/Shared_Git_repository_via_ssh_for_multiple_users.html16:38
nv d16:38
nvmd*16:38
osse let others connect to it via ssh16:39
Danjo1 joined16:41
variable joined16:42
Gonzo89 left16:43
tinajohnson left16:45
Walex left16:45
madewokherd joined16:47
Walex joined16:47
achadwick left16:48
eGGsha joined16:52
s00pcan left16:52
mellernoia-work joined16:53
Dragooon joined16:53
pm90_ joined16:53
Es0teric left16:53
denimsoft left16:53
denimsoft joined16:54
joako joined16:54
mellernoia left16:54
momken left16:57
faux___ joined16:58
choki left16:58
tang^ joined17:00
Noldorin joined17:01
eGGsha left17:01
faux___ left17:03
turlutton left17:04
c74d joined17:05
dytrivedi joined17:05
noisebleed left17:05
sagittarian left17:05
dytrivedi left17:06
BernhardPosselt1 joined17:07
dreiss joined17:09
nnyk left17:09
preston_ left17:10
JackFruh joined17:15
bongjovi left17:17
northfurr left17:18
dreiss left17:19
jteneyck left17:20
multi_io joined17:21
durham joined17:22
JackFruh left17:23
Dragooon left17:24
diegoaguilar left17:25
livingstn joined17:26
kukks joined17:27
s00pcan joined17:28
freestyl3r joined17:28
mmakunas left17:29
livingstn left17:29
gambl0re joined17:30
diegoaguilar joined17:31
sebhoss joined17:32
s00pcan left17:32
elsevero joined17:33
Meow-J joined17:33
dgutierrez1287 joined17:34
skorgon joined17:36
Zamerick joined17:36
The_Phoenix left17:37
dreiss joined17:37
Error404NotFound left17:38
tomog999_ joined17:38
s00pcan joined17:38
skylite joined17:40
denimsoft left17:40
tomog999 left17:40
rjc left17:42
sssilver left17:45
joako left17:46
dadamssg joined17:47
devoldmx joined17:47
chll left17:47
fedexo joined17:49
whiztech joined17:50
joako joined17:50
dionysus69 joined17:50
yqt left17:51
dadamssg left17:51
mjrcox joined17:51
devoldmx left17:52
wrouesnel1 joined17:52
gopar joined17:52
Es0teric joined17:53
darkbasic joined17:53
darkbasic_ left17:53
HeroYoojin joined17:54
whiztech left17:55
gitinfo set mode: +v17:56
HeroYoojin left17:56
HeroYoojin joined17:57
durre joined17:57
darkbasic left17:57
CustosLimen left17:58
darkbasic joined17:59
Es0teric left17:59
Nizumzen left18:00
kukks left18:01
Fuco joined18:01
Fuco when I want to send a git format-patch file as an email, it adds this line on top: From d3f251231f04794fc98b7521d3275ec910a25937 Mon Sep 17 00:00:00 2001 can I delete that?18:01
my client doesn't understand it18:01
Lyqyd joined18:03
Seveas yes you can, it's an mbox-style header18:03
jteneyck joined18:04
Fuco okey thanks :)18:04
oich joined18:05
jceb joined18:05
jml32ljl2 joined18:06
toothe I am trying to make a clone of my git repository. I make /var/git/myProject. How do I go about copying that git repository?18:06
i did a git init --bare --shared=group18:06
is that accurate?18:07
jteneyck left18:08
mostlybadfly left18:09
nvahalik joined18:09
joki left18:11
jonno11 left18:11
HeroYoojin left18:12
joel_falcou left18:12
qsuscs Fuco: pro tip: man git send-email18:12
gitinfo Fuco: the git-send-email manpage is available at http://jk.gs/git-send-email.html18:12
toothe okay, I'm lost here....18:12
I have this git repository -is that different than a clone?18:12
darkbasic_ joined18:13
HeroYoojin joined18:13
darkbasic left18:13
qsuscs git clone produces a repository18:13
Fuco qsuscs: I would rather interact with email via my client (emacs) than command line18:13
toothe ahh...18:13
so, there's no need for git init ?18:14
oich Is there a way to change my branch to only contain changes that are not in the branch it diverged from, after I have already merged changes from that branch?18:14
qsuscs Fuco: sure, but git send-email is usually _a lot_ easier18:14
also, emacs is an OS, not a mail client :p18:14
HeroYoojin left18:14
b1n4ry joined18:14
toothe im really confused...18:14
oich I mean only records changes that are not in the branch...18:15
toothe I don't understand the need for git init?18:15
chitopunk left18:15
hardenedapple joined18:15
Fuco qsuscs: I'll look at it then, thanks... I'm usually pretty lost in the git command line18:15
thomasreggi joined18:16
Fuco qsuscs: as you might've guesed I use my OS to interact with git :D18:16
joki joined18:16
toothe yargh...18:16
i can't figure this out18:16
qsuscs Fuco: i think that counts as !gui in that sense18:16
gitinfo Fuco: 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.18:16
thomasreggi I just found some weird behavior that git doesn't recognize when an extension casing is changed.18:17
Fuco qsuscs: I haven't asked how to do it in my client though, just if some line is necessary, but I understand the sentiment. Having a common baseline makes things easier18:17
thomasreggi So I I go from .HTML to .html it will not recognize that as a changed file.18:17
mac_ified joined18:18
mjrcox left18:18
OnkelTem What I do wrong if I continue getting username/password input when I do git push (to github)?18:18
I've added my pub key to github. Also I set my user.name to what I have in github profile18:19
axisys_ joined18:19
cdown left18:19
axisys_ left18:19
otter768 joined18:19
OnkelTem Also I ssh-add'ed my keys to ssh agent and have no any issues with ssh-ing to remote systems using key18:20
nvahalik left18:22
temmi_hoo left18:23
thomasreggi http://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git did the trick :)18:23
Umeaboy joined18:24
h4ml3t joined18:24
darkbasic_ left18:24
otter768 left18:24
darkbasic joined18:24
marcogmonteiro left18:26
darkbit left18:27
skylite left18:28
CheckDavid left18:29
Jackneill joined18:30
nvahalik joined18:30
monkieking joined18:32
toothe when I try to push a new branch, it says "Everything up-to-date"18:33
why?18:33
dreiss left18:33
Umeaboy left18:34
elsevero left18:34
Umeaboy joined18:34
bendangelo left18:36
waspinator_ joined18:36
darkbit joined18:40
skorgon toothe: how are you trying to push? what is push.default set to?18:40
toothe i believe simple.18:40
actually, I have no idea how I even created this detactched head. All I did was git checkout -b development.18:40
Google says this is likely because I have a detached head, but I don't understand how.18:41
happy-dude left18:41
waspinator_waspinator18:41
skorgon !detached18:41
gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach18:41
toothe no no, thatcan't be18:42
i just did "git checkout -b development"18:42
gsingh93_ joined18:42
skorgon that wouldn't detach your HEAD18:42
toothe why would checking out a new branch automatically detach?18:42
why not?18:42
!reattach18:43
gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue18:43
MechtiIde left18:43
toothe skorgon: But it did.18:43
I'm confused....18:43
elsevero joined18:44
toothe why did it detach from the head, if its not supposed to?18:44
Nevik !repro18:45
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.18:45
qsuscs toothe: git status tells you whether you are detached or not18:45
Nevik that too18:45
n00bdev joined18:45
toothe $ git status18:45
On branch development18:45
nothing to commit, working directory clean18:45
todd_dsm left18:45
toothe then when I do git commit, it says 'everything up-to-date'18:46
todd_dsm joined18:46
Nevik then there is nothing to commit18:46
dreiss joined18:46
toothe Yes there is, I just created a new branch.18:46
Nevik that doesnt mean anything18:46
surfnturf joined18:46
toothe ...?18:46
i just created a new branch, that isn't an update?18:46
Nevik the new branch starts where you were before. if you have not made any changes, there is nothing to commit18:46
no18:46
the branch is created18:46
there's nothing more to save about it18:46
toothe hm...18:46
frogonwheels joined18:46
qsuscs !soviet18:47
gitinfo [!soviet_git] In Soviet Git, commits are not on branches, branches point to a commit.18:47
Nevik hahaha18:47
toothe okay, here's what I have18:47
Nevik that one's new to me, qsuscs18:47
toothe I have my master, which is screwed up btw...but that's okay18:47
n00bdev left18:47
qsuscs you know C? commit *master = a15d7a3483ad40877ed874e35289e8e75eb3c802;18:47
toothe I have toothe-development, and want to create a new branch called development18:48
qsuscs think of it like that, just less easy to segfault18:48
toothe the idea is that rather than commiting everything to master, i wanna create a new branch called development.18:48
Nevik qsuscs, i work with a language that has references :P no nullpointers for me18:48
toothe how do I do that?18:48
Nevik toothe, you just created a new branch. go on making your changes and committing18:49
you're all set18:49
qsuscs Nevik: c# has both iirc.18:49
ignas left18:49
Nevik qsuscs, it probably does18:49
toothe Nevik: Okay....18:49
Nevik toothe, what do you think you're missing18:49
CKyle left18:49
Nevik you seem unconvinced18:49
surfnturf guys i'm trying to push my dev branch on top of a newer branch called xchanges. basically undoing all my work on xchanges. how do i do that?18:49
this is on local. afterwards i would push it to github18:50
toothe Nevik: I want my friend whose also working on this project to see the development branch, which is a complete copy of toothe-develop18:50
my current changes are in toothe-develop18:50
i want those changes to be in development.18:50
paul424 joined18:50
toothe because those are my personal updates.18:50
Nevik did you just create the branch development?18:50
toothe yes.18:51
Nevik then your changes are now there18:51
toothe okay...but for my friend also working on this, if he does a git clone, he won't see the development branch.18:51
Nevik no, if you have not pushed it to your remote, he won't18:51
toothe all he'll se ismy personal branch.18:52
Corey84 joined18:52
toothe so, as far as he's concerned, the development branch doesn't exist.18:52
Nevik that is correct18:52
toothe then how does he use the development branch if it doesn't exist?18:52
he'll hae to use my personal branch, which isn't good18:52
i want there to be a developent branch for him to view.18:52
Nevik toothe, you will have to push it to a repo he has access to. that is probably your remote. i'll assume you're using github or bitbucket or a similar service as your common remote repo18:53
paul424 "This branch is 1 commit ahead, 1035 commits behind OpenDungeons:development." How do I move my changes from old branch to new branch18:53
I know I have to create patch and then reapply it18:53
toothe Nevik: no, i'm using a personal one on an ssh server I have.18:53
p4trix left18:53
Nevik toothe, why are you not using a hosted platform?18:53
toothe Nevik: okay, how do I push that branch?18:53
Nevik does your friend have access to that repo on the ssh server?18:54
toothe yes.18:54
i just got done setting that part up.18:54
Nevik to be clear. you have a clone on your local machine as well?18:55
linux-modder left18:55
toothe yes, i have a few clones all over, just in case :-)18:55
h4ml3t left18:55
lamont left18:55
Nevik toothe, then you have a remote called origin that refers to the repo on your ssh server?18:55
temmi_hoo joined18:56
fedexo left18:56
Nevik if you dont know what any of this means, please ask18:56
toothe I think so...i've always set that manualy when I do a push.18:56
Nevik what does `git remote -v` tell you?18:56
you can leave out the urls if they're private18:56
toothe yes, it looks like its set to the right location.18:56
Nevik if it's more than ~2 lines, please paste it to some pastie service18:56
HeroYoojin joined18:56
Nevik okay18:57
then you can just `git push -u origin development`18:57
lamont joined18:57
elsevero left18:57
toothe okay....18:57
Nevik from then on, you only need to `git push` when you've made new commits on development18:57
toothe hm...18:58
Nevik doing `git push -u $remote $branch` sets that remote as the upstream location of that branch. using a plain `git push` uses this information to automatically figure out what to push where18:58
toothe i think that works...18:58
how do I set the remote?18:58
i am going to change the remote location soon18:58
Nevik you can change the url of an existing remote with `git remote set-url $newurl`18:58
toothe, man git remote has the full documentation on that subcommand :)18:59
gitinfo toothe: the git-remote manpage is available at http://jk.gs/git-remote.html18:59
paul424 Why creating patches with git is better than merging in ?18:59
Nevik paul424, it's not18:59
toothe yeah, i've read it a few times...tbh, it didn't make sense to me.18:59
jason237 joined18:59
todd_dsm left18:59
Nizumzen joined19:00
Nevik toothe, with the way you talked about branches earlier, you don't seem very familiar with git's concepts. technical documentation will be hard to digest then. don't worry, that's normal19:00
dgutierrez1287 left19:00
Nevik you should try finding the place where it says what i told you in that man page, so you can look it up again when you need it in the future19:00
eatsfoobars paul424: I'm not sure about the other question, perhaps something like ,rebase.19:00
,rebase19:00
damn19:00
Dazzyp left19:00
Nevik dat comma tho19:00
toothe Nevik: Thanks for the encouragement...19:00
really19:00
Nevik toothe, i can link you some introductory material if you feel like reading/watching more :)19:01
toothe okay!19:01
you kow, like with any and all technologies, i am always confused at first19:01
very confused19:01
it took me 3-4 weeks to understand django19:01
Nevik toothe, there's our general !starting_points@p and also some video !talks@p -- i think you probably already know about the !book@p19:01
toothe, feel free to look at a full list of these !triggers@p on the website19:02
they have a lot of good info19:02
m0ltar left19:02
Nevik the bot should have msg'd you this information, if you havent noticed19:02
UndeadElbowMacar joined19:02
toothe i did...just a sec, trying to set the new rmote. i'm probably missing something.19:03
Nevik what's the problem?19:03
eatsfoobars paul424: !rebase19:03
gitinfo paul424: 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.19:03
eka joined19:03
Nevik eatsfoobars, now i wanna know how you mistyped a comma or an exclamation mark19:03
eatsfoobars Nevik: I didn't mistype it, I thought that's how the bot worked19:04
Nevik ha19:04
i've never seen a bot using commas for triggers19:04
only things like !, ., @19:04
rarely ~19:04
jteneyck joined19:05
eatsfoobars fsbot in #emacs uses commas19:05
daito joined19:05
mizu_no_oto joined19:09
calherr joined19:10
daito left19:10
jteneyck left19:10
noisebleed joined19:11
darkbit left19:12
mjrcox joined19:12
todd_dsm joined19:13
toothe okay...im confused again19:13
surfnturf left19:13
mjrcox left19:14
kukks joined19:14
CheckDavid joined19:16
_ikke_ do explain19:16
elsevero joined19:16
toothe maybe I can figure this out on my own19:16
but in short, i set a new origin, then pulled19:16
but didn't see the branches that I had created, namely development and toothe-develop19:17
_ikke_ toothe: git branch -a19:17
beastd joined19:17
b1n4ry left19:18
toothe hm...that works...but why aren't they locally downloaded too when I do a clone?19:18
Nevik they are19:18
toothe they're listed as remotes/origin/development and remotes/origin/master19:19
Nevik yes19:19
toothe hm...why aren't they listed when I do `git branch`19:19
Nevik you're asking the right questions :) they're remote-tracking branches.19:20
one sec, i think the book has a section on this19:20
toothe Nevik: I'll def read the documentation again when I see this.19:20
b1n4ry joined19:20
toothe so, i've actually been using git for at least a year now, but I keep losing track of how things works :-)19:20
Nevik toothe http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches19:20
toothe cuz I get used to a few standard commands.19:20
Nevik toothe, if i may ask, what do field are you in?19:21
beastd probably you need to use -a or -r as argument to git branch19:21
Nevik beastd, indeed.19:21
b1n4ry left19:21
Nevik we have already said so :P19:21
beastd oops, sorry19:21
b1n4ry joined19:22
_ikke_ toothe: basically, git has a special set of 'branches' (refs), which git uses to keep track of what has been fetched from remote repository19:22
repositories*19:22
those are called remote tracking branches19:22
toothe i see..19:22
yeah, reading....19:22
MeltedLux joined19:22
qsuscs _ikke_: before i just throw it in again, why don’t you use the trigger?19:22
_ikke_ qsuscs: Was doubting / looking it up19:23
qsuscs: And sometimes I like it better to just explain it, instead of bombing people with triggers19:23
Nevik indeed19:23
_ikke_, you can have the bot pm the triggers to the person instead, to have it out-of-band (in most clients)19:24
_ikke_ Nevik: effect is the same19:24
Nevik meh, i dont think so. but to each their own19:24
skorgon left19:24
MeltedLux left19:24
mingwandroid joined19:25
BernhardPosselt1 left19:25
noisebleed left19:25
ewsqa joined19:25
ewsqa left19:26
qsuscs _ikke_: yeah point taken, !_rtb is certainly huge19:26
Shentino joined19:26
HelloAtMega joined19:27
Qjjt joined19:27
Qjjt left19:27
noisebleed joined19:28
Shentino left19:28
ciipe joined19:28
Shentino joined19:28
ciipe left19:29
thomasreggi left19:29
uaae joined19:29
uaae left19:30
ethali joined19:30
toothe hm...19:30
jml32ljl2 left19:30
toothe my updates are not present when I do git branch origin/development19:30
ehmatthes joined19:31
MeltedLux joined19:31
MeltedLux left19:31
MeltedLux joined19:31
_ikke_ toothe: git brach does not checkout branches19:31
belq joined19:31
belq left19:31
toothe ...oh yeah...19:32
Seveas toothe: that command does not do what you think it does. It creates a branch named origin/development, pointing to your current commit19:32
_ikke_ git checkout origin/development will automatically create a local branch called development19:32
Nevik there goes your memory again ;)19:32
ashokrajar left19:32
_ikke_ Seveas: I think in this case it's a noop19:32
Nevik `git checkout development`, _ikke_19:32
toothe yeah...19:32
Seveas _ikke_: nope. it'll actually create refs/origin/development19:32
Nevik indeed19:32
Seveas and checkout origin/development isn't the DWIM that creates the development branch either, it'll just check out the remote ref and detach HEAD19:33
toothe DWIM ?19:33
_ikke_ Nevik: argh, was heading for that one, but when looking up the branch name, I also copied the origin/ part :P19:33
Do what I mean19:33
Seveas the DWIM is that git checkout foo does the exuivalent of git checkout -b foo refs/origin/foo if the latter exists19:33
refs/remotes/origin/foo*19:33
Nevik DWIMNWIS :D19:34
_ikke_ Do What I Mean is the concept of tools trying to guess what you want, instead of what you are actually telling19:34
toothe gah! too confusing!19:34
im struggling, but super appreciate your help19:34
Nevik needs moar initialisms19:34
Seveas on a more silly note: I found out that you can create a tree with a .git folder in it using the github api19:34
bremner nmi19:34
dreiss left19:34
Nevik bremner, you got it19:34
Seveas, nice. you might wanna tell them about that19:34
could be a bug19:35
_ikke_ A severe bug that is19:35
oich left19:35
toothe okay, my branches are in red. That suggests that they aren't attached to the head, right?19:35
Dro___ joined19:35
_ikke_ toothe: Where are they in red? git branch -a?19:35
toothe yes.19:35
_ikke_ that means they are remote tracking branches19:35
toothe ah...19:36
Seveas https://github.com/seveas/whelk/tree/8c084a5697a987009d32170c75c3c8e6a134682419:36
mizu_no_oto left19:36
Seveas Nevik: I *just* found out, and it may no longer be possible, as it happend about 15 months ago :)19:36
toothe okay so let me do this: git checkout -b remotes/origin/development19:36
nraha joined19:36
nraha left19:36
Nevik Seveas, LOL19:36
talk about latency19:36
Dro___ left19:36
qsuscs toothe: no. git checkout development19:36
toothe i see...19:37
Seveas Nevik: I wouldn't have found out if I hadn't clone --mirrored and tried to push it to github again as a new repo. That makes github barf and say "don't do this, you fool".19:37
(in slightly more polite words)19:37
Nevik lol19:37
Dro___ joined19:37
qsuscs Seveas: you’re near AMS, eh?19:37
or even in19:37
Nevik ams?19:37
Seveas qsuscs: about 50k away. In AMS when I work, but that won't happen until nov. 16 :)19:38
_ikke_ Amsterdam19:38
Nevik oh19:38
weird abbreviation19:38
Dro__ left19:38
Seveas Nevik: IATA code.19:38
_ikke_ It's the international abbreviation19:38
Nevik ah19:38
qsuscs 50k wat19:38
_ikke_ What Seveas says19:38
Nevik i dont fly much, so i dont know19:38
Seveas we name all our offices and dc's after IATA codes19:38
livingstn joined19:38
_ikke_ 50km19:38
s00pcan left19:38
qsuscs ah19:38
Nevik lol19:38
qsuscs, you're metric too, right?19:38
Seveas which gives you DUB1 for dublin and DXB1 for dubai :)19:38
Nevik that should be obvious19:38
_ikke_ I translate for Seveas :P19:38
qsuscs oh well, in fact i won’t be able to say hello unless you’re in vaals19:39
Nevik oh wait isnt qsuscs my german comrade19:39
_ikke_ Limburg19:39
Southern part19:39
Seveas qsuscs: not for a while. That's barely even .nl anyway.19:39
qsuscs i know19:39
Nevik _ikke_, you're getting creepy :D19:39
_ikke_ Nevik: Why?19:39
Nevik you know things19:39
Seveas Knowledge Is Power!19:40
_ikke_ I spend to much time here :P19:40
qsuscs i’ll be in aachen tomorrow, having a look at a possible future living place19:40
_ikke_ Nevik: And I'm from NL too, like Seveas19:40
SimonNa joined19:40
Nevik qsuscs, you should come over here, bavaria all the way :P19:40
Seveas _ikke_: which part of .nl?19:40
qsuscs nobody likes bavaria19:40
Nevik _ikke_, i feel uncomfortable with this much NL presence19:40
_ikke_ Seveas: North-east19:40
Gxze joined19:40
Gxze left19:40
qsuscs in fact their dialect makes me rage19:40
_ikke_ Nevik: We counteract the german presence19:40
chitopunk joined19:40
Nevik qsuscs, which one? there are many19:40
s00pcan joined19:40
qsuscs Nevik: all of them19:41
Nevik hahaha19:41
Seveas Nevik: so in germany they're going to build 3 new hospitals for the mentally ill: One in berlin, one in Hamburg, and they'll just put a roof over Bavaria...19:41
_ikke_ lol19:41
Nevik Seveas, well played19:41
s00pcan left19:41
qsuscs bairisch, fränkisch, schwäbisch … can’t stand either19:41
Seveas _ikke_: grûnn?19:41
_ikke_ Seveas: I grew up there, now living in Drenthe19:41
Nevik i do have to chuckle whenever i hear a dutch accent19:41
qpdb_ stop being racist19:41
Nevik whether in german or english19:41
Dro__ joined19:41
beastd toothe: git branch and git checkout can have confusing results if used (slightly) wrong. they have a rather wide variety of syntax and semantics. imho it works best to check with gitk --all or another history visualizer that things actually happened like you expected.19:41
Oyl joined19:41
Seveas Nevik: it makes me cringe :)19:41
noisebleed left19:41
_ikke_ I cringe when I hear a dutch english accent19:41
Seveas: :D19:42
Nevik qpdb_, what's racist about disliking a dialect19:42
Oyl left19:42
Nevik hahaha19:42
like i do with a german one19:42
_ikke_ German English is funny :P19:42
qsuscs every time i hear dutch i think „ah, german! wait why don’t i understand a word? oh … this is not german.“19:42
Nevik i have not eradicated mine though19:42
Seveas qsuscs: toddler german19:42
_ikke_ qsuscs: deja-vu :P19:42
Nevik haha19:42
s00pcan joined19:42
eatsfoobars left19:42
Nevik it's like all dutchmen have the same experience :P19:42
Seveas Apparently my accent is more irish19:42
Nevik you guys should open a club. oh wait, you already have a country you share19:42
Utuu joined19:42
Seveas at least people always think I'm Irish :)19:43
qsuscs Seveas: it’s like your people got stuck before some language shiftings19:43
_ikke_ Seveas: lol19:43
Utuu left19:43
_ikke_ Seveas: Do you have a rolling r?19:43
qsuscs like, nl: lucht, de: luft19:43
ch -> f19:43
Nevik english: MAKE SHIT UP -> air19:43
oich joined19:43
Seveas _ikke_: when necessary or drunk.19:43
_ikke_ lol19:43
Seveas Also, I get very creative with my insults when drunk. Maybe that's Irish? :)19:44
_ikke_ qsuscs: Some of the old grammar is like german too: Heer des huises19:44
Nevik Seveas, no that's just drunk19:44
Dro___ left19:44
kukks left19:44
qsuscs the more i get drunk, the more sophisticated my language gets19:44
at first less dialect and more standard german, later it’s even somewhat old-fashioned19:45
Nevik are you a programmer? could be the Ballmer peak in action19:45
cerulean__ joined19:45
qsuscs uhh, kinda19:45
vdv left19:45
Oxlc joined19:46
mizu_no_oto joined19:46
Oxlc left19:47
UndeadElbowMacar left19:47
MinetestForFun joined19:48
dadamssg joined19:48
devoldmx joined19:48
ehmatthes left19:49
dionysus69 left19:49
Sasazuka joined19:49
HeroYoojin left19:50
yqt joined19:50
cdown joined19:51
devoldmx left19:52
Qpv joined19:52
eatsfoobars joined19:52
Qpv left19:52
mjrcox joined19:53
dadamssg left19:53
upene joined19:54
SonikBoom joined19:55
durre left19:56
durre joined19:57
s1nkn0de joined19:59
oich Is there a book/document that is "just the confusing parts" about git? I know that is ambiguous.20:00
sgen_ joined20:00
codetroll left20:00
Danjo1 left20:01
_ikke_ It's subjective20:01
But, I specifically know anything20:02
+don't20:02
jonno11 joined20:03
_ikke_ What, for example, do you consider confusing?20:03
upene left20:03
phroa oich: phroa's third law of git: the most confusing parts are the parts most critical to what you are currently doing. everything else you can grokk pretty well.20:03
jonno11 left20:03
livingstn left20:03
JackFruh joined20:03
OnkelTem joined20:04
mizu_no_oto left20:04
_ikke_ What are #2 and #1? :P20:04
oich _ikke_ git reset --soft HEAD~n && git commit, for example.20:05
cagedwisdom joined20:05
phroa your rebase /will/ have merge conflicts; your coworkers will never see the point in using git at the level you do20:06
sanketdg left20:06
vdv joined20:07
nvahalik left20:08
upene joined20:08
mostlybadfly joined20:09
oich I guess I will pick some git terms like MERGE_HEAD and try to read about them20:09
terminal_echo joined20:11
diegoaguilar left20:11
upene left20:13
preston_ joined20:13
snthsnth joined20:13
freestyl3r left20:15
canton7 oich, !gitinternals? !bottomup20:16
gitinfo oich: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)20:16
canton7 !gitinternals20:16
ok, I can't remember it, heh20:16
CKyle joined20:17
Guest15394 left20:17
CustosLimen joined20:17
phroa canton7: !triggers20:17
gitinfo canton7: Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.20:17
phroa !cs maybe?20:18
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 !bottomup20:18
phroa that's the only "internals"-containing trigger20:18
canton7 yeah maybe20:18
icio joined20:18
Sasazuka left20:19
ethali left20:19
phroa is terrified of phrases like the above20:20
jost_ left20:20
CKyle left20:20
upene joined20:20
otter768 joined20:20
phroa (in this case I know what directed acyclic graph means just by chance, but the rest of the CS-y stuff is (almost literally) greek to me)20:20
jost joined20:20
nuge joined20:21
DrNoNoNo joined20:21
Wetmelon joined20:21
cromero joined20:22
qsuscs phroa: σε γνωρίζω από την κόψη …20:23
i think i didn’t even misspell it20:23
phroa flees20:24
oich thanks those 2 links look interesting20:24
livingstn joined20:24
oich !gitinternals20:24
BernhardPosselt joined20:24
oich hah20:24
upene left20:24
HeroYoojin joined20:25
otter768 left20:25
toothe so is there any special software I need to run git on HTTP?20:25
BernhardPosselt hi, any idea why this mailmap entry does not work? Alessandro Cosentino [email@hidden.address] Alessandro [email@hidden.address]20:25
phroa oich: !gcs !designers !gitt !vcbe and !parable20:25
gitinfo oich: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html20:25
oich: 'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/20:25
oich: A book designed to teach people about Git in a real world usage model. The book follows a fictional company as they implement and learn about Git. Covers all 21 standard Git commands. Available for free at http://cbx33.github.com/gitt/20:25
oich: 'Version Control By Example' gives a good overview of the different VCSes available. The author will even mail you a dead-tree copy for free. http://ericsink.com/vcbe/20:25
mizu_no_oto joined20:25
gitinfo oich: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html20:25
livingstn left20:25
phroa shamelessly taken from !book's trigger20:25
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable20:25
BernhardPosselt apparently the mailmap does not work if both start with the same name20:25
qsuscs phroa: ΤΟΥ ΣΠΑΘΙΟΎ ΤΗΝ ΤΡΟΜΕΡΉ20:26
newbie123 left20:26
phroa okay cthulu20:26
ChanServ set mode: +o20:26
qsuscs kicked phroa (SPAM SPAM SPAM SPAM LOVELY SPAM)20:26
qsuscs set mode: -o20:26
phroa joined20:27
oich thanks20:27
DrNoNoNo left20:27
phroa any day20:27
qsuscs phroa: i guess you see what i mean.20:27
jmpp joined20:27
phroa qsuscs: I think I got the gist of it20:27
northfurr_ joined20:29
cdown left20:30
northfurr_northfurr20:30
oich gotta go. thanks20:31
HelloAtMega left20:31
oich left20:31
tristanseifert joined20:31
cdown joined20:31
thomasreggi joined20:31
specing qsuscs: don't hate the player, hate the game!20:32
qsuscs ARGH20:32
thanks20:32
now you made me lose the game20:32
phroa doesn't mean the player isn't at fault too :P20:32
mezod left20:33
durre left20:34
tristanseifert left20:36
cjwilburn joined20:37
cerulean__ left20:38
CussBot joined20:38
cdown left20:40
monkieking left20:40
BernhardPosselt left20:40
Danjo1 joined20:41
frobware joined20:41
Danjo1 left20:41
irwiss joined20:43
upene joined20:44
dreiss joined20:45
monkieking joined20:46
eatsfoobars left20:46
gambl0re left20:47
daivyk_ joined20:47
thomasreggi left20:47
lenswipe joined20:48
lenswipe left20:48
lenswipe joined20:48
lenswipe hey guys20:48
thomasreggi joined20:48
lenswipe anyone know how i yank commits from one branch to another (about 13 of them)20:49
upene left20:49
phroa lenswipe: depending on what you want, man git rebase, man git cherry-pick, man git merge20:49
gitinfo lenswipe: the git-rebase manpage is available at http://jk.gs/git-rebase.html20:49
lenswipe: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html20:49
lenswipe: the git-merge manpage is available at http://jk.gs/git-merge.html20:49
daivyk left20:49
lenswipe phroa, so do i start at the oldest commit and rebase from there onto my new branch?20:50
cjwilburn left20:50
sedition joined20:51
phroa have to go, hopefully someone else can describe them20:52
lenswipe ok20:52
ty20:52
tpollard joined20:52
cjwilburn joined20:53
cjwilburn left20:56
cjwilburn joined20:57
CKyle joined20:58
mizu_no_oto left20:58
IWishIKnew joined20:59
lmat joined21:00
lmat I have a repository in /srv/trac/repo/ and another in ~/source/trac/. The owner of the former is trac:trac, and the latter lmat:lmat.21:01
How do I push from the latter to the former?21:01
sedition left21:01
upene joined21:01
lmat I tried cd ~/source/trac; sudo -u trac git push; and it says "couldn't change back to ~/source/trac".21:01
nvahalik joined21:02
halfamind joined21:02
maestrojed joined21:02
dreiss left21:04
cjwilburn left21:05
lenswipe i just cherry picked them21:05
darkbasic left21:05
upene left21:06
UndeadElbowMacar joined21:06
dtrott joined21:06
mezod joined21:07
jteneyck joined21:07
darkbasic joined21:07
hardenedapple left21:08
cjwilburn joined21:08
CheckDavid left21:09
jmpp left21:09
dreiss joined21:10
snthsnth left21:11
jteneyck left21:12
dgutierrez1287 joined21:12
cdown joined21:14
TomyLobo left21:15
stee joined21:16
dgutierrez1287 left21:16
s00pcan left21:17
BeatrixKiddo left21:18
hardenedapple joined21:18
Xiti joined21:18
s00pcan joined21:19
cjwilburn left21:19
hardenedapple left21:19
thomasreggi left21:20
ahr3n joined21:22
scarabx joined21:22
skorgon joined21:22
gsingh93_ left21:24
lenswipe left21:26
Gama11 left21:26
snthsnth joined21:27
eka left21:28
toothe is there a way to have a git repo that is HTTP accessible?21:31
meaning, when I see a website that's like http://www.site.com/code.git, I wonder how they did that.21:31
do I need a separate HTTP code or something?21:31
jiggerypokery left21:31
vdv left21:34
wrouesnel1 left21:34
phantombeta joined21:34
vF3hNGxc47h8 joined21:35
jonno11 joined21:36
todd_dsm is there a log for this channel?21:36
daito joined21:36
jonno11 left21:37
tarkus left21:37
Jackneill left21:37
eka joined21:38
eka left21:38
halfamind1 joined21:39
pm90_ left21:39
halfamind left21:40
UndeadElbowMacar left21:40
daito left21:41
jmpp joined21:41
chitopunk left21:42
todd_dsm how do you stop monitoring some files?21:42
stee left21:42
dtrott todd_dsm: are you looking for git ignore ?21:43
todd_dsm dtrott: it goes a little deeper than that.21:43
I added some submodules to my vim config: git submodule add [email@hidden.address] vim/bundle/21:43
now, every time I push, I check status after and I see this: modified: vim/bundle/L9 (untracked content)21:44
this is probably better: http://pastebin.com/yvhfJaQK21:44
snthsnth left21:44
upene joined21:45
JanC_ joined21:46
s00pcan left21:46
todd_dsm dtrott: is there a lot of this channel?21:46
*log21:46
dtrott No idea21:46
IWishIKnew left21:47
JanC_JanC21:47
mmakunas joined21:48
devoldmx joined21:48
dadamssg joined21:49
tristanseifert joined21:49
CKyle left21:49
shinnya joined21:51
devoldmx left21:53
Kicer86 left21:53
dadamssg left21:53
Balliad joined21:53
scarabx left21:54
leeN left21:55
noisebleed joined21:55
halfamind1 left21:55
beastd left21:56
Umeaboy left21:56
Peuc joined21:56
mjrcox left21:56
WaReZ joined21:57
addshore left21:59
paul424 left21:59
qsuscs toothe: man git http-backend22:00
gitinfo toothe: the git-http-backend manpage is available at http://jk.gs/git-http-backend.html22:00
qsuscs todd_dsm: !log22:00
gitinfo todd_dsm: [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html22:00
nnyk joined22:02
snthsnth joined22:03
diegoviola joined22:04
zumba_addict left22:05
diegoviola I've made an accidental typo in my git commit message while trying to fix another typo and it's breaking my mind, and I can't no longer fix this, how do I get over this grief?22:06
qsuscs <shakespeare> go hang thyself22:07
phroa diegoviola: git commit --amend to rewrite your last message22:07
diegoviola phroa: it has already been accepted, this is the linux kernel repo22:07
phroa: I can't do that22:07
dtrott diegoviola: SOL then22:07
phroa no chance of repair22:07
diegoviola :(22:07
it's going to be there forever22:07
jteneyck joined22:08
jteneyck left22:08
jteneyck joined22:08
phroa if it's any consolation22:08
diegoviola I'm fucking frustarted22:08
frustarted22:08
FRUSTRATED22:08
damn it22:08
phroa it had to pass review of however many other people, and they didn't catch it :P22:08
qsuscs oh well22:08
JohnBje left22:08
qsuscs junio rephrased a commit message of mine and made a typo and comitted it22:08
sooo :D22:08
at least i can blame him.22:08
dtrott You can always submit another patch to fix it ...22:08
phroa uh22:09
diegoviola dtrott: how?22:09
dtrott: I'm talking about the commit message...22:09
git commit -m22:09
dtrott Sorry then no22:09
diegoviola :(22:10
victortyau left22:10
cjwilburn joined22:10
diegoviola the only hope is that I forget22:10
dtrott Most code reviews don’t spend much time on commit messgaes, they typically only look at the code since the commits get “somewhat” lost in history22:11
skorgon left22:12
icio left22:12
dreiss left22:12
cdown left22:12
jteneyck left22:12
Balliad left22:13
phroa I can hear Linus driving to your house with a baseball bat already.22:13
dtrott Watch out for the blue lights of the commit message police ;-)22:13
diegoviola :(22:15
dtrott Dude seriously, no one really cares about typo’s in commit messages.22:16
IWishIKnew joined22:16
qsuscs dtrott: *typos22:16
typographically correct, but otherwise horribly wrong apostrophe22:17
dtrott Except qsuscs....22:17
BeatrixKiddo joined22:17
toothe left22:17
qsuscs hey, i didn’t score 13 points in the german abitur for nothing :<22:17
(apparently i cannot speak english, however)22:18
deltab joined22:18
Lunatrius` joined22:18
Lunatrius`Guest7118922:19
osse i thought it was "typoes"22:19
dregad joined22:20
s1nkn0de left22:20
sinknode left22:20
dtrott I am probably not allow to omit random letters and replace them with apostrophes though.22:21
dregad left22:21
otter768 joined22:21
qsuscs okay enough grammar nazi for today, time to sleep22:21
dtrott unless you are saying that typo’s is short for: typographical erros.22:21
dreiss joined22:21
dtrott Missing r not intented.22:21
icio joined22:22
osse indented?22:24
dtrott I just decided to give up at that point.22:24
cjwilburn left22:24
sgen_ left22:24
dtrott I hope diegoviola feels better anyway.22:25
cdown joined22:25
otter768 left22:25
sdothum left22:26
Sonicbit joined22:27
dreiss left22:27
sdothum joined22:27
Sampezt joined22:28
King_Hual_ left22:28
Sonicbit left22:28
notebox left22:28
diegoaguilar joined22:28
MinetestForFun left22:29
Guest71189 left22:30
Lunatrius joined22:32
HelloAtMega joined22:35
cjwilburn joined22:35
rally left22:36
cdown left22:36
gopar left22:36
Lunatrius left22:36
Lunatrius joined22:36
vF3hNGxc47h8 left22:37
diegoviola thanks22:37
cjwilburn left22:37
dreiss joined22:38
zumba_addict joined22:39
afuentes joined22:39
HelloAtMega left22:40
snthsnth left22:40
halfamind joined22:40
kukks joined22:41
kukks left22:41
kukks joined22:41
snthsnth joined22:42
diegoviola hopefully someone will rebase in the future22:45
nvahalik left22:46
icio left22:48
CKyle joined22:49
cagedwisdom left22:50
dreiss left22:52
scrubbrush_ left22:52
sailorswift joined22:53
snthsnth left22:54
nnyk left22:55
snthsnth joined22:57
noisebleed left22:59
jrajav joined23:00
SonikBoom left23:01
cagedwisdom joined23:02
scrubbrush_ joined23:06
Kallis left23:06
dreiss joined23:07
jonno11 joined23:08
jteneyck joined23:08
elsevero left23:11
jteneyck left23:13
WaReZ left23:16
jmpp left23:17
quizzi joined23:19
CKyle left23:20
emulator_ joined23:21
dtrott left23:21
pm90_ joined23:21
halfamind left23:22
triuba joined23:23
mingwandroid left23:23
jceb left23:24
kriskropd joined23:24
freestyl3r joined23:24
est31 joined23:25
Nizumzen left23:25
est31 hi, is there a way to list all, including orphan, commits and filter them based on date?23:25
the commit in question is too old for reflog23:26
n00bdev joined23:27
sailorswift left23:27
n00bdev left23:27
cdown joined23:28
est31 left23:29
jost left23:31
livingstn joined23:31
est31 joined23:31
Sampezt left23:33
temmi_hoo left23:33
mjrcox joined23:34
mjrcox left23:34
b1n4ry left23:34
mjrcox joined23:35
CKyle joined23:37
wxg joined23:37
marjory left23:38
todd_dsm left23:39
cromero left23:41
wgrant joined23:41
Sonicbit joined23:44
mmakunas left23:45
mjrcox left23:45
northfurr left23:45
mmakunas joined23:47
est31 left23:47
ascarter joined23:48
phantombeta left23:49
ascarter left23:49
devoldmx joined23:49
basiclaser left23:49
hexagoxel joined23:49
dadamssg joined23:49
Hink joined23:49
ascarter joined23:50
X67r left23:50
IWishIKnew left23:50
jmpp joined23:51
mmakunas left23:52
phantombeta joined23:53
todd_dsm joined23:54
devoldmx left23:54
dadamssg left23:54
Hink left23:58
Hink joined23:58
rothsa joined23:58
rothsa left23:59
fstd left23:59
fstd joined23:59
unreal joined23:59

Logs Search ←Prev date Next date→ Channels Documentation