| --- Log opened Sun Jan 23 00:00:00 2011 |
| 00:03 | | Reiv [orthianz@Nightstar-01c6bde2.xnet.co.nz] has joined #code |
| 00:39 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 00:43 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 00:48 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 01:23 | | You're now known as TheWatcher[T-2] |
| 01:27 | | You're now known as TheWatcher[zZzZ] |
| 01:30 | | RichardBarrell [mycatverbs@Nightstar-ac7cec9b.cable.virginmedia.com] has joined #code |
| 01:39 | | RichardBarrell [mycatverbs@Nightstar-ac7cec9b.cable.virginmedia.com] has quit [Ping timeout: 121 seconds] |
| 01:41 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 01:47 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 01:52 | | kwsn [kwsn@Nightstar-a20cba8a.dyn.centurytel.net] has quit [Ping timeout: 121 seconds] |
| 02:00 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Client closed the connection] |
| 02:04 | | Vornicus-Latens [vorn@ServerAdministrator.Nightstar.Net] has quit [Ping timeout: 121 seconds] |
| 02:06 | | Vornicus [vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 02:06 | | mode/#code [+o Vornicus] by Reiver |
| 02:09 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 02:10 | < celticminstrel> | Okay, I can't seem to figure git out. |
| 02:11 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 02:13 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 02:20 | | kwsn [kwsn@Nightstar-7426b23f.dyn.centurytel.net] has joined #code |
| 02:21 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 02:30 | < celticminstrel> | Two questions. 1) I seem to have gotten into vi. At least I think it's vi. How do I get out? 2) How do I tell git to use something other than vi for commit messages? |
| 02:31 | <@McMartin> | ESC will put you out of insert mode; the command :q! in command mode is "quit immediately" |
| 02:31 | <@McMartin> | If you're on windows, vi is all it ships with, so you're better off getting a quick vi tutorial instead >_> |
| 02:31 | < celticminstrel> | I'm not on Windows. |
| 02:32 | <@McMartin> | git ought to respect the $EDITOR variable. |
| 02:32 | < celticminstrel> | I'll try that then. |
| 02:32 | < celticminstrel> | As I recall, svn has its own variable, which is why I asked. |
| 02:33 | <@McMartin> | Yeah |
| 02:33 | <@McMartin> | Let me do a quick manual check here |
| 02:33 | <@McMartin> | Other things you can do are use -m a la SVN or use -F possibly also a la SVN but I've never used it there. |
| 02:34 | < celticminstrel> | Does :q! save? |
| 02:34 | <@McMartin> | No |
| 02:34 | <@McMartin> | If you want to save, it's :wq |
| 02:34 | < celticminstrel> | I assume I need to save for git to get the commit message. |
| 02:34 | <@McMartin> | Yes. |
| 02:35 | <@McMartin> | But if you don't save, the commit aborts. |
| 02:35 | <@McMartin> | (And "i" to enter insert mode, "a" to enter insert mode at the next character, and "o" to enter it at the next line) |
| 02:35 | < celticminstrel> | But I had already typed out the commit message. |
| 02:35 | <@McMartin> | (cursor navigation is done via nethack) |
| 02:35 | <@McMartin> | Oh, OK |
| 02:35 | <@McMartin> | Sorry about that =( |
| 02:35 | < celticminstrel> | 'sokay. |
| 02:35 | <@McMartin> | I misunderstood |
| 02:35 | <@McMartin> | OK, git apparently checks GIT_EDITOR, VISUAL, and EDITOR, in order. |
| 02:35 | <@McMartin> | And if none are set it uses the OS default, which is *usually* a vi variant |
| 02:36 | <@McMartin> | Though it appears to be nano here. |
| 02:38 | < celticminstrel> | Okay, so does git commit upload? :| |
| 02:38 | <@McMartin> | No |
| 02:38 | <@McMartin> | Commit only commits to the local clone of the repo |
| 02:38 | <@McMartin> | To send it back to origin, you type "git push". |
| 02:38 | < celticminstrel> | Ah, is that how it works. Can I double-check my commit message first? |
| 02:38 | <@McMartin> | "git log" |
| 02:38 | <@McMartin> | Commits are actual commits |
| 02:39 | <@McMartin> | It's just that every user has their own repo |
| 02:39 | <@McMartin> | This part of DVCS I honestly am not expert with, so I designate one as the master repo and pretend everyone else is an SVN client |
| 02:39 | < celticminstrel> | Is it possible to change my commit message? |
| 02:39 | <@McMartin> | Hrm. |
| 02:39 | <@McMartin> | That's deeper magic than I have |
| 02:39 | <@McMartin> | I believe this somehow involves git reset. |
| 02:40 | <@McMartin> | I think it's possible, but offhand I don't know how |
| 02:40 | <@McMartin> | (And it may involve a rollback.) |
| 02:41 | <@McMartin> | Branch mechanics are totally beyond me in git. |
| 02:42 | < celticminstrel> | Do you know how to rollback? |
| 02:42 | <@McMartin> | Not offhand |
| 02:42 | <@McMartin> | I'm used to using git reset for descheduling a changed file pre-commit |
| 02:43 | <@McMartin> | But when looking up the env vars it mentioned that you could use it when finding mistakes post-commit too |
| 02:43 | <@McMartin> | It looks like git revert |
| 02:43 | < celticminstrel> | It's almost as if the manuals are written for someone who sort of knows how to use it but just needs a gentle reminder. |
| 02:44 | <@McMartin> | More or less |
| 02:44 | <@McMartin> | You realize this interacts oddly with man, right? |
| 02:44 | <@McMartin> | I'm following links from git-commit through git-reset to git-revert. |
| 02:44 | <@McMartin> | Each of these is a separate man page. |
| 02:44 | < celticminstrel> | I'm using git help <command> |
| 02:45 | <@McMartin> | Ah |
| 02:45 | <@McMartin> | I'm not sure if that's as thorough as the man pages. |
| 02:45 | <@McMartin> | Let's see... |
| 02:45 | <@McMartin> | Oh, it's the same thing |
| 02:45 | <@McMartin> | OK then. |
| 02:45 | < celticminstrel> | It seems to be usi-- yeah. |
| 02:45 | | * McMartin <-- still just a journeyman |
| 02:47 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 02:48 | | * celticminstrel decides to just trash the whole thing, re-pull it, copy the changed files and so on. |
| 02:50 | <@McMartin> | Heh. That works too~ |
| 02:52 | < celticminstrel> | Indeed it does. |
| 02:57 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Ping timeout: 121 seconds] |
| 02:58 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 03:18 | | AbuDhabi [annodomini@Nightstar-2026137c.adsl.tpnet.pl] has quit [[NS] Quit: Zzz.] |
| 03:21 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 03:23 | | Kindamoody is now known as Kindamoody[zZz] |
| 03:24 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 04:20 | | gnolam [lenin@Nightstar-38637aa0.priv.bahnhof.se] has quit [[NS] Quit: Z?] |
| 04:32 | | cpux is now known as shade_of_cpux |
| 06:13 | | celticminstrel [celticminst@Nightstar-f8b608eb.cable.rogers.com] has quit [[NS] Quit: And lo! The computer falls into a deep sleep, to awake again some other day!] |
| 06:28 | | Derakon is now known as Derakon[AFK] |
| 06:50 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 07:28 | | SmithKurosaki [smith@Nightstar-b4839efa.dsl.teksavvy.com] has quit [Ping timeout: 121 seconds] |
| 07:39 | | Reiv [orthianz@Nightstar-01c6bde2.xnet.co.nz] has quit [[NS] Quit: Going dooooown...] |
| 07:42 | | Vornotron [vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 07:43 | | Vornicus [vorn@ServerAdministrator.Nightstar.Net] has quit [Ping timeout: 121 seconds] |
| 07:45 | | Reiv [orthianz@Nightstar-01c6bde2.xnet.co.nz] has joined #code |
| 08:05 | | Vornotron is now known as Vornicus |
| 08:44 | | You're now known as TheWatcher |
| 08:55 | | Kindamoody[zZz] is now known as Kindamoody |
| 09:06 | | jeroid [jerith@687AAB.5E3E50.1197CC.9747DA] has joined #code |
| 09:20 | | jeroid [jerith@687AAB.5E3E50.1197CC.9747DA] has quit [[NS] Quit: Bye] |
| 09:20 | | jeroid [jerith@687AAB.5E3E50.1197CC.9747DA] has joined #code |
| 09:26 | | kwsn is now known as kwsn\t-2 |
| 09:28 | | kwsn\t-2 [kwsn@Nightstar-7426b23f.dyn.centurytel.net] has quit [[NS] Quit: ] |
| 10:05 | | You're now known as TheWatcher[afk] |
| 10:14 | | AnnoDomini [annodomini@Nightstar-2026137c.adsl.tpnet.pl] has joined #code |
| 10:14 | | mode/#code [+o AnnoDomini] by Reiver |
| 10:39 | | jeroid [jerith@687AAB.5E3E50.1197CC.9747DA] has quit [[NS] Quit: There are some people I have to set fire to. Back later. ] |
| 10:45 | | Vornicus is now known as Vornicus-Latens |
| 11:41 | | gnolam [lenin@Nightstar-38637aa0.priv.bahnhof.se] has joined #code |
| 13:02 | | Kindamoody is now known as Kindamoody|out |
| 13:13 | | shade_of_cpux is now known as cpux |
| 14:52 | | Kindamoody|out is now known as Kindamoody |
| 14:56 | | celticminstrel [celticminst@Nightstar-f8b608eb.cable.rogers.com] has joined #code |
| 15:16 | | Kindamoody is now known as Kindamoody|away |
| 15:33 | | Kindamoody|away is now known as Kindamoody |
| 16:09 | | You're now known as TheWatcher |
| 17:19 | | RichardBarrell [mycatverbs@Nightstar-ac7cec9b.cable.virginmedia.com] has joined #code |
| 17:32 | | Derakon[AFK] is now known as Derakon |
| 17:41 | | kwsn [kwsn@Nightstar-7426b23f.dyn.centurytel.net] has joined #code |
| 17:47 | | Kindamoody is now known as Kimo|translating |
| 18:06 | | AnnoDomini is now known as Birds |
| 19:15 | | Reiv [orthianz@Nightstar-01c6bde2.xnet.co.nz] has quit [Ping timeout: 121 seconds] |
| 19:43 | | AbuDhabi [annodomini@Nightstar-e6fb50ed.adsl.tpnet.pl] has joined #code |
| 19:43 | | AbuDhabi is now known as Birds_ |
| 19:46 | | Birds [annodomini@Nightstar-2026137c.adsl.tpnet.pl] has quit [Ping timeout: 121 seconds] |
| 19:46 | | Birds_ is now known as Birds |
| 20:02 | | kwsn is now known as kwsn|bear_season |
| 20:07 | | Kimo|translating is now known as Kindamoody |
| 20:09 | | RichardBarrell [mycatverbs@Nightstar-ac7cec9b.cable.virginmedia.com] has quit [[NS] Quit: BRB, resetting router.] |
| 20:49 | | Kindamoody is now known as Kimo|OpenGL |
| 20:53 | | Vornicus-Latens is now known as Vornicus |
| 20:58 | | Derakon is now known as Derakon[AFK] |
| 20:59 | | Reiv [orthianz@Nightstar-7011e22d.xnet.co.nz] has joined #code |
| 21:42 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 21:53 | | gnolam [lenin@Nightstar-38637aa0.priv.bahnhof.se] has quit [[NS] Quit: Z?] |
| 22:00 | | Birds is now known as AnnoDomini |
| 22:21 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Connection closed] |
| 22:23 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 22:27 | | Derakon[AFK] is now known as Derakon |
| 23:02 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Client closed the connection] |
| 23:04 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 23:14 | | RichardBarrell [mycatverbs@Nightstar-ac7cec9b.cable.virginmedia.com] has joined #code |
| 23:16 | | kwsn|bear_season is now known as kwsn|HELL_YEAH |
| 23:20 | | Alek[gone] is now known as Alek |
| 23:22 | | TarinakyKai [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| 23:25 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Ping timeout: 121 seconds] |
| 23:39 | | kwsn|HELL_YEAH is now known as kwsn |
| 23:43 | | TarinakyKai [Tarinaky@Nightstar-f349ca6d.plus.com] has quit [Client closed the connection] |
| 23:43 | | Ortiha [orthianz@Nightstar-1298e8fc.xnet.co.nz] has joined #code |
| 23:43 | | Reiv [orthianz@Nightstar-7011e22d.xnet.co.nz] has quit [Ping timeout: 121 seconds] |
| 23:44 | | Tarinaky [Tarinaky@Nightstar-f349ca6d.plus.com] has joined #code |
| --- Log closed Mon Jan 24 00:00:02 2011 |