On Mar 19, 2010 at 01:09 PM -0500, Lorin Rivers wrote:
I searched the google group, did some googling, and basically came up
empty.
I'm contemplating one of the DSVNs for a project and was wondering how
people who use those AND BBEdit handle their workflows.
I've been using git with BBEdit for about a year and think it's great. Much
better than SVN. You can get the git installer from Google. Just google
'git os x'. A couple of things:
Gitx is a nice little graphical utility to review things when you want. You
can call it from the command line. <http://gitx.frim.nl/>
If you add the following to your .bashrc, you can get some useful indication
as to when you are in a git repository and what branch is checked out. The
color stuff is abbreviated from a larger set of color definitions. I think
I got all the important bits. I didn't come up with this; it was something
I saw a while ago somewhere:
# color stuff
DULL=0
FG_CYAN=36
ESC="\033"
NORMAL="\[$ESC[m\]"
CYAN="\[$ESC[${DULL};${FG_CYAN}m\]"
# prompt
PS1="[${NORMAL}\u:\w] ${CYAN}\$(parse_git_branch)${NORMAL}\$ "
function parse_git_branch {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo "("${ref#refs/heads/}")"
}
----
Here's parts of my .gitconfig that might help. Some shortcuts to make git a
little easier to use ('co' instead of 'checkout') and some definitions for
use with bbedit:
[diff]
tool = "bbdiff"
[merge]
tool = opendiff
summary = true
keepBackup = false;
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[alias]
st = status
ci = commit
co = checkout
br = branch
[core]
excludesfile = /Users/tgray/.gitignore
editor = bbedit --wait --resume
[mergetool]
keepBackup = False
[difftool]
prompt = NO
[difftool "bbdiff"]
cmd = /usr/bin/bbdiff --wait --resume "$LOCAL" "$REMOTE"
----
There are different ways you can set this up. One is to use a shell script
wrapper around BBEdit, which works, but I no longer use for reasons
forgotten. The way I have it set up now is that if you call 'git diff' on a
changed file, it spits the results out on the command line. If you call
'git difftool' on a changed file, it comes up in BBEdit as expected. It
will also process several diffs properly, one after the other.
There are a set of scripts for using BBEdit with git; I think they are part
of some ruby package. It was called 'gittools' and one of the scripts was
'git-bbdiff'. I think this might be the master copy, but I'm not sure:
<http://github.com/farktronix/gittools>
To be honest, they are nice, but I'm not sure they are super useful to me.
If I think of anything else, I'll write later.
--
You received this message because you are subscribed to the
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem,
please email "[email protected]" rather than posting to the group.
To unsubscribe from this group, send email to bbedit+unsubscribegooglegroups.com or reply
to this email with the words "REMOVE ME" as the subject.
