IRCloggy #git 2016-02-06

Logs Search ←Prev date Next date→ Channels Documentation

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

2016-02-06

Imek left00:00
Imek joined00:00
Imek left00:01
EvilPenguin joined00:01
Imek joined00:01
Imek left00:02
samw joined00:02
Imek joined00:02
Imek left00:03
squiddle left00:03
Imek joined00:04
Imek left00:04
Imek joined00:05
samw left00:05
qsx wat00:05
kilo_bravo joined00:05
whomp how can i change the number of unchanged lines it takes between two areas of change for git to consider those areas separate chunks?00:06
Imek left00:06
sibach left00:06
thiago whomp: which command?00:06
whomp thiago, git add -p00:06
thiago git show/diff/format-patch, etc., or merge conflict?00:06
oh, you can't00:07
livingstn left00:07
qsx you can split a hunk or edit it manually00:07
thiago if diff (the tool) produces no @@ lines in between, it's one hunk00:07
you can hit the s key if there are non-modified lines in the middle00:07
whomp oh wow there are a lot of options, aren't there00:08
i only saw y and n lol00:08
queuetip joined00:08
sp33drac3r left00:09
livingstn joined00:09
queuetip not sure if this is a git question or a github question, but some of my commits on github are labeled as committed with (another teammate) and there's 2 pictures next to the commit00:09
why does that occur?00:09
irckin joined00:09
sp33drac3r joined00:09
livingstn left00:10
hexagoxel left00:10
whomp thx tho thiago00:10
jagob joined00:10
HanClinto joined00:10
qsx queuetip: commiter and author are two different identities00:11
they do usually, but need not correlate00:11
hexagoxel joined00:11
paddyez left00:11
qsx e.g. when one rebases or applies a patch, their identity is recorded as comitter (because they (re-)created the commit) and the author is kept (because they are responsible for the content)00:12
daito joined00:12
samw joined00:12
thiago I would say there's almost a certainty of correlation00:13
ash_workz left00:13
thiago correlation != equal00:13
or, put another way, it's not random :-)00:13
spaceone left00:13
jteneyck joined00:13
qsx watever00:14
it’s quarter past one in the morning and i’m tired, don’t come to me with language stuff .-.00:14
whomp left00:17
queuetip qsx: thanks for the explanation!00:17
daito left00:17
years joined00:18
coderMe joined00:18
mezod joined00:19
cagmz joined00:21
jteneyck left00:21
citizen-stig joined00:21
hyphenated left00:22
tristanp left00:22
tristanp joined00:23
toothe joined00:25
_aronnax_ joined00:25
toothe if I make a branch, and then make a series of commits on that branch, then merge it with master, do all the previous commit comments become part of the master now? Or just the head of the new brnach?00:26
citizen-stig left00:26
arescorpio joined00:26
tristanp left00:27
_aronnax_ yes all the history of your feature branch will be in the master branch history00:27
toothe darn....okay, cool.00:27
jimi_ left00:28
netj left00:28
netj joined00:29
Qwertie joined00:29
Macaveli joined00:29
Macaveli left00:30
clemf left00:30
rubyonrailed joined00:30
_aronnax_ left00:30
jottr joined00:30
BekN joined00:31
Qwertie Is there any way to have 2 different emails and names on my git config so I can have a different name/email on another git server?00:31
rubyonrailed left00:31
clemf joined00:32
qsx Qwertie: not per server00:32
the identity is recorded in the commit which is forged locally00:32
you can however configure that differently in each repo00:32
irckin left00:33
thiago or in the environment00:34
astockton left00:35
_aronnax_ joined00:38
rlf joined00:40
astockton joined00:40
spaceone joined00:40
_aronnax_ left00:41
rlf if I had a feature branch and instead of using git merge feature-branch I did git pull origin feature-branch in master and pushed, is there a way to revert it as if instead of that the merging was done through git merge (to show the Merged branch message)?00:41
_aronnax_ joined00:41
thiago it's just the message00:42
bronson left00:42
thiago the result is exactl the same because git pull did the git merge00:42
rlf yeah but it doesn't show on the graph lol00:42
like usually00:42
nwkj86 left00:42
rlf it's like I've keep working on master, which is annoying00:43
thiago no00:43
let me repeat: the product is *exactly* the same00:43
git pull = git fetch + git merge00:43
so you've done the merge00:43
rlf yeah I know that, thanks anyway00:43
thiago so the only difference is the message. How badly do you want to change the message?00:44
and note how it's a history rewrite, with all the problems that brings.00:44
rlf nah don't care that much, thank you :p00:44
vkngpmhc joined00:44
vkngpmhc_ joined00:45
tang^ left00:45
Lyqyd joined00:45
ahmed_elgabri joined00:45
douglascorrea left00:45
boombatower left00:45
_aronnax_ left00:45
EvilPenguin left00:47
cwillu_also_at_w left00:48
cyrus_mc left00:49
BrunoSaboia left00:50
vkngpmhc_ left00:50
vkngpmhc left00:50
HanClinto left00:51
jaguarmagenta2 left00:51
jaguarmagenta joined00:53
citizen-stig joined00:54
King_Hual joined00:55
mattfoo left00:56
kilo_bravo left00:58
fstd left00:59
amdi_ joined00:59
fstd joined00:59
citizen-stig left00:59
imachuchu left01:00
jaguarmagenta left01:00
samw left01:01
jaguarmagenta joined01:01
presto left01:02
scoobert1on joined01:02
mattfoo joined01:02
chitopunk left01:02
Sucks joined01:04
mostlybadfly joined01:04
clemf left01:05
scoobertron left01:06
blahdodo left01:07
codedmart left01:07
snguyen left01:08
mischat left01:08
astockton left01:08
AtnevRed joined01:08
codedmart joined01:08
blahdodo joined01:09
strozyka left01:09
jaguarmagenta left01:11
tmcmahon joined01:11
jaguarmagenta joined01:11
alanwill left01:12
justanotheruser left01:13
daito joined01:13
AtnevRed left01:13
douglascorrea joined01:14
ToBeCloud left01:14
justanotheruser joined01:14
EvilPenguin joined01:15
tmcmahon left01:15
jaguarmagenta left01:16
nfk left01:17
cagmz left01:17
daito left01:18
samw joined01:18
douglascorrea left01:19
sgambino joined01:21
bluezone left01:21
junw_ left01:21
mezod left01:22
samw left01:23
citizen-stig joined01:26
preyalone joined01:28
nilsi joined01:28
sibach joined01:28
vkngpmhc_ joined01:29
vkngpmhc joined01:29
jaguarmagenta joined01:30
baxx left01:30
bitkiller left01:30
citizen-stig left01:30
EvilPenguin left01:31
rubyonrailed joined01:32
ericvw left01:32
peoliye left01:32
NeonPhoenix joined01:32
a_thakur joined01:34
Karkus left01:35
rubyonrailed left01:37
codedmart left01:38
jottr left01:39
strozyka joined01:42
clemf joined01:42
harish_ joined01:43
rlf left01:43
Sucks left01:43
tristanp joined01:44
Sucks joined01:45
snguyen joined01:45
CheckDavid joined01:46
durham left01:46
sibach left01:46
Limes_ left01:48
tristanp left01:48
bruce_lee left01:48
jaguarmagenta2 joined01:48
jaguarmagenta2 left01:48
jaguarmagenta2 joined01:48
neanderslob joined01:48
jaguarmagenta2 left01:48
jaguarmagenta2 joined01:49
jaguarmagenta2 left01:49
jteneyck joined01:50
jteneyck left01:50
jteneyck joined01:50
jaguarmagenta2 joined01:50
jaguarmagenta left01:50
strozyka left01:51
raijin left01:52
raijin joined01:52
strozyka joined01:53
strozyka left01:53
jaguarmagenta2 left01:55
jaguarmagenta joined01:56
citizen-stig joined01:56
tristanp joined01:57
watabou joined01:57
bluezone joined01:57
sgambino left01:58
liamonade left01:59
squiddle joined01:59
jteneyck left01:59
Arsonide left01:59
govg joined02:00
citizen-stig left02:01
squiddle left02:04
devth joined02:05
s8321414 joined02:05
years_ joined02:06
sylario left02:06
devth_ left02:07
Ahmed90 left02:07
algae left02:07
tristanp left02:08
d10n-work left02:08
espindola joined02:08
Treio left02:09
thiago left02:09
years left02:09
anarchos2 joined02:10
a_thakur left02:10
gitinfo set mode: +v02:10
anarchos2 i'm looking for git binaries for arm, any idea where i can find them?02:10
chris_wot joined02:10
anarchos2 i should say git binary tarballs02:11
thiago joined02:11
years joined02:11
stockhol1 joined02:11
aleksandar2810 left02:11
thiago left02:12
xvx left02:12
bremner anarchos2: for what OS?02:12
anarchos2 bremner: chromeos02:13
bremner dunno what that is.02:13
anarchos2 that's why i'm looking for a tarball, not a .deb from debian or ubuntu02:13
qsx build them02:13
kaiza left02:13
qsx should be rather easy in fact02:14
chrome os is gentoo under the hood02:14
anarchos2 hmm02:14
years_ left02:14
stockholm left02:14
Vairn81 joined02:15
Sleepy63 left02:15
queuetip left02:15
Vairn81 left02:16
anarchos2 qsx: i have a ubuntu arm install setup, how would i compile it? i checked out git from git but there seems to be no configure (i haven't done much compiling before, asside from a ./configure; make;; make install)02:16
thiago joined02:16
Vairn81 joined02:16
Vairn81 left02:17
ilmgb_ joined02:17
Vairn81 joined02:17
qsx anarchos2: git:kernel:git/git::README02:17
gitinfo anarchos2: Git web link: https://git.kernel.org/cgit/git/git.git/tree/README?h=HEAD02:17
jeremy_c joined02:17
Vairn81 left02:18
Vairn81 joined02:18
ilmgb left02:19
qsx .version02:19
gitinfo changed the topic to: Welcome to #git! Just don't be an annoying git. | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Current stable version: 2.7.1 | Step 1) Cut a hole in the box 2) Put your code in the box 3) Have someone `git pull` the box. And that's how you git!02:19
Vairn81 left02:19
Vairn81 joined02:20
Vairn81 left02:21
tester joined02:21
kpease left02:21
Vairn81 joined02:21
Vairn81 left02:22
kierk joined02:23
Vairn81 joined02:23
anarchos2 qsx: great, thanks.02:23
aidalgol joined02:23
tyll_ joined02:24
Vairn81 left02:24
Vampire0_ joined02:24
citizen-stig joined02:26
tyll left02:27
fscala left02:27
Vampire0 left02:27
tristanp joined02:28
Sleepy63 joined02:29
whomp joined02:29
ianclark joined02:29
kpease joined02:29
fscala joined02:29
tester left02:30
Limes_ joined02:30
citizen-stig left02:31
sp33drac3r left02:31
Sasazuka left02:32
sibach joined02:32
sp33drac3r joined02:33
rubyonrailed joined02:33
kpease left02:33
whomp left02:33
ianclark left02:34
blckbit10 left02:35
jottr joined02:35
mablae_ joined02:35
blckbit10 joined02:37
rubyonrailed left02:38
coderMe left02:39
mablae__ left02:39
jottr left02:40
pks left02:41
frem left02:42
pks joined02:43
ShadeS joined02:45
ShadeS hello02:45
gitinfo ShadeS: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.02:45
madewokherd joined02:45
kierk left02:45
ShadeS I am going to be using git from two different accounts on one machine, is this going to be troublesome for me?02:46
I'm going to want to probably reconfigure my --global user.name02:46
peoliye joined02:47
Eugene ShadeS - depends how you want to split it. Per-repo is easy, just set the config option i nthat repo02:51
jaguarmagenta left02:53
Eugene If it's more arbitrary you can do it by setting the GIT_AUTHOR/COMMITTER_NAME env vars02:53
jaguarmagenta joined02:53
Eugene A bash alias can do this trivially02:53
years_ joined02:53
nofacade joined02:54
whomp joined02:55
citizen-stig joined02:55
michelangelo joined02:55
years left02:57
donmichelangelo left02:59
jaguarmagenta left02:59
ShadeS erm02:59
jaguarmagenta2 joined02:59
jaguarmagenta2 left02:59
ShadeS i think i'll just make another user acct on this machine to do this02:59
jaguarmagenta joined02:59
whomp left03:00
livingstn joined03:00
citizen-stig left03:00
alanwill joined03:01
livingstn left03:01
livingstn joined03:02
tristanp left03:02
a_thakur joined03:02
ahmed_elgabri left03:02
blackwind_123 left03:04
ryouma joined03:05
years_ left03:06
blackwind_123 joined03:06
ryouma i know how to show the last git log entry. i want to show the first, so i tried --1 and -+1 and +1. can this be done?03:07
kadoban joined03:07
Limes_ left03:08
Eugene `git rev-list --max-parents=0 HEAD` will show you "root" commits. This is normally the same as "the first commit", but it's possible to have orphan branches.03:08
Feed that SHA into `git show`03:09
ryouma git log can't do it?03:09
Eugene Sure03:09
AtnevRed joined03:09
Eugene --reverse will show you the log first-first; the first commit will be the root03:10
ryouma great! thanks!03:10
yeah i do not have multiple roots. my git philosophy is "stretch the limits of git as little as possible".03:10
hmm, git log -1 --reverse is still the most recent03:11
years_ joined03:11
ryouma but the rev list thing works03:11
pwnz0r left03:12
pwnz0r joined03:12
ojacobson git-rev-list args are mostly legal for git-log, too03:13
including --max-parents03:13
daito joined03:14
jaguarmagenta left03:14
DolpheenDream joined03:14
AtnevRed left03:14
jaguarmagenta joined03:14
douglascorrea joined03:15
whomp joined03:16
jaguarmagenta2 joined03:17
pwnz0r left03:17
diogenese left03:17
jaguarmagenta left03:18
daito left03:19
joufflu joined03:20
whomp left03:21
douglascorrea left03:21
chachasmooth_ left03:21
s8321414 left03:22
jaguarmagenta joined03:22
chachasmooth joined03:24
sp33drac3r left03:24
jaguarmagenta2 left03:24
years_ left03:27
Dyonisos left03:29
Sleepy63 left03:31
King_Hual left03:31
sp33drac3r joined03:33
rubyonrailed joined03:34
jolts joined03:34
years_ joined03:34
nofacade left03:35
jottr joined03:36
rubyonrailed left03:38
rubyonrailed joined03:39
jimi_ joined03:40
leonarth joined03:40
jottr left03:40
leonarth left03:41
jolts left03:41
cagedwisdom left03:41
d4rklit3 left03:42
diogenese joined03:43
astockton joined03:47
ryouma fatal: ambiguous argument '0': unknown revision or path not in the working tree.03:48
espindola left03:48
leonarth joined03:49
a_thakur left03:50
presto joined03:50
jaguarmagenta2 joined03:51
jstimm joined03:51
Piyush joined03:52
dsdeiz joined03:52
dsdeiz left03:52
dsdeiz joined03:52
years_ left03:53
espindola joined03:53
jaguarmagenta left03:54
jyjon joined03:55
rclanan joined03:55
m0viefreak left03:55
tinajohnson__ joined03:55
Sleepy63 joined03:56
Corosauce joined03:56
lindenle left03:58
ahmed_elgabri joined03:59
DolpheenDream left03:59
Corosus left03:59
squiddle joined04:00
a_thakur joined04:01
preyalone left04:01
alanwill left04:02
jyjon_ joined04:03
ahmed_elgabri left04:03
xolubi left04:04
squiddle left04:04
hyperair left04:04
Silenced joined04:05
Silenced left04:05
Silenced joined04:05
ojacobson $ git log --max-parents=004:06
commit ef223d134b48bd7f17f1ad32d6827d0bbff3cbb8 …04:06
jyjon left04:06
livingstn left04:07
mallocthis left04:08
rclanan left04:08
a_thakur left04:11
whomp joined04:11
mallocthis joined04:14
Goplat joined04:16
whomp left04:16
dsdeiz left04:17
dfrey left04:18
devth_ joined04:21
MrWoohoo joined04:23
shinnya left04:23
espindola left04:24
sibach left04:24
gfixler joined04:25
mallocthis left04:25
devth left04:25
presto left04:26
jedix left04:27
joufflu left04:27
Corosauce left04:28
a_thakur joined04:29
vok` left04:30
HanClinto joined04:30
noteness left04:30
rubyonrailed left04:32
anarchos2 left04:33
Corosus joined04:33
anarchos2 joined04:34
jedix joined04:34
jolts joined04:35
jottr joined04:37
noteness joined04:39
sp33drac3r left04:39
citizen-stig joined04:40
presto joined04:42
jottr left04:42
sp33drac3r joined04:43
sp33drac3r left04:44
citizen-stig left04:45
sp33drac3r joined04:46
n00bdev joined04:46
jimi_ left04:47
jyjon_ left04:47
mohabaks joined04:47
rubyonrailed joined04:47
jstimm left04:47
fedexo left04:48
astockton left04:48
jimi_ joined04:50
nnyk_ joined04:51
alanwill joined04:51
sp33drac3r left04:53
lindenle joined04:58
blackwind_123 left04:59
errr_ left04:59
stoned left05:00
daito joined05:00
presto left05:00
sibach joined05:01
stoned joined05:01
sp33drac3r joined05:02
lindenle left05:03
sibach left05:03
weox left05:03
citizen-stig joined05:04
daito left05:05
mohabaks left05:07
joki left05:07
a_thakur left05:07
citizen-stig left05:09
lindenle joined05:09
mwhooker joined05:09
AtnevRed joined05:10
sparetire left05:12
joki joined05:13
sp33drac3r left05:14
AtnevRed left05:15
mwhooker left05:16
mwhooker_ joined05:16
raijin left05:16
sp33drac3r joined05:17
douglascorrea joined05:18
aidalgol left05:21
douglascorrea left05:22
tristanp joined05:24
nilg joined05:25
mallocthis joined05:26
eka left05:26
errr_ joined05:26
InfoTest1 joined05:27
InfoTest left05:27
InfoTest1InfoTest05:27
jaguarmagenta2 left05:27
citizen-stig joined05:27
pacbard joined05:28
a_thakur joined05:28
kisonecat left05:28
mwhooker_ left05:28
jaguarmagenta joined05:29
whomp joined05:29
mallocthis left05:31
kisonecat joined05:31
citizen-stig left05:32
a_thakur left05:33
mohabaks joined05:34
lolmac left05:34
whomp left05:34
eka joined05:35
bb010g left05:38
jottr joined05:39
diogenese left05:39
sp33drac3r left05:40
Gamecubic left05:43
jottr left05:43
anarchos2 left05:45
whomp joined05:45
Cabanossi left05:46
Cabanossi joined05:48
nofacade joined05:48
sgambino joined05:48
citizen-stig joined05:49
whomp left05:51
rubyonrailed left05:52
meloc joined05:53
citizen-stig left05:53
ryouma ojacobson: ah, it fails with no =05:54
whomp joined05:56
yqt left05:57
cyan__ joined05:58
nilg left05:58
diogenese joined05:59
ahmed_elgabri joined05:59
sdothum left06:00
squiddle joined06:00
whomp left06:01
diogenese left06:01
samw joined06:01
lindenle left06:02
anarchos2 joined06:03
ahmed_elgabri left06:04
sp33drac3r joined06:05
squiddle left06:05
samw left06:05
HanClinto left06:06
mohabaks left06:07
sanketdg joined06:08
aidalgol joined06:09
citizen-stig joined06:10
diogenese joined06:10
sargas joined06:11
muthu joined06:12
citizen-stig left06:15
whomp joined06:17
nofacade left06:18
douglascorrea joined06:18
clemf left06:19
Anderson69s joined06:20
sp33drac3r left06:21
whomp left06:22
leonarth left06:22
sgambino left06:22
nilg joined06:23
douglascorrea left06:24
whomp joined06:24
vkngpmhc_ left06:26
vkngpmhc left06:26
jaguarmagenta2 joined06:27
snguyen left06:28
fracting left06:28
nilg left06:28
snguyen joined06:28
jaguarmagenta left06:29
fracting joined06:29
citizen-stig joined06:30
fracting left06:30
fedexo_ joined06:30
fedexo joined06:30
n00bdev left06:31
jeremy_c_ joined06:31
jeremy_c left06:31
fedexo_ left06:31
squiddle joined06:33
whomp left06:33
phaleth joined06:34
cagedwisdom joined06:35
citizen-stig left06:35
Piyush left06:35
jstimm joined06:36
sp33drac3r joined06:36
jottr joined06:39
cagedwisdom left06:39
govg left06:40
a_thakur joined06:41
jottr left06:45
mohabaks joined06:45
govg joined06:47
n00bdev joined06:47
alanwill left06:48
preyalone joined06:48
citizen-stig joined06:48
petersr joined06:49
HanClinto joined06:50
petersr left06:50
|node left06:51
pwnz0r joined06:52
LucaTM joined06:52
cagedwisdom joined06:53
Sucks left06:53
citizen-stig left06:54
NeonPhoenix_ joined06:56
anarchos2 left06:57
NeonPhoenix left06:59
daito joined07:00
govg left07:01
sargas left07:01
govg joined07:02
lindenle joined07:02
pungi-man joined07:04
vkngpmhc joined07:04
vkngpmhc_ joined07:04
diegoaguilar joined07:05
daito left07:05
citizen-stig joined07:06
lindenle left07:07
sp33drac3r left07:08
toogley joined07:08
nnyk_ left07:08
citizen-stig left07:10
AtnevRed joined07:11
NeverDie_ joined07:12
Wetmelon left07:13
sp33drac3r joined07:13
NeverDie left07:15
AtnevRed left07:16
pwnz0r left07:18
n00bdev left07:20
nander left07:21
thiago left07:22
Anderson69s left07:24
Anderson69s joined07:24
citizen-stig joined07:26
govg left07:28
citizen-stig left07:30
gniourf left07:37
sp33drac3r left07:37
albel727 left07:38
johnnyfive left07:39
jottr joined07:40
mohabaks left07:40
kadoban left07:41
vkngpmhc_ left07:44
vkngpmhc left07:44
sp33drac3r joined07:44
pantsman- joined07:44
govg joined07:45
jottr left07:45
johnnyfive joined07:47
jagob left07:48
albel727 joined07:48
sp33drac3r left07:49
vkngpmhc_ joined07:49
vkngpmhc joined07:49
vkngpmhc left07:49
vkngpmhc_ left07:49
mablae_ left07:50
SimonNa joined07:53
ryouma left07:55
watabou left07:56
MattMaker left07:58
Puhe left07:58
squiddle left07:58
ahmed_elgabri joined08:00
blackwind_123 joined08:00
pantsman- left08:02
ahmed_elgabri left08:04
elastix joined08:06
MattMaker joined08:06
citizen-stig joined08:08
govg left08:08
aidalgol left08:08
toogley left08:09
MattMaker left08:12
citizen-stig left08:13
reim joined08:13
sp33drac3r joined08:17
atmosx left08:18
hyphenated joined08:20
citizen-stig joined08:20
bluezone left08:21
amdi_ left08:22
Lyqyd left08:24
citizen-stig left08:25
Anderson69s left08:26
mallocthis joined08:28
danemacmillan left08:31
sp33drac3r left08:31
govg joined08:31
citizen-stig joined08:31
mallocthis left08:32
arescorpio left08:33
diegoaguilar left08:36
citizen-stig left08:36
govg left08:37
squiddle joined08:38
Silenced left08:38
radsy joined08:41
jottr joined08:41
citizen-stig joined08:41
xelxebar joined08:42
sp33drac3r joined08:43
cyan__ left08:44
squiddle left08:45
jottr left08:45
citizen-stig left08:46
Anderson69s joined08:47
infra-red joined08:47
Goplat left08:47
govg joined08:49
citizen-stig joined08:50
ferr joined08:54
citizen-stig left08:55
FiredBall-0x71 joined08:55
FiredBall-0x71 WELCOME TO ##ASTARA , HTTP://PEARLTREES.COM/PVPELITER OUR OFFICIAL WEBSITE ... . , THE MOST HIGH CHANNEL FOR HIS PRINCE AND SON ... . HOW ARE YA ALL , I RELEASE ONE CLASSIFIED GAME FOR YOU ALL , HTTP://Us.runesofmagic.gameforge.com ... . , join ##Astara08:55
tildes joined08:57
FiredBall-0x71 WELCOME TO ##ASTARA , HTTP://PEARLTREES.COM/PVPELITER OUR OFFICIAL WEBSITE ... . , THE MOST HIGH CHANNEL FOR HIS PRINCE AND SON ... . HOW ARE YA ALL , I RELEASE ONE CLASSIFIED GAME FOR YOU ALL , HTTP://Us.runesofmagic.gameforge.com ... . , join ##Astara08:57
danemacmillan joined08:58
FiredBall-0x71 left08:58
citizen-stig joined08:58
a_thakur left08:59
fracting joined09:00
orzo left09:00
preyalone left09:01
daito joined09:01
dsdeiz joined09:03
Mono2000 joined09:03
citizen-stig left09:03
Anderson69s left09:05
daito left09:05
citizen-stig joined09:06
Anderson69s joined09:07
dsdeiz left09:07
orzo joined09:07
danemacmillan left09:08
sp33drac3r left09:08
dsdeiz joined09:08
dsdeiz left09:08
dsdeiz joined09:08
diogenese left09:08
citizen-stig left09:10
Eclipse left09:11
Eclipse joined09:11
ahmed_elgabri joined09:11
nitin_ joined09:11
citizen-stig joined09:12
Anderson69s left09:12
Anderson69s_bug joined09:12
t0by joined09:13
weox joined09:13
blckbit10 left09:15
akmoilt joined09:16
citizen-stig left09:16
Imaginativeone left09:17
nfk joined09:17
tomog999 joined09:17
Anderson69s_bug left09:17
citizen-stig joined09:17
Anderson69s joined09:17
Anderson69s left09:17
tomog999_ left09:19
citizen-stig left09:21
jottr joined09:23
citizen-stig joined09:24
pantsman- joined09:25
dburba joined09:25
dburba left09:25
nilg joined09:26
Atm0spher1c left09:26
raijin joined09:26
citizen-stig left09:26
sp33drac3r joined09:29
nilg left09:31
xolubi joined09:32
sp33drac3r left09:33
AtnevRed joined09:34
sp33drac3r joined09:34
eka left09:35
AtnevRed left09:36
Jackneill joined09:36
eka joined09:36
samw joined09:37
led_belly_ left09:38
draenog left09:38
draenog joined09:40
HanClinto left09:41
gniourf joined09:41
samw left09:42
infra-red left09:46
Aces_Charles joined09:49
sp33drac3r left09:50
subhojit777 joined09:50
kiloreux joined09:52
xaa joined09:53
Zaknefain joined09:53
hyperair joined09:53
Juzzika joined09:54
diogenese joined09:54
Zaknefain left09:56
Juzzika left09:56
Juzzika joined09:57
CheckDavid left09:59
anarchos2 joined10:01
tristanseifert left10:03
pungi-man left10:08
danemacmillan joined10:09
mkoskar left10:14
eijk_ joined10:14
danemacmillan left10:14
mkoskar joined10:14
mkoskar left10:18
hardenedapple joined10:19
mauricio joined10:21
danemacmillan joined10:23
nwkj86 joined10:25
tvw joined10:26
govg left10:27
a_thakur joined10:28
tyll joined10:31
InfoTest left10:33
govg joined10:34
mallocthis joined10:34
tyll_ left10:34
geoid joined10:36
leonarth joined10:36
peoliye left10:38
leonarth left10:39
peoliye joined10:40
satifant joined10:41
ShadeS hey git folk, I'm new at this commit thing10:41
how long should the line be?10:41
is "Changed line 5 expect(false) to expect(true) completing (1/5) in AboutExpects.js" too long of a description?10:42
jolts left10:43
fees joined10:43
fedexo left10:44
heroux joined10:47
nilsi left10:47
BlessJah ShadeS: http://chris.beams.io/posts/git-commit/10:49
Faylite|Away left10:49
baxx joined10:49
Faylite|Away joined10:49
ShadeS BlessJah: "If you're having a hard time summarizing, you might be committing too many changes at once." I just changed /one/ thing and I'm /still/ having a hard time summarizing what i did10:53
in less than 50 chars, even thoughs omeone else said 70 is a good rule of thumb10:53
BlessJah: stating the line number and what file the change is being done in is kinda pointless, right?10:57
since you're going to see the file on the page with the commit comment next to it anyway10:58
right?10:58
radsy left10:59
ShadeS can anyone else comment on this ?10:59
star_prone joined11:00
subhojit777 left11:02
a3Dman left11:02
daito joined11:02
ShadeS ok i think I got it11:02
what I'm going to say11:02
pacbard left11:03
spb ShadeS: the commit message should explain the purpose and effect of the change, not just describe the text that was replaced11:04
if you want to see that expect(false) was changed to expect(true), then the diff will tell you that11:04
the commit message is there to explain why you changed it, either by saying what was broken that got fixed, or referring to a bug tracker entry, or similar11:05
daito left11:07
hyphenated left11:07
a3Dman joined11:07
anarchos2 left11:08
JohnBat26 joined11:09
ShadeS spb: well that's unfortunate because I already pushed it 8 |11:10
https://github.com/hackreactor/javascript_koans is the thing i'm working on11:10
expect(false).toBeTruthy(); //This should be true11:11
was what /was/ there so idk what else I would put in the commit message, other than the thing that was false was changed to true11:12
it's sort of real ambiguous11:12
"made it work" would be even more ambiguous as a commit message11:12
jolts joined11:12
tvw left11:12
ShadeS especially since the line above it is: it("should expect true", function() {11:13
eijk_ left11:15
Juzzika left11:15
rchavik joined11:15
Juzzika joined11:15
tildes left11:17
aleksandar2810 joined11:17
rchavik left11:18
tildes joined11:18
Juzzika left11:18
Karkus joined11:18
Juzzika joined11:18
Karkus left11:19
xender joined11:20
heroux left11:20
ShadeS how can i see the git hist of a file on github because Im' only seeing the last commit message on any particular file11:22
xender Hi, is there anything like "git status for amending", that is, a list of files (no content diff) that HEAD commit added/changed/removed?11:22
eka left11:23
xender `git show --name-only` is closest I've found, but it doesn't show added/modified/deleted/moved/copied markers, which could be handy11:23
eka joined11:24
JanC left11:25
satifant git show --name-status?11:25
govg left11:25
citizen-stig joined11:27
xender satifant: That's better, thanks11:28
heroux joined11:28
tildes left11:28
xender Any hope for pretty-printing like git status does by default, though?11:28
star_prone left11:29
xvx joined11:30
_rgn ShadeS: commmit message: "fix incorrect assertion"11:31
ShadeS _rgn: that's pretty good11:31
I think I'll start using that going forward11:31
but it's a lot more vague11:32
so I'm not sure that it's actually good or better than what I had11:32
can I get some other peoples opinions on whether _rgn's commit message is more appropriate than mine?11:32
_rgn and always present tense, fix instead of fixed11:32
ShadeS why's that?11:33
the fix is past tense now that it's up there11:33
nnyk_ joined11:34
ShadeS uh oh11:35
i have something incorrect in my commit message after I did a git push origin master11:35
how do I 'fix' this11:35
tyreld left11:36
satifant xender, sorry, don't know...11:36
_rgn git commit --amend && git push -f but that will rewrite the history which is a bad thing if other people have pulled your change. if you're working on it alone then it's fine11:36
mallocthis left11:36
ShadeS no it's just me11:37
rzyu joined11:37
rzyu left11:37
govg joined11:37
ShadeS _rgn: it's just "... && git push -f" and not ... & git push origin master -f ??11:37
Tqvu joined11:38
_rgn in your case both most likely do the same thing11:38
because your master is likely to track origin master11:38
Tqvu left11:39
ShadeS i see11:39
what did the -f do?11:40
elastix left11:40
JanC joined11:40
etyp joined11:40
etyp left11:40
Seveas That's the new ylvis song... what does the -f do....11:41
satifant xender, maybe you like git show --stat?11:41
ShadeS _rgn: ??11:41
jottr left11:41
ShadeS force push I guess? but what exactly is that11:43
mallocthis joined11:43
leonarth joined11:44
peoliye left11:44
muthu_ joined11:44
muthu left11:45
trobotham left11:45
star_prone joined11:47
baris joined11:48
trobotham joined11:48
satifant ShadeS, you changed your local commit, so the old one got deleted... but the old one already existed on the remote. git would reject a push, if commits would get lost during the push. with -f you can force this11:49
star_prone left11:50
ShadeS 'git would reject a push' i guess that's only if you have branch protection on?11:50
i don't in this case11:50
I'm starting to like git11:51
it gives you that achievement unlocked/I did something feeling if even only just a minor thing11:51
sure doesn't beat like, writing tons and tons of line of code with no documentation or testing and it just works11:51
heroux left11:52
ShadeS but that happens rarely11:52
star_prone joined11:52
satifant git always rejects non-forced pushed, that would change the history... (afaik)11:53
Jackneill left11:53
satifant but you can protect a branch in the way, that even forced pushed are not allowed11:53
TomyLobo joined11:53
Faylite|AwayFaylite11:55
danemacmillan left11:55
squiddle joined11:56
Jusle joined11:57
a_thakur_ joined11:58
a_thakur left11:58
s8321414 joined11:58
star_prone left11:59
geoid left11:59
heroux joined12:00
infernix left12:01
junw joined12:02
dantix joined12:05
JohnBat26 left12:06
Jackneill joined12:08
satifant left12:09
star_prone joined12:10
sdothum joined12:13
star_prone left12:15
infernix joined12:15
acetakwas joined12:16
phaleth left12:17
jost joined12:17
mms_ joined12:17
mms_ I am trying to install git bash for windows12:17
the install wizard just does not give that optino12:17
to install in different location12:18
David1977 joined12:18
mms_ I actually want bash terminal so I can easily do ssh12:18
instead of using putty12:18
and do scripting12:18
ahmed_elgabri left12:18
mms_ left12:21
tgunr left12:22
tgunr joined12:23
ahmed_elgabri joined12:23
Kicer86 joined12:25
citizen-stig left12:26
netj left12:28
netj joined12:28
subhojit777 joined12:30
ahmed_elgabri left12:38
localuser- joined12:38
ahmed_elgabri joined12:39
Puhe joined12:40
David1977 left12:40
zadock joined12:41
NeverDie_NeverDie12:44
circ-user-15GfU joined12:48
citizen-stig joined12:48
shinnya joined12:49
King_Hual joined12:51
phaleth joined12:51
cagedwisdom left12:51
mellernoia joined12:51
zadock left12:52
subopt left12:52
nwkj86 left12:53
subopt joined12:53
Mono2000 left12:54
nwkj86 joined12:54
NeonPhoenix_ left12:56
localuser joined12:56
ashka left12:57
junw left12:57
ashka joined12:58
ashka left12:58
mezod joined12:58
fstd left12:59
mauricio left12:59
gitinfo set mode: +v12:59
fscala left12:59
ashka joined12:59
fstd joined12:59
squiddle left13:00
a_thakur_ left13:00
fscala joined13:00
a_thakur joined13:01
localuser- left13:01
chiromante joined13:01
samw joined13:02
flavi0 joined13:02
daito joined13:03
nitin_ left13:03
espindola joined13:06
samw left13:06
daito left13:07
g105b mms_ install Linux13:08
g105b went there13:08
shekh7ar joined13:08
nitin_ joined13:09
govg left13:10
ch3sh1r joined13:10
a_thakur left13:11
shekh7ar left13:11
acetakwas left13:12
leonarth left13:12
Limes_ joined13:13
Eclipse left13:13
Eclipse joined13:13
shekh7ar joined13:13
bitkiller joined13:15
tristanseifert joined13:15
sgambino joined13:15
localuser- joined13:15
danemacmillan joined13:16
roxlu joined13:16
Code_Bleu left13:16
acetakwas joined13:17
Code_Bleu joined13:19
Juzzika left13:19
Juzzika joined13:19
localuser left13:19
sgambino left13:21
a_thakur joined13:21
danemacmillan left13:22
donnib left13:23
JoelGuest2045113:23
Code_Bleu left13:24
m0viefreak joined13:24
[Saint] left13:24
chotaz joined13:25
squiddle joined13:25
Code_Bleu joined13:25
fracting left13:25
[Saint] joined13:25
fracting joined13:26
sgambino joined13:26
espindola left13:26
coderMe joined13:26
ToBeCloud joined13:28
TomyLobo left13:28
gitinfo set mode: +v13:28
govg joined13:29
DrSlony joined13:30
DrSlony Hello. I git pushed a commit, forgot that I did, then I made another commit and squashed the top two, and when I push this new squashed commit it gets rejected. I know for a fact that nobody pulled the changes. How do I fix this?13:30
squiddle left13:33
jost_ joined13:35
diogenese left13:35
danemacmillan joined13:36
espindola joined13:37
jost left13:38
tinajohnson__ left13:39
heroux left13:39
mezod left13:40
danemacmillan left13:41
michelangelo left13:42
mohabaks joined13:44
sgambino left13:44
shekh7ar left13:44
s8321414 left13:44
nitin_ left13:44
espindola left13:47
donmichelangelo joined13:47
johnmilton joined13:48
feliwir joined13:48
eka left13:48
feliwir hey is there anything free for git lfs that can store than 1gb?13:48
1gb is by far not enough for us :( We switeched to git-lfs because we thought that would allow us to store more13:49
aleksandar2810 left13:49
localuser joined13:50
aleksandar2810 joined13:50
Jackneill left13:50
mohabaks left13:51
coderMe left13:51
baris left13:51
eka joined13:52
a_thakur left13:52
jimi_ left13:52
localuser- left13:54
Code_Bleu left13:54
johnmilton left13:54
johnmilton joined13:55
heroux joined13:55
johnmilton left13:55
johnmilton joined13:55
DrSlony left13:55
star_prone joined13:56
Code_Bleu joined13:57
feliwir or is there a way to use github lfs in a bitbucket repository?13:58
kiloreux left13:58
myhau joined13:58
chris2 .oO(wait until someone writes a git-lfs backend abusing github releases :P)14:00
star_prone left14:00
xender left14:00
tobias joined14:01
mallocthis left14:01
sgambino joined14:03
t0by left14:03
johnmilton left14:04
johnmilton joined14:04
feliwir no seriously how can i set where git-lfs stores my files?14:04
nitin_ joined14:06
johnmilton left14:06
johnmilton joined14:06
johnmilton left14:06
johnmilton joined14:07
roxlu left14:07
johnmilton left14:07
ferr left14:07
johnmilton joined14:08
sparetire joined14:08
star_prone joined14:09
qsx feliwir: !3rd14:09
gitinfo feliwir: [!3rdparty] That tool is not part of git-core. I don’t know, but if you’re patient, someone else might answer your question.14:09
qsx also, by consensus of #git, lfs sucks.14:09
feliwir qsx, git-lfs 3rd party? -.-14:09
Sucks? :'(14:09
mezod joined14:10
ToxicFrog left14:12
star_prone left14:13
baris joined14:14
[Saint] left14:14
ToxicFrog joined14:14
codedmart joined14:15
a_thakur joined14:16
tvw joined14:17
nitin_ left14:17
Wulf joined14:18
Wulf Hi14:18
mohabaks joined14:18
xanadu__ left14:19
snguyen left14:19
[Saint] joined14:20
xanadu_ joined14:20
baris left14:21
Guest20451 left14:21
devth joined14:22
devth_ left14:24
cdg joined14:24
timewalker left14:25
alanwill joined14:25
alanwill left14:25
timewalker joined14:26
sgambino left14:28
paddyez joined14:29
bitkiller left14:30
Gamecubic joined14:31
govg left14:32
baris joined14:32
Pabzh joined14:32
Pabzh left14:32
coderMe joined14:32
heroux left14:32
govg joined14:33
erpu joined14:33
erpu left14:33
heroux joined14:35
Guest20451 joined14:36
t0by joined14:36
a_thakur left14:36
presto joined14:37
[Saint] left14:38
nitin_ joined14:40
[Saint] joined14:43
cdg left14:44
mohabaks left14:44
Corosus left14:45
jedix left14:45
Sleepy63 left14:48
livcd_ left14:52
livcd_ joined14:52
mezod left14:55
Corosus joined14:56
cyan__ joined14:57
star_prone joined14:58
star_prone left14:58
a_thakur joined14:59
jedix joined14:59
mase-tech joined15:01
Sleepy63 joined15:01
myhau left15:01
Corosus left15:01
Corosus joined15:02
muthu_ left15:02
Silenced joined15:03
Silenced left15:03
Silenced joined15:03
NeverDie left15:03
daito joined15:03
iMiiTH left15:07
daito left15:08
cbreak drslony: force push with git push -f15:10
govg left15:10
tvw left15:12
cbreak feliwir: have you looked at git-annex?15:12
http://blog.deveo.com/storing-large-binary-files-in-git-repositories/15:12
feliwir cbreak, no does it offer more storage?15:13
cbreak feliwir: infinite storage15:13
feliwir I just read that atlassian and github are recommending git lfs15:13
junw joined15:13
cbreak feliwir: you get to provide your own servers, including renting them from amazon15:13
feliwir cbreak, isn't this pretty much the same like git-lfs? There is also a amazon s3 lfs server15:14
cbreak no15:14
feliwir no? where is the difference15:14
eijk_ joined15:15
cbreak feliwir: described in the article I linked above15:16
basically, annex is separated with its own commands, and lfs is somehow munged into git and requires special server support15:16
feliwir Git-annex works by storing the contents of files being tracked by it to separate location. What is stored into the repository, is a symlink to the to the key under the separate location15:16
the same is on the git-lfs describtion pretty much15:17
diegoaguilar joined15:18
acetakwas left15:22
cebor left15:22
ac3takwas joined15:22
ahmedelgabri joined15:23
mezod joined15:25
ahmed_elgabri left15:25
cebor joined15:26
circ-user-15GfU left15:27
baris left15:27
zequence left15:28
Silenced left15:29
zequence joined15:29
kiloreux joined15:29
ferr joined15:29
squiddle joined15:29
nilsi joined15:29
liamonade joined15:32
kiloreux left15:34
squiddle left15:34
zequence left15:36
jottr joined15:37
Imaginativeone joined15:39
duderonomy left15:40
Juzzika left15:41
jottr left15:41
jottr joined15:42
duderono_ joined15:43
zequence joined15:43
hardenedapple left15:43
The_Phoenix joined15:44
ToBeCloud left15:44
hardenedapple joined15:44
danemacmillan joined15:44
livingstn joined15:45
NeverDie joined15:48
abc123_ left15:49
erichf joined15:49
boombatower joined15:51
blackwind_123 left15:53
livingstn left15:53
Raging_Hog joined15:54
abc123 joined15:54
blackwind_123 joined15:54
heroux left15:55
sargas joined15:57
livingstn joined15:57
heroux joined15:57
DolpheenDream joined15:59
HanClinto joined16:00
jottr_ joined16:00
diegoaguilar left16:02
livingstn left16:02
ac3takwas left16:02
OS-xWindow joined16:03
Celelibi Can I have a few stats about a git repository, like the number of objects, this kind of stuff?16:03
OS-xWindow http://www.pearltrees.com/pvpeliter/laptop-disini-bought-governor/id15409744#item167481741, , xWindow 10 ENTERPRISE , FREE CLASSIFIED OS FROM THE MOST HIGH HAS BEEN RELEASED , CLICK ON THE LINK THAT POP UP AND CLICK DOWNLOAD ... . DON'T FORGET TO JOIN ##Astara ... .16:03
subopt left16:03
jottr left16:03
Celelibi OS-xWindow: spams are not welcome at all.16:03
Jusle left16:04
heroux left16:05
liamonade left16:05
ferr left16:06
ncd|leeN joined16:07
thiago joined16:07
ferr joined16:08
OS-xWindow left16:08
heroux joined16:09
leeN left16:10
liamonade joined16:10
lmat left16:12
baris joined16:13
DolpheenDream left16:14
xapak joined16:17
johnmilton left16:18
xapak Hello16:18
gitinfo xapak: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.16:18
snguyen joined16:18
Aces_Charles left16:18
nitin_ left16:18
xapak I’m curious, is there a way to pull just one/latest commit, push only new changes made locally, and see history unaffected? Like, properly linked based on the latest commit new changes are based on?16:19
localuser- joined16:20
dreiss joined16:20
ferr left16:20
Treio joined16:22
Ahmed90 joined16:22
snguyen left16:23
localuser left16:23
jeffreylevesque left16:29
jason237 left16:30
clemf joined16:33
johnmilton joined16:33
johnmilton left16:35
Silenced joined16:35
jimi_ joined16:36
kugel__kugel16:36
NeverDie left16:36
Silenced left16:37
Silenced joined16:37
rpdprd left16:41
rpdprd joined16:42
Eclipse left16:42
Eclipse joined16:42
NeverDie joined16:43
nwkj86 left16:44
danemacmillan left16:48
_aronnax_ joined16:48
Eclipse left16:48
Eclipse joined16:49
Dyonisos joined16:49
mallocthis joined16:50
t0by left16:52
cyan__ left16:53
UmbraMalison left16:53
wcpan_ joined16:53
cyan__ joined16:53
wcpan left16:54
sebhoss joined16:56
hardenedapple left16:56
Eclipse left16:58
a_thakur left16:58
Eclipse joined16:58
dsdeiz left16:58
UmbraMalison joined16:59
dixvagon joined17:00
mallocthis left17:00
a_thakur joined17:02
cyan__ left17:02
Eclipse left17:03
Eclipse joined17:03
acetakwas joined17:04
daito joined17:04
kiloreux joined17:05
zumba_addict joined17:05
t0by joined17:06
zumba_addict Good morning folks! I can't find Create from an existing repo in github.com. Maybe it's because I'm thinking about bitbucket. How can I do this in github?17:06
grawity that's the "Fork" button17:06
zumba_addict oh17:06
I thought forking was only meant if you wanted to submit PRs17:06
But I want a new name of the repository17:07
mariuscc joined17:08
grawity so rename it17:08
mallocthis joined17:08
cyan__ joined17:08
daito left17:09
trewe joined17:10
zumba_addict I couldn't even fork it in my own account17:10
maybe because it's my own repo17:10
sssilver joined17:11
zumba_addict I'll try this "If you meant renaming your repository, go to your repo and click "admin", then rename. Once you see the red box warning you about some sky-fallingness and other things, go read this question. Rename PRJ0.git to PROJ1.git , then edit the URL variable located in the .git/config file of your project."17:11
a_thakur left17:11
Sembiance left17:11
baris left17:11
nishchal joined17:12
zumba_addict found it :) thanks17:12
aapaal joined17:13
zumba_addict now on my local repo, how do I map it to the new one? Can I edit .git/config directly?17:13
modocache joined17:14
xapak zumba_addict, git remote <remote-name> set-url <git-url>17:14
Or git help remote. :p17:14
zumba_addict ok17:14
what about editing .git/config, is it highly discourage?17:14
xapak Hmm, I suppose so. git remote has anti-human error checks, I guess, heh.17:15
zumba_addict got it17:15
maybe for creating another copy of this branch, I think it's impossible to do currently in github.com. What I'll do is duplicate the directory, then create a new branch in github.com, then push it to the new repo17:16
preyalone joined17:18
trewe left17:20
nishchal left17:21
danemacmillan joined17:22
jottr_ left17:22
jottr joined17:22
cyan__ left17:23
cyan__ joined17:24
cyan__ left17:24
roxlu_ joined17:25
danemacmillan left17:29
mallocthis left17:29
fedexo joined17:30
aapaal left17:31
kadoban joined17:33
sssilver left17:34
variable joined17:34
variabletrout17:34
troutfunction17:35
functionconstant17:35
BytesAndCoffee left17:35
constant left17:36
variable joined17:37
M-ixi left17:38
jeffreylevesque joined17:38
variable left17:39
blackwind_123 left17:41
joako left17:41
pandeiro joined17:41
danemacmillan joined17:41
strozyka joined17:41
jeffreylevesque left17:42
blackwind_123 joined17:42
roxlu_ left17:43
jeffreylevesque joined17:43
joako joined17:43
dsdeiz joined17:43
heroux left17:43
subhojit777 left17:46
boombatower left17:48
ali1234 joined17:49
danemacmillan left17:49
ali1234 i cloned a repository and forgot --recursive how do i fix it without deleting and starting again?17:49
_ikke_ git submodule update --init --recursive17:50
amdi_ joined17:50
ali1234 thanks17:50
Wetmelon joined17:51
nilsi left17:52
jottr_ joined17:52
jottr left17:55
gitinfo set mode: +v17:55
subhojit777 joined17:55
perlpilo1PerlJam17:55
ali1234 left17:56
goTAN joined17:56
NeverDie left17:57
ahmed_elgabri joined17:58
ali1234 joined17:58
ahmedelgabri left17:58
jost_ left17:58
xapak left17:59
dreiss left18:00
Goplat joined18:02
nitin_ joined18:05
heroux joined18:06
nnyk joined18:06
mellernoia-work joined18:07
shinnya left18:08
mellernoia left18:09
NeverDie joined18:09
nnyk_ left18:10
moobee joined18:10
gitinfo set mode: +v18:10
jottr_ left18:12
Faylite left18:12
toogley joined18:14
strozyka left18:15
mallocthis joined18:15
danemacmillan joined18:17
mellernoia-work left18:17
nnyk left18:18
erichf left18:20
junw left18:21
junw_ joined18:21
dreiss joined18:21
quinguu joined18:21
quinguu left18:21
aswen joined18:22
danemacmillan left18:23
pungi-man joined18:23
AustinMatherne left18:24
AustinMatherne joined18:25
kiloreux left18:25
kiloreux joined18:25
GT joined18:26
skinux joined18:30
skinux Is this the right channel for questions about Git Bash?18:30
liamonade left18:31
Faylite joined18:31
qsx decide, git or bash18:31
whatever, !ask18:32
gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.18:32
skinux My questions is where to find .bashrc on Windows18:32
qsx $HOME18:32
skinux I need to add an alias to the file, but I don't find the file18:32
_ikke_ ~/.bashrc18:32
It's usaully the user dir18:32
C:\users\<username>18:33
strozyka joined18:33
qsx i think git bash sets $HOME to %HOMEDRIVE%%HOMEPATH%18:33
skinux Also, is the a command like 'start' that will bring up another Git Bash console?18:33
rewt `start bash` seems to do it18:34
almost18:34
`mintty`18:34
skinux Well, ls -a | grep bash shows .bash_history but no .bashrc18:34
Should I just create one?18:35
rewt yes, you can18:35
baris joined18:35
rewt to open a new bash, you could also press the windows key, type 'bash', and press enter18:37
liamonade joined18:39
elsevero joined18:39
jaguarmagenta2 left18:41
jaguarmagenta joined18:41
t0by left18:41
mallocthis left18:42
ahmed_elgabri left18:44
diegoaguilar joined18:45
avgn5 left18:45
ch3sh1r left18:46
EvilPenguin joined18:50
skorgon joined18:50
rpdprd left18:50
localuser- left18:52
localuser- joined18:53
clr joined18:53
xaa left18:53
rpdprd joined18:54
Silenced left18:58
nitin_ left19:00
leprechau left19:01
hosttor joined19:04
KnightsOfNi left19:04
boombatower joined19:04
ch3sh1r joined19:05
daito joined19:05
leprechau joined19:05
Puhe left19:06
KnightsOfNi joined19:06
dreiss left19:06
jimi_ left19:08
elsevero left19:09
elsevero joined19:09
daito left19:09
jolts left19:10
fracting left19:10
liamonade left19:11
ahmed_elgabri joined19:12
jayjo joined19:12
skinux left19:12
fracting joined19:14
jayjo left19:15
jayjo joined19:15
elastix joined19:15
jayjo left19:16
fahadash joined19:16
fahadash left19:16
fahadash joined19:16
fahadash left19:16
fahadash joined19:16
years joined19:18
GT left19:20
SOLDIERz joined19:20
subhojit777_ joined19:21
subhojit777_ left19:21
blackwind_123 left19:22
t0by joined19:23
subhojit777 left19:23
dreiss joined19:23
jmpp left19:24
jteneyck joined19:25
liamonade joined19:25
shinnya joined19:28
codedmart left19:28
jason237 joined19:28
acetakwas left19:28
joe- joined19:28
sgambino joined19:29
jmpp joined19:29
sgambino left19:30
skorgon left19:30
squiddle joined19:31
joufflu joined19:31
SOLDIERz left19:32
dreiss left19:34
squiddle left19:35
dixvagon left19:36
goTAN left19:37
aapaaal joined19:37
Lyqyd joined19:38
coderMe left19:38
David1977 joined19:38
coderMe joined19:41
xlegoman joined19:43
abc123 left19:45
abc123_ joined19:45
aswen left19:45
The_Phoenix left19:46
pandeiro left19:46
heroux left19:47
mostlybadfly left19:47
micechal joined19:48
micechal left19:49
NeverDie left19:50
heroux joined19:51
sanketdg left19:52
led_belly joined19:57
heroux left19:57
ahmed_elgabri left19:58
Wulf left19:59
rindolf joined20:00
dennda left20:00
Domhack joined20:01
heroux joined20:02
sargas left20:02
SimonNaa joined20:03
jolts joined20:03
NeverDie joined20:03
moobee left20:04
Wulf joined20:05
danemacmillan joined20:05
ahmed_elgabri joined20:05
jteneyck left20:06
SimonNa left20:06
squiddle joined20:06
aapaaal left20:06
aapaaal joined20:06
years left20:09
aleksandar2810 left20:09
Wulf Hi20:09
diegoaguilar left20:09
Wulf How can I get a list of all tags that contain a specific commit?20:10
lindenle joined20:10
ahmedelgabri joined20:10
grawity git tag --contains <hash>20:10
might be new-ish20:10
_ikke_ Don't think so20:10
Wulf grawity: thanks!20:11
squiddle left20:11
alekks joined20:11
localuser joined20:12
ahmed_elgabri left20:12
_ikke_ grawity: 200920:12
32c35cfb1e9c8523b9d60e5095f1c49ebaef027920:12
lindenle left20:14
TDJACR left20:15
mohabaks joined20:15
localuser- left20:16
yqt joined20:16
codedmart joined20:18
Bennux joined20:18
aaw joined20:19
codedmart left20:20
codedmart joined20:20
ahmedelgabri left20:23
modocache left20:23
modocache joined20:24
diegoaguilar joined20:25
dennda joined20:25
modocache left20:25
modocache joined20:26
ferr joined20:27
rubyonrailed joined20:29
codedmart left20:29
modocach_ joined20:30
TDJACR joined20:30
modocache left20:30
aaw left20:31
years joined20:31
jteneyck joined20:33
rneco joined20:33
RiPer joined20:34
Domhack left20:35
kierk joined20:37
mariuscc left20:37
aaw joined20:37
aaw left20:38
dantix left20:38
years left20:41
tristanp left20:42
raijin left20:43
raijin joined20:43
diegoaguilar left20:45
rubyonrailed left20:46
MiniMax joined20:46
JohnBat26 joined20:48
Bennux left20:50
funkiestj joined20:50
daito joined20:51
heroux left20:51
gitinfo set mode: +v20:52
funkiestj how can I find a source tarball for git 1.9.5?20:52
I have a VM that I have to use which is running Ubuntu 12.04 LTS20:52
mohabaks left20:52
mohabaks joined20:53
rewt the latest version of git runs just fine on ubuntu 12.04 LTS20:54
Seveas funkiestj: 1) git 1.9.5 is *ancient* 2) github.com/git/git/ will have them20:54
funkiestj right, but I need to interoperate with 1.720:54
Seveas the latest git will interoperate with 1.7 just fine20:54
though you should just upgrade the 1.720:54
funkiestj I have git 2.x on my Ubuntu 15.10 VM ...20:54
_ikke_ https://github.com/git/git/releases/tag/v1.9.520:54
funkiestj thx _ikke_20:55
dantix joined20:55
funkiestj I thought git 2.x was incompatible with git 1.x20:55
_ikke_ 1nope20:55
funkiestj hence the major version bump20:55
_ikke_ More like ui changes20:55
squiddle joined20:55
Seveas funkiestj: never assume things without verifying :)20:55
_ikke_ internal repo fromat hasn't changed20:55
rewt i run 2.7.0 (latest) on ubuntu 12.04 LTS20:55
NeverDie left20:55
daito left20:56
rewt http://askubuntu.com/questions/568591/how-do-i-install-the-latest-version-of-git-with-apt20:56
Eclipse left20:56
Eclipse joined20:56
funkiestj the worry isn't running 2.7 on 12.04, but interoperating with a master/origin that is 1.7.20:57
_ikke_ That's not a problem20:57
funkiestj what is Felipe talking about here https://felipec.wordpress.com/2014/05/29/git-v2-0-0/ when he says "backward incompatible". NOTE if it is not clear yet, I am a git n00b.20:57
_ikke_ funkiestj: That the UI has changed20:58
Seveas Felipe talks about the few ui changes that have different defaults than before20:58
_ikke_ things like config defaults and parameter argumetns20:58
aapaaal left20:58
Seveas also, felipe isn't the best source of git information20:59
funkiestj thx. I'm new to git and trying to figure things out :)20:59
sgambino joined21:00
funkiestj I want to use emacs/magit which is no go with 1.7. Based on your feedback I'll simply try the latest stable 2.7.x21:00
thanks for the hand holding :)21:00
joufflu left21:00
daito joined21:02
rewt funkiestj, i suggest going the ppa route (see answer in link), so you'll automatically get updates (same as other system packages) as newer versions are released21:02
mostlybadfly joined21:02
baris left21:03
funkiestj OK21:04
heroux joined21:05
aapaaal joined21:06
raijin left21:06
dreiss joined21:08
WaReZ joined21:09
daito left21:09
aapaaal left21:09
JSharpe joined21:11
joe- left21:11
Arsonide joined21:12
fracting left21:12
fracting joined21:13
heroux left21:13
chotaz left21:14
aleksandar2810 joined21:15
cagedwisdom joined21:17
diogenese joined21:18
t0by left21:18
|node joined21:20
sssilver joined21:20
t0by joined21:20
localuser- joined21:21
t0by left21:22
t0by joined21:22
sgambino left21:23
heroux joined21:23
dantix left21:23
akmoilt left21:23
dantix joined21:23
jteneyck left21:24
_jesse__ joined21:24
rubyonrailed joined21:24
localuser left21:25
Raging_Hog left21:26
rpdprd left21:29
raijin joined21:30
eijk_ left21:31
fahadash left21:31
mohabaks left21:31
rpdprd joined21:32
hosttor left21:32
nwkj86 joined21:33
_jesse__ is anyone aware of a way to `git commit --amend` without modifying the committer on the commit? Striking out in my searching21:33
flavi0 left21:33
jon-mac left21:35
BlessJah Trying to impersonate someone are we?21:37
_jesse__: why would you modify commiter? (or rather keep original commiter)21:37
goTAN joined21:37
xlegoman left21:38
rubyonrailed left21:38
funkiestj left21:39
pungi-man left21:39
localuser joined21:41
BlessJah _jesse__: check out GIT_COMMITTER_NAME GIT_COMMITTER_DATE GIT_AUTHOR_DATE env variables21:41
star_prone joined21:42
_jesse__ haha, not trying to impersonate, it'd just be nice to rebase a branch with master, but keep the current author/committer attribution21:42
BlessJah GIT_COMMITTER_NAME=qwe GIT_COMMITTER_EMAIL=qwe@qwe.qwe git commit -m ebebe --amend ; git cat-file -p HEAD | grep committer21:42
committer qwe [email@hidden.address] 1454794870 +010021:42
goTAN left21:42
_jesse__ hmm21:42
ddssx joined21:42
ddssx left21:42
kaiza joined21:43
BlessJah _jesse__: you want to keep author intact, committer is hidden field that's meant to point to person doing rebase/amend/pick etc21:43
codedmart joined21:43
baris joined21:44
localuser- left21:45
jxpx777 joined21:45
_jesse__ yeah, I know, we are abusing the committer field to model "pairing" where two users are involved in a commit and we'd like to attribute it to both21:46
jteneyck joined21:46
jteneyck left21:46
jteneyck joined21:46
jteneyck left21:46
jteneyck joined21:46
jteneyck left21:46
jteneyck joined21:46
_jesse__ which has led to some fighting with the git porcelain :)21:46
jteneyck left21:46
ojacobson an `as` shell function might be useful21:46
so you can write "as jesse git commit"21:47
if your email addresses have a predictable format or if there's a directory you can look them up in, that shouldn't be too hard21:47
star_prone left21:47
jteneyck joined21:47
jteneyck left21:47
jteneyck joined21:47
jteneyck left21:47
BlessJah would rather abuse commit message rather than committer21:47
duderono_ left21:48
duderonomy joined21:49
_ikke_ ie, signed-off-by21:49
MattMaker joined21:51
_jesse__ hat is another approach -- some of the tools built around git (like github) pick up the committer as a first class field which is what led us down this path21:51
*thet21:51
sssilver left21:51
_jesse__ *that21:52
but I understand that it isn't the intended usage21:57
I'll keep brainstorming around it, but thank you all for the discussion21:57
IanCarbon joined21:59
rneco left22:00
nnyk joined22:01
dfa joined22:02
meloc left22:02
baris left22:04
nander joined22:04
vkngpmhc joined22:05
vkngpmhc_ joined22:05
kiloreux left22:06
nnyk left22:07
Cassiopaya joined22:08
Discovery joined22:08
Discovery left22:08
Cassiopaya left22:08
Jusle joined22:09
rubyonrailed joined22:09
jagob joined22:10
devth_ joined22:10
fedexo left22:10
devth left22:13
IanCarbon left22:15
MindfulMonk joined22:15
dfa left22:16
squiddle left22:17
|node left22:19
poldo79 joined22:20
tristanp joined22:20
Imek joined22:20
JohnBat26 left22:22
LucaTM left22:22
blackwind_123 joined22:24
arooni joined22:24
Goplat left22:25
toogley left22:27
furrowedbrow joined22:27
codedmart left22:28
poldo79 left22:28
_jesse___jesse_22:28
CheckDavid joined22:31
jaaronamo left22:34
Kicer86 left22:37
jonesinator joined22:37
Sleepy63 left22:38
toogley joined22:38
ferr left22:39
toogley left22:42
localuser left22:42
sgambino joined22:43
BeatrixKiddo joined22:43
BeatrixKiddo left22:43
BeatrixKiddo joined22:43
squiddle joined22:43
pwnz0r joined22:45
pantsman- left22:45
Ranhir left22:45
hashpling joined22:46
heroux left22:47
star_prone joined22:48
squiddle left22:49
jaguarmagenta2 joined22:50
lungaro left22:50
rindolf left22:51
elastix left22:52
star_prone left22:52
jaguarmagenta left22:52
tristanp left22:53
yarnfive8 left22:53
heroux joined22:54
elastix joined22:54
dreiss left22:54
codedmart joined22:54
aranea joined22:55
chiromante left22:55
skorgon joined22:55
arooni left22:55
jeffreylevesque left22:56
peoliye joined22:57
arooni joined22:58
hashpling left22:58
joufflu joined22:59
jaguarmagenta joined23:01
jaguarmagenta2 left23:01
lungaro joined23:02
pwnz0r left23:02
daito joined23:04
diogenese left23:05
JSharpe left23:06
David1977 left23:08
daito left23:09
fees left23:09
mutt joined23:11
mezod left23:12
bitkiller joined23:12
_aronnax_ left23:12
MiniMax left23:13
jonesinator left23:16
dantix left23:19
diogenese joined23:20
jaguarmagenta left23:22
jaguarmagenta joined23:22
Ahmed90 left23:25
modocach_ left23:25
modocache joined23:26
Ranhir joined23:27
jaguarmagenta left23:30
mutt left23:31
aleksandar2810 left23:32
aleksandar2810 joined23:33
heroux left23:33
jaguarmagenta joined23:34
heroux joined23:34
rmrrn joined23:35
rmrrn left23:35
rmrrn joined23:35
D-Boy left23:36
arteomp joined23:36
VanillaBean joined23:36
Limes_ left23:37
dsdeiz left23:40
elastix left23:41
astockton joined23:41
|ifei5g00d joined23:41
rmrrn left23:44
astockton left23:45
rmrrn joined23:46
rmrrn left23:46
rmrrn joined23:46
gitinfo set mode: +v23:48
VanillaBean I just did a git puch origin stage command from my location that I usually only ever pull from. Git's history says the origin has the new commit, but I don't see it in origin (which happens to be bitbucket). Not sure what happened23:48
elsevero left23:48
irckin joined23:48
rmrrn left23:50
grawity which branch on Bitbucket are you looking in?23:50
arteomp Hello, one project has several commits from last tag. Im interesting only in one commit. What is good way to get patch for it? Make checkout to last tag, create new commit by hand and make diff? Or maybe exist better ways?23:51
VanillaBean under commit it says all. If I change it to stage I still don't see it23:52
grawity git cherry-pick <commit>23:52
modocache left23:52
jxpx777 left23:53
BeatrixKiddo left23:53
BeatrixKiddo joined23:54
rmrrn joined23:54
rmrrn left23:54
rmrrn joined23:54
D-Boy joined23:54
rmrrn left23:55
rmrrn joined23:55
rmrrn left23:55
rmrrn joined23:55
n00bdev joined23:57
EvilPenguin left23:58
skorgon left23:59

Logs Search ←Prev date Next date→ Channels Documentation