IRCloggy #git 2017-12-03

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-12-03

jrabe left00:00
kozy joined00:00
coco joined00:00
jrabe joined00:02
Plouescat left00:02
TomyLobo2 left00:02
pR0Ps joined00:03
finalbeta1 left00:04
KeyJoo left00:07
|ifei5good joined00:08
|ifei5good left00:09
|ifei5good joined00:09
kyan joined00:09
|ifei5g00d left00:10
Gustavo6046 left00:10
behr328 left00:10
dviola left00:11
BSabo left00:13
BSaboia joined00:13
YuGiOhJCJ left00:15
YuGiOhJCJ joined00:16
oojacoboo left00:16
leeN left00:17
wxg4irc joined00:23
cdg left00:23
cdg joined00:24
Cabanossi left00:29
cdg left00:29
codyw left00:29
Cabanossi joined00:31
oojacoboo joined00:32
dege left00:32
Lyqyd joined00:33
converge joined00:33
pbrewczynski left00:37
astronavt joined00:39
Gustavo6046 joined00:39
Kulrak left00:42
lufeng joined00:51
muelleme joined00:54
Kulrak joined00:56
Kulrak left00:56
Kulrak joined00:56
tvw left00:57
arktemprary joined00:58
matsaman left00:58
muelleme left00:58
Cabanossi left00:59
wxg4irc left00:59
wxg4irc joined01:00
Cabanossi joined01:01
YuGiOhJCJ left01:02
DaGoaty joined01:02
sea-gull left01:03
yohnnyjoe joined01:03
YuGiOhJCJ joined01:03
YuGiOhJCJ left01:05
YuGiOhJCJ joined01:05
DaGoaty left01:07
yohnnyjoe left01:07
xaxxon joined01:07
ZexaronS left01:09
rosa joined01:10
rosa left01:11
salamanderrake left01:11
xaxxon left01:13
kfoonamalik joined01:13
ZexaronS joined01:14
Gurkenglas joined01:15
VoradorPT left01:15
VoradorPT joined01:16
Dean joined01:17
gitinfo set mode: +v01:18
Dean Hello?01:18
rosa joined01:18
cdown left01:19
cdown joined01:19
volestorm left01:19
Dean So I have never used git before today, and was working on a project in IntelliJ. I had the bright idea of making a git repository in the directory of the project (I thought that was how to add it). I don't know what I've done, but I now don't have access to anything but the folders themselves01:20
All of the java files are gone?01:20
volestorm joined01:20
YuGiOhJCJ left01:24
kfoonamalik left01:24
YuGiOhJCJ joined01:25
cdg joined01:25
pirocks left01:27
Dean left01:32
astronavt left01:35
Gustavo6046 left01:35
marianina8 joined01:35
marianina8 left01:40
Cabanossi left01:44
xaa left01:44
rosa left01:45
wxg4irc left01:45
Cabanossi joined01:46
astronavt joined01:46
ZyX-I left01:47
menip left01:49
thinkpad left01:51
PHPanos joined01:51
arktemprary left01:52
arktemprary joined01:53
Lyqyd left01:54
mizu_no_oto joined01:54
muelleme joined01:54
PHPanos left01:55
lufeng left01:57
BSab joined01:58
a3Dman joined01:59
thinkpad joined02:00
menip joined02:00
Lyqyd joined02:00
muelleme left02:00
BSabo joined02:01
BSaboia left02:02
ahrs left02:03
rorro left02:03
ahrs joined02:04
BSab left02:05
finalbeta joined02:06
salamanderrake joined02:06
nowhere_man left02:07
lufeng joined02:09
salamanderrake left02:10
nowhere_man joined02:11
surfist left02:13
lufeng left02:14
lufeng joined02:16
Lyqyd left02:16
danielcm joined02:18
codyw joined02:18
danielcm left02:19
mikecmpbll left02:28
dreiss joined02:31
mikecmpbll joined02:32
dsdeiz left02:32
dsdeiz joined02:32
devbaka__ joined02:34
DolphinDream left02:37
kyan left02:37
devbaka_ left02:38
arktemprary left02:40
DolphinDream joined02:40
menip left02:41
salamanderrake joined02:41
DolphinDream left02:41
arktemprary joined02:42
robinsmidsrod joined02:45
ilbot3 left02:45
DolphinDream joined02:46
salamanderrake left02:47
xcesariox joined02:47
dsdeiz left02:48
dsdeiz joined02:49
dsdeiz left02:49
dsdeiz joined02:49
shinnya joined02:51
arktemprary left02:52
xaxxon joined02:53
arktemprary joined02:54
menip joined02:54
d^sh left02:55
converge left02:55
d^sh joined02:56
ilbot3 joined02:58
Murr left02:58
Murr joined02:59
orbyt_ left03:01
mizu_no_oto left03:01
mikecmpbll left03:02
yohnnyjoe joined03:04
quarters joined03:04
DaGoaty joined03:04
coco left03:04
menip left03:06
YuGiOhJCJ left03:07
lagothri1 joined03:07
yohnnyjoe left03:08
DaGoaty left03:09
kpease joined03:10
astronavt left03:10
lagothrix left03:11
blackwind_123 joined03:11
kpease left03:11
lagothri1lagothrix03:12
IndianArya joined03:13
netj left03:13
netj joined03:14
sasheto joined03:15
kpease joined03:17
salamanderrake joined03:19
introom left03:21
introom joined03:22
menip joined03:23
AmR|EiSa joined03:24
menip left03:26
salamanderrake left03:26
arktemprary left03:28
causasui joined03:29
Zamerick left03:29
VoradorPT left03:30
arktemprary joined03:30
surfist joined03:31
cdg left03:31
orbyt_ joined03:31
masuberu left03:32
Elon_Satoshi left03:32
kyan joined03:33
Tobbi left03:33
chachasmooth_ joined03:35
chachasmooth left03:35
salamanderrake joined03:38
Elon_Satoshi joined03:38
menip joined03:41
oojacoboo left03:42
menip left03:42
konsolebox left03:42
salamanderrake left03:42
konsolebox joined03:44
xlegoman left03:45
dre_ left03:45
dre_ joined03:46
Gurkenglas left03:51
salamanderrake joined03:57
Zamerick joined03:57
menip joined03:59
menip left04:00
salamanderrake left04:02
pks left04:03
pks joined04:05
agowa339 left04:07
xcesariox left04:07
d10n joined04:09
svm_invictvs left04:10
svm_invi_ joined04:10
robinsmidsrod left04:10
d10n Is there a clean way to get the git command being run from the commit-msg hook?04:11
svm_invi_svm_invictvs04:11
tkore joined04:11
Nizumzen left04:12
Cabanossi left04:13
tkore\ left04:13
blackwind_123 left04:14
Cabanossi joined04:15
arktemprary left04:15
nooooone joined04:15
blackwind_123 joined04:15
arktemprary joined04:16
menip joined04:16
wxg4irc joined04:17
ResidentBiscuit left04:19
ResidentBiscuit joined04:19
narendraj9 joined04:20
PresidentBiscuit joined04:20
Zamerick left04:21
shinnya left04:21
wxg4irc left04:23
infinisil Um, why does `git rev-list --all -1 --reverse` return the same commit as `git rev-list --all -1` (the latest one)?04:24
ResidentBiscuit left04:24
infinisil oh, because it first chooses one, then reverses it :/04:24
konsolebox left04:29
salamanderrake joined04:30
kyan left04:31
dreiss left04:33
nd- joined04:35
salamanderrake left04:35
konsolebox joined04:35
Elon_Satoshi left04:35
nd left04:36
snowkidind left04:38
konsolebox left04:40
blackwind_123 left04:41
blackwind_123 joined04:41
konsolebox joined04:42
xlegoman joined04:46
netlar left04:49
arktemprary left04:49
mud left04:50
xaxxon left04:52
IndianArya left04:53
steeze left04:53
xaxxon joined04:53
ContourNut left04:56
quarters left04:57
narendraj9 left04:58
quarters` joined04:58
Murr left04:58
Murr joined04:59
xaxxon left05:04
quarters` left05:05
yohnnyjoe joined05:05
chachasmooth_ left05:05
chachasmooth joined05:05
BenderRodriguez joined05:07
Yerdna joined05:08
yohnnyjoe left05:09
Yerdna left05:12
menip left05:13
day__ joined05:18
tunekey left05:19
steeze joined05:20
daey left05:21
day__daey05:21
kpease left05:26
quarters` joined05:27
Bill joined05:31
safe joined05:31
BillGuest4306705:31
arktemprary joined05:31
rajat joined05:33
menip joined05:34
siriusy joined05:34
siriusy left05:34
konsolebox left05:37
marianina8 joined05:37
konsolebox joined05:38
justan0theruserjustanotheruser05:39
marianina8 left05:42
svm_invictvs left05:46
svm_invictvs joined05:47
quarters` left05:51
netj left05:52
netj joined05:52
PresidentBiscuit left05:53
dermoth left06:00
dermoth joined06:01
steeze left06:01
netj left06:04
netj joined06:04
BSab joined06:04
dave0x6d left06:05
arktemprary left06:05
marianina8 joined06:05
xaxxon joined06:06
marianina8 left06:06
BSabo left06:08
rajat left06:13
arktemprary joined06:19
xaxxon left06:20
xaxxon joined06:21
Sleepy63 joined06:22
DolphinDream left06:24
Guest43067 left06:24
arktemprary left06:26
a3Dman left06:27
arktemprary joined06:27
Cabanossi left06:28
a3Dman joined06:30
Cabanossi joined06:30
dave0x6d joined06:30
tobiasvl infinisil: yes, --reverse just prints in reverse order. you can just pipe to `head` or `tail` instead to do what you're trying to do06:31
konsolebox left06:32
Puffball left06:33
pbrewczynski joined06:33
xaxxon left06:33
konsolebox joined06:34
rajat joined06:34
orbyt_ left06:37
narendraj9 joined06:38
shinnya joined06:41
arktemprary left06:41
arktemprary joined06:42
zefferno joined06:43
imack joined06:51
wxg4irc joined06:55
xaxxon joined06:55
konsolebox left06:58
Murr left06:58
konsolebox joined06:59
Murr joined06:59
madewokherd left07:04
dermoth left07:05
dermoth joined07:06
nydel07 joined07:06
menip left07:09
xaxxon left07:10
xaxxon_ joined07:10
konsolebox left07:10
cytherea[m] joined07:11
konsolebox joined07:12
xaxxon_ left07:18
narendraj9 left07:19
mikecmpbll joined07:19
mikecmpbll left07:20
menip joined07:20
narendraj9 joined07:20
menip left07:22
menip joined07:22
konsolebox left07:26
konsolebox joined07:27
xaxxon joined07:28
KeyJoo joined07:29
blackwind_123 left07:29
imack left07:31
blackwind_123 joined07:31
mda1 joined07:32
boombatower left07:32
konsolebox left07:35
xlegoman left07:36
jceb joined07:38
menip left07:41
konsolebox joined07:41
tkore\work joined07:41
Solvaring joined07:43
dsdeiz left07:49
dsdeiz joined07:49
abba joined07:51
piremi left07:52
cdg joined07:55
menip joined07:57
cdg left08:00
robotroll joined08:03
menip left08:05
tarkus joined08:09
tarkus left08:15
menip joined08:17
wxg4irc left08:18
robotroll left08:26
cbreak left08:27
cbreak joined08:28
menip left08:30
schleppel joined08:32
konsolebox left08:34
konsolebox joined08:36
__marco joined08:39
jceb left08:42
pbrewczynski left08:43
neil_cn joined08:44
konsolebox left08:44
opalepatrick joined08:44
dave0x6d left08:45
konsolebox joined08:46
lufeng left08:47
jnavila joined08:48
tarkus joined08:50
thiago left08:51
King_Hual joined08:54
dsdeiz left08:54
dsdeiz joined08:54
dsdeiz left08:54
dsdeiz joined08:54
narendraj9 left08:56
BouncyKnightMike joined08:57
Murr left08:58
DaGoaty joined08:58
wxg4irc joined08:59
Murr joined08:59
sea-gull joined09:01
Guest27261 joined09:02
DaGoaty left09:04
yohnnyjoe joined09:06
Phylock joined09:08
imack joined09:08
codyw left09:09
neil_cn left09:10
Solvaring left09:10
ShekharReddy joined09:11
Feral_Cat joined09:11
yohnnyjoe left09:11
TomyLobo2 joined09:12
Guest27261 left09:12
xaxxon left09:12
cdg joined09:13
cdg_ joined09:15
lufeng joined09:15
Sarge9451 left09:15
lufeng left09:15
lufeng joined09:16
Gurkenglas joined09:17
cdg left09:18
cdg joined09:18
cdg_ left09:19
sea-gull left09:20
xaxxon joined09:20
cdg left09:23
xaxxon left09:25
Xrayez joined09:27
Guest27261 joined09:32
energizer left09:34
muelleme joined09:34
tmm88 joined09:35
sea-gull joined09:41
Gurkenglas left09:44
xaxxon joined09:45
d^sh left09:47
d^sh joined09:47
Guest27261 left09:50
dre_ left09:50
__marco left09:52
sea-gull left09:55
Mike11 joined09:56
__marco joined09:56
svm_invictvs left09:59
pirocks joined09:59
TomyLobo2TomyLobo10:00
Guest27261 joined10:02
ocds joined10:03
rkta left10:03
overlord_tm joined10:05
Sarge945 joined10:07
konsolebox left10:09
__marco__ joined10:10
sea-gull joined10:11
konsolebox joined10:11
SteffanW joined10:11
xaxxon left10:11
BSabo joined10:12
govg joined10:12
__marco left10:12
BSaboia joined10:14
tarkus left10:14
tarkus joined10:15
BSab left10:15
BSabo left10:17
ocds left10:17
finalbeta left10:17
finalbeta joined10:18
BSab joined10:18
BSaboia left10:21
ocds joined10:23
thierryp joined10:23
YuGiOhJCJ joined10:24
gareppa joined10:26
shripadr joined10:27
Cabanossi left10:28
NwS joined10:29
dsdeiz left10:29
dsdeiz joined10:29
dsdeiz left10:29
dsdeiz joined10:29
Cabanossi joined10:29
rajat left10:30
jrtappers joined10:31
tarkus left10:32
muelleme left10:32
Guest27261 left10:33
Guest27261 joined10:33
paul424 joined10:36
tarkus joined10:36
Guest27261 left10:37
jstein_ joined10:38
jstein_jstein10:38
jrtappers left10:38
cur8or left10:41
a3Dman left10:42
cur8or joined10:42
a3Dman joined10:43
xaxxon joined10:43
KeyJoo left10:44
nooooone left10:45
nooooone joined10:46
nooooone left10:47
jrtappers joined10:48
rajat joined10:48
konsolebox left10:48
nooooone joined10:49
jnavila left10:49
nooooone left10:49
nooooone joined10:50
thierryp left10:52
_ADN_ left10:53
mikesrike joined10:55
konsolebox joined10:55
Plouescat joined10:58
Murr left10:58
Murr joined10:59
vit3 joined10:59
basiclaser joined10:59
Guest27261 joined11:03
catsup joined11:03
catsup left11:04
Plouescat left11:04
catsup joined11:05
imack left11:07
yohnnyjoe joined11:07
xaxxon left11:08
nooooone left11:08
YuGiOhJCJ left11:08
YuGiOhJCJ joined11:08
ghost43 left11:10
alexx8 joined11:10
ghost43 joined11:10
jnavila joined11:11
yohnnyjoe left11:12
Guest27261 left11:19
ixxie joined11:20
ixxie can anybody recommend me a clean way to pull a PR from a repo, prefrebly an approach that is easily repeatable across different repositories?11:21
__marco__ left11:22
__marco__ joined11:23
darkbit joined11:23
ghost43 left11:23
nowhere_man left11:23
ghost43 joined11:23
gareppa left11:26
pbrewczynski joined11:27
ok91 joined11:33
mohabaks joined11:39
KeyJoo joined11:40
mohabaks left11:40
overlord_tm left11:40
mohabaks joined11:41
db8093246 joined11:42
xaxxon joined11:43
konsolebox left11:44
shinnya left11:44
paul424 left11:46
konsolebox joined11:46
xaxxon left11:47
nowhere_man joined11:49
codyw joined11:50
mikecmpbll joined11:52
safe left11:52
ixxie left11:54
tmm88 left11:58
Mike11 left11:58
cbreak git pull therequest12:02
KeyJoo left12:03
converge joined12:03
vit3 left12:06
__marco__ left12:08
phluks joined12:12
mohabaks left12:13
Cabanossi left12:13
arktemprary left12:13
GeraldW ixxie: if you have a PR from a forked repo, I use this "workflow"12:14
arktemprary joined12:15
GeraldW git clone https://github.com/<origrepo>12:15
Cabanossi joined12:15
GeraldW git remote add <new remote name> https://github.com/<forked repo>12:15
git pull12:15
git pull <forked repo>12:15
git checkout -b <PR branch name> -t <new remote name>/<PR branch name>12:15
git checkout <PR branch name>12:15
tmm88 joined12:17
mohabaks joined12:17
darkbit left12:18
rorro joined12:22
nowhere_man left12:23
xaa joined12:23
mohabaks left12:23
jnavila left12:24
nidr0x left12:26
codyw left12:26
shodan` joined12:28
jnavila joined12:30
Kristjan joined12:32
Kristjan left12:36
Tobbi joined12:37
nidr0x joined12:38
Zamerick joined12:39
ShekharReddy left12:40
shantytown joined12:42
shodan` left12:43
nast joined12:43
mohabaks joined12:45
abba left12:46
shodan` joined12:47
zefferno left12:52
shodan` left12:52
shantytown left12:54
leeN joined12:56
shantytown_ joined12:58
__marco joined12:59
Gurkenglas joined13:03
tombusby left13:03
tombusby joined13:04
nast left13:05
shantytown_ left13:07
yohnnyjoe joined13:08
robotroll joined13:09
snowkidind joined13:09
shinnya joined13:11
yohnnyjoe left13:13
ZyX-I joined13:13
ravndal joined13:15
sea-gull left13:15
ZexaronS left13:18
mooasaurus left13:19
robotroll left13:19
ZexaronS joined13:19
mooasaurus joined13:19
ocds left13:20
wxg4irc left13:20
shinnya left13:21
rkta joined13:21
Gurkenglas left13:21
jrtappers left13:23
tunekey joined13:26
shantytown_ joined13:31
shantytown_ left13:31
shantytown_ joined13:32
hyun joined13:32
shantytown_ left13:33
shantytown_ joined13:33
shantytown_ left13:33
hyun left13:33
cdown left13:36
cdown joined13:36
hyun joined13:41
shantytown joined13:42
shantytown_ joined13:43
aard_ joined13:45
shantytown_ left13:46
shantytown left13:47
hyun left13:47
Gurkenglas joined13:49
shantytown_ joined13:51
imack joined13:52
arktemprary left13:53
shantytown_ left13:54
arktemprary joined13:54
shantytown_ joined13:54
shantytown_ left13:55
rkta left13:55
shantytown joined13:55
shantytown left13:58
tmm88 left13:59
macopython joined14:04
macopython My github repo show different data than my local repo. Still it shows Updated when I pull changes. Any help ?14:05
tkore\ joined14:05
joeytwiddle macopython, you could first check where `git pull` is pulling from: git remote -v14:06
arktemprary left14:06
macopython joeytwiddle: Ok. Let me check14:06
tmm88 joined14:06
tmm88 left14:06
tmm88 joined14:06
Nizumzen joined14:07
macopython It shows two origins14:07
Sorry not repo but remote14:07
joeytwiddle it usually pulls from origin by default14:07
macopython origin and upstream14:07
joeytwiddle you can also check your upstream (where pull pulls from): git rev-parse --abbrev-ref --symbolic-full-name @{u}14:08
you can also update by hand: git fetch --all # and then # git merge your_remote/your_remote_branch14:08
macopython It shows origin/ISSUE-34014:08
tkore left14:09
macopython ISSUE-340 is my current branch14:09
joeytwiddle i guess you want to merge from origin/master, but git is merging (pulling) from origin/ISSUE-34014:10
Sarge9451 joined14:10
macopython May be. I am not sure14:10
Actually my repo contains proper code14:11
Whereas my github repo contains some old wrong code14:11
Sarge945 left14:12
joeytwiddle oh, that sucks! if nobody has pulled or forked from your repo, then you could force overwrite those wrong commits14:12
macopython Nobody has pulled or forked but earlier I raised a PR from my repo14:13
arktemprary joined14:13
joeytwiddle git push -f origin HEAD:master # this would replace the 'master' branch on github with your current branch14:13
did you raise your PR from 'master' ?14:13
macopython Nope14:14
I raised from ISSUE-340 branch14:14
whitby left14:14
joeytwiddle then i guess just `git push -f` would do it!14:14
macopython I see14:14
Let me try14:14
I don't have any current changes on my local repo. Will it still push ?14:15
joeytwiddle yes, if the remote has a different commit, it will change it14:16
whitby joined14:16
macopython I see14:17
It shows long description14:17
Saying warning: push.default is unset;....14:18
BSabo joined14:19
macopython git config --global push.default matching14:19
git config --global push.default matching14:19
git config --global push.default matching14:19
It says to use this14:19
joeytwiddle blimey. you could just do it explicitly: git push -f origin HEAD:ISSUE-34014:20
EpixZhang joined14:21
macopython Ok. Will it update my PR too ?14:21
relipse joined14:21
BSaboia joined14:21
joeytwiddle yes, github does that automagically14:22
macopython Cool14:22
Let me do that14:22
arktemprary left14:23
BSab left14:23
macopython It shows "Everything up-to-date"14:23
joeytwiddle then origin/ISSUE-340 is the same as your current commit14:24
macopython Ohh14:24
BSabo left14:24
joeytwiddle is origin the correct remote?14:24
BSab joined14:24
gitinfo set mode: +v14:25
EpixZhang Hello, I'm having the exact same problem described here https://stackoverflow.com/questions/32567075/git-ignore-blank-lines-does-not-work-is-there-any-workaround . Any ideas?14:25
BSabo joined14:25
relipse left14:25
macopython joeytwiddle yes14:26
Github repo still says last commit as 5 hours ago :(14:27
h12o joined14:27
joeytwiddle What does `git log` say?14:28
basiclaser left14:28
BSaboia left14:28
BSab left14:29
Bill_ joined14:30
joeytwiddle EpixZhang, you could try adding `-w`. also, check the lines don't have any tabs or spaces on them14:30
Elon_Satoshi joined14:31
macopython It shows same commit id14:31
I am not able to understand what is happening14:32
joeytwiddle me neither :D14:33
macopython :)14:33
joeytwiddle so your local commit is the same as github's commit? that's good i guess! but you don't like what git is showing in the PR? have you forgotten to commit your local changes...?14:34
macopython ID of both commit is same14:34
But At last I got conflicts and I resolved them and pushed them14:35
arktemprary joined14:35
macopython May be that is the reason this situation has happened14:35
rajat left14:35
olivetree_ joined14:36
rorro left14:36
clickjack left14:37
clickjack joined14:37
joeytwiddle well you could do two things to bump it: 1. amend your current commit (add a . to the commit message) and force push that, or 2. add a small commit that doesn't do much, and push that14:37
overlord_tm joined14:37
coco joined14:37
EpixZhang joeytwiddle, I tried `-w`, but same result. And I checked the file in hex. It has multiple `0x0a` (LF) but no space or tabs.14:38
macopython joeytwiddle Let me try them14:38
shodan` joined14:40
joeytwiddle EpixZhang, "Ignore changes whose lines are all blank." the problem is your change includes some non-blank lines14:41
EpixZhang joeytwiddle, so is there any way to let git diff only show non-blank lines?14:42
gareppa joined14:43
qpdb joined14:45
joeytwiddle EpixZhang, you could strip them yourself! | grep -v '^\+$'14:46
arktemprary left14:46
DvdKhl joined14:46
imack left14:46
ptsd joined14:47
jimmyrcom_ joined14:47
pirocks left14:48
YuGiOhJCJ left14:49
lufeng left14:52
__marco left14:52
lufeng joined14:52
EpixZhang Ah, yes. I can strip blank lines and do diff then14:52
oaao joined14:53
j416 EpixZhang: what is the use-case for this?14:54
EpixZhang j416, I'm using weblate to translate language files. weblate always delete blank lines but I want to keep them.14:55
j416 and hiding blank lines solves it?14:58
Murr left14:58
Murr joined14:59
Bill_ left14:59
EpixZhang j416, I hope so. still trying14:59
h12o left15:00
j416 grep didn't help?15:00
KeyJoo joined15:01
shantytown joined15:02
shantytown left15:05
Gustavo6046 joined15:05
lufeng left15:05
joeytwiddle actually i was suggesting you could grep out the lines from the output of `git diff`, but do whatever works best15:06
j416 ^15:07
h12o joined15:09
yohnnyjoe joined15:09
EpixZhang joeytwiddle, `git diff` gives line number indications and plus/minus mark before lines. just removing lines seems breaking the patch15:11
j416 EpixZhang: I still don't quite understand what it is you are trying to do15:12
if you don't want blank lines, why did you add them in the first place?15:12
cdg joined15:13
EpixZhang j416, https://github.com/CFPAOrg/OmniOcular/commit/5264ef4fedb4195bb25385aa1e2baa081fa5c4b6 well, just see this commit. I want get rid of that red lines.15:13
yohnnyjoe left15:14
gareppa left15:14
robotroll joined15:14
j416 EpixZhang: and then do what?15:14
EpixZhang using blank lines to divide a file into serval pieces. just for human easy reading15:14
h12o left15:14
j416 Use patch mode when adding and avoid adding the removed blank lines.15:15
muelleme joined15:15
EpixZhang the file is generated by weblate15:18
cstratak joined15:18
j416 and committed by weblate too?15:18
EpixZhang yep15:19
j416 and you want to edit this commit?15:19
EpixZhang yep15:19
j416 16:15:26 j416 | Use patch mode when adding and avoid adding the removed blank lines.15:19
:)15:19
muelleme left15:19
j416 man git-add look for -p15:19
gitinfo the git-add manpage is available at https://gitirc.eu/git-add.html15:19
arktemprary joined15:20
j416 also available for git-checkout if you prefer this.15:20
EpixZhang I'm a git newbie.... Reading it. THX15:20
j416 EpixZhang: would it help if I showed you an example?15:20
EpixZhang j416, Oh yes please!15:21
j416 EpixZhang: https://asciinema.org/a/QwMF2cn0aUsegWzGaq4fEmqyI15:23
arktemprary left15:24
EpixZhang j416, WOW cool15:25
shodan` left15:26
j416 EpixZhang: 'git add -p' works the same way except backwards.15:26
Bercik left15:26
sea-gull joined15:26
Cabanossi left15:29
salamanderrake joined15:29
dviola joined15:29
shantytown joined15:29
mohabaks left15:29
__marco joined15:30
Cabanossi joined15:30
shantytown left15:30
ravndal left15:30
ravndal joined15:31
rorro joined15:32
cstratak_ joined15:32
cstratak left15:32
jimmyrcom_ left15:33
h12o joined15:33
VoradorPT joined15:33
jimmyrcom_ joined15:35
Bercik joined15:35
finalbeta left15:36
finalbeta joined15:36
Masber_080 left15:37
cstratak_ left15:39
cstratak_ joined15:39
madewokherd joined15:39
xlegoman joined15:41
cur8or left15:42
h12o left15:43
theoceaniscool joined15:44
whyme joined15:44
Gustavo6046 left15:47
OnkelTem left15:51
theoceaniscool left15:52
jimmyrcom_ left15:52
converge left15:53
OnkelTem joined15:53
coco left15:54
jimmyrcom_ joined15:54
meadmoon joined15:57
shodan` joined15:57
cstratak_ left15:58
Cabanossi left15:59
brainpro1 left15:59
meadmoon left16:00
Cabanossi joined16:00
converge joined16:02
tkore\work left16:03
fstd left16:04
h12o joined16:05
__marco left16:06
Mike11 joined16:06
salamanderrake left16:08
h12o_ joined16:08
coco joined16:08
salamanderrake joined16:09
h12o left16:10
ShalokShalom left16:13
arktemprary joined16:15
__marco joined16:16
Keverw joined16:18
Gustavo6046 joined16:18
Gustavo6046 left16:18
Gustavo6046 joined16:19
Gustavo6046 left16:19
coco left16:20
EpixZhang left16:20
Gustavo6046 joined16:20
Gustavo6046 left16:20
Gustavo6046 joined16:21
jstein left16:23
imack joined16:25
pbrewczynski left16:27
mikesrike left16:27
luckman212 left16:28
Jithak joined16:29
phluks left16:29
arktemprary left16:30
hexa- joined16:30
cdown left16:32
yohnnyjoe joined16:32
akyshnik joined16:33
Nizumzen left16:33
luckman212 joined16:34
arktemprary joined16:37
h12o_ left16:37
jimmyrcom_ left16:38
Jithak left16:38
jimmyrcom_ joined16:39
kyan joined16:40
kyan left16:40
sasheto left16:40
shantytown_ joined16:42
sasheto joined16:43
macopython joeytwiddle: Both content were samer. They used tab and I used space :(16:43
h12o joined16:44
shantytown_ left16:45
macopython left16:45
arktemprary left16:46
VoradorPT left16:48
tmm88 left16:48
ptsd left16:51
sea-gull left16:52
orbyt_ joined16:52
thiago joined16:52
opalepatrick left16:52
tmm88 joined16:53
AmR|EiSa left16:54
brainpro1 joined16:56
zxd joined16:56
shodan` left16:56
zxd what's the command to force a push only if the server dosen't have new commits which I don't already have?16:57
svm_invictvs joined16:57
moritz push --force-with-lease16:58
shodan` joined16:58
Murr left16:58
Murr joined16:59
oprypin zxd, what you're describing is basically default push without force17:00
dege joined17:03
zxd yes --force-with-lease will force a push only if what I have for the ref remote is the same as the ref in the remote17:05
wanted to rebase last 3 commits into 117:06
but allow push only if no one had pushed in this time17:06
nadley joined17:06
fstd joined17:06
oprypin your description is still of the default push and force-with-lease is what you want (described in last message)17:07
shodan` left17:07
zxd force-with-lease is the default ? oprypin ?17:08
oprypin no but it's what you want17:08
dbb joined17:08
zxd cool17:08
dbb hi -- can soome summarize the CLI steps to take when I arrive in a project directory that is a year old or more.. and the ORIGIN is in github dot com and has a bunch of activity .. e.g. apache_allura17:09
BSabo left17:10
BSaboia joined17:10
moritz dbb: "git pull"17:11
Tobbi left17:11
pirocks joined17:13
dbb git fetch --all gets all the new branches from all remotes.. right?17:14
if so, that gets that they *exist* but not the contents?17:14
h12o left17:15
dbb the default behavior is to get only the contents of one branch, that the stale directory already knows.. right ?17:15
imack left17:16
dbb .. so you have to manually get the contents of any other branch already known, and also get the existance of any new branches. right ?17:16
moritz: agree?17:17
sarri left17:18
cbreak dbb: no17:20
fetch gets all history17:20
Tobbi joined17:21
dbb hmm does the `git fetch --all` bring the contents of all the branches from all the remotes?17:21
cbreak yes, fetch gets all history17:22
if you want all remotes, do a git remote update17:22
or fetch all remotes yourself17:22
sarri joined17:23
sarri left17:23
sarri joined17:23
dbb ok - so that is my complete question.. what do I do from a project directory that is a year (or more) stale.. all the steps17:23
to get it back in full synch with the remote called ORIGIN17:24
new branches and also known branches17:24
thiago git fetch origin; git remote prune origin17:24
cbreak a simple git pull will fetch the remote the current branch tracks, and merge it17:24
converge left17:25
thiago merge, rebase or reset each branch to their upstream, as needed17:25
dbb a simple git pull will fetch ONLY the remote the current branch tracks, and merge it17:25
netj left17:25
dbb thiago: what commands please?17:25
thiago git pull17:26
netj joined17:26
cbreak dbb: you said yourself you care about origin17:26
dbb thiago: no, that gets one branch that is known..17:26
thiago right17:26
do it for each branch17:26
dbb you are ignoring my question17:26
thiago I'm not17:26
if you want to update each branch, run git pull17:26
dbb in apache_allura, there are dozens of branches, named for tickets17:27
thiago do that one by one17:27
dbb seriously ?17:27
thiago yes17:27
Nizumzen joined17:27
dbb that is not believable17:27
cbreak dbb: why not?17:27
thiago let's be clear: we're talking about local branches17:27
cbreak dbb: if you need to work on a branch, you work on that branch17:27
dbb name every new branch manually in the remote ? and pull the contents ?17:27
thiago the ones that show up if you do "git branch"17:27
cbreak dbb: no, local17:28
dbb: honestly, why don't you just do what I told you instead of whining?17:28
dave0x6d joined17:28
Cabanossi left17:29
dbb so what steps exactly cbreak .. when I go to a directory called apache_allura and it is a year old17:29
jimmyrcom_ left17:29
cbreak dbb: the exact steps I told you17:29
dbb: git pull17:29
thiago git branch, then for each branch listed there, check it out, git pull17:29
dbb (I know that there are dozens of new branches in the remote)17:29
Nizumzen left17:29
cbreak dbb: that doesn't matter17:29
Nizumzen joined17:30
Cabanossi joined17:30
dbb dozens of calls to git pull .. really17:30
cbreak dbb: do you work on all branches at once?17:30
dbb maybe someone else can say this also17:30
thiago write a script then17:30
jimmyrcom_ joined17:31
dbb I want my local repo to be completely up to date with the work of the main project17:31
thats all.. I suspect strongly that there is a different command we have not talked about17:31
cbreak dbb: so do what I told you17:31
dbb thx for your replies17:32
overlord_tm left17:32
thiago how many branches does "git branch" show17:33
?17:33
overlord_tm joined17:33
dbb git branch -a | wc ## 90017:34
cbreak dbb: remove the -a17:34
dbb why is my local repo not identical to the remote ?17:34
cbreak because you suck at following advice?17:35
dbb clean language please17:35
thiago please remove the -a17:35
how many branches are shown?17:35
Nizumzen left17:35
thiago your repository is not identical because it's a repository you work on. If it's identical, you can't work with it.17:36
dbb the reason for my question is.. that there are new works in the remote that I do not have and do not know about.. I am asking, how do I get to know all the new branches in the remote, and copy all the contents of all the new branch, and the branches I know about17:36
thiago: false17:36
thiago you'd have to prove me wrong17:37
cbreak dbb: so why do you whine and moan instead of just doing what we told you?17:37
thiago now, how many *local* branches?17:37
mohabaks joined17:37
dbb my repo is not current, so why are you trying to make me say the local branches?17:37
Nizumzen joined17:37
thiago because those are the branches you need to update17:37
h12o joined17:37
cbreak dbb: because that's THE ONLY ONES THAT MATTER after a git remote update17:37
dbb no - I want to update those PLUS new branches17:37
thiago git pull will have done that17:38
dbb cbreak: by definition, yes17:38
cdg left17:38
thiago the first pull will fetch all the new branches from the remote and store them in local copies (not branches)17:38
then you need to update any local branch you do have, or delete it17:38
dbb similar to `git fetch --all` ?17:38
cbreak no17:38
thiago no17:38
simlar to "git fetch"17:38
thierryp joined17:39
cbreak as I said above: git pull is all you need if you only care about origin17:39
zefferno joined17:39
cbreak git remote update will fetch all remotes17:39
dbb: do you always ignore advice and blabber the same repeated garbage?17:39
dbb no personal insults, please17:39
Tobbi left17:40
cbreak this wasn't personal17:40
it was scientific17:40
thiago dbb: for each branch listed in git branch, decide if you want to update it (because you'll work on it in the near future) or whether you should just delete it17:41
dbb: for those you want to delete, git branch -D branchname17:41
for those you want to keep and update, git checkout branchname && git pull17:41
Tobbi joined17:41
dbb speaking of scientific, I will find another, similar situation .. a git repo that is a year or more behind, and has a lot of activity .. and try this again17:41
thiago dbb: try what I've just recommended17:41
dbb: if it doesn't work, show us what didn't work.17:42
cbreak what we told you will work in any git repository17:42
thiago dbb: but try17:42
dbb thiago: I did not quite understand the 'prune' part above, but I am trying a new one next17:42
thiago dbb: ignore it17:42
cbreak you don't need it unless you want to forget about branches17:42
dbb ok thx17:42
thiago dbb: do the commands I've said in the last 3 minutes17:42
cbreak dbb: just do what I told you 20 minutes ago, it'll work.17:43
dbb repeating the phrase "do what I told you" sounds like a developmental issue on your part there cbreak17:43
no need to repeat yourseld17:43
cdg joined17:44
bremner does arguing with the people helping you work in general? it seems like a bad strategy to me.17:44
cbreak dbb: you're the one repeating the same bullshit over and over17:44
dbb bremner: agree, back to the experiment17:44
bremner notes you could both access the wonders of /ignore17:44
cbreak bremner: I could also just ban him17:45
bremner cbreak: that's like /ignore, but more so.17:45
dbb admins generally know how to cool off.. thats why they are admins17:46
thiago cbreak: you're not helping. Please take 5 minutes to cool off.17:47
cbreak thiago: I've helped him plenty17:47
thiago cbreak: you're not helping now. You're hindering.17:47
cbreak nope17:47
thiago in respect for your long history of being a contributor to this channel, I'm asking politely you cool off.17:48
cbreak thiago: why do you assume I'm not cool?17:48
thiago cbreak: because your saying "bullshit"17:48
cbreak that's normal american english17:48
cdg left17:49
nowhere_man joined17:49
rorro left17:50
m0viefreak left17:51
YuGiOhJCJ joined17:51
robotroll left17:52
VoradorPT joined17:53
dbb ok - got one.. apache_spark .. from feb1717:55
there is tons of work on that17:56
git branch # master17:56
git remote -vv # ORIGIN github17:57
Q One .. do I have all the branches from github, locally now.. the total size of the git repo.. ?17:57
opalepatrick joined17:57
cbreak do a git pull17:57
shripadr left17:58
dbb I want to understand what I have now17:58
cbreak after a git pull you can go offline, as I said a few times, you will have all the history of the remote, in your repo17:58
dbb the history.. means the commit contents of all remote branches ?17:58
cbreak yes.17:58
dbb so .. after `git pull` .. I can checkout every branch, locally, without any network activity . do I understand that correctly ?18:00
thiago yes18:00
dbb ok thx18:00
thiago you can *create* a local branch off of any remote branch, without network18:00
you will not have branches of the remote. You'll have a locally stored copy of the remote branches.18:00
dbb no create questions yet.. only becoming current on the main project18:00
thiago I'm saying this to be clear. git pull does not create or remove branches.18:01
dbb ok thx18:01
thiago it downloads from the remote and stores the local copies18:01
yqt joined18:02
ahurst joined18:02
ahurst left18:02
h12o left18:03
opalepatrick left18:06
dbb ok - very high activity.. as expected.. and the important part is perhaps this .. http://paste.debian.net/998947/18:07
I notice the "fast forward" part.. meaning this is clean and simple catching up18:07
thiago right18:08
dbb in this case, the number of branches is manageable18:08
h12o joined18:08
thiago 1?18:08
dbb so, I could checkout one at a time and pull18:08
Droolio left18:08
dbb no .. each of those .. 1.6 2.0 2.1 2.218:09
thiago 09:56 < dbb> git branch # master18:09
you said 118:09
cbreak dbb: those don't matter18:09
dbb they are maintained ..18:09
they DO matter18:09
thiago those don't matter18:09
cbreak dbb: no18:09
thiago there's only 1 branch18:09
cbreak dbb: you already have their data18:09
the only ones where you have to pull is YOUR LOCAL BRANCHES18:09
dbb ok - maybe I dont know.. here is my situation .. in projects I deal with .. there are several maintained brances18:09
cbreak because of the merge part of pull18:09
dbb branches18:09
thiago you only have to check out the branches listed by git brach18:10
dbb so.. perhaps a 2.0 2.1 and 2.218:10
thiago not git branch -a, not git branch -r18:10
git branch18:10
dbb I need all that.. each one18:10
Codaraxis_ joined18:10
cbreak dbb: no18:10
thiago read what I'm saying18:10
cbreak you need those you want to work on18:10
thiago you only need to update local branches18:10
cbreak none else18:10
and you can do all that work locally, without ever getting new data from remotes18:10
cdg joined18:11
Codaraxis left18:13
thiago dbb: let me explain this again to you:18:14
Tobbi left18:14
deepy joined18:14
thiago there are branches, which are listed by git branch18:14
dbb locally18:14
thiago and there are local copies of remote branches, listed by git branch -r18:14
the local copies of remote branches are not branches18:14
rorro joined18:14
dbb ah oh hm18:14
thiago the local copies are updated by git fetch. All of them.18:15
dbb thats new to me18:15
thiago git pull runs git fetch, then git merge18:15
so the first git pull will update *all* local copies of remote branches18:15
that's what this line here means:18:15
ba8912e..dff440f master -> origin/master18:15
that's git fetch telling you that it fetched the remote's "master" and stored it in "origin/master"18:15
dbb ok18:16
thiago it also downloaded a new remote branch and stored in origin/branch-2.2. And it downloaded a bunch of tags.18:16
dbb " the local copies of remote branches are not branches" is utterly new to me18:16
thiago then git fetch ended. Git merge took over and printed:18:17
Updating ba8912e..dff440f18:17
that's when your current branch (I'm assuming master) was updated to match its upstream.18:17
SteffanW left18:17
dbb sure - the contents of the commit labeled with that hash, sequentially gets the newer commits added, until things are current on that branch18:18
cbreak it's not sequential18:18
thiago git is a little more efficient than that, but essentially you're right18:18
dbb ok "by some means"18:18
cbreak it just gets the new content directly18:18
Kyrya joined18:19
thiago now your local copy of all the remote branches is up to date. You can disconnect from the Internet.18:19
dbb that is certainly what I wanted18:19
thiago you may have other branches that this one git pull did not update. You can check them out and git pull them (needs Internet), or you can check them out and run "git merge @{upstream}" (no Internet needed).18:20
dbb thats new to me ..18:20
thiago which part?18:21
thierryp left18:21
thiago being clear: you may have *local* branches. All the remote copies were updated.18:21
dbb git merge -curious syntax thing-18:21
cbreak dbb: that's just one of the many ways to refer to the upstream branch18:21
thiago @{upstream} or @{u} for short is the current branch's upstream18:21
cbreak you can use any other way18:21
you don't have to specify it even18:22
dbb knowing one way is a start there18:22
thiago HEAD@{upstream} to be more specific18:22
works for any branch18:22
cbreak dbb: git pull is the same as git pull @{u}18:22
the @{u} is assumed18:22
dbb ok - so its clear that I am asking.. if there are two or three or four maintained branches, and I want the full data and history for all of them.. then I do .. x y z18:23
thiago fatal: '@{u}' does not appear to be a git repository18:23
cbreak well, needs the remote too...18:23
dbb: git pull18:23
dbb this is what I am getting at ..18:23
thiago dbb: if you have three local branches you want updated because you're going to work on them, check out each in turn and git pull18:23
Tobbi joined18:24
thiago dbb: you may be working on 3 branches out of two dozen branches the remote repository has18:24
if you're not going to work on them, delete the local branches18:24
dbb no no .. this confuses the topics .. of temporary work branches, versus serious released and maintained branches18:25
thiago no, it does not18:25
it's the same thing18:25
dbb I am not asking about a workflow with temporary branches at all18:25
thiago and I'm not talking about them either18:25
cbreak all branches are the same to git18:25
thiago let's say you have a local branch called "branch-1.6" because last year you submitted a fix there18:25
dbb I am asking about a major software release repo, that has several maintained release versions, plus perhaps all kinds of ticket activity and such18:26
thiago how likely are you to need to submit a fix there in the next six months?18:26
dbb thats a different question18:26
thiago please answe18:26
dbb I am an editor on a large linux project.. there are more than fifty major projects.. some of which move slowly, and some are quite active.. most use git now, but not all18:27
I review the contents and activity of each project18:27
across language groups18:27
cbreak dbb: so... why do you think git pull is not sufficient?18:27
what is missing?18:27
thiago ok, so you don't make changes. You look at changes by others. Correct?18:28
sasheto left18:28
dbb that is what I am doing in this context now..18:28
I have been a production coder also18:28
thiago how do you do that? git checkout and look at the files? Or git log?18:28
Cabanossi left18:29
dbb I am learning about git.. there is another team member that is great for workflows.. and another that is really skillful in the whole repo management.. .18:29
ZexaronS left18:29
menip joined18:29
Raed|Laptop joined18:29
dbb we have a gogs instance now18:29
Cabanossi joined18:29
dbb I tried kallithea, but its not very active18:29
ZexaronS joined18:30
thiago I don't know any of those18:30
I need to know git commands18:30
dbb yeah no worries18:30
thiago but we can find out: did you use these tools in apache/spark in the last year?18:31
grawity so if you want to review activity in various branches, a simpler way is to directly look at the fetched "remote branches"18:31
what I usually do is: 1) cd ~/src/fooapp; 2) git pull; 3) tig origin/master@{1}..origin/master; 3b) tig origin/stable-4.7@{1}..origin/stable-4.7; 3c) and so on18:32
dbb looks for tig18:32
grawity you can use `git log` or `gitk`, I prefer tig18:33
sasheto joined18:33
dbb This is the manual for Tig, the ncurses-based text-mode interface for git.18:34
grawity the method thiago was describing "check out each in turn and git pull" would involve: 1) cd ~/src/fooapp; 2a) git checkout master; git pull; tig @{1}..; 2b) git checkout stable-4.7; git pull; tig @{1}..; 2c) and so on18:34
dbb hehe git backwards.. got iy18:34
menip left18:35
dbb yeah that grawity18:35
grawity the result is more or less the same: with @{1}.. you get the newly added commits since the previous reflog entry18:35
dbb aha18:35
doug16k joined18:35
sQVe joined18:36
jungsubk joined18:37
diogenese left18:37
DolphinDream joined18:38
Mike11 left18:38
YuGiOhJCJ left18:40
YuGiOhJCJ joined18:40
sQVe left18:41
behr328 joined18:42
zefferno left18:43
h12o left18:43
__marco left18:43
xaxxon joined18:43
DolphinDream left18:45
DolphinDream joined18:45
xaxxon left18:45
snowkidind left18:46
h12o joined18:46
sasheto left18:47
sQVe joined18:47
xaxxon joined18:48
TomyLobo left18:50
kfoonamalik joined18:52
sQVe left18:52
dmcpolyzen18:53
sasheto joined18:54
skypatrol_ joined18:55
mda1 left18:56
watabou joined18:58
Murr left18:58
ZexaronS left18:59
Murr joined18:59
cdown joined18:59
ZexaronS joined19:00
Feral_Cat left19:04
YuGiOhJCJ left19:07
YuGiOhJCJ joined19:08
energizer joined19:09
Elon_Satoshi left19:12
atomi joined19:12
ZexaronS left19:14
paul424 joined19:14
enkrypt left19:14
ZexaronS joined19:15
Elon_Satoshi joined19:15
ozcanesen joined19:15
Xiti left19:15
oojacoboo joined19:16
chaosruler joined19:17
Raed|Laptop left19:18
h12o left19:19
Gustavo6046 left19:20
wilbert_ joined19:21
anli joined19:21
jost joined19:23
h12o joined19:24
Gustavo6046 joined19:25
pirocks left19:26
cdown left19:27
enkrypt joined19:28
Tobbi left19:29
tkore\tkore19:29
thierryp joined19:31
thierryp left19:32
because left19:38
because joined19:39
Tobbi joined19:39
tijensse joined19:39
BouncyKnightMike left19:40
igemnace joined19:40
Gustavo6046 left19:42
Gustavo6046 joined19:43
staafl left19:45
jungsubk left19:45
tmm88 left19:46
nowhere_man left19:46
diogenese joined19:46
nowhere_man joined19:46
Xiti joined19:48
hellux joined19:49
leeN left19:51
energizer left19:54
h12o left19:54
cdown joined19:54
tarkus left19:57
wilbert_ left19:59
behr328 left20:02
cdown left20:04
Tobbi left20:05
behr328 joined20:05
Gustavo6046 left20:06
Gustavo6046 joined20:07
webdev007 joined20:07
schleppel left20:11
Xrayez left20:12
glisigno1i joined20:12
glisigno1i I have a local git repository with two branches, master and testing. How do I setup my remotes so that master is pushed to origin/master and testing is pushed to testing/master?20:13
YuGiOhJCJ left20:13
_ikke_ just set the correct upstream for both repos20:14
git branch -u origin/master master; git branch -u testing/master testing20:14
h12o joined20:14
wilbert_ joined20:15
Lauven joined20:15
ewitz joined20:16
eusid joined20:17
Mykalyc_ joined20:17
eusid I have to greatly alter my project structure in order to try something out. I may or may not keep this new project structure is there an easy way to do this without git blowing up?20:18
from reading i ahve to issue git mv commands20:18
do i move the files then issue git mv or do i issue git mv and it will move them for me?20:18
tang^ use `git mv` and it will do the work for you20:19
eusid okay great so can i do something like projectidr/module/* /projectdir20:19
tang^ something like that, yes20:19
I just did a whole bunch last week20:19
eusid okay cool thansk for the answers. basic questions but i've been in git situations this week i don't want to encounter again20:20
mattcen left20:20
akyshnik_ joined20:20
cdg left20:20
cdg joined20:21
Elon_Satoshi left20:21
mud joined20:22
akyshnik left20:22
mattcen joined20:25
cdg left20:25
dbb this one seems importat .. http://gitolite.com/gcs.html#(22)20:26
KeyJoo left20:26
nowhere_man left20:26
Tobbi joined20:27
Cabanossi left20:28
menip joined20:28
nowhere_man joined20:28
floatleft joined20:29
Elon_Satoshi joined20:29
Cabanossi joined20:30
TomyLobo joined20:30
KeyJoo joined20:30
Xrayez joined20:31
ozcanesen left20:31
xaxxon left20:31
m0viefreak joined20:32
KeyJoo left20:33
cdown joined20:34
dbb aha - this is the first I have ever heard of the reflog .. http://gitolite.com/gcs.html#(54)20:34
tsukasa_ joined20:34
_ikke_ Super convenient20:35
KeyJoo joined20:35
codyw joined20:36
Kyrya left20:39
yqt left20:40
ozcanesen joined20:43
kfoonamalik left20:45
Lyqyd joined20:47
h12o left20:47
akyshnik_ left20:48
ozcanesen left20:48
Anja__ joined20:49
mohabaks left20:50
nowhereman joined20:52
Mykalyc_ left20:52
mr_sm1th joined20:52
mr_sm1th Wondering if someone made a nicely typeset A4 PDF out of the Pro Git book.20:53
Tobbi left20:53
wootehfoot joined20:55
phluks joined20:55
jgrof joined20:55
_ikke_ mr_sm1th: And I gather this is not it, right? file:///home/kevin/Downloads/progit.pdf20:55
Looks like US Letter20:55
Tobbi joined20:55
pandem1 ahhh good old kevins files20:55
nowhere_man left20:55
_ikke_ lol20:56
:D20:56
https://github.com/progit/progit2/releases/download/2.1.17/progit.pdf20:56
Gurkenglas left20:56
jnavila left20:56
h12o joined20:57
Cabanossi left20:57
mr_sm1th That looks more like A5. I want to print it, you see.20:58
_ikke_ I figured20:58
Murr left20:58
Murr joined20:59
mr_sm1th The source of the book is online it turns out, so shouldn't be too hard.20:59
Thanks!20:59
_ikke_ yes, was about the suggest that20:59
Cabanossi joined21:00
jimmyrcom_ left21:00
jimmyrcom_ joined21:01
atomi left21:05
Lauven left21:06
atomi joined21:07
jgrof left21:07
plitter left21:09
igemnace left21:09
Elon_Satoshi left21:12
npgm joined21:15
overlord_tm left21:15
rorro left21:16
Elon_Satoshi joined21:18
atomi left21:18
paul424 left21:20
atomi joined21:20
jimmyrcom_ left21:24
surfist left21:24
superlazer joined21:25
paracelcus joined21:25
surfist joined21:25
atomi left21:25
Anja_ joined21:25
atomi joined21:26
jimmyrcom_ joined21:26
h12o left21:28
Anja__ left21:29
Exagone313 joined21:29
h12o joined21:36
BenderRodriguez left21:36
ghost43 left21:39
ghost43 joined21:39
ZyX-I left21:39
energizer joined21:40
menip left21:40
h12o left21:40
phluks left21:43
overlord_tm joined21:47
thierryp joined21:47
glisigno1i left21:48
thierryp left21:48
plitter joined21:49
Isla_de_Muerte joined21:51
menip joined21:52
h12o joined21:52
NwS left21:53
Kazuto joined21:54
Kazuto left21:54
Kazuto joined21:54
cdown left21:54
Noldorin joined21:56
overlord_tm left21:57
alexx8 left21:57
Gustavo6046_ joined22:01
Gustavo6046 left22:05
cdown joined22:05
h12o left22:06
ZyX-I joined22:07
armyriad left22:07
Gustavo6046_ left22:08
Gustavo6046 joined22:10
Sasazuka joined22:10
Raed|Laptop joined22:11
__marco joined22:12
h12o joined22:12
rorro joined22:13
armyriad joined22:13
superlazer left22:14
Xrayez left22:18
hellux left22:19
boombatower joined22:19
Gustavo6046 left22:20
mattcen left22:20
wrrn joined22:21
overlord_tm joined22:22
theoceaniscool joined22:25
wrrn left22:25
mattcen joined22:27
ShalokShalom joined22:29
ok91 left22:30
Gustavo6046 joined22:31
ok91 joined22:31
aard_ left22:33
steeze joined22:33
BSab joined22:36
Lyqyd left22:36
__marco left22:37
menip left22:37
stantont joined22:37
BSaboia left22:38
m0viefreak left22:38
BSaboia joined22:38
stantont left22:38
BSab left22:41
ghost43 left22:42
ghost43 joined22:42
BSab joined22:42
BSaboia left22:42
Raed|Laptop left22:43
h12o left22:43
BSaboia joined22:45
floatleft left22:46
BSab left22:46
floatleft joined22:47
_ADN_ joined22:47
Raed|Laptop joined22:49
menip joined22:51
wootehfoot left22:52
theoceaniscool left22:54
menip left22:54
h12o joined22:54
menip joined22:55
a3Dman left22:56
Gustavo6046 left23:00
xlegoman left23:01
jost left23:02
__main__ joined23:02
goweol joined23:02
goweol1 joined23:04
webguynow joined23:05
floatleft left23:06
goweol left23:06
floatleft joined23:06
schultza joined23:07
Raed|Laptop left23:08
BenderRodriguez joined23:11
menip left23:11
_main_ joined23:12
_main_ left23:13
__main__ left23:14
ZexaronS left23:14
_main_ joined23:14
ZexaronS joined23:15
a3Dman joined23:15
a3Dman left23:15
a3Dman joined23:15
h12o left23:16
_main___main__23:17
mattcen left23:22
menip joined23:22
Gustavo6046 joined23:23
Juri_Agarin joined23:30
luckman212 left23:31
ljc joined23:31
Kaisyu joined23:32
mattcen joined23:32
rackleen joined23:33
luckman212 joined23:38
TomyLobo left23:40
nivag_ left23:41
Cabanossi left23:42
db8093246 left23:44
Sasazuka left23:44
Cabanossi joined23:45
Raed|Laptop joined23:45
ShalokShalom left23:45
KeyJoo left23:45
skinkitten joined23:46
ShalokShalom joined23:47
tmsmith joined23:47
ShalokShalom left23:47
ShalokShalom joined23:47
anli left23:50
jimmyrcom_ left23:50
rorro left23:51
jimmyrcom_ joined23:53
skinkitten left23:53
steeze left23:53
goweol1 left23:54
nivag_ joined23:55
ghost43 left23:57
ghost43 joined23:58

Logs Search ←Prev date Next date→ Channels Documentation