John Wiegley
63b7adc76b
Add a command, E, which calls git-interactive-rebase to initiate an
...
interactive rebase session using Emacs as the editor.
2009-01-27 17:30:04 -04:00
Marius Vollmer
c563011099
Mention wazzup in NEWS.
2009-01-25 01:08:28 +02:00
Marius Vollmer
6c8a668d24
Wazzup section fixes.
...
* magit.el (magit-refresh-wazzup-buffer): Use the branch name as the
title and a type of 'wazzup'.
2009-01-25 01:04:51 +02:00
Marius Vollmer
8f9fb43590
More flexible titles and types for magit-insert-section.
...
* magit.el (magit-insert-section): Revert earlier change: first
argument is used as the section title and the section type is usually
nil. When the first argument is a pair, it specvifies both the title
and the type.
2009-01-25 01:03:24 +02:00
Marius Vollmer
3baf7f4372
Indentation fixes.
2009-01-25 00:41:03 +02:00
Marius Vollmer
a6bc339e9c
Cleaned up section creation a bit.
...
* magit.el (magit-section-hidden-default): New.
(magit-new-section): Only expect type as argument, not a general list
of slots. Take 'hidden' value from magit-section-hidden-default.
(magit-with-section): Likewise.
(magit-wash-diff): Adapted.
2009-01-25 00:39:03 +02:00
Marius Vollmer
583ecc7a12
Don't highlight the whole log or commit buffer.
...
* magit.el (magit-refresh-commit-buffer): Use nil as type for outer
section so that the highlight is not used for it.
(magit-refresh-log-buffer): Likewise.
2009-01-24 21:08:25 +02:00
Marius Vollmer
528e13f4a7
Wazzup.
2009-01-24 20:57:53 +02:00
Marius Vollmer
60f09e0615
Clean up types and titles of sections.
...
* magit.el (magit-with-section): Check that args is a list before
accessing its car.
(magit-insert-section): Set the title of the section from the real
title, and the txpe from the real type.
2009-01-24 20:56:42 +02:00
Marius Vollmer
0ce0a2524f
Be smarter about correcting point.
2009-01-24 20:45:34 +02:00
Marius Vollmer
ef809ab4d3
Remove debugging messages.
2009-01-24 20:42:34 +02:00
Marius Vollmer
f95f34e695
Acknowledge Alexey.
2009-01-22 00:47:55 +02:00
Alexey Voinov
c691bc7800
Allow unmarking the marked commit.
...
Once, I hit "." instead of "r ." by accident and have found no way to
reset this mark. This just seems not to be right.
2009-01-22 00:47:50 +02:00
Alexey Voinov
76406385a2
Fixed visualization of marked commits
...
Face of previously marked commit was not restored when marking
another. Also red color looks really bad on dim gray
background. Orange is much better.
2009-01-22 00:46:06 +02:00
Marius Vollmer
c3830edab8
Make it work better on Windows. Thanks to Jeff Dik.
...
* magit.el (magit-find-buffer): Expand the default-directory.
2009-01-19 01:33:15 +02:00
Marius Vollmer
3433556d03
Merge commit 'fdr/sign-off'
2009-01-19 01:22:01 +02:00
Marius Vollmer
3e2905924a
Merge commit 'cymacs/master'
2009-01-19 01:18:35 +02:00
Alexey Voinov
10fe99adb4
Ambiguity in call to git log fixed
...
If branch or tag name is the same as some file in repository, git log
was reporting that as "ambiguous argument 'test': both revision and
filename. Use '--' to separate filenames from revisions".
2009-01-19 01:06:04 +02:00
Marius Vollmer
3d34a7ca21
Make buffer saving behavior customizable.
...
Thanks, Geralt!
* magit.el (magit-save-some-buffers): New.
(magit-status): Use it.
2009-01-19 00:56:12 +02:00
Marius Vollmer
64b8265ad3
Removed unused threshold machinery.
...
* magit.el (magit-current-section): Removed threshold argument.
Updated all callers.
(magit-collapse-threshold): Removed.
2009-01-19 00:55:26 +02:00
Marius Vollmer
b430adda17
Make sure that point never ends up in an invisible region.
...
* magit.el (magit-correct-point-after-command): New.
(magit-post-command-hook): New, to collect all post-command activitiy.
(magit-mode): Use it instead of magit-highlight-section.
(magit-section-set-hidden): Don't touch the rear-stickyness.
2009-01-19 00:24:11 +02:00
René Stadler
45fb865e1b
Fix incorrect diff hightlighting of lines beginning with "+" or "-".
2009-01-09 23:21:02 +02:00
René Stadler
b7fe74520d
Disable undo in all magit-mode buffers.
...
Saves lots of memory and prevents triggering a scary warning when Emacs detects
the massive amount of undo usage.
2009-01-09 23:20:58 +02:00
Daniel Farina
68344a20a0
Add signoff customization option
...
Signed-off-by: Daniel Farina <drfarina@acm.org>
2008-12-17 02:23:20 -08:00
Marius Vollmer
b30faeb310
Merge commit 'voins/voins'
2008-11-30 22:37:42 +02:00
Marius Vollmer
5fb732725e
Mention autogen.sh
2008-11-30 22:31:32 +02:00
Marius Vollmer
f055b18754
Typo.
...
* magit.el (magit-marked-commit): Fix typo in error message.
2008-11-30 22:31:22 +02:00
Alexey Voinov
7386af19b5
Use "medium" git log format when visiting commit
...
Visiting commit does not always work well when default git log format
was changed. This change makes git log explicitly use "medium" format,
which is out of the box default value.
2008-11-28 23:56:50 +03:00
Marius Vollmer
54ad9f00c8
Added Alex and Marcin to copyright header.
2008-11-13 20:48:55 +02:00
Marius Vollmer
d5aa6d7404
Thanks!
2008-11-13 00:26:36 +02:00
Marcin Bachry
2c45b73d01
Added `magit-copy-item-as-kill' command.
...
* magit.el (magit-copy-item-as-kill): new command to copy sha1 of
commit at point into kill ring.
2008-11-13 00:19:04 +02:00
Marcin Bachry
0bbb824fcd
Fixed `magit-goto-previous-section' not showing proper commit in
...
commit buffer.
* magit.el (magit-show-commit): don't shadow "commit" parameter in let
form
* magit.el (magit-show-commit): accept both string and section struct
as "commit" parameter
2008-11-13 00:08:16 +02:00
Marius Vollmer
e2fa665ba1
Different tag and head label colors for different backgrounds
2008-11-13 00:07:34 +02:00
Marcin Bachry
f6956593bc
Show gitk-style coloured tag and head labels in log buffer.
2008-11-12 23:46:41 +02:00
Marcin Bachry
ef3e0d0c5a
Washing functions in `magit-insert-section' couldn't set face text
...
property.
* magit.el (magit-refresh-marked-commits-in-buffer): don't overwrite
face property if not needed
2008-11-12 23:46:18 +02:00
Marcin Bachry
4e274b5941
Faster way to diff working tree with HEAD.
...
* magit.el (magit-diff-working-tree): assumes "HEAD" if not revision
was given in minibuffer.
2008-11-12 23:45:44 +02:00
Marius Vollmer
b45a99c88c
Acknowledge Alex Ott for git svn support.
2008-11-11 22:55:52 +02:00
Alex Ott
fe7ffeb943
Add keybindings for git-svn commands.
...
* magit.el (magit-mode-map): Bind magit-svn-rebase and
magit-svn-dcommit.
* magit.texi (Top): Document it.
2008-11-11 22:50:44 +02:00
Alex Ott
2007a3714e
Initial support for git svn.
2008-11-11 20:00:24 +02:00
Marius Vollmer
4e8ff13fbb
(Updated NEWS)
2008-11-10 00:28:19 +02:00
Marius Vollmer
7ac76de47c
Stashing.
...
* magit.el (magit-wash-stash, magit-wash-stashes): New.
(magit-insert-stashes): New.
(magit-refresh-status): Call it.
(magit-stash): New.
(magit-mode-map, magit-mode-menu): Bind it.
(magit-apply-item, magit-cherry-pick-item, magit-discard-item): Deal
with stashes.
* magit.texi: Document stashing.
2008-11-10 00:07:08 +02:00
Marius Vollmer
cafd4b93de
(Updated TODO)
2008-11-09 23:21:43 +02:00
Marius Vollmer
88baa2e066
Make the magic fields in the commit message more explicit.
...
* magit.el (magit-log-header-end): New.
(magit-log-edit-get-fields, magit-log-edit-set-fields): Look for and
insert it.
2008-11-09 23:13:17 +02:00
Marius Vollmer
7defaab319
NEWS.
2008-11-07 00:29:52 +02:00
Marius Vollmer
157bee4bf5
Even more control for pushing.
...
* magit.el (magit-push): Always push the current branch and nothing
else. Ask for a remote when none is configured yet and set it. Also
ask when given a prefix argument, but don't set it as default in that
case.
* magit.texi (Pushing and Pulling): Document this.
2008-11-07 00:20:13 +02:00
Marius Vollmer
a96b8763b5
More control over pushing.
...
* magit.el (magit-read-remote): New.
(magit-push): Read remote when given a prefiy argument.
2008-11-07 00:00:37 +02:00
Marius Vollmer
201822e96f
Basic support for tagging.
...
* magit.el (magit-tag, magit-annotated-tag): New.
(magit-log-edit-commit): Run "git tag" when tag field is set.
(magit-mode-map): Add them to 't' and 'T', respectively.
(magit-mode-menu): Add them as well.
(magit-pop-to-log-edit): New.
(magit-log-edit): Use it after removing the tag field.
2008-11-06 23:46:29 +02:00
Marius Vollmer
ee7070af15
Bring back the stars.
...
* magit.el (magit-insert-unpulled-commits,
magit-insert-unpushed-commits): Explicitly include a asterisk in
output.
2008-11-06 22:53:49 +02:00
Marius Vollmer
121ded3274
Offer tags as well when asking for a revision.
...
* magit.el (magit-list-interesting-revisions): Append output of "git tags".
2008-11-06 19:12:58 +02:00
Marius Vollmer
b1f4a36f58
Survive old Gits that do not understand git name-rev --always.
...
* magit.el (magit-name-rev): Don't use --always.
2008-10-29 20:22:13 +02:00