gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
707 commits 1 branch 0 tags 10 MiB
Commit graph

707 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jesse Alama
44763451f1 Permit cancelling log edits. 
* magit.el: Permit cancelling log edits.

magit-log-edit-confirm-cancellation: New defcustom.
magit-log-edit-map: New keybinding: C-c C-k to cancel the log.
magit-log-edit-cancel-log-message: New function.
magit-pop-to-log-edit: Indicate that cancellation is possible.
 2009-03-01 05:10:41 -04:00
John Wiegley
5c42f45f53 'C-u x' will do a hard reset 2009-03-01 05:10:41 -04:00
John Wiegley
8583b8c39d Made git-svn support usable for the average user 
Previously it was insisting on a branch named "git-svn", but I'm not
sure if this is ever created by default.  Also, there is no need to call
"remote update", and if it is called asynchronously, it blocks the
subsequent call to svn fetch.
 2009-03-01 05:10:40 -04:00
Marius Vollmer
63e78891d8 Only try to fit current section into window when it is not hidden. 
* magit.el (magit-goto-next-section): Here.
 2009-03-01 03:02:19 +02:00
Marius Vollmer
5c3ac91e0f Documentation updates. 2009-03-01 03:00:23 +02:00
Ian Eure
e4032c3d17 Allow magit to work with Tramp. 2009-02-28 19:29:41 +02:00
Marius Vollmer
549a2cb836 No idea how to present tags in the UI. 2009-02-28 19:25:20 +02:00
Marius Vollmer
5a1039cd6f Show correct filenames in the "Pending changes" section. 
* magit.el (magit-diff-line-file): Don't insist on "a/..." being the
first file.
 2009-02-28 19:22:22 +02:00
Marius Vollmer
8652dc979c Make it an option to stage everything on magit-log-edit. 
* magit.el (magit-commit-all-when-nothing-staged): Added ask-stage choice.
(magit-log-edit): Implement it.
 2009-02-28 19:16:31 +02:00
Marius Vollmer
144716f26e Tentative plan for 0.7. 2009-02-28 17:05:02 +02:00
Steve Purcell
99d518bba7 Show unpushed/pulled commits from a git-svn remote in magit-status 2009-02-28 17:01:16 +02:00
Marius Vollmer
24a0985910 Unbreak magit-remote-update for git-svn users. 
* magit.el (magit-remote-update): Don't try to run two git commands
asynchronously at the same time, stupid.
 2009-02-28 16:49:23 +02:00
Marius Vollmer
76458ff5ce Added link to mailing list. 2009-02-27 02:21:31 +02:00
Marius Vollmer
27d53bd39e Document new behavior of 'c'. 2009-02-20 01:25:30 +02:00
Marius Vollmer
ef479d6b5a Made "git commit --all" more explicit. 
* magit.el (magit-log-edit-get-field): New.
(magit-commit-all-when-nothing-staged): New.
(magit-log-edit): Set 'commit-all field accordingly.
(magit-log-edit-commit): Use that field to control "--all" option.
 2009-02-20 01:17:37 +02:00
Marius Vollmer
a78f8b6019 Allow '-' and '_' in log-edit field names. 
* magit.el (magit-log-header-end, magit-log-edit-get-fields): Here.
 2009-02-20 01:15:26 +02:00
David Wallin
3efeed124e magit-goto-next-section: when moving down to the next section, try to fit the 
whole hunk in the window
 2009-02-19 23:09:26 +02:00
Marius Vollmer
043c90e740 Build-Depend on emacsen instead of on emacs. 
Thanks Darren Hoo!
 2009-02-19 23:03:25 +02:00
John Wiegley
b991100ce6 Several improvements to the whazzup command 
1. Don't report a branch if it has no commit in common with HEAD.  This
   is for people who keep alternate histories in their repositories.

2. Don't report a branch if another branch with the same basename and
   commit as HEAD has already been reported.  Thus, if a branch "foo"
   with 5 unpulled commits was pushed to origin, don't display both
   "foo" and "origin/foo" in the whazzup buffer, since they reflect the
   same thing.
 2009-02-19 15:01:32 -04:00
Marius Vollmer
e9bed9b1e2 Fixlet to make magit-status work again when called from a non-Git dir. 
* magit.el (magit-get-top-dir): It's default-directory not
default-dir, stupid.
 2009-02-19 13:44:41 +02:00
Marius Vollmer
47cffef546 Fixlet to make the log work again. 
* magit.el (magit-configure-have-graph): Removed leftover %s from
format string.
 2009-02-18 17:53:54 +02:00
Marius Vollmer
3300960cad Merge commit 'jwiegley/master' 2009-02-16 23:59:54 +02:00
John Wiegley
bcb59cac51 Made behavior of M-H and M-h consistent for diffs 2009-02-15 21:38:44 -04:00
John Wiegley
c87154d7f6 Use display-buffer, not pop-to-buffer, when showing magit-process after a delay 2009-02-15 21:08:57 -04:00
Marius Vollmer
cdc036915f Fix mode line process status. 
* magit.el (magit-prefix-p): Compare components with equal so that it
works for strings.
(magit-process-indicator-from-command): Take
magit-git-standard-options into account when choping off the head.
 2009-02-16 00:29:45 +02:00
