magit's interactive rebase feature tries to start the server even if
it is already running. If it is already running then Emacs asks
whether or not it should destroy existing clients. This is fatal if
the frame magit is running in was created by emacsclient
itself (e.g. Emacs is running in the background with "--daemon"), so
the user has to answer "no".
This question can be avoided if the server is only startet if it isn't
already running.
The following functions are available from the branch list (which in
turn is made read-only):
- Checking out the branch in the current line
- Deleting the branch in the current line (prefix forces deletion even
if not merged into current branch); works on both local and remote
branches
- Manual and automatic merges of the branch in the current line into
the current branch
- Quitting the branch list
Includes updated documentation.
If you have a local tracking branch, e.g. called 'test', and the
remote branch name is different than test (e.g. 'somwhere/master')
then the commands for retrieving the unpulled and unpushed commits was
calling "git log test..somwehere/test" which may or may not exist.
Add a modest rpm .spec file and ensure that it's autoconf'd to keep
step with the release version number.
Ignore the generated .spec file, but ensure it's distributed with any
tarballs.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Makefile.am uses $builddir, which isn't available in older (<= 1.9)
versions of automake. Declare this requirement explictly in
configure.acy.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
The autoconf/automake files now honour --with-site-start to allow
selection of the directory where automatically sourced elisp files are
stored. The original default is retained.
This switch makes support of non-debian systems easier. RHEL5, for
example, places these files in /usr/emacs/site-lisp/site-start.d/.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Intended to be bound to X instead of magit-reset-working-tree for those who
feel it is a more consistent pair for x. Suggests HEAD and therefore works
like magit-reset-working-tree by default. Eliminates need to use C-u x.
One might argue that this also makes it work better in a case when GIT_DIR
points outside of a work tree, but because in that case any directory is a
valid "top dir" from GIT's point of view, that is debatable. But at least
one can use Magit in that case by first making sure that default-directory
is the top dir and then executing magit-status.
