IRCloggy #git 2013-08-17

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.

2013-08-17

cmn then you need to check for the error conditions you want to handle specially00:00
catsup exactly00:00
but how to do it?00:00
→ g0bl1n joined00:00
catsup well i guess i check the string output of rev-parse for "Path '.*' does not exist"00:01
← mmlac-bv left00:01
← lethjakman left00:01
← maroloccio left00:01
← mckendri_ left00:02
cmn each one is different, so you need to check differently00:02
← infynyxx left00:03
cmn if you don't know how to handle it, then you shouldn't and you should simply fail00:03
catsup um00:03
the absense of the file is not an error00:03
absence00:04
in my application. however, anything else is an error.00:04
→ plumpkin joined00:04
catsup (in other words i need the application to do one thing if the file is not there, another if the file is there, and yet another if there is any kind of error.)00:05
→ tatsuya_o joined00:06
→ kcj joined00:07
→ mizu_no_oto joined00:08
← jkremser left00:11
→ dreiss joined00:11
← tatsuya_o left00:11
→ juanmabc joined00:13
← conan_ left00:14
→ conan joined00:17
← Milossh left00:17
← skiernose left00:19
→ rfoust joined00:20
← dreiss left00:21
← m0viefreak left00:21
→ JPeterson joined00:23
← mvensky left00:24
← bsaboia_ left00:25
→ kpreid joined00:27
← mloskot left00:27
→ multi_io joined00:27
← kcj left00:28
← thiago left00:28
← cedeon left00:29
→ Chryyz joined00:29
← g0bl1n left00:30
← juanmabc left00:33
→ dreiss joined00:33
← tjbiddle left00:35
← frgtn left00:37
→ maxmanders joined00:37
← devoldmx left00:39
→ devoldmx joined00:40
→ skiernose joined00:40
→ twoface88 joined00:41
→ v0n joined00:42
← v0n left00:42
→ v0n joined00:42
→ aegis__ joined00:43
← crazydiamond left00:43
← maxmanders left00:43
v0n → v1n00:43
→ lethjakman joined00:43
← acharlieh left00:43
→ bitslip joined00:43
← iliketur_ left00:45
← devoldmx left00:45
← skiernose left00:46
→ maxmanders joined00:46
← sparq_ left00:49
← joepie91 left00:49
→ spechal_ joined00:49
→ frgtn joined00:50
spechal_ When I do a git clone to convert an SVN repo, it keeps asking gem for a password after almost revision, saying: Found branch parent: (refs/remotes/tags/2.0.2rc2) ed698a5d4172ade49d6a32dbba344ea7b50b42ca Following parent with do_switch … could anyone elaborate on why it would keep asking me for a password? I've converted several subbranches from this repo already00:51
→ relipse joined00:51
→ Davey joined00:51
→ devoldmx joined00:55
→ jalama joined00:55
→ crazydiamond joined00:56
← dmarkham left00:57
→ _BJFreeman joined00:57
← Davey left00:58
→ Roots47 joined00:58
_BJFreeman → BJfreeman00:58
← v1n left00:59
← maxmanders left00:59
→ Cromulent joined01:00
← ColKurtz left01:00
← ewnd9 left01:00
→ ewnd9 joined01:01
→ Suprano joined01:01
← devoldmx left01:02
← FernandoBasso left01:02
→ devoldmx joined01:02
→ girishr joined01:03
← M4renz left01:04
← CodeShark left01:05
→ normanrichards joined01:05
→ kcj joined01:07
← devoldmx left01:07
→ Goplat joined01:08
← rednaks_ left01:08
← hwrd|work left01:09
→ Juri_Agarin joined01:10
→ Milossh joined01:10
← Skrypter left01:10
→ pdurbin joined01:10
→ madewokherd joined01:10
→ marklite joined01:10
→ M4renz joined01:11
← amcsi left01:11
← hahuang65 left01:11
← marklite left01:12
→ Gatwick joined01:12
→ v1n joined01:13
→ enr joined01:14
← Suprano left01:14
← BSaboia left01:16
← Droolio left01:16
← aegis__ left01:16
→ AWinterman joined01:17
← AWinterman left01:18
→ AWinterman joined01:18
← Gatwick left01:19
→ Gatwick joined01:19
← enr left01:20
← yacks left01:20
← mizu_no_oto left01:20
← Gatwick left01:21
→ Tabmow joined01:21
→ Gatwick joined01:21
← Gatwick left01:21
→ devoldmx joined01:21
→ Gatwick joined01:22
← crazydiamond left01:22
← looper left01:22
→ sarcasticsimba joined01:23
sarcasticsimba → vigs01:23
milki hm01:24
it depends on how you are connecting maybe01:24
→ looper joined01:24
offby1 spechal_: I seem to recall that Subversion would do that if you're not using ssh-agent01:26
Which means: I doubt it's git-svn's fault01:26
→ vlad003 joined01:27
← FreezingCold left01:28
→ Cromulent|2 joined01:28
← nitrix left01:28
← Cromulent left01:29
← Cromulent|2 left01:31
→ Vampire0_ joined01:31
→ Skrypter joined01:32
→ abrkn joined01:32
→ devoldmx3 joined01:32
← abrkn left01:33
→ bmac joined01:33
→ devoldmx27 joined01:34
← lethjakman left01:35
← Vampire0 left01:35
→ maxmanders joined01:35
← arborism left01:35
← frgtn left01:36
← devoldmx left01:36
← SHyx0rmZ left01:36
← Dougie187 left01:36
← devoldmx3 left01:37
→ nitrix joined01:37
nitrix → Guest6715701:37
vigs → tomhanks01:39
tomhanks → vigs01:39
← Guest67157 left01:39
→ Guest67157 joined01:39
← joshsmith left01:39
→ Spyro joined01:40
→ iliketur_ joined01:41
← Guest67157 left01:41
← iliketur_ left01:42
→ nitrix joined01:42
← scorphus left01:43
← shuaib left01:43
← M4renz left01:43
← maxmanders left01:44
← gusnan left01:45
← Marquisk2 left01:45
→ aisbaa joined01:45
→ maxmanders joined01:45
→ iliketur_ joined01:46
→ Marquisk2 joined01:46
← BJfreeman left01:46
← mechanicalduck left01:47
→ M4renz joined01:47
→ mizu_no_oto joined01:48
→ natechan joined01:49
→ Davey joined01:53
← Gamecubic left01:53
→ freestyl3r joined01:56
← pitzips_alt left01:57
← looper left01:57
→ hahuang65 joined01:57
← Davey left01:58
← freestyl3r left01:59
→ intripoon_ joined01:59
← wongon left01:59
→ sgambino joined01:59
→ diegoviola joined02:00
→ Swayz joined02:01
→ Nicholas_Rishel_ joined02:02
← Gatwick left02:02
← Swayz left02:02
← spechal_ left02:02
→ Gatwick joined02:03
→ freestyl3r joined02:03
← Nicholas_Rishel left02:05
→ maroloccio joined02:06
← alvaro_o left02:08
← bmac left02:08
→ joshsmith joined02:09
→ verysoftoiletppr joined02:09
→ bmac joined02:09
→ Balliad joined02:10
→ mmlac-bv joined02:11
← ziddey left02:11
← devoldmx27 left02:12
→ devoldmx joined02:12
← cads left02:12
→ tmcmahon joined02:13
← bitkiller left02:14
← diegoviola left02:15
→ enr joined02:15
→ simesy joined02:15
→ diegoviola joined02:16
→ Midnightblues joined02:17
→ bitkiller joined02:19
← boombatower left02:19
← enr left02:19
← FrodoTheHobbit left02:20
← bmac left02:20
→ FrodoTheHobbit joined02:21
→ russt joined02:21
→ bmac joined02:21
← Destos left02:22
← Skrypter left02:22
→ quazimodo joined02:26
← Kabaka left02:26
← w0ng left02:27
→ Kabaka joined02:28
← mizu_no_oto left02:28
← tmcmahon left02:29
← freestyl3r left02:31
→ jiku joined02:32
→ kiffer84 joined02:33
← kcj left02:33
← Midnightblues left02:34
← Balliad left02:34
← Gatwick left02:34
← kiffer84 left02:35
→ acharlieh joined02:35
→ Gatwick joined02:36
← bmac left02:38
→ marklite joined02:38
← marklite left02:39
← maxmanders left02:41
← Gatwick left02:46
← AWinterman left02:46
→ FrodoTheHobbit1 joined02:49
→ nilg joined02:50
← griotspeak left02:52
← FrodoTheHobbit left02:52
→ Swayz joined02:53
→ griotspeak joined02:53
→ Davey joined02:53
← bitkiller left02:54
← mmlac-bv left02:57
→ thiago joined02:57
→ bitkiller joined02:58
← Davey left02:58
→ maxmanders joined02:59
← jiku left03:01
← mdiers left03:02
→ mdiers joined03:04
← donmichelangelo left03:04
→ donmichelangelo joined03:04
← quazimodo left03:05
→ tatsuya_o joined03:07
← jalama left03:08
→ FreezingCold joined03:09
→ Cromulent joined03:10
← maxmanders left03:10
← Cromulent left03:10
← iliketur_ left03:11
→ Cromulent joined03:12
← tatsuya_o left03:12
→ frgtn joined03:12
← griotspeak left03:14
→ iliketur_ joined03:15
← tplaner left03:15
← Roots47 left03:15
→ enr joined03:16
← frgtn left03:16
→ Roots47 joined03:16
→ jiku joined03:18
→ seanruby joined03:18
seanruby hello03:19
gitinfo seanruby: 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.03:19
← enr left03:20
seanruby how do you diff two git repos? is there a way?03:20
j416 seanruby: that doesn't make sense03:20
seanruby: what do you want to accomplish?03:21
seanruby I want to compare to git repos03:21
→ AWinterman joined03:21
→ kcj joined03:21
seanruby I'm building one thats exactly the same as another and I want to compare mine vs there's03:21
and see what the differences are03:21
j416 use recursive diff?03:22
(outside of git)03:22
→ flippo joined03:22
j416 seanruby: still not sure what your use case is. sorry.03:22
← iliketur_ left03:23
← sgambino left03:24
← harish left03:24
seanruby okay. I'm going through a book right now, and I have a example git repo, and I want to compare the git repo I've built from the book to the git repo I've been given.03:24
← SergeyPenkin left03:25
seanruby that's why I'd like to do a git wide diff, to see the differences between my git and the author's03:25
j416 ok03:25
→ iliketur_ joined03:25
j416 you'd have to script that03:25
seanruby yea, i've found a vim plugin called dirdiff03:26
j416 I don't believe git has a built-in feature to compare the repo a as a whole, at least not in porcelain03:26
seanruby that recrusively builds a vimdiff between two directories03:26
j416 you'll have differences there anyway03:26
it won't help03:26
because your repo is (I'm guessing) not the exact same03:26
(i.e. you committed in another name perhaps, and most likely your commits have different timestamps compared to those of the author)03:27
you could add the author's repo as a remote and compare the contents of your branches03:27
seanruby right, I'd imagine that. I just want to see the code differences in certain directories. to see why the author's code works and why mine doesn't03:28
j416 and then do a visual (manual) scan of the log history to see if there's a difference03:28
→ pitzips_alt joined03:28
j416 seanruby: see, that's a whole different question03:28
→ arvind_khadri joined03:28
seanruby that might be a little more convenient03:28
j416 seanruby: add the author's repo as a remote, git fetch, then run git diff between your branch and the remote branch03:29
I'm in a bit of a hurry but that should get you started03:29
→ preflex_ joined03:29
seanruby okay, that was very helpful though. I'll give it a shot03:29
→ w0ng joined03:29
seanruby that sounds a little smarter than what I was originally planning to do03:30
preflex_ → preflex03:30
← acharlieh left03:30
j416 what you originally asked sounds a bit like "I want to compare my computer to his computer and see what the difference is"03:30
(when all you wanted was to compare the contents of a specific directory)03:30
:)03:30
seanruby well. I could do that with dirdiff03:30
j416 whatever floats your boat. :)03:31
seanruby even if I compare the two git's using remote branches, all my database stuff will show up in the diff03:31
okay! I'll try them both out03:31
it seems like a convenient thing to know how to do in either case03:31
j416 you can choose to diff only specific paths03:32
→ sgambino joined03:33
j416 it works very similar to the regular diff, except that it knows how to diff against things in your repo03:33
→ harish joined03:33
girishr git log A..B -- foo.c shows me changes of foo.c between those revisions. what do i put for A when A is the first commit of the repo?03:35
j416 girishr: the sha1 of the first commit of the repo03:36
girishr j416: that doesn't work, though i expect it to03:37
← natechan left03:37
j416 ok03:37
girishr j416: if you have git.git handly03:39
git log e83c51633..8bc9a0c76 -- README doesn't show e83 commit03:39
→ michaelarestad joined03:39
girishr git whatchanged e83c51 shows README03:39
j416 sure03:40
`git log e83c51633..8bc9a0c76` shows the difference between those commits. If your README file didn't change, it won't be shown.03:40
since your first commit adds all the files, then all files will show in its diff against nothing03:41
girishr j416: right. so how do i say git log <since_the_very_beginning>...8bc9a0c76 -- README03:41
j416 girishr: cat README03:41
tkil j416 -- ?03:42
cat is current, log is history of changes... unless i'm misunderstanding?03:42
girishr git log -- README shows the very beginning commit. so, git can show it if i can figure out how03:42
tkil girishr -- omit the commit range. all changes to README from initial commit *should* be: .... right.03:42
girishr -- rev-list should return ids that log is describing.03:43
so: git rev-list -- README | tail -1 ?03:43
hm, rev-list requires commits.03:43
girishr -- git rev-list --all -- README | tail -1 => e83c5163316f89bfbde7d9ab23ca2e25604af290 (for git.git)03:44
j416 girishr: before you added anything, you had nothing. I.e., README didn't exist. The difference between nothing and what you have now, is per definition equal to what you have now. Thus, `cat README`. :)03:44
girishr: if you want to be sure, you can do `git log -p -- README` to see a log with all the diffs for that file03:45
tkil j416 -- "where am i?" "you're in a helicopter!" http://www.bastichlabz.org/~tigger/TechHumor/mshelicopter.txt03:46
→ lpaul7 joined03:47
← russt left03:47
← pitzips_alt left03:47
← guampa left03:48
→ PovAddict joined03:49
j416 tkil: hm, 40403:49
PovAddict I seem to have crafted a git repository with an empty subtree :o03:49
→ CheckDavid joined03:49
← sgambino left03:50
PovAddict $ git ls-tree HEAD:kstars | grep downloads03:50
040000 tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 downloads03:50
$ git ls-tree HEAD:kstars/downloads03:51
$03:51
tkil j416 -- WFM. *shrug*03:51
j416 maybe some dns trouble03:51
tkil j416 -- punchline (and relevance to the conversation) is simply: "... they gave me a technically correct but completely useless answer."03:51
j416 tkil: heh well.. I'm trying hard to understand what is asked for, not always obvious. :)03:52
→ quazimodo joined03:52
tkil j416 -- same one here http://www.ncbuy.com/humor/jokes_view.html?jkv=1061303:52
j416 my above answers should suffice03:52
→ frgtn joined03:52
tkil j416 -- "changes from origin" to "cat current version" is a bit of a large leap. :)03:52
j416 lol03:53
tkil: he didn't say origin03:53
← AWinterman left03:53
tkil j416 -- "how do i say git log <since_the_very_beginning>"03:53
(yes, "origin" is overloaded in git-speak, sorry.)03:53
j416 tkil: he said, the diff from the very beginning, i.e. before the first commit (since using the first commit wasn't early enough as I understood it...)03:54
:)03:54
anyway03:54
I have to get going, girishr I hope you got what you wanted, good luck! ;)03:54
girishr j416: thanks03:54
i am still looking though :)03:54
PovAddict whew http://paste.kde.org/pd6611845/03:54
← joshsmith left03:54
girishr --root shows some promise03:55
tkil girishr -- then restate, plase? j416 and others have tried to answer a few different versions of what you're asking...03:55
→ carpii joined03:55
tkil do you have a concise statement of the problem you're actually trying to solve?03:55
girishr sure, let me try again03:55
"command to check if a file has changed between two revisions"03:55
carpii I have quite a few stashes, many of which have already been applied and merged into master (by using stash apply and then not dropping them). How would I go about iterating over my stashes to see which ones actualy contacin diffs which have not yet been merged into master?03:56
tkil ok. and git diff rev1..rev2 -- path/to/file doesn't work, why?03:56
girishr tkil: my first attempt was git diff A..B -- README. this works as long as A is not the first commit of the repo03:56
PovAddict carpii: git show -p stash@{42}03:56
girishr: you don't need the .. in that case03:57
girishr right. so i just need to special case, i guess :(03:57
carpii Pov, this does a diff compared to current branch?03:57
→ tpollard joined03:57
→ AWinterman joined03:57
→ Davey joined03:57
PovAddict carpii: no, that would be kinda useless03:57
carpii why?03:57
PovAddict if you do normal commits on your branch, and then compare a stash ref with the current branch, the diff would show those commits being reverted03:58
tkil girishr -- it does seem to work here.03:58
PovAddict even though that's not what would happen if you apply/pop the stash03:58
tkil girishr -- that is, first commit for git.git is e83... right?03:58
← jiku left03:58
carpii Pov, I understand, but can you explain what -p does? I cant see it in man git show03:59
gitinfo the git-show manpage is available at http://jk.gs/git-show.html03:59
carpii i guess its a patch, but based on what03:59
tkil girishr -- and if i do, e.g. "git diff e83c5163316f89bfbde7d9ab23ca2e25604af290..HEAD -- streaming.c", then it shows it as pure insertion (which makes sense)03:59
carpii actually a stash itself is just a patch right03:59
tkil carpii -- "pretty"03:59
carpii oh, ok03:59
j416 carpii: see man git-log for the -p option03:59
gitinfo carpii: the git-log manpage is available at http://jk.gs/git-log.html03:59
PovAddict carpii: a stash is internally stored as a commit03:59
tkil carpii -- more particularly, with git-show, it's "pretty as per the type of object"03:59
carpii so ti find staches which havent yet been merged into master, i would need to write some bash script to iterate over each git show -p ?03:59
to find stashes04:00
← donmichelangelo left04:00
← plumpkin left04:00
j416 carpii: you might be able to use man git-cherry for it04:00
gitinfo carpii: the git-cherry manpage is available at http://jk.gs/git-cherry.html04:00
PovAddict well, start with "git stash list" :)04:00
tkil carpii -- without thinking about it too hard, why not just check out your current state then: for each stash, apply, see if there are diffs; if not, discard stash; if yes, ignore that stash (git reset something), then move on to next stash.04:00
carpii sure, but its a bit more complcated than stash list :)04:01
girishr tkil: let me check04:01
PovAddict oh wow04:01
carpii: "git stash list -p" :)04:01
carpii j416, thanks looks real useful04:01
→ donmichelangelo joined04:01
PovAddict but that'd still be "reviewing diffs manually"04:01
carpii tkil, thats a good diea. I could just loop over each stash, apply it, see if theres any diffs, and then reset HEAD04:02
i dont mind reviewing them manually, if somethings changed04:02
i just want to clean up all the cruft04:02
and maybe stop using stashs after that :p04:02
tkil carpii -- fwiw, i suspect that more than one stash per branch is probably a bad habit.04:02
→ yacks joined04:02
tkil ... right. :)04:02
carpii yeah i agree04:02
i always stashed thinking it would be temp04:03
PovAddict just found I have 8 stashes in here04:03
carpii but it never works out that way04:03
PovAddict x.x04:03
carpii so they kinda hang about04:03
girishr tkil: mm04:03
anway, i have something that works for me now :) i just drop the ...04:03
tkil girishr -- if that's not what you want, let's work on reformulating the question.04:03
→ sgambino joined04:03
→ ffio joined04:03
← PovAddict left04:04
← Swayz left04:04
← sgambino left04:05
← dreiss left04:05
girishr tkil: http://pastebin.com/rtqFzpK3 basically is what i wanted04:06
tkil girishr -- so it's really just an api issue then. ok. :)04:07
→ dsdeiz joined04:10
→ sparq_ joined04:11
← OOPMan left04:12
← iliketur_ left04:13
→ OOPMan joined04:13
← bitkiller left04:13
pekster carpii: Perhaps spinning off branches instead would be better for your workflow in those cases; you can always decide to commit it back to your master (or whatever is upstream) or just delete the branch if you don't want it04:13
← simesy left04:14
← Marquisk2 left04:14
pekster I'll sometimes do something like `git checkout -b WIP-documentation-updates` or something instead of a stash. Works much the same, but I can "let it sit" if I end up doing that (after all, coding is more fun that documenting :D )04:14
→ BiggFREE joined04:17
→ trusktr joined04:17
→ Tommy[D]_ joined04:17
carpii pek, yeah I use branches an awful lot, its just my workflow got a bit screwed up because I was being interrupted by other devs (and needing to switch branches)04:17
think ive sorted that now, i just create a new branch even if its called stash.whatever04:17
stash.list output is not intuitive as to what branch you were on imo04:18
← Cromulent left04:18
→ Cromulent joined04:18
← ErKa left04:20
← Cromulent left04:21
← quazimodo left04:22
→ Nicholas_Rishel joined04:23
→ skiernose joined04:24
← h0bbit left04:24
← Roots47 left04:25
← Nicholas_Rishel_ left04:25
← dsdeiz left04:27
→ oojacoboo joined04:30
← oojacoboo left04:32
← maroloccio left04:33
← seanruby left04:34
← sparq_ left04:35
→ simesy joined04:39
→ raf joined04:40
→ shuaib joined04:40
← CheckDavid left04:40
← Davey left04:40
← Joshi3s` left04:41
← lpaul7 left04:41
← carpii left04:50
← normanrichards left04:52
← Nicholas_Rishel left04:53
→ angelsl joined04:54
← v1n left04:55
→ Nicholas_Rishel joined04:55
← raf left04:55
← OOPMan left04:56
→ ErKa joined04:57
→ lil-omega joined04:58
→ OOPMan joined04:58
→ fridim__ joined04:59
gitinfo set mode: +v05:00
→ beautifulmind joined05:02
← beautifulmind left05:03
→ beautifulmind joined05:04
enli i have two different repos lying on the file system. i wish to apply commits from repo1 to repo2. i do not wish to add remote of repo1 to repo2 and pull because i am near partition size where repo2 is.05:05
i created patches with "git format-patch" and i have patches with me but there are so many patch portions those are not applied because the repo2 has updated files05:06
what i need to do is while creating patches with "git format-patch", add more number of reference code around the changed blocks. i am not sure if this is the correct wording.05:07
so i can easily compare the patch file with the current source code and apply patch manually if it fails. can i somehow achive this?05:08
← simesy left05:10
→ h0bbit joined05:10
thiago enli: what do you mean by "add more number of reference code" ?05:10
← ErKa left05:11
enli thiago: whenever a patch is generated for changed lines(added/deleted) it also adds the code around those changed lines. what is the name of that block? i am referring to that one.05:11
thiago the context05:11
do you want more lines in the context?05:11
← RogueBurger left05:12
← mribeirodantas left05:14
← verysoftoiletppr left05:14
→ verysoftoiletppr joined05:16
→ enr joined05:16
→ maqr joined05:17
→ dsdeiz joined05:17
← enr left05:21
← Nicholas_Rishel left05:24
→ rue joined05:25
→ tango_ joined05:27
← diegoviola left05:27
enli thiago: yes, i guess thats it.05:27
→ raf_ joined05:27
← AWinterman left05:29
← skiernose left05:30
→ Cromulent joined05:32
→ xequence joined05:32
→ acharlieh joined05:33
→ vals_ joined05:33
← kukks left05:33
← tango_ left05:34
enli thiago: thanks! found the switch -U and that is exactly what i needed.05:34
→ catsup joined05:36
→ kerrick joined05:36
→ Caritade joined05:38
← angelsl left05:38
→ juanmabc joined05:39
→ rdecurnex joined05:41
← dsdeiz left05:42
← rdecurnex left05:42
→ Sigma joined05:42
→ rdecurnex joined05:42
→ hwrd|work joined05:44
← lil-omega left05:45
→ sparq_ joined05:48
→ angelsl joined05:48
→ mckendri_ joined05:49
← arvind_khadri left05:51
← Cromulent left05:53
← michaelarestad left05:53
→ michaelarestad joined05:54
← tpollard left05:54
→ AWinterman joined05:56
→ ledestin joined05:57
← michaelarestad left05:58
→ Cromulent joined05:59
← mckendri_ left05:59
→ mckendri_ joined06:02
← w0ng left06:03
→ ErKa joined06:03
→ zacts joined06:04
→ scorphus joined06:04
← fridim__ left06:05
→ FreezingAlt joined06:06
← h0bbit left06:06
← mckendri_ left06:06
← FreezingCold left06:08
→ whowantstolivefo joined06:09
→ Cassiel joined06:10
→ h0bbit joined06:10
→ Gue______ joined06:11
→ ncd|leeN joined06:17
← acharlieh left06:18
→ tatsuya_o joined06:19
← Cromulent left06:20
→ SergeyPenkin joined06:20
→ simesy joined06:20
→ mckendri_ joined06:21
← sparq_ left06:23
→ michaelarestad joined06:24
← hwrd|work left06:24
← simesy left06:25
← scorphus left06:25
← mckendri_ left06:27
← raf_ left06:29
→ mckendri_ joined06:29
← juanmabc left06:31
→ irqq_ joined06:31
← shinnya left06:32
irqq_ → irqq06:32
← beautifulmind left06:33
← michaelarestad left06:33
→ Nicholas_Rishel joined06:36
→ JosephFerano joined06:38
← Caritade left06:38
→ hwrd|work joined06:42
← vigs left06:42
→ dsdeiz joined06:44
← akurilin left06:45
→ dfanjul joined06:47
← GT4066 left06:47
→ drizzd joined06:51
→ chuckharmston joined06:52
→ Edgan joined06:56
← ffio left06:57
← Goplat left06:58
← frgtn left06:59
← yacks left06:59
→ michaelarestad joined06:59
← FreezingAlt left06:59
← chuckharmston left07:00
→ godoitis joined07:01
→ scorphus joined07:03
→ fostertheweb joined07:03
→ dsdeiz_ joined07:03
← michaelarestad left07:04
← Nicholas_Rishel left07:05
← dsdeiz left07:05
→ longbeach joined07:06
← scorphus left07:06
→ sh4rm4 joined07:07
→ scorphus joined07:07
← madewokherd left07:09
← fostertheweb left07:09
← hyperair left07:09
→ hyperair joined07:10
← hyperair left07:15
→ enr joined07:17
← kerrick left07:19
← godoitis left07:19
→ godoitis joined07:19
← hwrd|work left07:21
→ kerrick joined07:21
← enr left07:22
← mdiers left07:23
← mckendri_ left07:24
→ umib0zu joined07:24
→ mdiers joined07:24
← sh4rm4 left07:26
→ sh4rm4 joined07:27
→ Roots47 joined07:28
→ frgtn joined07:29
→ maxmanders joined07:30
← maxmanders left07:30
→ third^ joined07:30
← dfanjul left07:32
→ emergion joined07:35
→ Tritania joined07:37
→ yacks joined07:38
← frgtn left07:38
← rdecurnex left07:38
← scorphus left07:38
→ mona_ joined07:38
→ byprdct joined07:39
← ewnd9 left07:39
→ frgtn joined07:40
→ ozette joined07:41
→ ewnd9 joined07:42
← tatsuya_o left07:43
← ErKa left07:46
→ Thra11 joined07:48
← thiago left07:49
→ babilen joined07:50
→ rendar joined07:50
→ simesy joined07:54
← shuaib left07:56
→ rchavik_ joined07:56
→ w0ng joined07:57
← Gue______ left07:57
rchavik_ → rchavik07:59
→ subhojit777 joined08:00
→ michaelarestad joined08:00
← AWinterman left08:01
→ AWinterman joined08:01
→ shuaib joined08:02
← enli left08:03
← shuaib left08:04
← michaelarestad left08:04
← xequence left08:04
→ bvi joined08:06
← AWinterman left08:06
→ raf_ joined08:07
← yacks left08:08
→ Guest__ joined08:08
→ Fritz7 joined08:09
→ shruggar joined08:09
← ewnd9 left08:10
→ Ratler joined08:13
← nitrix left08:15
← Roots47 left08:15
→ fuzzybunny69y joined08:15
← umib0zu left08:15
→ Roots47 joined08:16
→ nitrix joined08:16
nitrix → Guest4691308:16
→ xequence joined08:18
→ enr joined08:18
→ dreiss joined08:18
→ jonifen joined08:19
→ vkz joined08:20
→ pantsman joined08:20
← enr left08:22
→ quazimodo joined08:23
← FrodoTheHobbit1 left08:26
→ whowantstolivef3 joined08:26
→ exoon joined08:26
← jonifen left08:28
→ jonifen joined08:28
→ aladdinwang joined08:28
→ marthinal joined08:30
→ bvi_ joined08:31
← SergeyPenkin left08:31
→ marthinal_ joined08:33
← bvi left08:33
← dreiss left08:33
← marthinal left08:35
← girishr left08:35
→ nova_ joined08:36
← bvi_ left08:36
→ marthinal joined08:37
vals_ → tango_08:37
← raf_ left08:39
← marthinal_ left08:40
← JosephFerano left08:41
← shruggar left08:42
→ JosephFerano joined08:43
← relipse left08:44
→ sq-one joined08:44
→ rednaks joined08:48
← huoxito left08:49
→ cads joined08:52
→ ziddey joined08:53
← godoitis left08:53
← Guest__ left08:54
→ aChatir joined08:54
→ maxmanders joined08:54
← rendar left08:55
→ yacks joined09:00
← maxmanders left09:00
→ michaelarestad joined09:00
→ skorgon joined09:01
→ hyperair joined09:01
← ziddey left09:01
← emergion left09:02
→ nicedice_ joined09:03
→ |third| joined09:03
→ crane_ joined09:03
→ intripoon joined09:04
← michaelarestad left09:05
← third^ left09:05
→ Gatwick joined09:05
← nsanden left09:05
→ mechanicalduck joined09:06
← ntus1017 left09:06
← intripoon_ left09:06
← crane left09:06
← pantsman left09:06
← nicedice left09:07
→ rendar joined09:08
→ maxmanders joined09:08
|third| → third^09:09
← Milossh left09:10
→ raf_ joined09:10
→ ffio joined09:13
→ Milossh joined09:15
→ FrodoTheHobbit joined09:15
← quazimodo left09:15
← St_Marx left09:15
→ gittish joined09:16
→ enr joined09:18
← xequence left09:20
← frgtn left09:20
← cads left09:23
→ pdx joined09:23
→ jkremser joined09:23
← Textmode left09:23
← enr left09:23
← jkremser left09:24
→ jkremser joined09:24
← aChatir left09:27
← dvide left09:28
← ozette left09:30
→ cads joined09:31
→ marklite joined09:31
→ m8 joined09:32
← raf_ left09:33
← Gatwick left09:34
→ crazydiamond joined09:34
← marklite left09:34
← jonifen left09:35
→ elixir joined09:37
→ ozette joined09:38
→ jceb joined09:41
→ Mitchellvanw joined09:41
→ Gatwick joined09:42
← crazydiamond left09:44
→ the_cybersphinx joined09:46
→ xequence joined09:46
→ jonifen joined09:47
← sq-one left09:51
→ ffio_ joined09:51
← ffio left09:52
← Gatwick left09:53
→ Gatwick joined09:53
← Gatwick left09:53
→ Gatwick joined09:53
← Gatwick left09:53
→ Gatwick joined09:53
← Gatwick left09:55
→ SHyx0rmZ joined09:55
→ Cromulent joined09:55
→ Guest__ joined09:57
→ cha1tanya joined09:58
→ crazydiamond joined09:58
← banger left09:59
← h0bbit left10:00
→ michaelarestad joined10:01
← jonifen left10:02
→ Gatwick joined10:03
← Gatwick left10:03
→ yassine joined10:04
→ p1ng joined10:05
← Roots47 left10:05
← michaelarestad left10:05
← mechanicalduck left10:08
→ stormwild joined10:08
→ mikef joined10:12
→ bvi_ joined10:14
→ Roots47 joined10:15
→ deuterium joined10:16
→ CheckDavid joined10:17
→ mikef__ joined10:17
→ enr joined10:19
← mikef left10:20
→ zhost joined10:22
← whowantstolivefo left10:23
← nilg left10:23
← jceb left10:23
← enr left10:24
→ raf_ joined10:25
← bvi_ left10:26
→ zbcm joined10:27
← angelsl left10:28
→ bvi_ joined10:28
→ shruggar joined10:28
→ Caritade joined10:29
← Thra11 left10:30
← Mitchellvanw left10:30
→ Mitchellvanw joined10:33
→ Gamecubic joined10:33
← Cassiel left10:34
→ HelloShitty joined10:39
← xequence left10:39
← Roots47 left10:41
← raf_ left10:42
← mikef__ left10:43
→ Balliad joined10:43
← Caritade left10:44
→ mikef__ joined10:44
← cads left10:45
← doener left10:45
← rednaks left10:46
→ mikef joined10:46
← mikef__ left10:47
→ rednaks joined10:47
→ Thra11 joined10:47
← shruggar left10:48
← nova_ left10:50
→ mikef__ joined10:50
← yacks left10:51
← mikef left10:54
→ nova_ joined10:54
→ marhaban joined10:55
← Sigma left10:55
→ normanrichards joined10:55
← Balliad left10:55
← PaulCapestany left10:55
→ ngladitz joined10:57
← mikef__ left10:58
← maxmanders left11:01
→ michaelarestad joined11:01
← bvi_ left11:02
← mona_ left11:05
→ freestyl3r joined11:05
← michaelarestad left11:06
← marhaban left11:07
← twoface88 left11:08
→ xequence joined11:08
→ twoface88 joined11:08
→ Sigma joined11:09
→ glosoli joined11:10
→ quazimodo joined11:10
← byprdct left11:12
→ yacks joined11:13
← rue left11:13
→ rue joined11:15
→ wrouesnel1 joined11:16
← nova_ left11:17
→ nova_ joined11:18
→ mikef joined11:18
→ boblu joined11:19
→ mona_ joined11:19
→ Droolio joined11:20
← boblu left11:25
← xequence left11:28
← gittish left11:29
→ mikef__ joined11:29
← rue left11:30
→ Mode-M joined11:30
← mikef__ left11:30
→ rue joined11:31
→ michaelarestad joined11:31
← mikef left11:32
← Guest__ left11:32
← ngladitz left11:33
← TandyUK left11:35
→ TandyUK2 joined11:35
← michaelarestad left11:36
→ FernandoBasso joined11:36
→ PeterBooker joined11:44
← Cromulent left11:45
← simesy left11:46
← ffio_ left11:46
← normanrichards left11:46
→ boblee joined11:46
→ BitPuffin_ joined11:52
→ Gue______ joined11:52
→ gittish joined11:57
→ Ry0_ joined11:58
→ Nibato joined11:59
← longbeach left12:02
→ gusnan joined12:02
→ noxd joined12:03
→ gusnan_ joined12:04
→ maxmanders joined12:05
→ ffio_ joined12:06
← gusnan left12:07
→ silverfix joined12:08
← maxmanders left12:09
→ maxmanders joined12:12
→ abrkn joined12:16
← kcj left12:16
← ffio_ left12:16
→ Cromulent joined12:16
← maxmanders left12:16
→ ffio joined12:17
→ hoschi joined12:20
← vkz left12:22
→ flaguy48 joined12:23
← marthinal left12:24
→ angelsl joined12:26
→ plumpkin joined12:26
→ maxmanders joined12:27
← ffio left12:27
→ ntus1017 joined12:28
→ sgambino joined12:28
← Cromulent left12:29
← maxmanders left12:31
← Mode-M left12:32
→ michaelarestad joined12:32
← hoschi left12:32
← conan left12:32
→ simesy joined12:33
← michaelarestad left12:37
→ _iron joined12:39
← elixir left12:39
→ elixir joined12:39
→ maxmanders joined12:40
← ozette left12:40
→ Naoe-Kanno joined12:41
← Mitchellvanw left12:42
← SHyx0rmZ left12:43
→ kcj joined12:43
→ maxmande_ joined12:43
→ mtk joined12:44
→ Balliad joined12:45
→ Mitchellvanw joined12:45
← maxmanders left12:45
→ tatsuya_o joined12:46
→ danicampa901 joined12:48
← Milossh left12:48
→ tatsuya__ joined12:48
← maxmande_ left12:49
← tatsuya_o left12:49
← HelloShitty left12:51
→ guampa joined12:52
→ Milossh joined12:53
→ HelloShitty joined12:53
← cotton left12:57
← gittish left12:57
→ xequence joined12:57
→ cotton joined12:58
← Balliad left13:00
→ ulkesh joined13:01
→ hoschi joined13:02
← freestyl3r left13:02
→ rath joined13:03
→ St_Marx joined13:03
→ Balliad joined13:03
← Ry0_ left13:04
← angelsl left13:04
→ angelsl joined13:06
→ gittish joined13:07
← zbcm left13:09
← angelsl left13:10
→ angelsl joined13:12
→ m0ltar joined13:12
← angelsl left13:12
← Balliad left13:13
← m0ltar left13:13
→ sdrfnord1 joined13:14
→ rodyhaddad joined13:14
← sh4rm4 left13:14
→ sh4rm4 joined13:15
→ angelsl joined13:15
→ Balliad joined13:16
← xequence left13:18
→ mechanicalduck joined13:19
← BitPuffin_ left13:19
→ xequence joined13:20
→ enr joined13:20
→ frgtn joined13:20
→ Marquisk2 joined13:21
← cha1tanya left13:23
→ gvdm joined13:25
← enr left13:25
← tatsuya__ left13:25
← frgtn left13:25
glosoli → rubysyntax13:26
rubysyntax → pythonsyntax13:27
pythonsyntax → glosoli13:27
← Mitchellvanw left13:27
← a-l-e left13:28
← angelsl left13:32
→ herdingcat joined13:32
→ michaelarestad joined13:32
→ shinnya joined13:33
→ angelsl joined13:34
← mona_ left13:35
← angelsl left13:35
herdingcat hi, if I wanna send commits to an email after commit to a mail addr, what hook I shall use?13:35
moritz post-receive, iirc13:36
→ angelsl joined13:37
← michaelarestad left13:37
herdingcat thanks moritz13:38
cbreak if you actually want on commit13:38
consider wanting something else13:38
→ fridim__ joined13:38
cbreak there is post-commit but it usually makes no sense for notification13:38
→ fdel joined13:39
fdel I have an annotated tag where I'd like to edit the tag message (without moving the tag to a new commit). I tried "-a -f" options, it opens the editor but the old message isn't loaded. Is it possible to "amend" it without copy-pasting?13:40
→ localghost joined13:41
→ RogueBurger joined13:42
→ freestyl3r joined13:43
herdingcat cbreak, what I shall use? post-commit / post-receive ?13:43
← subhojit777 left13:43
← Gue______ left13:45
→ tinti joined13:45
cbreak herdingcat: if you want to do it properly, post-receive on some central server13:47
← rodyhaddad left13:47
→ heroux joined13:49
← dsdeiz_ left13:49
→ nerdfiles joined13:55
← glosoli left13:56
→ boblu joined13:56
→ gebi joined13:58
herdingcat cbreak, acked13:59
← xequence left14:01
→ cedeon joined14:02
→ xequence joined14:02
→ michaelarestad joined14:03
← michaelarestad left14:03
→ michaelarestad joined14:03
← kcj left14:04
← yassine left14:06
← gebi left14:07
→ DoniRS joined14:07
→ gebi joined14:07
← babilen left14:08
← michaelarestad left14:08
← jkremser left14:08
→ wongon joined14:09
← silverfix left14:09
← gebi left14:10
→ vkz joined14:10
→ gebi joined14:12
→ kcj joined14:13
→ babilen joined14:13
← gebi left14:16
→ Vinnie_win joined14:17
→ gebi joined14:17
→ tufflax joined14:19
← gebi left14:19
→ enr joined14:21
← angelsl left14:21
← ledestin left14:21
→ gebi joined14:22
→ rabellamy joined14:22
→ angelsl joined14:23
→ mfulz joined14:24
← mfulz left14:25
← enr left14:25
← elixir left14:26
← noxd left14:26
→ ledestin joined14:27
← gebi left14:29
→ gebi joined14:29
→ maxmanders joined14:30
← donmichelangelo left14:30
→ donmichelangelo joined14:30
← pfoley left14:31
→ shruggar joined14:31
→ Mitchellvanw joined14:32
→ bitkiller joined14:32
→ e66 joined14:33
→ Gues_____ joined14:33
← verysoftoiletppr left14:34
→ michaelarestad joined14:34
← michaelarestad left14:34
→ michaelarestad joined14:34
← maxmanders left14:34
→ Schrostfutz joined14:36
→ mdhopkins joined14:36
Schrostfutz hi, does someone know how i can delete a git repository with gitosis?14:36
→ p3lim joined14:36
→ mechanicalduck_ joined14:37
→ frgtn joined14:38
← Mitchellvanw left14:38
mdhopkins Hi, we have our designers/artists set up to use Git with us devs. They use the Gitbox GUI client. We didn't think about the problems all their large binary files would cause and now need to deal with some massive repos, malloc errors errors etc. I am looking at git-annex and git-media as solutions and am anxious to not have to retrain them. From their perspective, will adding files and pushing/pulling them be as seamless as before14:38
or are will there be an addition to their workflow because of the binary file management?14:38
← ntus1017 left14:39
← michaelarestad left14:39
← mechanicalduck left14:39
→ Vinnie_win_w joined14:40
→ MrDHat joined14:44
← Vinnie_win left14:45
→ eqyiel joined14:45
← simesy left14:47
← aladdinwang left14:50
← nfroidure left14:51
iveqy mdhopkins: the manuals for git-annex would tell you that, but afaik it will add som complexity since it's not completely hidden (that would be dangerous)14:52
← fuzzybunny69y left14:52
→ nfroidure joined14:52
← ulkesh left14:52
→ cluster28 joined14:53
cbreak how about making the binary part a submodule?14:54
← rendar left14:54
cbreak then only the artists will suffer from the problems :)14:54
← ledestin left14:54
← exoon left14:54
→ exoon joined14:54
cluster28 i followed this tutotrial bur i not able to enable the public repository http://git-scm.com/book/en/Git-on-the-Server-Public-Access14:55
i get this error: $ git clone http://git.gitserver/project.git/14:55
Cloning into 'project'...14:55
fatal: http://git.gitserver/project.git/info/refs?service=git-upload-pack not found: did you run git update-server-info on the server?14:55
mdhopkins cbreak: ;) At one point, the web code and the working art files were in the same repo. We have at least been splitting those out; it was ridiculous.14:56
→ ntus1017 joined14:56
→ dsdeiz joined14:56
mdhopkins iveqy: I'll read through more carefully; I suppose I will need to simulate the workflow myself to see where the issues might arise and how trainable the changes will be.14:56
cbreak is git annex still windows hostile?14:57
← ntus1017 left14:57
→ bmac joined14:57
← rchavik left14:58
← bmac left14:58
← rednaks left14:58
← twoface88 left14:59
→ ffio joined14:59
→ z8z joined15:01
← babilen left15:02
← gebi left15:03
→ babilen joined15:03
→ gebi joined15:03
→ michaelarestad joined15:05
← gebi left15:05
← michaelarestad left15:05
← Balliad left15:05
→ michaelarestad joined15:05
→ joshsmith joined15:05
→ maxmanders joined15:06
→ marix88x joined15:06
→ Gatwick joined15:07
← rabellamy left15:07
← boblu left15:07
→ gebi joined15:08
→ Dougie187 joined15:08
→ raf_ joined15:09
→ Cromulent joined15:10
← gebi left15:10
← michaelarestad left15:10
← maxmanders left15:11
← angelsl left15:12
← Gues_____ left15:12
← raf_ left15:13
→ gebi joined15:13
Vinnie_win_w → Vinnie_win15:14
→ tinti_ joined15:16
← gebi left15:16
→ goldbrush joined15:17
→ pantsman joined15:17
← Guest46913 left15:17
→ Guest46913 joined15:17
Guest46913 → nitrix15:17
← herdingcat left15:18
→ gebi joined15:18
→ herdingcat joined15:19
→ rednaks joined15:20
← cluster28 left15:21
← herdingcat left15:21
grawity not much – I haven't tried it, but the last few weeks of blog posts have been mainly about the dev porting it to Windows15:21
it sounds like latest builds work well15:21
→ herdingcat joined15:22
→ Gues_____ joined15:22
→ arietis joined15:22
→ angelsl joined15:23
← xequence left15:23
← herdingcat left15:24
← z8z left15:25
→ herdingcat joined15:25
← angelsl left15:25
→ angelsl joined15:26
← herdingcat left15:26
→ ErKa joined15:27
← cedeon left15:27
→ herdingcat joined15:27
← angelsl left15:28
→ mckendri_ joined15:29
← herdingcat left15:30
← gebi left15:30
→ gebi joined15:30
→ farn joined15:30
→ michaelarestad joined15:30
→ angelsl joined15:31
→ herdingcat joined15:31
← gebi left15:32
→ xequence joined15:32
← CheckDavid left15:33
← herdingcat left15:33
← Sigma left15:34
← Gues_____ left15:34
→ relipse joined15:34
→ mribeirodantas joined15:35
nitrix Hi, is the git:// protocol encrypted?15:35
→ gebi joined15:35
→ conan_ joined15:36
→ b0x joined15:37
b0x hi - any suggestions for good github alternatives (free) that support private repos?15:38
← xequence left15:38
← exoon left15:38
osse b0x: bitbucket15:38
b0x thats what i was leaning towards15:39
though its limited to 5 users?15:39
iveqy nitrix: no15:39
→ minerale_ joined15:40
→ HobGoblin joined15:40
HobGoblin → Guest5309615:41
cbreak nitrix: wouldn't be of much use, considering it's not authenticated15:43
nitrix I just noticed. Mhhh, alright.15:43
cbreak use ssh if you want security15:43
iveqy nitrix: you're looking for ssh15:44
nitrix https in my case.15:44
Is there a way to save https credentials in a config somewhere?15:44
I love my dotfiles...15:44
cbreak nitrix: look up .netrc or so15:45
git uses libcurl for http stuff as far as I know15:45
cbreak prefers to stay away from that abused protocol15:45
grawity .netrc should work for curl, if your password doesn't have spaces15:45
→ setmeaway joined15:46
grawity Git has its own credential management these days too15:46
plugins for keyrings, flatfile, memory cache, etc.15:46
nitrix I'd rather keep it vanilla.15:46
→ maxmanders joined15:46
→ lethjakman joined15:46
iveqy grawity: git has?15:47
cbreak I just use ssh's :)15:47
grawity iveqy: man git credential15:47
gitinfo iveqy: the git-credential manpage is available at http://jk.gs/git-credential.html15:47
iveqy grawity: thanks15:47
grawity comes with 'helpers' for memory and flatfile (man git-credential-cache, man git-credential-store), there are a few more in contrib/ for gnome-keyring, kwallet, Windows, OS X, etc.15:48
gitinfo the git-credential-cache manpage is available at http://jk.gs/git-credential-cache.html15:48
the git-credential-store manpage is available at http://jk.gs/git-credential-store.html15:48
← gebi left15:48
iveqy grawity: oh, it's just for the helper files, it's not for git://15:48
→ gebi joined15:48
grawity well, git:// doesn't have authentication at all, so yeah15:49
I wasn't talking about the git protocol, I was talking about the git software.15:49
and the git software already uses this thing for https?://15:50
← maxmanders left15:51
← frgtn left15:51
→ Guest__ joined15:52
→ thiago joined15:52
→ ology joined15:52
→ monokrome joined15:52
← arietis left15:53
→ vince_prignano joined15:54
cbreak authentication for http isn't terribly useful, considering it's unencrypted.15:54
→ nsanden joined15:57
→ simesy joined15:57
← gebi left15:57
→ gebi joined15:58
→ aChatir joined15:58
← setmeaway left15:58
→ eribeiro joined16:01
← simesy left16:02
→ rnz_ joined16:03
→ tmcmahon joined16:03
← kcj left16:04
← aChatir left16:04
→ benzrf joined16:05
benzrf hello!16:05
is there a server I can run to allow cloning of my repo?16:05
I don't want to use hosting, nor do I want to hand out scp access16:06
← gebi left16:06
benzrf *ssh16:06
← vince_prignano left16:06
← gittish left16:06
→ vince_prignano joined16:06
← tmcmahon left16:07
→ xequence joined16:08
→ v8energy joined16:09
← Dougie187 left16:09
→ h0bbit joined16:10
EugeneKay benzrf - there's git-daemon, but !publish ;-)16:10
gitinfo benzrf: [!publish_github] Publishing git repos via git-daemon or gitweb is not for the faint of heart. Consider using Github as a free place to post your work, and let them worry about administration.16:10
v8energy I moved a file from one folder to another. I pushed, the file was still in the same folder. so I tried doing git add . -A then commit and push, and then git add -u then commit and push. then I also tried git rm file/location but it complained that the file is no longer at that folder. help.16:10
benzrf hmm16:11
in what way are they not for the faint of heart?16:11
o_o16:11
EugeneKay PITA to setup, relative to `git push github`16:11
→ normanrichards joined16:11
→ twoface88 joined16:11
benzrf hm16:12
← Cromulent left16:12
← Guest__ left16:12
→ rabellamy joined16:13
→ arietis joined16:13
→ meLon joined16:14
← joshsmith left16:14
fdel I have an annotated tag where I'd like to edit the tag message (without moving the tag to a new commit). I tried "-a -f" git-tag options, it opens the editor but the old message isn't loaded. Is it possible to "amend" it without copy-pasting?16:15
offby1 fdel: I think you'll have to delete the tag and make a new one16:15
tags are like commits: they're immutable16:15
fdel When I move them to another tag, I can edit the tag annotation16:16
so you must be wrong, offby116:16
osse fdel: but editing the messages you are in fact creating a new tag with the same name and deleting the previous one16:16
it feels like editing, but it isn't16:17
→ Guest__ joined16:17
fdel yes, but I wonder why I can't see the old tag message when staying on the same commit16:17
← plumpkin left16:17
benzrf oh16:17
fdel I do when I move the tag to another commit16:17
benzrf I'll just use ftp16:17
-.-16:17
osse fdel: maybe there is no good reason and it's just an oversight16:18
→ rudak joined16:21
offby1 benzrf: have you looked at !gitolite?16:21
gitinfo benzrf: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/16:21
← rudak left16:21
offby1 it does require 'handing out scp access' but perhaps it's not as bad as you think16:21
osse fdel: git tag -a -f -F <(git log -1 --pretty=%B your_tag) your_tag16:21
← renatow left16:21
→ Goplat joined16:21
→ renatow joined16:21
→ enr joined16:21
fdel osse: hmm yes didn't think of that way. thx16:22
v8energy please hellp. the file doesn't wanna go away :((16:22
→ Artpicre joined16:22
osse fdel: it's a bitch to write, but you can make it a shell function16:22
benzrf !help16:22
gitinfo What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.16:22
benzrf hm16:22
CareBear\ v8energy : your problem description is lacking lots of information16:23
v8energy : because you are not being very explicit about what you have done16:23
EugeneKay v8energy - !repro16:23
gitinfo v8energy: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.16:23
offby1 !repro16:23
gitinfo Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.16:23
EugeneKay Jinx!16:23
ChanServ set mode: +o16:23
offby1 glares at EugeneKay16:23
EugeneKay set mode: +q16:23
offby1 ow.16:23
→ bewest joined16:23
EugeneKay Oh, dangit.16:23
→ hwrd|work joined16:24
benzrf what is +q?16:24
quiet?16:24
→ Ry0_ joined16:25
EugeneKay Yeah, but it doesn't work if I've previously +v'ed him, also as a joke.16:25
benzrf ah16:25
EugeneKay set mode: -q16:25
EugeneKay set mode: -o16:25
offby1 spits out pieces of gag16:25
← p1ng left16:25
mechanicalduck_ → mechanicalduck16:26
offby1 the joke goes over my head since I never know what those codes mean anyway16:26
EugeneKay Well, done properly, you'll see "cannot send to channel" per the /topic16:26
← enr left16:27
→ AWinterman joined16:27
→ Mitchellvanw joined16:29
← ErKa left16:29
← conan_ left16:29
→ ozette joined16:29
arand cbreak: It's being worked on, I think it's in the "testing welcom" state ;)16:30
cbreak: Oh, that was a reply to somewhere way back in scrollback.16:31
rohieb hmm. If I git am patches previously given to me by git format-patch, they do not have the same SHA1 for me and for the people who send me the patches, right?16:31
osse rohieb: correct16:31
rohieb okay. So when I then git pull from them, I have to take care of this?16:31
or do I just merge -s ours?16:31
← benzrf left16:31
v8energy CareBear\: https://gist.github.com/anonymous/2fdc3dbcd4e79599da2516:32
osse rohieb: if you pull --rebase Git will automatically detect idential patches and drop yours16:32
rohieb osse: okay, thx16:33
→ tatsuya_o joined16:34
← marix88x left16:34
← ferdev left16:35
← twoface88 left16:35
← rabellamy left16:36
← Sonderblade left16:38
→ muculus joined16:40
← OOPMan left16:42
CareBear\ v8energy : so what is the question?16:43
→ pitzips_alt joined16:43
CareBear\ v8energy : ls vendor/assets/javascripts/16:43
v8energy the PIE.js won't get removed from vendor/assets/javascripts16:43
← Guest__ left16:43
v8energy it's not in the directory16:43
CareBear\ so it was removed16:43
v8energy but it's still in the git16:43
← sgambino left16:44
→ OOPMan joined16:44
CareBear\ I somehow doubt that..16:44
v8energy i will take a screenshot16:44
CareBear\ git ls-tree vendor/assets/javascripts/16:44
sorry: git ls-tree HEAD vendor/assets/javascripts/16:44
v8energy http://puu.sh/443eg.png16:44
ok16:44
CareBear\ "in the git" is vastly different from "on github"16:45
→ boblu joined16:45
v8energy CareBear\: https://gist.github.com/anonymous/92f3b96451746947ca5116:45
← ology left16:45
v8energy i am using gitbucket16:45
CareBear\ github is a service offering some toys for using git16:45
same same16:46
so,16:46
v8energy yea16:46
→ EdGrubemran joined16:46
CareBear\ as you see, PIE.js is not in the tree16:46
v8energy yeah it's not16:46
but it won't go away from the gitbucket16:46
CareBear\ I think it's likely that you are not reading what you think you are reading, on gitbucket16:47
→ Guest__ joined16:47
CareBear\ or that you haven't written what you think you have written, to gitbucket16:47
← infogulch left16:47
EdGrubemran → EdGruberman16:47
← Naoe-Kanno left16:47
← b0x left16:47
→ infogulch joined16:47
CareBear\ look into the git push situation, so that you are actually performing the actions that you want16:48
v8energy when i push it says everything is up to date16:48
→ conan_ joined16:48
→ SHyx0rmZ joined16:48
v8energy even though PIE.js doesn't exist in the directory but it's still in the gitbucket16:49
CareBear\ you should study the two concepts branches and remotes16:49
iveqy v8energy: what's gitbucket?16:49
CareBear\ I fear that you don't really know what's going on when you push16:49
v8energy i meant bitbucket sorry16:49
← xequence left16:51
iveqy v8energy: is this problem somehow related to the problem you described in #github?16:51
v8energy iveqy: yeah16:51
iveqy v8energy: so what part has github with this? I don't get that16:52
→ Roots47 joined16:52
→ verysoftoiletppr joined16:52
← Artpicre left16:53
← boblu left16:53
← h0bbit left16:55
→ sriracha joined16:55
→ Artpicre joined16:55
v8energy people in github know how git works :P16:56
← normanrichards left16:56
→ RaceCondition joined16:56
→ SergeyPenkin joined16:56
osse My guess is that you are pushing other branches or pushing to the wrong place, and that's why you don't see the change onbitbucket16:56
iveqy v8energy: well, I say !repro, off all your commands, not just a screenshot16:57
gitinfo v8energy: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.16:57
→ outcoldman joined16:57
→ rabellamy joined16:57
→ devoldmx3 joined16:58
← babilen left16:58
→ twoface88 joined16:59
v8energy iveqy: i already have16:59
→ longbeach joined16:59
v8energy iveqy: https://gist.github.com/anonymous/2fdc3dbcd4e79599da2517:00
→ nursodiq joined17:00
← nursodiq left17:00
← Tabmow left17:01
← devoldmx left17:01
→ sq-one joined17:02
→ gittish joined17:06
← AWinterman left17:06
← tatsuya_o left17:07
→ AWinterman joined17:07
← _iron left17:07
← stormwild left17:07
← sriracha left17:08
← gittish left17:08
← pitzips_alt left17:08
← dsdeiz left17:08
← Droolio left17:08
→ btree joined17:10
→ girishr joined17:10
← btree left17:10
← foobarbaz left17:11
→ natechan joined17:12
← AWinterman left17:12
← thiago left17:12
→ thiago joined17:13
→ mehdiNej joined17:13
→ noxd joined17:15
← _jmg left17:15
→ joshsmith joined17:16
→ tatsuya_o joined17:17
→ h0bbit joined17:18
→ AWinterman joined17:20
→ babilen joined17:20
← Mitchellvanw left17:21
→ enr joined17:22
← vkz left17:22
← enr left17:24
← SergeyPenkin left17:25
→ barneybook joined17:27
← ozette left17:27
← Ry0_ left17:27
→ Cromulent joined17:28
→ bmac joined17:29
← michaelarestad left17:30
→ michaelarestad joined17:30
→ maxmanders joined17:31
→ gittish joined17:33
→ Forkk joined17:33
Vampire0_ → Vampire017:33
← michaelarestad left17:35
→ skiernose joined17:36
← Cromulent left17:36
← skiernose left17:37
→ cads joined17:39
→ rendar joined17:40
→ cha1tanya joined17:40
→ EF0 joined17:40
→ FreezingCold joined17:42
← FrodoTheHobbit left17:42
← sq-one left17:42
→ Mode-M joined17:42
→ Ry0_ joined17:43
→ hackula joined17:48
mckendri_ → mckendricks17:48
→ dan64 joined17:48
← sdrfnord1 left17:49
→ sdrfnord1 joined17:50
← wrouesnel1 left17:50
→ kukks joined17:51
← kukks left17:51
→ kukks joined17:51
← hoschi left17:54
→ leen^| joined17:54
← rfoust left17:54
← sdrfnord1 left17:56
← goldbrush left17:57
← ncd|leeN left17:57
→ lpapp joined17:58
→ Darrell joined17:59
→ michaelarestad joined18:00
Darrell hello. i'm new to git and VCS in general. I'm just curious about a good git workflow… So, how often should one be committing to the repository? every 5-10 minutes? every time a new feature is added/bug is fixed?18:01
→ R1KRDO joined18:02
← tatsuya_o left18:02
canton7 do it per unit of work rather than per time. for me, normally every time I make a set of change which accomplish something, however small18:02
← gvdm left18:02
← cads left18:02
→ gvdm joined18:03
axrfnu yep, working units are a reasonable approach18:03
if you need a more fine-grained saving status your editor/ide may help you with undo-history18:04
← lpapp left18:05
← michaelarestad left18:05
→ plumpkin joined18:07
Darrell ah, okay. thanks guys.18:09
← Darrell left18:10
← rabellamy left18:11
← trusktr left18:11
← Ry0_ left18:13
→ aChatir joined18:14
← aChatir left18:15
→ dmarkham joined18:15
→ PaulCapestany joined18:18
→ CodeShark joined18:19
→ Naoe-Kanno joined18:20
← natechan left18:20
← St_Marx left18:20
→ matanya joined18:21
← Artpicre left18:21
← SHyx0rmZ left18:22
→ enr joined18:23
← Schrostfutz left18:25
→ parcs_ joined18:25
parcs_ 'git pull' is equivalent to 'git fetch' followed by what?18:26
canton7 'git merge @{upstream}'18:26
parcs_ ah okay18:26
← enr left18:28
→ Schrostfutz joined18:29
← Milossh left18:30
→ CheckDavid joined18:30
→ NikolayAndMushro joined18:30
→ Ry0_ joined18:31
gitinfo set mode: +v18:31
NikolayAndMushro Hello. Does anybody have problem with getting last version of git?18:32
at ubuntu/mint18:32
← conan_ left18:34
← Guest__ left18:34
→ conan_ joined18:35
cbreak NikolayAndMushro: cloning from git.git doesn't work?18:35
→ aard_ joined18:36
→ michaelarestad joined18:36
parcs_ is there any way to have 'git merge --ff-only' explain why it is unable to fast-forward?18:36
cbreak parcs_: just use !lol18:37
gitinfo parcs_: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all18:37
cbreak parcs_: or git log --graph --oneline --decorate HEAD HEAD@{u}18:37
parcs_ oh i see18:38
fast-forward is only usable when there are no local commits18:38
otherwise you have to use rebase18:38
← rath left18:39
cbreak or merge18:39
or reset18:39
parcs_ rebase is better18:39
→ atomx joined18:40
← dmarkham left18:40
← michaelarestad left18:40
atomx What is the space limit for free accounts to BitBucket ?18:41
← kbar left18:42
thiago atomx: check bitbucket.com, or see if they have an IRC channel18:42
we're not affiliated18:42
atomx Maybe somebody will know ;) I managed only to find that they offer unlimited number of projects . And 90 % of users here used bitbucket at least once.18:43
→ raf_ joined18:43
→ iderik joined18:45
cbreak atomx: I read it's at least 118:46
→ dr_ick joined18:47
atomx Bitbucket offers both commercial plans and free accounts. It offers free accounts with an unlimited number of private repositories (which can have up to five users in the case of free accounts) as of September 201018:47
quote from wikipedia18:48
says nothing about the limits of space.18:48
→ Morgon_ joined18:49
iveqy v8energy: if you look at the first error message from git commit you see that you have nothing to commit, use git commit -am "ok"18:50
← angelsl left18:51
→ vkz joined18:51
Morgon_ Greetings! What might be the best way to take a branch and squash some older, non-related commits (accidentally used a framework's git repo as a base), yet keep our own commit history?18:51
→ natechan joined18:51
iveqy Morgon_: with git rebase -i18:52
Morgon_: however see !public18:52
gitinfo Morgon_: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum18:52
Morgon_ Yeah, that's why I was asking - wasn't sure if there was another way to do it other than rebase :)18:53
parcs_ what extra work would they have to do? just git rebase origin/master right?18:53
← Schrostfutz left18:53
← raf_ left18:53
→ aspiers joined18:54
iveqy Morgon_: well there is. You could do an orphan branch starting from your first commit and then build your commits on top on that18:54
← shruggar left18:54
iveqy Morgon_: and then just delete the old branch18:54
it might be simplier, depending on your repo structure18:54
Morgon_ I'm having trouble with rebase, I keep seeing 'noop'.18:55
iveqy parcs_: no, a git reset18:55
→ v1n joined18:55
← cha1tanya left18:55
← h0bbit left18:56
← babilen left18:56
→ babilen joined18:57
← devoldmx3 left18:58
← mechanicalduck left18:58
Morgon_ Sheesh. This repo is a mess. Combination of project commits and framework commits from their authors. heh18:59
→ glosoli joined19:00
iveqy Morgon_: that's why everyone should read !merge_vs_rebase until they understand it ;)19:01
gitinfo Morgon_: [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html19:01
← v1n left19:01
→ michaelarestad joined19:01
← Marquisk2 left19:02
← atomx left19:02
← R1KRDO left19:03
→ normanrichards joined19:05
Morgon_ iveqy: Sure, that helps going forward. But how do I fix the past? :P19:07
← vkz left19:08
iveqy Morgon_: not shure you should...19:08
Morgon_ :-/ Definitely don't need/want commit history from the framework maintainers.19:09
→ pandeiro joined19:09
iveqy Morgon_: I've gived you two alternatives, both can be pretty work intensive, not sure you'll benefit from it19:09
Morgon_ But there have been a non-trivial amount of commits done by the team that needs to stay.19:09
→ whowantstolivefo joined19:09
iveqy Morgon_: how will you get new features from the framework guys?19:09
Morgon_ iveqy: And I definitely thank you! I'm just having trouble using rebase.. keeps telling me 'noop'19:09
composer, mostly. The framework stuff is just the application skeleton, essentially. They make minor tweaks that could be patched in; we don't need git history19:10
→ kesha_ joined19:10
iveqy Morgon_: well, how many commits are we talking about that is not from the framework?19:11
← vince_prignano left19:11
Morgon_ That is from us? 350+19:12
← Roots47 left19:13
← babilen left19:14
← NikolayAndMushro left19:14
iveqy Morgon_: a bit too many to cherry-pick IMHO19:14
→ cedeon joined19:14
→ babilen joined19:15
Morgon_ iveqy: I'd be willing to do it if there's a way to remove it from the framework skeleton history. *sigh* It's so dirty.19:15
iveqy Morgon_: it is, do the orphan branch trick19:15
→ boblu joined19:17
Morgon_ iveqy: git branch --orphan git_rebase <SHA> ?19:17
er, 'git checkout --orphan git_rebase <SHA>'19:18
iveqy Morgon_: unfortunately not =(, git checkout --orphan19:19
I can't understand why that isn't possible to do with the git branch command =(19:19
→ tatsuya_o joined19:21
← girishr left19:22
Morgon_ iveqy: Perhaps I'm confused on the purpose of this command. It seemed like it would have allowed me to use <SHA> as my original commit, but still keeping the commits after that. Essentially this command puts me 'at' the commit in question with no history. Where do I get the additional history?19:22
→ Shusshu joined19:23
→ Dougie187 joined19:23
→ enr joined19:23
thiago Morgon_: first of all, are you aware of the consequences of the rewrite of history?19:24
← Shusshu left19:24
thiago Morgon_: do you have contributors to your code? people who have cloned your repository?19:24
Morgon_ Perhaps not fully.. but enough that I know it's not always the best option. But in this case, I would really like to try.19:24
iveqy Morgon_: you got a link about that from me earlier...19:25
Morgon_ This is not a public repo.19:25
There are other contributors, but we're all part of the same team.19:25
I just want to remove non-project commits from the history. It *really* shouldn't be this hard, if I'm fully honest. :(19:25
thiago Morgon_: it's the *last* option, always19:26
Morgon_ Well that's where we're at.19:26
thiago Morgon_: everyone will need to re-clone19:26
Morgon_ They'll live.19:26
thiago Morgon_: delete their repositories19:26
iveqy Morgon_: do a git checkout to the first commit you want to use, then git checkout --orphan... then cherry pick the commits you like. After that move the branch pointer (master if you like) with git reset19:26
thiago Morgon_: if they have commits on top that they haven't pushed to the master code line, there will be trouble19:26
Morgon_: are you sure you want to continue?19:26
← rendar left19:27
iveqy thiago: well, it's possible for them to cherry-pick their commits too. It just requires some more git knowledge19:27
Morgon_ That... doesn't make sense from a 'not a git developer' point of view. Changes should only be determined by their difference from existing code. I don't see how rebasing history is going to affect code they're working on.19:27
thiago iveqy: yes19:27
iveqy: but it opens up for the possibility someone will merge the old history19:28
← fridim__ left19:28
← enr left19:28
iveqy Morgon_: every commit has a sha1, the sha1 is the content of the commit and all history, if you change the history you'll change the commit19:28
thiago: yes. Your recommendations is clearly the best way to go with unexperienced git users19:29
Morgon_ thiago: The situation is this: We checked out a framework's 'skeleton' repo (the rest is handled via composer) as the basis for our project. It has all of the commit history from their development, as well as ours. I want to keep our history, but not have theirs.19:29
→ ziddey joined19:29
thiago Morgon_: I know19:30
Morgon_ ..ok19:30
thiago Morgon_: but you did not answer my questions19:30
Morgon_: are you prepared to have everyone delete their repositories?19:30
Morgon_ Sure. It's small enough that we could have them stash, patch, or otherwise get to a common spot.19:31
thiago no patch19:31
I mean, no stash19:31
Morgon_ Fine.19:31
thiago you need to create patches with git format-patch19:31
anything else is dangerous19:31
Morgon_ Patch. Copy code. This shouldn't have anything to do with the history. It's just changes in code.19:31
thiago ok19:31
now, besides the history, are there files you need to remove?19:32
Morgon_ No19:32
thiago I mean, the skeleton repo, do you want to remove it too?19:32
← mdiers left19:32
thiago or just the commits from it?19:32
→ vigs joined19:32
Morgon_ Just the commits is fine.19:32
thiago ok19:32
do you have one commit that represents the exact initial state you want?19:32
Morgon_ Yes. Going to use the team's first commit on the project (pre skeleton)19:33
thiago ok19:33
what do you mean by "pre skeleton" ?19:33
Morgon_ These were commits that were made before we moved to the framework.19:33
How they're both there, I honestly don't remember at this point.19:34
both == full project history, and full framework history19:34
thiago you've lost me19:34
I couldn't care less about what the contents of your repo are19:35
I am interested only in history19:35
Morgon_ That's what I mean.19:35
If I do 'git log', our history is essentially intertwined with the framework's commit history19:35
thiago is there one commit whose ancestors you want to discard, but the tree state is what you want?19:35
intertwined?19:36
← boblu left19:36
thiago have people been merging the unwanted history?19:36
Morgon_ Yeah. The first initial commit of our project is where I want to be the new base of the history19:36
thiago ok, let's try this19:36
Morgon_ And yes, we've been using it for updates of the framework.19:36
→ ology joined19:36
Morgon_ It's messy, I know19:36
→ btree joined19:36
thiago what is the SHA-1 of that first commit?19:36
Morgon_ 6af50b19:37
(or 6af50b0fb905f82901c98a6ac578e9c3bca4e59d if you want the full)19:37
thiago echo 6af50b0fb905f82901c98a6ac578e9c3bca4e59d > .git/info/grafts19:37
now do a git log and see if the history is un-messy19:37
← PaulCapestany left19:37
Morgon_ Oh, which branch should I be in when I do this?19:37
Because I had started to do the orphan thing19:37
← Ry0_ left19:38
Morgon_ So I'm on an orphan branch now19:38
thiago the echo can be done from any branch19:38
it affects the entire history19:38
Morgon_ Right, but the reason I ask is because 'git log' currently says "bad default revision 'HEAD'" :)19:38
thiago was it working before?19:38
Morgon_ Before I did the orphan, yes. Not in my orphan branch.19:39
← FreezingCold left19:39
thiago check out any of your branches19:39
forget the orphan thing19:39
← ffio left19:40
← btree left19:40
→ madewokherd joined19:41
Morgon_ I just nuked it (temp directory anyway) and started over. In any case, after echoing to grafts, 'git log' does not seem any different than normal.19:41
thiago:19:41
thiago then your history is messy19:41
it means your first commit is not the first commit19:41
→ ErKa joined19:41
thiago the framework was merged at a later point19:42
Morgon_ Yes, it was. Sorry if I didn't make that more clear than I thought I did. :)19:42
→ cha1tanya joined19:42
Morgon_ The first commit is the framework's first commit.19:42
thiago find the first commit that isn't messy19:42
the first commit past the mess19:42
that's the commit you have to echo into the grafts file19:43
don't worry, the grafts file is completely reversible19:43
← lethjakman left19:43
thiago no loss19:43
→ lifelike joined19:44
Morgon_ thiago: Sorry, what do you mean 'isn't messy'. They're all messy, I guess. The most recent commit from the framework side was June 15th. We do have several of our own commits afterwards, but there are also many commits before then that I'd like to keep.19:44
← wongon left19:44
thiago ok19:44
then find each and every one of the merge commits19:45
in the grafts file, write the SHA-1 of the commit and the SHA-1 of the parent you want to keep, one pair per line19:45
separated by spaces19:45
→ aChatir joined19:46
→ Roots47 joined19:46
← glosoli left19:46
← kesha_ left19:47
→ bklane joined19:48
Morgon_ thiago: I can use the short sha's right? (Since that's what git log spits out for Merge notifications)19:49
milki not for grafts19:49
Morgon_ Oh come on.19:49
tkil does someone have a cheat sheet for working against linux-next? cloned it a month or so ago, branched off of it and did some work. now i'd like to rebase my branch on the current state of linux-next.19:49
just not sure how to do that...19:49
→ aard__ joined19:49
→ barneybook|2 joined19:50
← aard__ left19:50
thiago tkil: git rebase remotename/linux-next19:50
tkil thiago -- "fatal: Needed a single revision" "git remote -v" says: origin git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (fetch) (and same for push)19:52
← barneybook left19:52
thiago tkil: what command printed that?19:52
tkil $ git rebase origin/linux-next -> fatal: Needed a single revision19:52
← aard_ left19:52
tkil doing "git rebase origin" gives me a merge error.19:53
grawity There's no branch called 'linux-next' there...19:53
thiago tkil: git log origin/linux-next19:53
tkil adding "-s ours" works but it seems to want to individually hundreds of packages.19:53
thiago tkil: does the branch even exist?19:53
tkil s/packages/patches/ thinko.19:53
grawity linux-next just has a 'master' branch where the "next" stuff goes19:53
thiago tkil: ok: git rebase remotename/branchname19:54
grawity Which `git rebase origin` picks up correctly.19:54
thiago tkil: replace with the correct remote name and branch name19:54
tkil thiago -- at this point, i have no idea. i'm pretty sure my steps were: clone the url given for linux-next, make a branch, work on branch. now i want to rebase my work branch off current linux-next...19:54
ok, i'll try those.19:54
← Roots47 left19:54
tkil thiago -- whole point is i'm not sure what the "correct remote and branch name" are, other than the fact that i successfully cloned it originally...19:55
← eribeiro left19:55
thiago tkil: don't ask us then19:55
tkil: we're users of Git. If you need help with the project you're working on, ask the people working on that project.19:56
tkil ah. nice day to you too.19:56
← maxmanders left19:56
← Dougie187 left19:56
← lifelike left19:57
Morgon_ thiago milki - Is there a way to show the full SHA for Merge histories?19:57
milki use the short one and shove it at rev-parse19:57
Morgon_ Ah, that's something at least. Thanks.19:58
← bklane left20:00
→ glosoli joined20:02
← crazydiamond left20:03
← cha1tanya left20:03
← iderik left20:04
← JPeterson left20:05
← OOPMan left20:05
→ Gues_____ joined20:06
→ momomomomo joined20:07
← hwrd|work left20:07
→ xequence joined20:07
← noxd left20:08
← babilen left20:09
→ OOPMan joined20:10
← OOPMan left20:10
→ hwrd|work joined20:11
← tatsuya_o left20:11
→ sriracha joined20:13
← muculus left20:13
Morgon_ thiago: Other than one merge having duplicate graft data (will look into why there are two merges with the same parent), this seems pretty good. The very first commit is still from the framework maintainer.. don't know if that's to be expected, since their history is earlier than ours.20:14
Hrm. Though I only have 120 commits here, instead of the 350 I was expecting.20:15
← mehdiNej left20:15
→ OOPMan joined20:15
→ mizu_no_oto joined20:16
Morgon_ Ah, looks like all of the project history before the introduction of the framework is no longer here. Will have to find those merges.20:16
thiago Morgon_: there's no such thing as duplicate20:16
← xequence left20:16
thiago Morgon_: not per commit. Same parent is fine.20:17
Morgon_ error: duplicate graft data: bb3607291ba29d53eec2fc111edcc1c44bf7b023 55d1d533d14c3a61c28765a146813a849cd31e5520:17
I found two merges with the same parent, but the child is different.20:17
← hackula left20:17
Morgon_ It's 55d1 in one, a4cac5 in the other.20:17
There's another one like this, as well. Let me check what those merges were.20:18
thiago Morgon_: like I said, there's no duplicate of the first commit20:18
Morgon_: you can repeat the parents as often as you want20:18
→ tatsuya_o joined20:20
Morgon_ thiago: Weird. I definitely see two similar merges. Merge: bb36072 a4cac55 .. Merge: bb36072 55d1d5320:20
Same commit message, too20:20
→ noxd joined20:21
← mizu_no_oto left20:21
thiago Morgon_: those are the parents20:21
Morgon_: the important thing is that the actual commits (the one in "commit 123456") is not repeated20:21
→ Nicholas_Rishel joined20:21
Morgon_ Buuuut they are.20:21
thiago no, they aren't20:22
anyway, I've just found git log --no-abbrev-commit20:22
← hwrd|work left20:22
Morgon_ Two similar merge IDs that are pointing to two different commits; those two commits also have the same message.20:22
Hrm, --no-abbrev-commit doesn't seem to affect Merge IDs.20:23
thiago what do you mean by "merge IDs"?20:23
→ mizu_no_oto joined20:23
→ Roots47 joined20:23
→ mloskot joined20:23
Morgon_ "Merge: bb36072 a4cac55 " in the history. Perhaps the wrong terminology20:23
← conan_ left20:23
thiago yes20:23
"parents"20:23
Morgon_ Which one is the parent? The first or the second20:24
← mizu_no_oto left20:24
thiago both20:24
Morgon_ ....k20:24
→ iderik joined20:24
← AWinterman left20:24
thiago the first is the first parent; the second is the second parent20:24
Morgon_ So why is git complaining about 'duplicate', then20:24
→ conan joined20:24
thiago you repeated the commit20:24
→ AWinterman joined20:24
thiago as I said, there's no repetition of the commit20:24
you can repeat parents as often as you want, but not the commit (the first field)20:25
Morgon_ Well *I* didn't. It wasn't my commit. But if I look at the raw log, I see the commit twice with two different SHAs20:25
→ rabellamy joined20:25
Morgon_ Sec, I'll show you.20:25
thiago then there is no duplication20:25
← arietis left20:25
thiago you've just said there are two different SHA-1s20:25
commit 08d91d4b8e72b8fe6f6a86b53c995fb548cff81b20:25
Merge: 071c48a5ff8842d43fcdc95db08b561d340a2bfd 6a56fd306937552dbeb53b30149288dc83d2c90b20:25
suppose you want to remove the second parent20:25
you'll write to the grafts file: 08d91d4b8e72b8fe6f6a86b53c995fb548cff81b 071c48a5ff8842d43fcdc95db08b561d340a2bfd20:26
→ shruggar joined20:26
← iderik left20:26
Morgon_ thiago: http://pastebin.com/TAVNsRkZ .. I simply copied the merge parents 'bb36072 a4cac55' and 'bb36072 55d1d53' to the grafts file, and git is complaining about those.20:27
→ iderik joined20:28
grawity The graft syntax is <commit> <parent> [parent...], right?20:28
thiago right20:28
Morgon_ But if you notice, the merges and the commits they point to have different IDs.20:28
thiago Morgon_: please read what I said20:28
Morgon_ Hrm.20:28
So I have to operate on commits, not merge parents?20:29
thiago Morgon_: of course20:29
Morgon_: if you want to remove a parent from a commit, you need to tell Git what that commit is20:29
← AWinterman left20:29
Morgon_ *shrugs* You said "thiago: then find each and every one of the merge commits" .. So I just looked for the Merge data20:29
thiago grawity: actually, it's commit [parent...]20:29
→ maxmanders joined20:29
thiago Morgon_: find the merge *commits*20:30
Morgon_ Well the merge parents represent *commits*20:30
thiago Morgon_: no20:30
Morgon_ ..k20:30
thiago Morgon_: commits represent commits20:30
← iderik left20:30
thiago Morgon_: each commit has zero or more parents20:30
Morgon_: merge commits have two or more parents20:30
Morgon_: regular commits have one parent20:30
→ iderik joined20:30
thiago Morgon_: root commits have zero parents20:30
Morgon_ git is intentionally confusing, then. When I see "Merge: bb36072 a4cac55" and I can resolve "bb36072" into a full commit ID, that says merge parents represent commits. That's fine if that's not actually the case, but you can't blame me for thinking so20:31
← verysoftoiletppr left20:31
thiago Morgon_: Git not confusing20:31
→ Dougie187 joined20:31
thiago Morgon_: each commit is identified by exactly one SHA-120:31
Morgon_ StackOverflow would suggest otherwise. :)20:31
EugeneKay They're idiots. !blog20:31
gitinfo Blog posts, while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative.20:31
→ acharlieh joined20:31
← sriracha left20:31
thiago Morgon_: each commit may have zero or more parents. When it has two (or more), it's called a merge commit.20:31
Morgon_: the parents are listed in that Merge: line20:32
← maxmanders left20:32
thiago Morgon_: find the parent you want to remove, then write to the grafts file: <commit> <parent you want to keep>20:32
← noxd left20:32
EugeneKay Two commits which have the same changeset may have different SHAs, because of a difference in parentage, timestamp, author, message, or any other metadata - that makes them different commit.20:32
Morgon_ So how would I accurately determine the commits to use in the grafts file? How would I start, at least? I felt that if I just operated on our own commits, that would give me the right data.20:32
pekster Morgon_: If you're coming from subversion, think of the Merge: HASH lines like the svn:refinfo that svn keeps -- same idea, it just says "this commit has data that came from this other commit"20:33
thiago Morgon_: find the merge commits that have parents you want to remove20:33
pekster revinfo*20:33
Morgon_ pekster: Nope, not from svn. Sorry.20:33
EugeneKay If they were the same commit, they'd hash to the same SHA20:33
→ AWinterman joined20:33
→ h0bbit joined20:33
Morgon_ thiago: I thought I was identifying things I wanted to keep? grafts is for what I want to remove?20:33
thiago Morgon_: identify things you want to remove20:34
Morgon_: grafts is both about adding and removing20:34
Morgon_: it's about rewriting ancestry20:34
Morgon_ I want to remove: all things that have nothing to do with our commits.20:34
our = team.20:34
thiago Morgon_: right. But there's no git do-what-I-wnat20:34
Morgon_: you have to identify the commits that bring changes you don't want.20:34
Morgon_: I've been assuming that those are merges.20:35
Morgon_ Seems fairly easy to say "Give me these commit ids"20:35
← rednaks left20:35
thiago Morgon_: sure. What's the selection criteria?20:35
what are...20:35
Morgon_ Commits that are done by specific people in my team. I don't mind if I have to manually go in and paste the actual commit ids. I just don't want any commits that were done by the other project.20:36
thiago to remove the commits you don't want, you have to identify the commits that brought them in.20:36
pekster Sounds like more of a workflow issue then since perhaps these "other projects" should have been committing to their own branch. It's a little late to fix that for your existing history though20:36
thiago I'm assuming that they were brought in by a merge by someone in your team.20:37
→ Caritade joined20:37
Morgon_ pekster: It shouldn't be. rebase. keep these commits, remove the others. It's very simple when you think of it from outside git.20:37
EugeneKay This sounds pathological20:37
Morgon_ thiago: Yes.20:37
thiago Morgon_: find *those* commits: the merges by someone in your team.20:37
Morgon_: each merge has two (or more) parents. Write to the grafts file: <commit SHA-1> <parent(s) that you want to *keep*>20:38
pekster You're rebasing commits that have been pushed between teams? If you're doing that you're generally doing it wrong (as then everyone has to pull *your* rebased changes, and git won't do this automatically for anyone else)20:38
→ enjoi joined20:38
← Roots47 left20:38
enjoi Hello all20:38
→ rfoust joined20:38
thiago pekster: as far as I've identified so far, there have been no rebases20:38
pekster: someone in his team has been merging code that he doesn't want there anymore. Some other component.20:39
→ maxmanders joined20:39
gitinfo set mode: +v20:39
thiago actually, he wants the code. He just doesn't want the history of them.20:39
enjoi Hey there :-)20:39
Morgon_ thiago: Okay, that might be a little easier to identify, as that was A) me, and B) most of it was done just once when I did my initially merge of the changes. So... okay.20:39
So the commit is d8e35a43aa3ec17fc963bd149203f7a20009c49d and the Merge line is Merge: a3542be e31445720:39
← Mode-M left20:40
Morgon_ You're saying identify the commit that represents the code line previous to what I want to keep, or to what I want to remove20:40
EugeneKay wtf are you trying to do, and what is wrong with rebase20:40
thiago Morgon_: which commit don't you want?20:40
Morgon_ EugeneKay: When I try to rebase, I just get 'noop', so I'm done with that. :)20:40
thiago Morgon_: which parent do you want removed?20:40
EugeneKay That's the wrong question20:41
→ scripty joined20:41
EugeneKay Your inability to use a command does not mean the command is bad20:41
← scripty left20:41
Morgon_ I didn't say the command was bad.20:41
I simply said it wasn't working for my particular situation20:41
→ thelamest joined20:41
enjoi So I have a question.. I have a git repo on github.com -- I have of course the master, then the branches : SideBar, and AboutU -- a developer is working on the branches and he has comiited the stuff, in order for me to 'receive' the work that he has changed, can I just do a git clone command again?20:41
or do I have to do something else?20:41
← h0bbit left20:41
EugeneKay .....which is? Though at this point I don't know that I care - I hate having to beat problems otu of people. Good luck; you'll need it.20:41
enjoi I am a bit confused with this, i've read the manual on git, but im still a bit confused here20:42
← dr_ick left20:42
Morgon_ EugeneKay: I'm fully willing to give you the full rundown if you stop assuming.20:42
← valtido left20:42
EugeneKay Morgon_ - you weren't three sentences ago ;-)20:42
enjoi - did they Fork your github repo? Or did oyu grant them access to push to your repo directly?20:42
enjoi I tried doing a git merge command, but it said i didn't have a working trree or soemthing20:42
um, it is all in our repo20:43
but he does have a fork too20:43
but we will call the fork illrelivant for now20:43
← AWinterman left20:43
Morgon_ thiago: Okay, found it. It was actually a different merge line that I needed to follow. commit 1d3ac2f0f0a10d4bf76042e55abd8c5c2133a0da / Merge: 08cb97f a3542be -- I do NOT want 08cb97f20:43
→ AWinterman joined20:43
Morgon_ thiago: It should be noted that a35 doesn't exist in the log. Don't know if that's relevant.20:43
EugeneKay Within the Github web UI, you can play with the Pull Request button. They've moved it around lately, so go hunting20:43
thiago Morgon_: write: 1d3ac2f0f0a10d4bf76042e55abd8c5c2133a0da a3542be<the rest>20:43
EugeneKay Or from your (working copy, not --bare) clone, `git fetch; git merge origin/SomeBranch` while you're on the master branch; then `git push` the result if it looks good.20:44
→ scripty joined20:44
EugeneKay IF the commits are in the other Fork on github, you need to `git remote add somefork <URL>`, then `git fetch somefork`, and proceed ettc20:44
← AWinterman left20:45
EugeneKay (Or they can make a Pull Request from their repo to yours via the web UI, which will give you an automerge button, OR you can use the !request refspec hack)20:45
→ AWinterman joined20:45
Morgon_ thiago: Oh man. That's the only line I apparently needed!20:45
EugeneKay (and of course that's the wrong bot factoid)20:45
enjoi so if my github were say http://github.com/development1 and i had a branch AboutU I would do git merge github.com/development1 AboutU?20:45
Morgon_ Just that single line removes all of the other junk20:45
thiago Morgon_: check with git log that the history looks like what it needed to look like20:45
Morgon_ (Except one small merge, but I'm not going to nitpick)20:45
← tatsuya_o left20:46
thiago Morgon_: once you're satisfied, we can make it permanent20:46
Morgon_ 387 commits. Definitely looks better20:46
EugeneKay enjoi - no; fetch from the named remote "origin", which uses that URL. Then `git merge origin/BRANCH`.20:46
→ tatsuya_o joined20:46
EugeneKay When you fetch git keeps a local copy of branches from your repo on github, under the "origin/" namespace(because that's what the default remote is called when you ran `git clone`20:46
enjoi ohh I think I see20:47
→ otc joined20:47
enjoi when I used git clone, it kept the url that I cloned from20:47
Morgon_ thiago: Fantastic. Thank you for all of your help and patience thus far. How do we make this permanent, and does this have the same pitfalls as rebase? (Or will we still be rebasing? heh)20:47
enjoi so now from this point forward, I can just use like git fetch20:47
or so forth, right?20:47
EugeneKay Exactly so.20:47
enjoi ahhh20:47
I was missing that part before lol20:47
EugeneKay To fetch from a Fork(as github calls them), you need to add additiona lremotes20:48
enjoi I did something earlier and wonked it allllll up on the local pc lol20:48
i was so frustrated20:48
→ hoschi_ joined20:48
EugeneKay Github(through some magic) also exposes Pull Requests(the things in their Issues system) through a special refspec that you can use. !github_pull20:48
gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/334224720:48
enjoi I had to reclone it and everything20:48
EugeneKay I don't doubt it. git is a hard thing to wrap one's head around20:48
enjoi hehe20:48
well practice makes perfect20:49
pekster The good news is you can practices as your local repo is entirely "your domain" until you do a push somewhere else20:49
EugeneKay Or frustrates you to the point of quitting20:49
enjoi (anything with a irc freenode channel has got to be complicated)20:49
=p20:49
EugeneKay But whatever20:49
→ mechanicalduck joined20:49
enjoi nice20:49
thiago Morgon_: no rebasing20:49
Morgon_: to make it permanent, run: git filter-branch --all20:50
enjoi that def clears stuff up EugeneKay20:50
thanks much man :)20:50
EugeneKay enjoi - for more reading, try !concepts. It helps.20:50
gitinfo enjoi: "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs/20:50
thiago Morgon_: then delete the server repository, recreate it, push20:50
Morgon_: once that is done, delete all clones20:50
← mdhopkins left20:50
Morgon_ thiago: Hrm. One catch... you can't delete 'master' on a github repo, can you20:50
EugeneKay You can; change the default branch in the Settings page20:51
Morgon_ Ah, thank you20:51
→ vkz joined20:51
EugeneKay !master ;-)20:52
gitinfo [!master_branch] 'master' is the default name for the first branch commited by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.20:52
→ boblu joined20:52
→ rnsanchez joined20:53
→ rednaks joined20:53
thiago Morgon_: I wouldn't know20:53
Morgon_: I said delete the repository.20:53
→ arietis joined20:53
thiago Morgon_: then recreate it20:53
Morgon_ Even branches?20:53
enjoi ok, so I did 'git fetch origin SideBar" and I got the result of this " * branch SideBar -> FETCH_HEAD"20:53
thiago Morgon_: delete *everything*20:53
enjoi so now do I have to merge it or anything?20:53
Morgon_ Oi. Okay.20:53
enjoi in order for the code to come from github to my pc?20:53
thiago Morgon_: you've just created new and incompatible branches20:53
EugeneKay !fetch420:53
gitinfo [!fetchfour] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).20:53
thiago Morgon_: you may want to back up first20:53
EugeneKay Just `git fetch origin`; no branch.20:53
enjoi ohh20:54
Morgon_ thiago: I'd say. :P20:54
enjoi oops lol20:54
EugeneKay Everybody does it20:54
thiago Morgon_: delete the repository and all its clones. Create the repository again. Push from your work area.20:54
Morgon_: when I say "all its clones", I mean ALL. Including those on your colleagues' computers.20:54
← glosoli left20:54
Morgon_ thiago: Well I'll send an email out about the impending doom.20:55
→ glosoli joined20:55
Morgon_ As long as the history is there, it shouldn't be too terribly tragic.20:55
thiago: Thank you very much for your help. I greatly appreciate it20:55
thiago Morgon_: if they forget to delete and push some work, you'll have to do this all over again20:56
enjoi ok so.20:56
I think i did it lol20:56
I guess ill have to wait and see if my boss says it did or not20:57
=x20:57
← Gues_____ left20:57
enjoi this should be the freakin developers that is developing the sites job20:57
why i am stuck doing it, beats me lol20:57
but at least now i have a reason to learn git20:57
pekster Don't count on it; I've seen contractors leave things in a really screwed up state before20:57
enjoi oh please20:58
dont get me started lma20:58
← boblu left20:58
enjoi I walked into a fucking JUNGLE as a web administrator for this place20:58
← aChatir left20:58
enjoi centos 6.4 vps in SHAMBLES20:58
EugeneKay Hop in the deep end: swim or drown20:58
enjoi yep20:58
exactly lol20:58
← normanrichards left20:58
pekster Smarter companies invest some time into laying out standards and review process for code commits so it doesn't get messy in the first place. Or if it does there's at least someone to blame for it ;)20:58
enjoi oh oh oh20:59
thats me!20:59
haha20:59
EugeneKay yay, irc works on phone now20:59
enjoi woot20:59
using airc?20:59
← hoschi_ left20:59
→ mdiers joined20:59
pekster Start drafting up some standards then :). git (and any VCS really) lets you work in a variety of workflows, but that lets you do "bad things" too (since someone else might want that)20:59
enjoi want to know my solution? ....21:00
EugeneKay This one https://play.google.com/store/apps/details?id=com.countercultured.irc21:00
→ boombatower joined21:00
enjoi get rid of this shitty box, start fresh21:00
this way we can actually have a real architechture design21:00
EugeneKay I recommend a Linode. They're excellent boxen.21:00
Lemme guess, PHP?21:00
enjoi you're the 3rd to tell me that21:00
lol21:00
EugeneKay Gee, I wonder why21:00
→ mizu_no_oto joined21:00
enjoi can you host multiple domains and such with linode as well?21:01
→ kesha__ joined21:01
EugeneKay Sure, that's your own configuration mostly.21:01
They have a DNS manager integrated into their panel; works excellently.21:02
← Nicholas_Rishel left21:02
← twoface88 left21:02
← boombatower left21:02
→ boombatower joined21:03
→ Cassiel joined21:03
enjoi nice21:03
yeah the first thing I did after establishing root on here was install webmin21:04
has made life much easier lol21:04
EugeneKay Ew :-p21:04
→ aChatir joined21:04
enjoi much better than cpanel21:04
as long as it is secured properly its a great tool imo21:05
EugeneKay Much worse than knowing how to configure a server(or using a config tool like Salt! <3)21:05
enjoi I was going to use sendmail right..21:05
← rfoust left21:05
enjoi but no, i have to use shitty Exim21:05
because the box refuses to let me use sendmail with cpanel21:05
EugeneKay wtf and ew21:05
← pdx left21:06
enjoi yum install anything, fucks up because of rpmforge (i've fixed it now)21:06
← kesha__ left21:06
enjoi but still wants me to use yum-complete-transaction21:06
EugeneKay Yup.21:06
enjoi for what reason not sure21:06
EugeneKay rpmforge is like that.21:06
→ twoface88 joined21:06
enjoi i've done yum clear all, yum-complete-transaction21:06
EugeneKay Because you got the yum DB wedged21:06
enjoi etc..21:06
→ normanrichards joined21:07
enjoi ah21:07
→ pdx joined21:07
enjoi I was googling for hours trying to find out why haha21:07
→ kesha__ joined21:07
enjoi I might be giving up this job, its not worth it21:08
← irqq left21:08
EugeneKay Nothing wrong with that21:09
← twoface88 left21:11
→ fostertheweb joined21:12
enjoi $2000 (payed at the end) for the following: Manage the VPS, Maintain the urrent source code control system, control and monitor user access to the server, implement security measures to safeguard sensitive data, plan for backup and recovery of database information , maintain archived data, and assist as needed with development for Wordpress21:13
projects*21:13
and they are using the living hell out of me...21:14
→ Roots47 joined21:14
EugeneKay Charge hourly; invoice weekly21:15
devops 4.... wait, no, I don't do that much anymore. Hell yeah.21:15
← matanya left21:15
← kesha__ left21:15
← arietis left21:15
→ m0ltar joined21:16
cbreak 2000... one week of work or so?21:16
→ fridim__ joined21:18
EugeneKay snorts21:19
EugeneKay "week"21:19
cbreak :(21:20
→ shellH joined21:20
EugeneKay :-D21:20
Of course, I'm stuck in an airport this afternoon.21:20
cbreak 2k/week isn't that bad, is it?21:20
thiago before or after taxes?21:21
cbreak before21:22
→ JPeterson joined21:22
thiago well, it's not as good as after :-)21:22
cbreak yeah :/21:23
→ m0viefreak joined21:23
cbreak it's probably different for everyone, but I pay around 1.5 moths worth of salary per year in direct taxes21:23
(and then mandatory retirement fund, VAT, ...)21:24
thiago 1.5/12 = 12.5%21:24
that's really nothing21:24
MrDHat → MrDHat|offline21:24
← pdx left21:24
enjoi lol after taxes of course21:24
→ enr joined21:24
enjoi ind contractor man21:24
I have to put half of that away for taxes (mainly because I live in CT)21:24
→ mdhopkins joined21:24
enjoi the biggest theives of america21:24
thiago how much is the state tax there?21:25
enjoi 6.35 I think21:25
thiago it's 8.5 here in OR21:25
enjoi ouch21:25
and here I thought we were getting bent over21:26
thiago which reminds me... the state revenue service hasn't replied on my tax returns yet21:26
enjoi greedy sobs21:26
EugeneKay, no no21:27
this is for a couple of months21:27
EugeneKay Ouch21:28
enjoi yeah21:28
← mribeirodantas left21:28
enjoi I did it for my resume though21:28
← enr left21:28
enjoi I don't have any college, and I kind of got fucked out of my high school diploma when my sister decided to be a stupd meth head and abandon her 2 kids leaving me to take care of them21:29
got filed on for 2 counts of truency, etc... jail school sentenced, didnt want to be in jail school cause I couldn't stand it21:29
had kids, so that put off my GED21:29
← w0ng left21:29
cbreak life's so much easier without interacting with people21:29
enjoi so any experience i can grab up to put on my resume I do it21:29
cbreak -> no kids21:29
enjoi yeah, you're right21:30
← mdhopkins left21:30
← AWinterman left21:30
enjoi I love my kids to death, I am seperated from the mother now so I have time to study and such21:30
but it does make life easier21:30
cbreak I hope only figurative and not literal death... :)21:30
enjoi if I could have them live with me though I would in a heart beat21:30
lol yeah shes just a bitch ind of deal21:31
shes still breathing unfortionately21:31
oops did I say that21:31
everything I know is all self learned21:32
i've been a computer junky since I was a young tot, dialing up to get freeware on my dads friends bbs @ 9800 baud21:32
→ Nicholas_Rishel joined21:32
enjoi when it was just unix, dos, or rude-dos21:33
lol21:33
← iderik left21:33
→ iderik joined21:33
enjoi 386 with a turbo button that does...absolutely nothing!21:33
I was so excited I was like 8 years old and my mom brought me home an old TRS-80 terminal from her job21:34
I was like yeahh, can't really do anything with it, but yeahh!21:34
← fostertheweb left21:34
enjoi go monochrome color power!21:34
→ kesha_ joined21:34
enjoi hehe21:34
→ Fernando1asso joined21:35
cbreak my first computer had 256 color support :P21:35
enjoi Anyone here ever goto the AOL priv chat VB?21:35
I went back to AOL years later on a trial just so i could do some penn testing on it and I found out they banned the VB rooms21:35
Which is a big shame, because I as well as many others learned to program there21:36
← danillonunes left21:36
enjoi that was like "THE" room to goto if you wanted progs or to learn how to develop progs21:36
→ mdhopkins joined21:36
← FernandoBasso left21:36
Fernando1asso → FernandoBasso21:36
← fridim__ left21:37
→ AWinterman joined21:38
← scripty left21:38
← mdhopkins left21:39
← m0ltar left21:39
← kesha_ left21:39
enjoi any commander keen fans? lol21:39
otc I'm old enough to remember it but I wasn't really a fan.21:41
Preferred Sonic and Mario.21:41
→ joelpittet joined21:42
enjoi Mmm mario21:43
I still remember that like yesterday21:43
→ rudak joined21:43
← boombatower left21:43
→ cads joined21:43
enjoi like if you jump over the first pipe after a couple steps you can get your 1up, so no matter how much you screw up you can still play withno game over21:43
→ boombatower joined21:43
enjoi or when you take the ele up forthe level warp21:43
lol21:43
tkil thiago -- fwiw, it turns out that linux-next is substantially rebased every night, so on one hand, it's not a good tree to base work on; on the other hand, it's the tree that greg k-h recommends.21:43
← ology left21:44
tkil thiago -- in the end, i ended up cherry-picking the non-applied commits from my original series onto a new branch created off that day's rebase of linux-next.21:44
← pantsman left21:44
← rudak left21:45
← otc left21:46
← boombatower left21:46
← Thra11 left21:46
← rabellamy left21:47
← PeterBooker left21:49
→ boombatower joined21:50
→ fostertheweb joined21:50
← boombatower left21:50
→ boombatower joined21:52
← FernandoBasso left21:53
← aChatir left21:53
← rednaks left21:53
→ FernandoBasso joined21:53
→ vince_prignano joined21:53
enjoi lol yeah EugeneKay: "The term is effective from 8/12 until 11/29."21:53
via contract21:54
← boombatower left21:54
enjoi rough huh?21:54
← joki left21:54
enjoi for $2000?! -- Thats what I get for walking in blind lol21:54
maybe next time ill tell them I want to see the status of the server first lol21:54
→ boombatower joined21:55
← iderik left21:57
→ dr_ick joined21:57
← longbeach left21:58
→ diegoviola joined21:59
← Dougie187 left21:59
← CheckDavid left22:00
→ joki joined22:01
← normanrichards left22:03
→ dreiss joined22:04
→ superfred joined22:06
← dr_ick left22:06
→ GT4066 joined22:06
← cedeon left22:07
→ tplaner joined22:07
→ iderik joined22:08
← quazimodo left22:08
← joshsmith left22:09
← enjoi left22:09
← flippo left22:10
← AWinterman left22:10
← BiggFREE left22:10
← Vinnie_win left22:10
← maxmanders left22:11
← vigs left22:11
→ ology joined22:11
→ tmcmahon joined22:11
→ Vinnie_win joined22:12
← momomomomo left22:12
← danicampa901 left22:12
← Roots47 left22:12
→ skiernose joined22:13
→ fridim__ joined22:14
→ kesha_ joined22:16
← bmac left22:17
→ FreezingCold joined22:19
← tmcmahon left22:20
→ enr joined22:24
← boombatower left22:25
→ wongon joined22:28
← acharlieh left22:28
← enr left22:29
← kesha_ left22:29
← fostertheweb left22:30
→ kesha_ joined22:30
→ fuzzybunny69y joined22:31
← ziddey left22:32
→ g00s joined22:36
→ Roots47 joined22:37
← nova_ left22:37
g00s hi, is user.email used by git for anything (beside storing in the commit)? if i put some opaque thing in there like a uuid; will it break any functionality in git or github ?22:37
grawity It won't break anything... in fact, many repos converted from SVN have user@repo-uuid as the email addresses.22:38
→ insejn joined22:38
← Guest53096 left22:39
→ Guest53096 joined22:39
g00s grawity ok, thanks.22:39
Guest53096 → UukGoblin22:39
grawity (I've even seen geniuses who ended up with "Author: mark <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>" in their repo, but that's an edge case.)22:39
g00s heh22:39
snogglethorpe hmm, wait a trs80 is a complete computer... surely you could do something with it... :]22:40
grawity although I'm kind of wondering why you would /want/ to put UUIDs there22:40
→ bmac joined22:40
arand Isn't it used by git send-email as well?22:40
→ ferdev joined22:41
grawity It is, as the 'From:' address, but I guess g00s will just use Github pull requests...22:41
g00s honestly, i'm thinking about changing my email in a few months and as a noobie, kind of freaking out about using git filter-branch to rewrite history22:42
grawity Then don't rewrite it, there's no reason for doing that22:42
← pandeiro left22:42
g00s ok22:42
grawity If it was your email address at the time of making those old commits, then the history is fine22:42
← kesha_ left22:42
grawity g00s: Git sometimes uses the ".mailmap" file to translate old addresses, or to merge duplicates – I think it's described in the manpage of `git shortlog`22:43
g00s: for example, https://github.com/gitster/git/blob/master/.mailmap or https://github.com/torvalds/linux/blob/master/.mailmap22:44
I don't think Github uses it yet, though, but you can add multiple email addresses to a Github account anyway22:44
→ kesha_ joined22:44
g00s ok, thanks !22:44
grawity (so both old and new commits can be associated)22:44
hmm, the mailmap in torvalds/linux is a bit odd22:45
but the one in gitster/git should work as an example.22:45
← g00s left22:46
← Caritade left22:47
← outcoldman left22:48
← bmac left22:55
← tatsuya_o left22:56
→ twoface88 joined22:56
→ TDJACR joined22:56
← kesha_ left22:56
→ kesha_ joined22:58
→ rurufufuss joined22:59
← vkz left22:59
← Nicholas_Rishel left22:59
→ Joshi3s` joined23:00
→ kcj joined23:00
→ rednaks joined23:00
← mizu_no_oto left23:00
← gvdm left23:00
→ gvdm joined23:01
→ rabellamy joined23:02
← Gatwick left23:04
→ acharlieh joined23:05
← diegoviola left23:06
→ ozette joined23:06
→ elkng joined23:07
→ bbloom joined23:07
elkng why wen I do "wget https://github.com/lhunath/scripts/archive/master.zip" I got file "master" instead of "master.zip" ?23:07
grawity 1) not a Git question, 2) because that URL actually redirects to https://codeload.github.com/lhunath/scripts/zip/master (and wget even shows this to you)23:08
← nerdfiles left23:09
grawity actually, the second URL has a header with "filename=scripts-master.zip", but wget doesn't understand that one23:09
← OOPMan left23:09
← rnsanchez left23:10
→ verysoftoiletppr joined23:10
→ rnsanchez joined23:10
← kesha_ left23:11
→ kesha_ joined23:11
→ nerdfiles joined23:11
→ _Dweller joined23:12
← nerdfiles left23:12
← Roots47 left23:13
← kesha_ left23:13
→ kesha_ joined23:13
→ hwrd|work joined23:16
← rnz_ left23:16
← whowantstolivefo left23:17
← kesha_ left23:18
← twoface88 left23:21
← zhost left23:23
→ twoface88 joined23:24
→ enr joined23:25
← verysoftoiletppr left23:26
← Tuna-Fish left23:26
→ otc joined23:27
→ verysoftoiletppr joined23:28
← verysoftoiletppr left23:29
→ verysoftoiletppr joined23:29
← hwrd|work left23:29
← enr left23:30
→ Tuna-Fish joined23:30
→ joshsmith joined23:31
← kcj left23:31
→ rabellamy1 joined23:32
← twoface88 left23:33
← leen^| left23:33
→ normanrichards joined23:34
← rabellamy left23:35
→ outcoldman joined23:38
← localghost left23:38
← dreiss left23:38
← tinti left23:39
← ozette left23:39
← rabellamy1 left23:39
← vince_prignano left23:41
← Goplat left23:42
→ Terry_ joined23:45
← normanrichards left23:45
← whaley left23:46
→ flippo joined23:46
offby1 lesson: use "curl ... >" instead :)23:47
→ Goplat joined23:48
→ Entomo joined23:49
← drizzd left23:49
→ rnz joined23:51
→ kcj joined23:51
← shinnya left23:51
→ fury joined23:53
← TheFuzzball left23:53
→ coot joined23:53
coot Hello, how to change the yellow color in git log output (the color of sha)?23:54
→ pierre1 joined23:55
← wongon left23:56
elkng how that channel differ from #github ?23:57
→ _iron joined23:57
arand coot: I think you'd need to redefine the whole git log --format=23:57
→ whaley joined23:57
← conan left23:58
coot this what I expect after my doc reading and googling ...23:58
→ terravires joined23:59

Logs Search ←Prev date Next date→ Channels Documentation