IRCloggy #git 2016-03-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-03-06

mischat joined00:01
barajasfab joined00:01
Sigfrid left00:03
eletuchy left00:03
Balliad left00:04
jason237 left00:06
flavi0 left00:07
sdothum left00:08
eletuchy joined00:08
JanC joined00:08
GT4066 left00:09
sdothum joined00:10
polyidus left00:13
eletuchy left00:15
diegoviola left00:18
barajasfab left00:18
mischat left00:19
fracting left00:21
delight left00:23
mattfoo left00:24
espindola joined00:25
mattfoo joined00:28
Bat`O_ left00:28
jottr_ joined00:29
cagedwisdom left00:29
espindola left00:31
linuxmint joined00:32
linuxmint left00:33
rolha_ joined00:34
rolha left00:35
paddyez left00:37
chris_wot joined00:37
user083 joined00:37
dsdeiz left00:38
rolha joined00:39
rolha_ left00:40
jimmyeatworld left00:42
HelloAtMega joined00:42
cagmz joined00:45
nwkj86 left00:49
martixy Hm, I a bit of a problem. I wanna set up a local dev env for a project I forked. I can easily create local versions of the config/project files, but that still means I have to modify the single gitignore file. That either means a commit that throws a wrench in the whole affair or having to worry about keeping those changes unstaged for all eternity. Is there a better way?00:49
Jauble joined00:49
Goplat left00:52
daito joined00:52
Midoshi27 left00:53
diogenese joined00:53
eletuchy joined00:54
Tatsh left00:56
BombStrike left00:56
daito left00:57
Limes_ left00:57
fstd_ joined01:00
BombStrike joined01:01
Domhack left01:01
Domhack joined01:02
whitby left01:02
fstd left01:03
fstd_fstd01:03
lolmac left01:10
MissionCritical left01:11
user083 left01:12
LBV_User joined01:13
lolmac joined01:14
King_Hual left01:15
kam270 left01:15
Rodya_ joined01:17
dsdeiz joined01:17
sangy left01:18
espindola joined01:20
MissionCritical joined01:21
rubyonrailed joined01:23
Rodya_ left01:26
liamonade left01:26
jottr joined01:26
Rodya_ joined01:26
jottr_ left01:30
espindola left01:30
Rodya_ left01:31
CEnnis91 joined01:32
DaveLib joined01:32
sargas joined01:33
jaafar left01:34
sssilver joined01:37
jaguarmagenta left01:37
MattMaker left01:38
Goplat joined01:38
lethjakman-l left01:38
pasky left01:43
Dreamer3 left01:43
hgl joined01:43
Dreamer3 joined01:44
lucasem joined01:47
Impaloo left01:48
cdg left01:49
Impaloo joined01:49
pasky joined01:50
linuxmint joined01:50
Dreamer__ joined01:50
tristanp joined01:51
diegoviola joined01:52
ajf- joined01:53
daito joined01:53
tristanp left01:54
diegoviola left01:54
Dreamer3 left01:55
ajf- left01:55
mezod left01:55
cyan__ left01:58
daito left01:58
espindola joined02:03
dsdeiz left02:03
MattMaker joined02:04
MattMaker left02:04
diegoviola joined02:04
cagmz_ joined02:05
jaguarmagenta joined02:05
m0viefreak left02:05
m0viefreak joined02:06
DaveLib left02:06
Goplat left02:06
nettoweb joined02:07
kfoonamalik joined02:08
osse martixy: use .git/info/exclude02:08
cagmz left02:08
rolha_ joined02:08
osse it's like a private .gitignore02:08
DaveLib joined02:09
weox joined02:09
kfoonamalik left02:09
cagmz_ left02:09
martixy Huh... cool. Thank you.02:09
rolha left02:10
jaguarmagenta left02:10
jaguarmagenta joined02:10
martixy Wait... shit. Windows.02:12
cdg joined02:13
codeman joined02:19
tachoknight__ joined02:22
cagmz joined02:22
tachoknight__ left02:23
nettoweb left02:24
dan2k3k4 joined02:24
donmichelangelo joined02:26
ajf- joined02:27
Rodya_ joined02:27
HanClinto joined02:27
lindenle joined02:27
michelangelo left02:29
jottr left02:30
espindola left02:30
spb joined02:30
espindola joined02:31
rolha_ left02:31
lindenle left02:31
espindola left02:32
Literphor joined02:33
rolha joined02:33
mablae__ joined02:34
Goplat joined02:34
sssilver left02:34
sssilver joined02:35
lethjakman-l joined02:36
Vampire0_ joined02:36
sangy joined02:36
jeffmjack left02:37
cdg left02:37
mablae_ left02:37
cdg joined02:37
Vampire0 left02:39
cdg_ joined02:40
lethjakman-l left02:41
cdg left02:42
pks left02:44
pks_ joined02:45
Rodya_ left02:47
diego2 joined02:47
Rodya_ joined02:47
diego2 left02:47
diego2 joined02:47
diegoviolaGuest6511402:48
diego2diegoviola02:48
Rodya_ left02:48
espindola joined02:49
Guest65114 left02:49
espindola left02:50
osse martixy: so what?02:52
cagmz left02:53
martixy slashes02:53
Not allowed in filenames.02:53
osse martixy: .git and info are directories02:53
martixy Oh.02:53
osse slashes aren't allowed anywhere I know of02:54
martixy I dunno... I vaguely remember linux being more permissive.02:55
osse martixy: it is definitely more permissive.02:55
/ and \0 are the only ones that aren't allowed02:56
ColdKeybo[a]rd joined02:57
Sucks joined02:57
ColdKeyboard left02:58
ColdKeybo[a]rd left02:58
lbv-user joined02:59
ShapeShifter499 left02:59
ColdKeyboard joined02:59
martixy Hmm.. interesting. So you can name your files with control characters? :)02:59
osse yes03:00
lbv-user left03:01
martixy That's mildly amusing. :)03:01
LBV_User left03:02
nfk left03:03
IlNominePatre left03:03
Cassiopaya left03:03
Limes_ joined03:03
Sucks left03:04
Ahmed90 left03:05
lolmac left03:07
LeBlaaanc left03:08
Limes_ left03:09
Noldorin left03:09
cdg_ left03:09
strayPuppy joined03:10
rolha_ joined03:10
lolmac joined03:11
rolha left03:13
fedexo joined03:13
Noldorin joined03:16
fscala left03:17
qsx especially if you do it on NTFS and try to access it from windows03:18
jaguarmagenta2 joined03:18
qsx ever tried deleting (not to mention open or so) a file containing a colon on windows?03:18
dan2k3k4 left03:18
codeman left03:18
ajf- left03:18
fscala joined03:19
Noldorin left03:19
rubyonrailed left03:20
chachasmooth left03:20
rubyonrailed joined03:21
jaguarmagenta left03:22
chachasmooth joined03:23
jagob left03:23
Dougie187 joined03:25
dan2k3k4 joined03:27
Literphor left03:29
botevoker joined03:31
lethjakman-l joined03:36
nettoweb joined03:38
nettoweb left03:40
choki_ joined03:43
jason237 joined03:43
rubyonrailed left03:45
choki left03:45
jason237 left03:47
spinningarrow joined03:48
d4rklit3 joined03:48
Rodya_ joined03:49
cmosguy joined03:50
D-Boy left03:50
jason237 joined03:50
joufflu joined03:52
fahadash How do I revert files changes that have not been staged back to the last commit? git checkout master --force does not work03:54
Literphor joined03:54
daito joined03:54
darlinger fahadash: git checkout HEAD03:55
fahadash: actually, git reset --hard HEAD^03:55
to go back to the least commit03:56
fahadash after doing git reset --hard HEAD I continue to see the unstaged changes03:57
dan2k3k4 left03:58
fahadash those changes are new directories created03:58
daito left03:59
arescorpio joined03:59
nilsi joined03:59
fahadash ok I tried this... git add --all then git reset --hard HEAD and it worked04:00
Thanks04:00
D-Boy joined04:01
dreiss joined04:02
cdg joined04:10
dhureen joined04:10
nppr joined04:10
lrvick left04:11
Silenced joined04:11
Silenced left04:11
Silenced joined04:11
nppr left04:11
jfelchner_ joined04:12
jfelchner left04:13
diegoviola left04:14
s00pcan left04:17
Jauble left04:18
cdg left04:18
DaveLib left04:20
diegoaguilar left04:20
roygbiv joined04:21
Rodya_ left04:21
Jauble joined04:21
s00pcan joined04:22
spinningarrow left04:24
fstd left04:24
ensyde_ joined04:25
Dougie187 left04:26
mayankgupta1996 joined04:26
[TheFlash] joined04:27
lrvick joined04:27
[TheFlash] hi, i'm using "git bisect skip" to skip certain revisions while bisecting, but the number of revisions left doesn't seem to decrease when i do it, why is that?04:28
lindenle joined04:29
[TheFlash] it says it still has 23 revisions to test, but i really feel like i've skipped a lot more than 2304:29
bollullera left04:29
tlaxkit left04:30
kam270 joined04:32
ShapeShifter499 joined04:33
lindenle left04:33
lrvick left04:33
kam270 left04:34
kam270 joined04:34
diegoaguilar joined04:35
HelloAtMega left04:35
TDJACR left04:38
[TheFlash] ah, ok, it's done now04:41
so i guess it only "felt" like more than 2304:41
nevermind04:41
[TheFlash] left04:41
treaki__ joined04:42
HanClinto left04:42
tigos2 joined04:43
|node joined04:43
xelxebar joined04:44
botevoker left04:44
diogenese left04:44
m0viefreak left04:45
CEnnis91 left04:45
treaki_ left04:46
Jauble left04:46
tigos2 left04:47
Jauble joined04:47
italoacasas left04:49
|node left04:50
Gamecubic left04:55
Gamecubic joined04:56
ahr3n joined04:56
Manikandan joined04:57
TDJACR joined04:57
jagob joined04:57
ShapeShifter499 left05:01
ensyde_ left05:03
kadoban left05:04
ToBeCloud left05:04
PtxDK left05:05
PtxDK joined05:05
srcerer left05:05
srcerer_ joined05:05
martixy left05:06
bannakaffalatta joined05:07
diogenese joined05:08
ShapeShifter499 joined05:10
denimsoft joined05:10
hgl left05:10
diogenese left05:12
srcerer_ left05:12
tinajohnson__ joined05:13
hgl joined05:13
Jauble left05:16
aviraldg left05:17
ensyde_ joined05:17
Silenced left05:18
Rodya_ joined05:18
lucasem left05:21
Rodya_ left05:23
dinesh_ joined05:25
dinesh__ joined05:26
dinesh__ left05:26
Gamecubic left05:28
benbergman left05:30
sdothum left05:30
botevoker joined05:30
boudicca joined05:31
benbergman joined05:31
dinesh_ hi05:31
axisys left05:31
dinesh_ left05:32
ShapeShifter499 left05:32
dinesh_ joined05:32
dineshp joined05:33
boudiccas left05:33
dinesh_ left05:33
Jauble joined05:34
botevoker left05:36
dineshp When I generate a patch using git patch format -1 , how do i ensure that the generated file has a maximum column width of 70 columns. Because when sending emails using git send-email, the community requires that the email is formatted to a amx of 70 columns05:36
*max05:36
punto left05:36
dhureen left05:36
punto joined05:37
sargas left05:38
Cabanossi left05:38
Cabanossi joined05:41
swordonly joined05:42
PryMar56 dineshp, did you install `git-email`?05:43
dineshp, then, man git-send-email05:45
gitinfo dineshp: the git-send-email manpage is available at http://jk.gs/git-send-email.html05:45
dineshp PryMar56: no, I am using git format-patch to generate the patch files and emailing it using git send-email05:45
PryMar56 dineshp, I'm Debian centric, not sure what your Env is05:45
dineshp PryMar56: linux mint05:46
pks_pks05:46
dineshp the commands should be pretty similar05:46
languitar left05:47
languitar joined05:47
dineshp how to the the people on the git mailing list format their emails and patches that they send, such that they are a max of 70 columns in width?05:47
socketguru left05:47
Manikandan left05:48
dineshp PryMar56: if you have experience sending out properly formatted patches, could you help me out?05:48
ShapeShifter499 joined05:48
PryMar56 dineshp, try to test and send patches to a web email. Use a revision range straight from git05:49
dineshp PryMar56: I tried that but I am not able to restrict the width of each line to 70 columns. I am currently manually editing it to 70 columns per line. since this is very inefficient, ia ma looking to automate it05:51
*i am05:51
kam270 left05:53
sssilver left05:54
daito joined05:55
cagmz joined05:55
Silenced joined05:56
Silenced left05:56
Silenced joined05:56
PryMar56 dineshp, 70 columns is not standard. Nice try05:56
enjoy the fruitless edits and manual intervention05:57
dineshp PryMar56: I sent a patch yesterday and that was the comment I got from Junio. How do I format the patches and emails? What do you suggest?05:57
PryMar56 git-format-patch accepts --stat=7005:57
dineshp PryMar56: Thank you, will try it out05:58
daito left05:59
diegoaguilar left06:03
diogenese joined06:03
GuKKDevel joined06:04
dineshp PryMar56: git format-patch -1 --stat=70 -M origin/master -o outgoing/06:05
PryMar56: Still the patches are not being formatted properly, with 70 columns per line06:06
sssilver joined06:06
PryMar56 dineshp, terminal width, luke06:08
dineshp PryMar56: I did not understand.06:08
my terminal width 80characters, but some lines in the generated patch file contain 100 lines06:09
*columns06:09
arescorpio left06:11
kam270 joined06:12
jonmorehouse joined06:13
dharrigan left06:14
dreiss left06:14
lethjakman-l left06:14
kam270 left06:14
bennyZ joined06:15
jonmorehouse left06:16
jonmorehouse joined06:17
jonmorehouse left06:18
Dios joined06:18
Rodya_ joined06:19
dineshp left06:19
Jauble left06:20
bennyZ left06:20
drawkula left06:22
Aerosonic joined06:24
nilg joined06:24
Rodya_ left06:25
floatingpoint joined06:25
jonmorehouse joined06:25
cmosguy left06:26
jonmorehouse left06:26
jonmorehouse joined06:27
jonmorehouse left06:27
jonmorehouse joined06:29
srcerer joined06:29
jonmorehouse left06:30
lindenle joined06:30
Jauble joined06:31
cagmz left06:31
joufflu left06:33
lindenle left06:35
dharrigan joined06:35
drawkula joined06:36
freimatz joined06:42
ramsub07 left06:42
StormLrd joined06:42
GuKKDevel left06:43
fedexo left06:43
jaafar joined06:45
mayankgupta1996 left06:46
mayankgupta1996 joined06:49
Goplat left06:51
_ikke_ That's because the patch has to match the code06:52
If the code is more than 80 columns, the resulting patch will be too06:53
choki_choki06:53
fstd joined06:53
lethjakman-l joined06:54
choki left06:54
elastix joined06:56
Kicer86 joined06:57
Dios left06:57
ensyde__ joined06:58
FunkyAss joined06:59
lethjakman-l left06:59
phaleth joined06:59
Jauble left07:00
ensyde_ left07:01
sssilver left07:02
nilg left07:02
boombatower left07:04
sssilver joined07:07
wrouesnel left07:07
subhojit777 joined07:08
swordonly left07:09
Silenced left07:09
Sasazuka left07:09
LucaTM joined07:11
kaiza joined07:12
elastix left07:12
PryMar56 left07:13
Jauble joined07:15
meloc_ left07:16
crater2150 left07:19
Rodya_ joined07:21
paddyez joined07:22
floatingpoint left07:23
presto left07:23
emPi joined07:24
denimsoft left07:24
lethjakman-l joined07:25
Rodya_ left07:25
elementalest left07:26
elementalest joined07:26
elementalest left07:26
elementalest joined07:26
brcolow joined07:26
brcolow I have the following branch situation: http://imgur.com/mIzepN1 - I would like to flatten a la git rebase -i HEAD~1, but doing so causes a TON of annoying merge conflicts. is there a way to tell git to DWIM (which is to use the latest changes from the most recent commit)07:28
denimsoft joined07:29
lethjakman-l left07:30
MutantMahesh joined07:30
spinningarrow joined07:30
_ikke_ brcolow: This looks like a simple --no-ff merge that you want to undo?07:31
jaafar left07:31
brcolow I am not sure07:32
_ikke_ Oh no, I see it now07:32
brcolow I just want a straight line, linear history07:33
_ikke_ right07:33
brcolow without a ton of merge conflicts, which maybe I don't fully understand, but /should/ be possible?07:33
xelxebar left07:34
_ikke_ brcolow: I think you first want to undo the merge07:34
not sure, but that might contribute to the merge conflicts you're seeing07:34
brcolow git reset --hard 20145c3 ?07:34
_ikke_ You know the consequences of rewriting published history?07:35
brcolow indeed07:35
_ikke_ brcolow: Looks right07:35
brcolow I am the only consumer, thankfully07:35
Dragooon joined07:35
brcolow lmao07:35
_ikke_ ?07:35
brcolow undoing the merge seems to have fixed everything, seems it is just a straight line now!07:36
looks good now! :) thanks very much07:36
_ikke_ right.. :P07:36
brcolow sometimes with git I feel really lost because of the amount of possibilities, but it is always so simple in my experience07:37
_ikke_ Are you sure, beceause your history was still diverged07:37
cdg joined07:37
brcolow git pull shows up to date, I am on master, nothing to commit07:37
_ikke_ brcolow: does git log --oneline master..origin/master return commits?07:37
brcolow returns nothing07:38
_nadim joined07:38
_ikke_ That's because origin/master still has the merge commit07:38
brcolow oh, should I push --force?07:39
_ikke_ Hold on a sec07:39
brcolow sure07:39
tinajohnson__ left07:39
_ikke_ can you post !situation somewhere?07:40
gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)07:40
daito joined07:40
_ikke_ It does not show commit messages only branchnames and commits07:40
increase 20 to 30 or something07:40
brcolow http://pastebin.com/6fhzAeBH07:41
grassass joined07:41
brcolow that bitfinex-link-brainstorm branch is just an idea branch I had, just holds some reworkings that I have no merged into master yet07:41
cdg left07:42
Motoko left07:42
_ikke_ brcolow: besides the reset, what other commands did you run?07:43
Something caused your origin/master to be reset too07:43
brcolow I /thought/ nothing...but looking at my command history I might have reflexively done git push --force...if I did I'm quite sorry for the confusion07:45
_ikke_ That would explain it07:45
but that also means you are missing some history07:45
daito left07:45
_ikke_ All the commits on the bottom of the image you pasted07:45
elastix joined07:46
elastix left07:46
_ikke_ brcolow: You should be really careful with git push --force07:46
brcolow hmm..I am comparing my current git log output to the image and nothing is missing07:47
_ikke_ git branch --contains 375013607:49
Jauble left07:49
Tryop88 joined07:49
brcolow ah.....07:50
yes..07:50
daito joined07:50
brcolow but now07:51
I have a commit 71b...with the same commit message as 375013607:51
it is the 2nd latest commit07:51
_ikke_ Ok, so you already did do some rebasing?07:52
brcolow I'm honestly not sure at this point07:52
but all appearances show that your suggestion did do what I want. How it worked and what nonsensical commands I typed into the terminal like a monkey is another matter07:53
dreiss joined07:53
ixian8 left07:54
a_thakur joined07:54
Jauble joined07:55
jagob left07:55
daito left07:57
dmko joined07:57
ixian joined07:59
intrigueD joined08:01
Wetmelon is it possible to pick & choose commits to merge?08:02
thiago left08:02
Wetmelon Say I branch, make 3 commits on the new branch but I only want to merge commits #1 and #3 back into master, is that doable?08:02
brcolow cherry-pick08:04
https://git-scm.com/docs/git-cherry-pick08:04
a_thakur left08:04
spinningarrow left08:05
Wetmelon ty08:06
freimatz left08:06
ssd532_ joined08:10
_ikke_ brcolow: I suspect you did a rebase and then git pull afterwards08:10
akiva joined08:12
weox left08:13
_ikke_ Wetmelon: Note that cherry-pick does not merge history, just copies commits08:14
MutantMahesh left08:16
Wetmelon Oh, that's fine08:18
srcerer left08:18
ahr3n left08:19
srcerer joined08:20
elastix joined08:21
Rodya_ joined08:22
ahr3n joined08:22
srcerer_ joined08:24
neanderslob_ joined08:26
Rodya_ left08:26
srcerer left08:26
denimsoft left08:26
Silenced joined08:29
Silenced left08:29
Silenced joined08:29
Literphor left08:29
srcerer_srcerer08:30
dreiss left08:31
lindenle joined08:32
rolha joined08:34
moobee joined08:34
gitinfo set mode: +v08:34
rolha_ left08:35
ugjka joined08:36
nidr0x joined08:36
srcerer_ joined08:36
lindenle left08:36
srcerer left08:36
Wetmelon left08:39
ahr3n left08:39
morfin60 joined08:39
morfin left08:39
srcerer_srcerer08:40
t0by joined08:41
text1 left08:41
elastix left08:41
Jauble left08:46
MutantMahesh joined08:48
subhojit777 left08:52
intrigueD left08:55
tinajohnson__ joined08:55
pantsman- joined08:59
strayPuppy left08:59
subhojit777 joined09:02
sssilver left09:03
eletuchy left09:04
MutantMahesh left09:05
moL-Ou joined09:07
davisonio joined09:08
Jauble joined09:12
slappymcfry joined09:13
lethjakman-l joined09:14
joki left09:14
Aerosonic left09:17
xelxebar joined09:17
lethjakman-l left09:18
joki joined09:18
radsy joined09:19
mayankgupta1996 left09:21
cyan__ joined09:25
Wetmelon joined09:27
xelxebar left09:27
Jauble left09:28
polyidus joined09:29
scarabx joined09:29
xelxebar joined09:30
scarabx left09:30
jacob357 joined09:30
scarabx joined09:30
bannakaffalatta left09:31
Fijit joined09:32
Wetmelon left09:32
jacob357 left09:32
cyber37 joined09:33
cyber37 Hi guy's, i have a question about Git. I have a Git server hosted in a VPS server actually, and i clone my repo into my computer directly from that server.09:33
Is it possible now to have a Git server in a local server (at home) witch make auto push to the Git server hosted on the VPS09:33
Is it a "normal"service ?09:33
kfunk joined09:35
MutantMahesh joined09:35
cyber37 Doing a simple copy is not "good" for me because i want to have the VPS Git always refreshed09:36
scarabx left09:40
mohabaks joined09:40
nidr0x left09:43
nidr0x joined09:43
Borkr joined09:43
mattcen cyber37: I'd look at git hooks on your local "server"09:43
So you have your working repo, which you push to your local "server" repo, which has, say, a post-receive hook that pushes to the VPS09:44
post-receive may not be the best place for it; check out !git-hooks09:44
:(09:44
!githooks09:45
Ugh, anyway, check the githooks manpage09:45
eulb joined09:46
Rodya_ joined09:48
mehola left09:49
mdw joined09:50
mdw left09:51
cyber37 left09:51
jfelchner joined09:52
jfelchner_ left09:53
Rodya_ left09:53
daito joined09:53
ivo_ joined09:57
nidr0x left09:58
daito left09:58
d4rklit3 left09:58
nidr0x joined09:58
TomyLobo joined10:01
subhojit777 left10:02
MutantMahesh left10:02
johnnyfive left10:03
nidr0x left10:03
nwkj86 joined10:03
rolha_ joined10:03
eletuchy joined10:05
rolha left10:06
Domhack left10:06
e66 joined10:07
subhojit777 joined10:07
toogley joined10:08
akolar joined10:09
eletuchy left10:09
ramsub07 joined10:10
johnnyfive joined10:12
cyan__ left10:12
cyan__ joined10:12
lethjakman-l joined10:15
zeroed joined10:16
nidr0x joined10:17
catsup left10:17
catsup joined10:17
Borkr left10:18
catsup left10:18
cyan__ left10:19
lethjakman-l left10:19
WayToDoor left10:20
WayToDoor joined10:21
cyan__ joined10:21
Gloomy joined10:22
davisonio left10:24
Jackneill joined10:25
ramsub07 left10:25
nidr0x left10:29
jimmyeatworld joined10:30
Gloomy left10:31
polyidus left10:31
mohabaks left10:32
jost joined10:32
drodger left10:32
Seveas mattcen: the bot responds to things like man githooks :)10:32
gitinfo mattcen: the githooks manpage is available at http://jk.gs/githooks.html10:32
delight joined10:33
drodger joined10:34
radsy left10:36
mohabaks joined10:38
akolar left10:38
zeroed left10:42
staticshock left10:42
nilsi left10:43
akiva left10:49
Rodya_ joined10:49
rolha joined10:50
davisonio joined10:51
rolha_ left10:51
davisonio left10:52
davisonio joined10:52
Rodya_ left10:54
Rynomster left10:55
eulb left10:57
blackwind_123 left10:59
Rynomster joined10:59
Rynomster left10:59
Rynomster joined10:59
blackwind_123 joined11:00
mayankgupta1996 joined11:00
Amaa joined11:00
Limes_ joined11:01
rolha_ joined11:02
Jauble joined11:02
rolha left11:02
HelloAtMega joined11:03
mohabaks left11:07
mattcen Seveas: Thanks :)11:07
There are so many different bot syntaces! (syntaxes? whatever.)11:08
d0nn1e left11:08
jimmyeatworld left11:09
grawity syntaxen11:09
d0nn1e joined11:10
spinningarrow joined11:10
Macaveli joined11:13
mattcen Wiktionary says syntaxes. *shrug*11:17
Jauble left11:17
freimatz joined11:17
slappymcfry left11:18
PCatinean joined11:19
nidr0x joined11:19
choki joined11:20
grawity I know, was kidding11:20
cyan__ left11:21
raven-au left11:22
nidr0x left11:22
filcab joined11:25
wiched joined11:30
Jauble joined11:31
Jauble left11:31
dineshp joined11:34
lindenle joined11:34
Tryop88 left11:34
wrouesnel1 joined11:35
dineshp When I generate a patch using git patch format -1 , how do i ensure that the generated file has a maximum column width of 70 columns. Because when sending emails using git send-email, the community requires that the email is formatted to a amx of 70 columns11:35
mattcen left11:36
dineshp if there is anyone who regularly sends out patches to the git source code, could you tell me how you format our patches and send out the emails?11:36
fscala left11:37
lindenle left11:39
staticshock joined11:39
fscala joined11:39
zadock joined11:40
grawity you can't ensure that11:40
the diff format doesn't have any provisions for wrapping/continuing a line11:41
rolha joined11:41
aspiers joined11:41
dineshp well, I sent a patch yesterday to the git mailing list and that was the comment I recieved from Junio who is the git project maintainer. I could not find any documentation on this as well11:42
grawity if the community cannot accept that patches will have lines as long as the actual file (+ 1), the community needs to a) accept patches as attachments, b) accept Git pull requests, or c) reconsider its values...11:42
oh is that git.git you're talking about?11:42
Seveas dineshp: that means in the source code the lines should me mate shorter11:42
grawity: yeah11:42
grawity that is odd considering https://github.com/gitster/git/blob/master/Documentation/CodingGuidelines#L17211:43
dineshp: maybe Junio meant that your *commit message* should be wrapped to 70 columns?11:43
subhojit777 left11:44
grawity dineshp: which is a thing you should do anyways11:44
dineshp: and is done during `git commit (--amend)`11:44
exarch joined11:44
mattcen joined11:44
staticshock left11:44
dineshp he mentioned code as well, so I was really lost trying all possible solutions including --stat=70 during git format-patch11:45
yeah I guess he probably meant the commit message only11:45
raven-au joined11:45
Seveas dineshp: as a rough rule: code lines no longer htan 80 chares with tab being 8 chars, commit message title no longer than 60-ish chars (so [PATCH v2] fits) and commit message paragraphs again no longer than 70-ish.11:45
Amaa left11:46
paddyez left11:46
j416 dineshp: link to the actual correspondence might shed light on the problem11:46
dineshp so this is my workflow: git format-patch --cover-letter -M origin/master -o outgoing/ , then gedit outgoing/0000-*, git send-email outgoing/*11:46
j416: give me a minute , i will share the link11:47
j416 Seveas: 60-ish -- where'd you get this from? (I'm not arguing against, just curious, since 50 seems to be a common limit used)11:47
grawity well 50 is a bit *too* short imho11:48
j416 dineshp: why do you need to edit the patches?11:48
grawity: maybe slightly. Through practice it's not very hard to stay at <= 50 though11:48
Seveas j416: I just did round_to_nearest_ten(70-len([patch v2])) :)11:48
j416 Seveas: ah, _with_ [patch] eh11:49
mehola joined11:49
dineshp http://article.gmane.org/gmane.comp.version-control.git/28830011:50
Rodya_ joined11:50
kam270 joined11:50
dineshp http://article.gmane.org/gmane.comp.version-control.git/28830111:51
HelloAtMega left11:51
dineshp http://article.gmane.org/gmane.comp.version-control.git/28830311:51
ivo_ left11:51
mdw joined11:51
grawity yes, so, your commit message really needs some line-wrapping11:51
Balliad joined11:52
dineshp j416: I edited the patch to type in my cover letter. Is there a better way to do it?11:52
grawity: Other than that, anything else that needs to be done?11:53
j416 dineshp: like you did --cover-letter11:53
dineshp: (and yes, you're supposed to edit coverletter by hand)11:53
dineshp git format-patch --cover-letter -M origin/master -o outgoing/11:53
j416 dineshp: your editor should be able to have some sane wrap setting11:54
dineshp the above command generates the cover letter, but i still need to type it in11:54
daito joined11:54
j416 dineshp: what editor are you using?11:54
mehola left11:54
dineshp gedit11:54
j416 ok, I don't know about that11:54
dineshp I use vi as well11:55
j416 vim has some sane things11:55
I don't know about other OSes, but if you'd install git via brew it also adds vim syntax files for git11:55
mxkr joined11:56
secki joined11:56
dineshp j416, so can you verify my workflow and correct me if I doing something wrong apart from the commit message11:56
so this is my workflow: git format-patch --cover-letter -M origin/master -o outgoing/ , then gedit outgoing/0000-*, git send-email outgoing/*11:56
j416 it'll indicate if your commit message is malformed and it'll wrap its body at 72 chars as is the norm11:56
grawity you can make gedit show a 'margin' at some column11:56
and use it as a guideline11:56
Rodya_ left11:56
j416 dineshp: it seems the only error is in what you're doing in the gedit step11:56
moobee left11:57
spinningarrow left11:57
pantsman- left11:57
dineshp I will amend the commit message and send the patch once again. Thank you j416 and grawity11:58
j416 dineshp: you might also want to set your e-mail "From" to match your git username/email; just for logic's sake :)11:58
mdw left11:58
daito left11:58
spinningarrow joined11:59
shiriru joined11:59
a_thakur joined11:59
mdw joined12:01
boudiccas joined12:01
lethjakman-l joined12:04
boudicca left12:04
kam270 left12:04
eletuchy joined12:06
dineshp left12:06
yereby joined12:08
lethjakman-l left12:08
ramsub07 joined12:09
dsdeiz joined12:10
raven-au left12:11
eletuchy left12:12
mxkr left12:13
nidr0x joined12:16
nidr0x left12:16
oggi joined12:17
King_Hual joined12:18
Cabanossi left12:18
dineshp joined12:20
mdw left12:20
nidr0x joined12:20
mayankgupta1996 left12:21
e66 left12:22
mayankgupta1996 joined12:22
flavi0 joined12:22
MutantMahesh joined12:22
Tryop88 joined12:23
choki left12:23
mdw joined12:24
mdw left12:24
mdw joined12:26
nidr0x left12:27
Gamecubic joined12:27
mdw left12:27
davisonio left12:27
sauvin left12:27
nidr0x joined12:27
sauvin joined12:27
kam270 joined12:29
HelloAtMega joined12:29
Balliad left12:29
mwhooker joined12:30
oggi left12:31
dan2k3k4 joined12:31
pmort joined12:33
doener joined12:33
toogley left12:33
mdw joined12:35
diegoviola joined12:35
mdw left12:35
subhojit777 joined12:36
mdw joined12:36
mdw left12:37
rolha left12:37
VarunAgwSnowden12:38
SnowdenSnowden2512:39
drawkula left12:39
egeerardyn joined12:39
drawkula joined12:40
staticshock joined12:41
Snowden25VarunAgw12:41
johnmilton joined12:41
Balliad joined12:43
DocMAX joined12:44
DocMAX hi12:44
i cange branch with "git branch mybranch2"12:45
Balliad left12:45
davisonio joined12:45
grawity that doesn't change the branch though12:45
DocMAX how can i update the files now to have mybranch2 files?12:45
grawity you want `git checkout mybranch2`12:45
DocMAX oh yes12:45
id did that after12:45
staticshock left12:46
DocMAX now git reset --hard should update the files right?12:46
grawity no12:46
CussBot left12:46
grawity `git checkout` already updates them12:46
but12:46
DocMAX i see no updates12:46
grawity well you just created the branch right now12:46
using 'git branch'12:46
so it doesn't have any commits of its own yet12:46
so where *would* the updates come from?12:46
DocMAX https://github.com/stintel/openwrt-packages/tree/master/net/strongswan12:46
i want the "strongswan" branch cloned12:46
johnmilton left12:47
CussBot joined12:47
nidr0x left12:47
grawity so delete the one you created, and do `git checkout -b mybranch2 origin/strongswan`12:47
or `git branch mybranch2 origin/strongswan; git checkout mybranch2`12:47
DocMAX one sec12:48
i was in the strongswan folder12:48
then i did a "git branch strongswan" (which was wrong)12:48
then a "git checkout strongswan" (which switched the branch)12:49
daedeloth joined12:49
DocMAX then a "git reset --hard" (which did not update the files to this branch)12:49
forget about mybranch212:49
tinajohnson__ left12:49
DocMAX so what shall i do now?12:50
nidr0x joined12:50
DocMAX to get the files of branch "strongswan"12:50
grawity git reset --hard origin/strongswan12:50
and maybe, git branch -u origin/strongswan12:50
to make future updates easier12:50
pmort left12:50
DocMAX fatal: ambiguous argument 'origin/strongswan': unknown revision or path not in the working tree.12:51
grawity hrmm12:51
git fetch origin12:51
then try again12:51
mehola joined12:51
DocMAX same12:51
Rodya_ joined12:52
DocMAX Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'12:52
git reset --hard strongswan works12:53
but doesnt update my files12:53
spinningarrow left12:53
rolha joined12:53
emmajane joined12:54
espindola joined12:54
Juzzika joined12:55
grawity always remember that 'strongswan' on your clone is *not* the same branch as 'strongswan' on the Github repo12:55
you created your own branch named 'strongswan' with no relation to what's on Github12:56
so anyway12:56
DocMAX ah ok12:56
but you know what i want12:56
?12:56
grawity basically each repo has its own branches12:56
yeah12:56
Rodya_ left12:56
DocMAX so how can i do what i want?12:56
grawity so can you pastebin the output of 'git remote -v; git fetch --all; git branch -a'?12:56
mehola left12:57
DocMAX dur12:57
sure12:57
zartu joined12:58
DocMAX http://pastebin.com/QrXPDy6712:58
grawity hmm12:59
what about `git config remote.origin.fetch`?12:59
DocMAX sorry its german12:59
johnmilton joined12:59
nidr0x left12:59
DocMAX +refs/heads/master:refs/remotes/origin/master12:59
grawity git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*12:59
DocMAX no output12:59
grawity now go back to `git fetch; git branch -u origin/strongswan; git reset --hard origin/strongswan`13:00
davisonio left13:00
fstd_ joined13:00
DocMAX has a problem with "git branch -u origin/strongswan"13:01
origin/strongswan doesn not exist13:01
grawity huh13:01
`git fetch` should have downloaded that just fine13:01
MutantMahesh left13:01
grawity oh waiiit a moment13:01
osse assuming it exists13:01
spinningarrow joined13:02
grawity are you actually in a submodule?...13:02
nidr0x joined13:02
nidr0x left13:02
DocMAX how do i know?13:02
grawity ah, no13:02
well you gave me a different repo than `git remote` shows13:02
DocMAX i'm still on branch strongswan13:02
grawity but I see now that it's actually just a fork13:02
so13:02
_tk_ joined13:02
grawity git remote add -f stintel https://github.com/stintel/openwrt-packages13:03
git branch -u stintel/strongswan13:03
git reset --hard stintel/strongswan13:03
fstd left13:03
fstd_fstd13:03
grawity *that* should work13:03
DocMAX *that* worked!13:03
nidr0x joined13:03
nidr0x left13:03
DocMAX and what ever those commands do13:04
can you explain what i did?13:04
nnyk_ joined13:04
lethjakman-l joined13:05
grawity well like I said, each repo has its own branches13:05
you originally cloned https://github.com/openwrt/packages13:05
but the branch you want is only in https://github.com/stintel/openwrt-packages13:05
so you added a remote (a bookmark basically) to download everything from that one13:05
`git branch -u` sets the branch's "upstream" for when you do `git pull` in the future13:06
since it was previously set to local master branch, or whatever you created the branch from13:06
spinningarrow left13:06
DocMAX and to undo this i need to do what?13:06
thx for the explanation very much!13:07
crater2150 joined13:07
grawity well `git checkout master` is probably enough13:07
you can also delete the 'strongswan' branch with `git branch -D`, and/or remove the 'stintel' remote with `git remote rm`13:08
j416 DocMAX: !book might give you a better undetstanding13:08
gitinfo DocMAX: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable13:08
eletuchy joined13:08
ssd532_ left13:08
DocMAX yeah i guess i have to study git for those "simple" tasks13:09
spinningarrow joined13:09
lethjakman-l left13:09
rolha left13:11
dsdeiz left13:11
j416 DocMAX: it really helps. You might think it's faster to ask case-by-case, but spending a day reading will quite definitely save you a lot of time, if you are using git regularly.13:12
davisonio joined13:12
espindola left13:13
eletuchy left13:13
DocMAX grawity, wondering, where is the information saved? in .git folder? i dont see a .git folder in strongswan dir13:13
pmort joined13:13
DocMAX j416 thx!13:14
grawity git rev-parse --git-dir13:14
I do still have a feeling it's a submodule13:14
DocMAX wow13:15
davisonio left13:15
DocMAX it s in a completly different folder13:16
how does git know where to look?13:16
grawity maybe the .git is a file13:16
DocMAX does it check the parent folders?13:16
davisonio joined13:16
grawity yeah it does13:16
DocMAX until it find a .git dir?13:16
dineshp left13:16
grawity but, what exactly did that command print?13:16
DocMAX ./feeds/packages/.git13:16
and i'm here:13:17
./package/feeds/packages/strongswan13:17
yiee joined13:17
DocMAX there is also a ./.git13:17
does it jump from there to ./feeds/packages/.git ?13:17
j416 how could it print "./feeds/packages/.git" if you are in package/feeds/packages/strongswan13:18
DocMAX thats the question13:18
here is the full patch13:18
path13:18
j416 are you sure it printed exactly that?13:18
DocMAX docmax@ubuntu:~/openwrt/trunk/package/feeds/packages/strongswan$ git rev-parse --git-dir13:18
grawity if $GIT_DIR is set, it uses that; otherwise it only checks for .git going upwards13:18
DocMAX -/home/docmax/openwrt/trunk/feeds/packages/.git13:19
Limes_ left13:19
j416 DocMAX: right, so it didn't print ./feeds/packages/.git13:19
DocMAX: "." means "current directory".13:19
Macaveli left13:19
grawity and if it finds a *file* named .git, then it follows its contents13:19
DocMAX ok now it makes sense? :-)13:19
j416 DocMAX: it doesn't because those are two separate directory trees13:20
DocMAX: did you type that manually or something?13:20
DocMAX no13:20
there is no env variable13:20
and no git file13:20
intellix joined13:20
pmort left13:21
j416 ~/openwrt/trunk/package/feeds/packages/strongswan13:21
~/openwrt/trunk/feeds/packages13:21
^13:21
DocMAX YOU are the experts13:21
intellix left13:21
pmort joined13:21
DocMAX how does it work?13:21
maybe goes upward till finds .git?13:21
linuxmint left13:21
j416 yes, but there is no upwards .git13:21
it's sideways13:22
DocMAX the first .git is here: ~\openwrt\trunk\.git13:22
j416 the git rev-parse --git-dir should give that13:22
then*13:22
hexagoxel joined13:22
DocMAX no ides guys :-)13:23
idea13:23
j416 I suspect pebkac13:23
espindola joined13:23
j416 DocMAX: could you !repro that again?13:23
gitinfo DocMAX: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.13:23
DocMAX what?13:24
where is the command i shall use?13:24
j416 pwd13:25
git rev-parse --git-dir13:25
output of those two.13:25
DocMAX git rev-parse --git-dir is just one line13:25
j416 how does that help me?13:25
DocMAX -/home/docmax/openwrt/trunk/feeds/packages/.git13:25
toogley joined13:25
DocMAX whats the sencond command?13:26
second13:26
j416 14:25:09 +j416 | git rev-parse --git-dir13:26
TomyLobo left13:26
DocMAX thats the 1st13:26
j416 no13:26
DocMAX searching for this? http://pastebin.com/NThNgyDM13:27
j416 DocMAX: try: cd -P .13:28
(are there symlinks in your path?)13:28
DocMAX goes to that dir13:29
j416 what dir13:29
DocMAX oh sorry13:29
symlinks!13:29
i was in a simlink dir13:30
j416 problem solved then13:30
DocMAX sorry for the confusion13:30
interesting, simlinks do not show .git?13:30
doener left13:30
lss_ joined13:30
j416 what do you mean?13:30
a symlink is not a directory13:30
m0viefreak joined13:30
DocMAX cd -P . jumped to "~/openwrt/trunk/feeds/packages/net/strongswan"13:31
j416 yes, as expected13:31
DocMAX but no .git there13:31
j416 /home/docmax/openwrt/trunk/feeds/packages/.git13:31
^13:31
ugjka left13:31
DocMAX yes there it is13:31
j416 now, this is above where you are currently13:32
(which was not the case before)13:32
DocMAX goes 2x times upward13:32
j416 yes.13:32
DocMAX and git follows symlinks13:32
j416 yes and no13:32
it stores symlinks as symlinks13:32
DocMAX ah ok13:33
j416 your shell follows them13:33
ugjka joined13:33
The_Phoenix joined13:33
The_Phoenix left13:33
The_Phoenix joined13:33
espindola left13:35
mwhooker left13:35
lindenle joined13:36
HelloAtMega left13:36
mrkat left13:38
T7rees joined13:40
star_prone left13:40
lindenle left13:40
pmort left13:41
staticshock joined13:41
Juzzika left13:42
tinajohnson__ joined13:42
ramsub07 left13:44
Macaveli joined13:44
ramsub07 joined13:44
ErKa joined13:45
happy-dude joined13:46
staticshock left13:46
espindola joined13:51
raven-au joined13:52
espindola left13:53
Rodya_ joined13:53
daito joined13:55
Literphor joined13:55
Rynomster left13:55
jel80 joined13:56
tchan left13:56
Rodya_ left13:57
electrogeek left13:58
cebor_ joined13:58
rolha joined13:58
neohe_ left13:58
cebor left13:59
DocMAX2 joined13:59
neohe joined13:59
electrogeek joined13:59
daito left14:00
DocMAX left14:00
dineshp joined14:01
kam270 left14:04
dan2k3k4 left14:05
Limes_ joined14:07
morfin60 left14:08
yiee left14:08
sangy left14:08
dsdeiz joined14:09
dsdeiz left14:09
dsdeiz joined14:09
eletuchy joined14:10
glebihan left14:11
Dnf joined14:11
rolha left14:12
a_thakur left14:12
a_thakur_ joined14:12
diogenese left14:12
happy-dude left14:12
dineshp left14:13
intrigueD joined14:13
dineshp joined14:13
eletuchy left14:14
DocMAX2 left14:15
happy-dude joined14:15
a_thakur_ left14:15
glebihan joined14:16
DocMAX joined14:16
DocMAX left14:16
spinningarrow left14:17
fees joined14:18
davisonio left14:19
intellix joined14:19
Gloomy joined14:20
Macaveli left14:21
rolha_ left14:21
rolha joined14:22
tchan joined14:23
ensyde__ left14:24
Cabanossi joined14:25
HelloAtMega joined14:25
nosmelc joined14:27
jaafar joined14:27
nosmelc I tagged some Git commits using Visual Studio 2015, but the tags aren't making it to the origin/master and origin/develop branches on Visual Studio Team Services. Any ideas why?14:28
hgl left14:28
intrigueD left14:28
osse probably because they are not pushed14:28
Tryop88 left14:28
rolha_ joined14:29
osse I mean, that must definitely be the reason. Why VS doesn't do that I don't know14:29
nosmelc osse I think so too, but I see nothing in VS about how to push tags14:29
osse I assumed they'd get pushed with the commits14:29
osse git push has a flag that does exactly that. maybe it's configurable14:30
rolha left14:30
tgunr left14:31
hgl joined14:31
Tryop88 joined14:31
mmlb joined14:32
netj left14:33
netj joined14:33
rolha joined14:35
rolha_ left14:35
Discovery joined14:35
IlNominePatre joined14:35
hgl left14:36
chigang left14:36
Balliad joined14:37
nosmelc osse that's git push --tags, right?14:37
j416 nosmelc: plain git push does not push tags by default, you need to pass --tags. If VS can create tags, I assume it can push them somehow.14:37
osse nosmelc: I was thinking of --follow-tags, but --tags works too14:37
zadock left14:38
j416 nosmelc: you can also push indiviudal tags by using a full refspec (git push origin refs/tags/nameoftag)14:38
nosmelc: so possibly you could.. I don't know, click a tag and select push, or so14:39
Balliad left14:39
mischat joined14:40
nosmelc j416 maybe, but I don't see a way to push a tag in VS14:40
j416 nosmelc: drop down to cmdline maybe :)14:40
star_prone joined14:41
nosmelc j416 haha yeah that might work. I was seeing if I could do everything right in VS201514:41
mischat left14:41
nosmelc j416 getting tags onto the remote branches is the only thing I've had trouble with so far14:41
j416 mhm14:42
integrations are nice, when/if they work :)14:42
mostly they don't14:42
staticshock joined14:42
nosmelc j416 SourceTree connected to BitBucket could do it14:43
j416 I've heard good things about sourcetree14:43
cyan__ joined14:43
j416 never tried it14:43
star_prone left14:44
star_prone joined14:44
sinax joined14:44
sargas joined14:45
nosmelc Doing more searching I found the answer. VS2015 doesn't have the ability to push tags yet14:46
j416 hah.14:46
nosmelc I'll need to do git push --tags origin14:46
osse that's really weird14:46
how do you push branches with it? it's all the same (more or less)14:47
staticshock left14:47
nosmelc osse you just do a Push, or you can do Synch which I think does a pull, merge, and then push14:47
osse :S14:48
j416 ew14:48
never push sync14:48
er, never press the button for 'sync', is what I mean without terminology ambiguity14:49
j416 off to dinner14:49
jaguarmagenta2 left14:49
jaguarmagenta joined14:49
Goplat joined14:49
sdothum joined14:50
MadHatter42 joined14:50
ramsub07 left14:50
Tryop88 left14:51
Tryop88 joined14:51
wrouesnel1 left14:52
biertie left14:53
biertie joined14:53
biertiebdesmet14:53
lethjakman-l joined14:53
Rodya_ joined14:54
nnyk_ left14:54
Noldorin joined14:55
morty29 joined14:56
spinningarrow joined14:56
spinningarrow left14:57
shiriru left14:57
spinningarrow joined14:57
lethjakman-l left14:58
Rodya_ left14:58
subhojit777 left14:59
acetakwas joined15:00
sinax left15:00
spinningarrow left15:02
Silenced left15:02
Gitzilla left15:02
spinningarrow joined15:02
davisonio joined15:03
Dnf left15:03
shinnya left15:04
PCatinean left15:04
grayjoc joined15:04
Silenced joined15:05
Silenced left15:05
Silenced joined15:05
Tratos joined15:05
acetakwas left15:06
orisk joined15:07
showaz joined15:09
showaz Hi, what are the mechanisms to bring back git-submoule (static) in the main (site) tree along with the history?15:09
Gitzilla joined15:10
eletuchy joined15:10
osse showaz: Do you mean git submodule init?15:13
intrigueD joined15:14
showaz osse: deinit (merge history to main storage)15:14
osse: maybe this good http://stackoverflow.com/a/23328223/212699015:14
grawity you can import it as a subtree15:14
yes, like that15:14
eletuchy left15:15
Silenced left15:16
mischat joined15:16
leeN joined15:16
Silenced joined15:16
Silenced left15:16
Silenced joined15:16
pantsman- joined15:17
t0by left15:17
intrigueD left15:18
Literphor left15:18
MadHatter42 left15:18
pungi-man joined15:19
showaz grawity: but history save sub-module trash.15:20
MadHatter42 joined15:20
acetakwas joined15:20
diegoviola left15:21
d4rklit3 joined15:22
bannakaffalatta joined15:22
espindola joined15:22
FunkyAss left15:24
sssilver joined15:24
FunkyAss joined15:24
espindola left15:25
denimsoft joined15:26
j416 hah, tried out sourcetree15:27
I've barely started the thing and the first thing it did (without asking) was to change one line and add 6 extra lines to my ~/.gitconfig15:28
Juzzika joined15:28
Juzzika left15:28
nosmelc left15:30
j416 trailing whitespace at that agh15:30
but I do like its "add -p" implementation allowing selection of individual lines, not just hunks15:30
commit message editor is nuts15:31
j416 uninstalls15:31
PHPanos joined15:31
PHPanos left15:32
PHPanos joined15:32
nilsi joined15:33
neohe_ joined15:35
MadHatter42 left15:35
mayankgupta1996 left15:35
SabreWolfy joined15:36
grawity eh, `git gui` can do the same15:36
CEnnis91 joined15:36
Sucks joined15:37
lindenle joined15:37
neohe left15:38
italoacasas joined15:39
italoacasas left15:39
delight left15:39
italoacasas joined15:40
acetakwas left15:40
italoacasas left15:41
Tryop88_ joined15:42
lindenle left15:42
grayjoc left15:42
staticshock joined15:43
mischat left15:43
Tryop88 left15:45
Puck6633 joined15:47
staticshock left15:47
diegoaguilar joined15:49
diegoviola joined15:49
a_thakur joined15:50
j416 grawity: true15:50
grawity: except not to ~/.gitconfig -- it stores its info locally iirc15:51
ooh select -> stage lines for commit -- I did not know it did this15:53
nice15:53
mehola joined15:53
emmajane left15:54
lethjakman-l joined15:54
d4rklit3 left15:54
Rodya_ joined15:55
Guest55 joined15:55
daito joined15:55
showaz left15:56
ramsub07 joined15:56
_tk_ left15:56
Silenced left15:57
SabreWolfy left15:57
orisk left15:58
mehola left15:58
nosmelc joined15:58
mischat joined15:59
Rodya_ left15:59
diegoviola left15:59
lethjakman-l left15:59
daito left16:00
nnyk_ joined16:00
subhojit777 joined16:01
sq-one joined16:01
nilsi left16:01
diogenese joined16:02
a_thakur_ joined16:03
cagmz joined16:03
a_thakur left16:05
T7rees left16:05
Pulp joined16:06
acetakwas joined16:06
delight joined16:07
RudolphFenz joined16:09
jaguarmagenta2 joined16:09
denimsoft left16:10
dmko left16:10
denimsoft joined16:11
jaguarmagenta left16:11
eletuchy joined16:11
Silenced joined16:13
Silenced left16:13
Silenced joined16:13
pungi-man left16:13
jost left16:14
acetakwas left16:14
eletuchy left16:16
Snopandan joined16:16
a_thakur_ left16:17
daynaskully left16:18
ramsub07 left16:18
tvw joined16:18
ErKa left16:19
ivo_ joined16:19
jost joined16:20
HelloAtMega left16:22
dreiss joined16:22
nydel07 left16:23
cagmz left16:23
Snopandan left16:24
toogley left16:24
Guest55 left16:24
staticshock joined16:25
zadock joined16:25
whitby joined16:26
jost left16:28
jost joined16:30
jost left16:31
tgunr joined16:35
s00pcan left16:37
Ahmed90 joined16:38
s00pcan joined16:38
ErKa joined16:39
sargas left16:41
daynaskully joined16:41
acetakwas joined16:43
yereby left16:44
kermit left16:44
liri_ left16:47
staticshock left16:49
Tryop88_ left16:49
zeroed joined16:52
Sucks left16:52
brandonw left16:53
brandonw joined16:54
mehola joined16:55
lethjakman-l joined16:55
Gloomy Hey :)16:55
Rodya_ joined16:55
Gloomy I'm developing a little web app, is there a way I can run it directly from github?16:55
j416 #github16:56
Gloomy oh. sorry16:56
j416 afaik github only serves static content16:56
_ikke_ yes16:56
intellix left16:56
Gloomy It's only html/css/js16:57
e66 joined16:58
staticshock joined16:58
echelon left16:59
lethjakman-l left16:59
mehola left16:59
subhojit777 left17:00
Borkr joined17:00
Rodya_ left17:01
subhojit777 joined17:01
jonesinator joined17:02
aaronj left17:02
Jqj joined17:07
secki left17:07
treehug88 joined17:07
toogley joined17:07
dineshp left17:08
thiago_ joined17:08
diegoaguilar left17:09
sbeller_ joined17:09
diegoaguilar joined17:09
sargas joined17:09
sbeller left17:10
GandalfTheWizard joined17:10
mizu_no_oto joined17:11
eletuchy joined17:12
ramsub07 joined17:12
spinningarrow left17:12
daedeloth left17:13
mizu_no_oto left17:14
MutantMahesh joined17:15
kn-928 joined17:16
durham joined17:16
eletuchy left17:17
kn-928 left17:18
t0by joined17:18
t0by left17:18
Jqj left17:19
Wetmelon joined17:20
lethjakman-l joined17:21
secki joined17:22
m0viefreak left17:22
The_Phoenix left17:24
kalz left17:24
abiom joined17:24
Gamecubic left17:24
subhojit777_ joined17:26
jel80 left17:26
lethjakman-l left17:27
subhojit777 left17:28
subhojit777_subhojit77717:28
morty29 left17:29
e66 left17:30
cyan__ left17:32
InfoTest joined17:32
ramsub07 left17:34
Dios joined17:34
Dios left17:35
PryMar56 joined17:37
lindenle joined17:39
staticshock left17:40
durham left17:41
fstd left17:43
woxidu left17:43
lindenle left17:44
HelloAtMega joined17:44
fstd joined17:45
Rodya_ joined17:45
abiom left17:47
diegoviola joined17:47
presto joined17:48
livingstn joined17:48
star_prone left17:49
Domhack joined17:49
iuoqo joined17:50
acetakwas left17:52
aaw joined17:53
sssilver left17:53
davisonio left17:54
mi100hael_ joined17:55
mehola joined17:55
Ardit joined17:56
daito joined17:56
dreiss left17:57
scarabx joined17:59
mizu_no_oto joined17:59
mi100hael left17:59
mehola left18:00
exarch left18:00
iuoqo left18:00
daito left18:01
mizu_no_oto left18:01
denimsoft left18:01
M3mphiZ left18:01
subscope joined18:02
InfoTest left18:02
zeroed left18:03
scarabx left18:03
scarabx joined18:03
d4rklit3 joined18:04
M3mphiZ joined18:05
satifant joined18:06
lethjakman-l joined18:07
subscope left18:08
Lyqyd joined18:08
subscope joined18:09
ipt joined18:10
fedexo joined18:10
lethjakman-l left18:13
eletuchy joined18:13
MutantMa_ joined18:15
eletuchy left18:17
Rodya_ left18:17
treehug88 left18:19
MutantMahesh left18:19
happy-dude left18:19
Borkr left18:20
Gloomy left18:20
mizu_no_oto joined18:20
fahadash left18:21
roygbiv left18:21
aaw left18:22
livingstn left18:23
M3mphiZ left18:23
livingstn joined18:24
mizu_no_oto left18:25
leeN left18:25
Sucks joined18:25
jagob joined18:26
subscope left18:26
ochorocho1 joined18:26
M3mphiZ joined18:27
subscope joined18:27
Literphor joined18:28
vF3hNGxc47h8 joined18:29
ipt left18:29
subhojit777 left18:29
diegoviola left18:30
livingstn left18:31
mohabaks joined18:32
livingstn joined18:32
Gamecubic joined18:33
mi100hael_ left18:33
Rodya_ joined18:33
Vgr_ joined18:34
Vgr left18:35
sul joined18:35
sul left18:35
mizu_no_oto joined18:37
sargas left18:37
staticshock joined18:37
shinnya joined18:38
Rodya_ left18:39
sul joined18:39
Sucks left18:40
Sucks joined18:40
Sucks left18:40
lindenle joined18:40
Sucks joined18:40
Sucks left18:40
eletuchy joined18:41
MutantMa_ left18:42
dopeddude joined18:42
staticshock left18:42
paddyez joined18:42
paddyez left18:42
paddyez joined18:42
espindola joined18:42
KtoTo joined18:42
lindenle left18:44
robogoat left18:45
star_prone joined18:46
star_prone left18:47
ErKa left18:49
Goplat left18:49
tinajohnson__ left18:49
moL-Ou left18:51
e66 joined18:52
espindola left18:52
staticshock joined18:53
Silenced left18:54
sgambino left18:55
eletuchy left18:55
espindola joined18:55
espindola left18:56
mehola joined18:56
IlNominePatre left18:57
Discovery left18:58
mehola left19:01
IlNominePatre joined19:01
Cassiopaya joined19:01
nnyk_ left19:02
leeN joined19:03
netj left19:07
netj joined19:07
lethjakman-l joined19:09
ef5c_ef5c /quit19:11
ef5c_ef5c left19:11
sul left19:11
rubyonrailed joined19:12
lethjakman-l left19:14
ghostlines joined19:15
kaiza left19:15
subscope left19:15
catsup joined19:16
espindola joined19:16
ArtursL joined19:16
zacts joined19:17
espindola left19:17
s00pcan left19:18
s00pcan joined19:19
sgambino joined19:19
mikiones joined19:20
diogenese left19:20
subscope joined19:21
dreiss joined19:22
mikiones left19:23
Literphor left19:23
PityDaFool joined19:23
diogenese joined19:24
kalz joined19:25
citizen-stig left19:26
dreiss left19:27
cr4zy joined19:27
s00pcan_ joined19:28
s00pcan left19:29
Literphor joined19:29
RudolphFenz left19:30
jagob left19:30
citizen-stig joined19:30
otho joined19:32
oich left19:32
ivo_ left19:32
Midoshi27 joined19:34
tomog999_ joined19:34
cr4zy left19:35
woxidu joined19:35
tomog999 left19:37
Cassiopaya left19:38
mangolisk_ left19:38
Rodya_ joined19:40
fstd_ joined19:40
lindenle joined19:41
toogley left19:41
samw joined19:41
IlNominePatre left19:41
fstd left19:41
fstd_fstd19:41
kaiza joined19:42
mangolisk joined19:42
radsy joined19:44
lindenle left19:45
Rodya_ left19:45
diegoaguilar left19:47
kolobyte[cccp]19:47
cagedwisdom joined19:50
strayPuppy joined19:52
dopeddud_ joined19:53
chiromante joined19:54
chiromante left19:55
mizu_no_oto left19:55
dopeddude left19:55
samw left19:56
eletuchy joined19:56
safe joined19:56
ramsub07 joined19:56
zarel joined19:57
daito joined19:57
zarel left19:58
zarel joined19:58
thecomedian_ left19:59
sq-one left19:59
PryMar56 left19:59
woxidu left20:00
ramsub07 left20:01
eletuchy left20:01
s00pcan joined20:01
daito left20:01
s00pcan_ left20:02
[cccp]kolobyte20:02
diegoaguilar joined20:02
thecomedian joined20:04
dopeddud_ left20:05
brandonw left20:08
Midoshi27 left20:08
brandonw joined20:09
lss_ left20:09
Cabanossi left20:09
m0viefreak joined20:09
s00pcan_ joined20:09
lethjakman-l joined20:10
Cabanossi joined20:11
ajf- joined20:11
s00pcan left20:12
ivo_ joined20:12
lethjakman-l left20:15
s00pcan joined20:15
jfelchner_ joined20:16
lss joined20:16
latrommi left20:17
s00pcan_ left20:18
jfelchner left20:18
bedouin left20:18
diegoviola joined20:19
ixian left20:19
sssilver joined20:20
s00pcan left20:20
electrogeek left20:20
Spinkzeit left20:20
electrogeek joined20:21
ixian joined20:21
thecomedian left20:22
CheckDavid joined20:22
ugjka left20:23
thecomedian joined20:23
Spinkzeit joined20:23
s00pcan joined20:24
ErKa joined20:24
aspiers left20:24
thecomedian left20:24
mischat left20:24
aspiers joined20:25
ramsub07 joined20:26
thecomedian joined20:26
zadock left20:27
thecomedian left20:28
bedouin joined20:28
thecomedian joined20:29
azimuth_ joined20:29
mehola joined20:29
s00pcan left20:30
benwaffle left20:31
Dyonisos joined20:31
kaiza left20:32
s00pcan joined20:33
rezrov left20:34
rezrov joined20:34
strayPuppy left20:35
mizu_no_oto joined20:35
zartu left20:35
rubyonrailed left20:35
davisonio joined20:36
rubyonrailed joined20:37
rubyonrailed left20:37
s00pcan left20:37
lss left20:38
rolha left20:39
PryMar56 joined20:39
s00pcan joined20:40
Dazzyp left20:40
lss joined20:41
Rodya_ joined20:41
rolha joined20:41
lindenle joined20:42
ahr3n joined20:42
jfelchner_ left20:42
choki joined20:44
Rodya_ left20:46
aidalgol joined20:47
lindenle left20:47
rolha_ joined20:49
rolha_ left20:50
eijk joined20:50
sauvin left20:50
zartu joined20:51
rolha left20:51
mohabaks left20:51
s00pcan left20:52
amdi_ joined20:52
rolha joined20:53
s00pcan joined20:53
sauvin joined20:53
phaleth left20:54
nnyk_ joined20:54
acetakwas joined20:54
tpollard joined20:55
rolha left20:57
delight left20:57
Lyqyd left21:01
acetakwas left21:02
ghostlines left21:02
ramsub07 left21:04
mohabaks joined21:04
freimatz left21:08
nosmelc left21:08
mischat joined21:08
mischat left21:09
lebster if i make tags into a branch1, then merge that branch1 into branch2, do the tags get added to the branch2?21:09
moritz lebster: tags always point at commits, not at branches21:10
xlegoman joined21:10
moritz so the tag is reachable from branch2, but it doesn't "get added to" it, whatever that means21:10
n1000_n100021:12
_ikke_ both tags and branches are refs, pointers to comimts21:13
commits21:13
the difference is that branches move and tags not21:13
rlf joined21:13
joufflu joined21:14
lebster soo if you delete a branch containing a commit that was tagged. the tag will still be there?21:15
mischat joined21:15
_ikke_ yes21:16
deleting a branch just removes a single pointer21:16
secki left21:18
joufflu left21:19
mehola left21:20
sbasso joined21:21
subscope left21:21
joufflu joined21:22
a3Dman left21:22
a3Dman_ joined21:23
rlf left21:23
de-vri-es left21:23
HelloAtMega left21:24
elastix joined21:24
de-vri-es joined21:26
sauvin left21:27
apiarian joined21:27
saidi joined21:27
sauvin joined21:27
mohabaks left21:30
pantsman- left21:30
apiarian left21:31
zartu left21:31
arooni joined21:31
xlegoman left21:31
nosmelc joined21:32
JTrader joined21:33
grayjoc joined21:33
diogenese left21:34
LucaTM left21:34
tvw left21:36
dreiss joined21:37
Midoshi27 joined21:38
nosmelc left21:40
denimsoft joined21:41
elsevero joined21:41
woxidu joined21:41
lethjakman-l joined21:41
espindola joined21:41
espindola left21:42
Rodya_ joined21:42
diogenese joined21:43
aidalgol left21:43
daito joined21:43
esc left21:44
aidalgol joined21:45
Chill_Surf joined21:45
Sonicbit left21:45
flavi0 left21:46
lethjakman-l left21:46
elsevero left21:47
flavi0 joined21:47
daito left21:47
elsevero joined21:47
Rodya_ left21:47
theskillwithin left21:48
theskillwithin joined21:48
dsdeiz left21:50
Jackneill left21:50
jottr joined21:51
daito joined21:54
pmort joined21:55
pmort left21:55
zartu joined21:56
zartu left21:56
pmort joined21:56
HelloAtMega joined21:57
ivo_ left21:57
HelloAtMega left21:57
diogenese left21:57
grayjoc left21:58
HelloShitty joined21:58
HelloShittyHelloAtMega21:59
daito left22:00
sssilver left22:01
nnyk joined22:02
PHPanos left22:03
eijk left22:04
fscala left22:04
nnyk_ left22:04
fscala joined22:05
dan2k3k4 joined22:05
pmort left22:07
jnewt joined22:07
Ardit left22:08
Kicer86 left22:08
Lyqyd joined22:09
mischat left22:10
jottr left22:13
dsdeiz joined22:14
dsdeiz left22:14
dsdeiz joined22:14
Sasazuka joined22:14
saidi left22:15
ErKa left22:17
bollullera joined22:18
diogenese joined22:18
lss left22:19
FirewalkR joined22:20
lss joined22:22
diogenese left22:23
t0by joined22:23
t0by left22:23
err joined22:27
ToBeCloud joined22:27
err left22:28
mmlb left22:28
err joined22:29
errGuest6863722:29
brcolow left22:29
Guest68637 left22:29
Guest68637 joined22:29
Guest68637 left22:29
alandala_ joined22:30
alandala_ left22:30
emPi left22:30
dreiss left22:31
flavi0 left22:31
johnmilton left22:32
egeerardyn left22:32
liamonade joined22:34
latrommi joined22:35
mizu_no_oto left22:35
denimsoft left22:36
rolha joined22:37
_nadim left22:38
paddyez left22:39
davisonio left22:40
Literphor left22:41
FirewalkR left22:41
kaiza joined22:41
lethjakman-l joined22:42
lindenle joined22:43
Rodya_ joined22:44
FirewalkR joined22:45
Midoshi27 left22:45
lethjakman-l left22:47
elastix left22:47
lindenle left22:48
Literphor joined22:48
Rodya_ left22:49
FunkyAss left22:50
eletuchy joined22:50
ochorocho1 left22:52
mmlb joined22:53
sbasso left22:55
fees left22:56
mehola joined22:56
Gitzilla left22:58
alandala joined22:58
JTrader left22:59
TalkToMe joined22:59
pmort joined23:01
rMdes left23:01
dan2k3k4 left23:02
Brando753 left23:03
astrofog joined23:04
Fijit left23:06
safe left23:08
vmonteco left23:08
King_Hual left23:09
eletuchy left23:10
Limes_ left23:10
rolha left23:10
codeman joined23:10
johnmilton joined23:13
satifant left23:13
TalkToMe left23:14
pmort left23:14
rolha joined23:14
mi100hael joined23:15
liamonade left23:17
JTrader joined23:17
liamonade joined23:18
diegoaguilar left23:20
mi100hael left23:20
ArtursL left23:21
p-l joined23:21
pmort joined23:23
pmort left23:23
p-l left23:23
pmort joined23:24
MattMaker joined23:25
leprechau left23:25
samw joined23:25
EduardoMartins joined23:26
otho left23:28
diogenese joined23:29
intrigueD joined23:29
nwkj86 left23:29
Tryop88 joined23:29
nwkj86 joined23:30
codeman left23:30
samw left23:30
MattMaker left23:32
Tryop88 left23:33
MattMaker joined23:34
rolha left23:35
zarel left23:35
kam270 joined23:35
ColdKeyboard left23:35
ahr3n left23:36
ColdKeyboard joined23:37
jottr joined23:37
dj_spies joined23:38
Brando753 joined23:38
nfk joined23:39
p-l joined23:41
rolha joined23:42
watabou joined23:42
samw joined23:43
lindenle joined23:44
rolha left23:44
livingstn left23:45
Rodya_ joined23:45
jottr left23:45
jottr joined23:45
nnyk left23:46
lindenle left23:49
pR0Ps left23:49
samw left23:49
Rodya_ left23:49
rolha joined23:49
p-l left23:50
mischat joined23:51
tristanp joined23:51
boombatower joined23:53
radsy left23:53
WayToDoor left23:54
samw joined23:54
M3mphiZ left23:55
daito joined23:56
polyidus joined23:57
M3mphiZ joined23:57
ahr3n joined23:58
pR0Ps joined23:59

Logs Search ←Prev date Next date→ Channels Documentation