Marius Vollmer
bded317bc8 Use Git cherry-pick also for 'a' and Git revert for 'v'. 
* magit.el (magit-cherry-pick-commit): Removed, replaced with
magit-apply-item.
(magit-revert-commit): Likewise.
(magit-apply-commit): Use git cherry pick and optionally do everything
magit-cherry-pick-commit and magit-revert-commit could do.
 2009-02-15 23:58:46 +02:00
Marius Vollmer
1e3f94437e Pass "--no-pager" to Git. 
* magit.el (magit-git-standard-options): New.  Changed almost all uses
of magit-git-executable to also pass magit-git-standard-options.
 2009-02-15 23:58:43 +02:00
Marius Vollmer
35ea9ab265 Improve message when discarding changes in a region. 
* magit.el (magit-discard-item): Here.
 2009-02-15 20:15:46 +02:00
Marius Vollmer
b523d9c15e Don't use dynamic scoping. 
* magit.el (magit-refresh-status, magit-insert-staged-changes):
Explicitly pass no-comment parameter.
* magit.el (magit-show-stash): Use 'stash', not 'info.
 2009-02-15 20:13:13 +02:00
Marius Vollmer
2913ea0220 Make 'sure' that taking a snapshot does not revert buffers wrongly. 
* magit.el (magit-stash-snapshot): Wrap calls to magit-run in one
magit-with-refresh so that magit-revert-files is only called once.
Calling it twice within one second does not work.
 2009-02-15 20:00:35 +02:00
John Wiegley
c97fa1a0c3 If SPC and DEL are used within a normal text region, just scroll up/down. 2009-02-14 23:58:29 -04:00
Marius Vollmer
c6f796de04 Ignore PDF and PS output. 2009-02-15 05:14:34 +02:00
Marius Vollmer
d7ae65a579 Distinguish "new file" and "new mode". 
* magit.el (magit-wash-diff): Here.
 2009-02-15 03:28:31 +02:00
Marius Vollmer
24677b0c7a Put stashes into *magit-stash* so that magit-currently-shown-stash works. 2009-02-15 03:23:45 +02:00
Marius Vollmer
2958f9cfd4 Pass -U arg to diff correctly. 
* magit.el (magit-refresh-diff-buffer): Don't cons U arg onto 'args'.
 2009-02-15 03:23:17 +02:00
Marius Vollmer
b1eec95572 Fix applying parts of patches in reverse. 
* magit.el (magit-insert-hunk-item-region-patch): Pass through "+"
lines for reverse patches.
(magit-apply-hunk-item*): New, factored out of magit-apply-hunk-item
and magit-apply-hunk-item-reverse.
(magit-apply-hunk-item-reverse): New.  Use it instead of passing
"--reverse" to magit-apply-hunk-item so that
magit-insert-hunk-item-region-patch knows whether we are applying in
reverse or not.
 2009-02-15 03:11:43 +02:00
Marius Vollmer
87a533d3d6 More docs. 2009-02-15 02:38:19 +02:00
Marius Vollmer
a080ca01c1 Clean up the messages produced by magit-init a bit. 
* magit.el (magit-init): Message fixes.  Use yes-or-no-p for
potentially destructive operations.
(magit-status): Message fixes.
 2009-02-15 02:26:21 +02:00
Marius Vollmer
e6167b8080 Document that magit-status can create new Git repos. 2009-02-15 02:19:57 +02:00
Marius Vollmer
b670b16b33 Merge 'voins/init'. 2009-02-15 02:11:06 +02:00
Marius Vollmer
401c548dc5 More info for '?'. 
* magit.el (magit-describe-item): Add magit-section-context-type.
 2009-02-15 02:06:53 +02:00
Marius Vollmer
1b4094e3de Removed binding for 'K', run git clean when hitting 'k' on the section title. 
* magit.el (magit-discard-item): Run git clean when point is on the
"Untracked files" section title.
* magit.texi: Document this.
 2009-02-15 02:06:06 +02:00
Marius Vollmer
b627c9203a Merge commit 'voins/diff' 2009-02-15 01:53:00 +02:00
Marius Vollmer
9fc7465d61 Do not use '-x' with git clean. 
I am afraid that would surprise to many people since "removing
untracked files" means removing the ones listed in the status buffer.
 2009-02-15 01:50:11 +02:00
Marius Vollmer
62d9f73aea Merge commit 'voins/clean' 2009-02-15 01:47:44 +02:00
Marius Vollmer
ff1e5bcd5b I like semicoli. 2009-02-15 01:39:05 +02:00
Marius Vollmer
45c6d95da4 Document M-s, M-S, M-h, and M-H. 2009-02-15 01:37:21 +02:00
John Wiegley
d38c05a5ac M-h and M-H now hides the whole current file/buffer, and M-s/S shows it. 2009-02-15 01:15:55 +02:00
John Wiegley
7910b4c3dd When popping to the magit-process after a delay, goto point-max. 2009-02-15 01:14:50 +02:00
John Wiegley
efdd97b0b0 For git-svn repositories, 'f' runs git svn fetch in addition to remote update. 2009-02-15 01:09:54 +02:00