Commit graph

47 commits

Author SHA1 Message Date
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
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
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
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
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
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
e5d349a4e1 Mention 's' for adding untracked files. 2008-10-27 22:14:40 +02:00
Marius Vollmer
a0df957934 Manual updates. 2008-10-12 03:42:20 +03:00
Marius Vollmer
53f4c6e826 Fixlet in manual. 2008-10-12 03:17:14 +03:00
Marius Vollmer
b64c4ebd25 Texinfo menu fixes. 2008-10-12 02:56:04 +03:00
Marius Vollmer
14004f41c6 Stage/unstage, etc individual lines.
* magit.el (magit-insert-region, magit-insert-current-line): New.
(magit-insert-hunk-item-region-patch): New.
(magit-run*): Added 'input' parameter.
(magit-run-with-input): New.
(magit-diff-item-insert-header, magit-insert-diff-item-patch,
magit-insert-hunk-item-patch, magit-apply-diff-item): Rewritten to
use *magit-tmp* buffer instead of a file.
(magit-apply-hunk-item): Likewise, and also restrict the patch to the
region when appropriate.
(magit-discard-item): Make sure that diff items that are not in the
staged or unstaged sections can not be discarded.
* magit.texi: Document it all.
2008-10-12 02:51:45 +03:00
Marius Vollmer
8a96fa09d1 Different hide/show behavior.
* magit.el (magit-expand-collapse-section): New.
(magit-mode-map): Bind TAB to magit-toggle-section and S-TAB to
magit-expand-collapse-section.
* magit.texi: Document it.
2008-10-12 02:51:45 +03:00
Marius Vollmer
138ac10b34 The "Untracked files" section is back, with better ignoring.
* magit.el (magit-wash-untracked-file, magit-wash-untracked-files,
magit-insert-untracked-files): New.
(magit-insert-unstaged-changes): Don't include other files in output.
(magit-mode-map): '1' jumps to untracked files instead of unpulled
changes.
(magit-stage-item, magit-discard-item, magit-visit-item):
Handle untracked files.
(magit-ignore-file): New.
(magit-ignore-item): Use it.
(magit-ignore-item-locally): New.
(magit-mode-map): Bind it to "I".
* magit.texi: Document it all.
2008-10-12 02:51:39 +03:00
Marius Vollmer
59aac28585 Updated manual and TODO. 2008-09-27 15:26:09 +03:00
Marius Vollmer
7419a8b48a Mention non-support for rewriting merge commits in the manual. 2008-09-15 02:27:43 +03:00
Marius Vollmer
9ce8cb3426 Fixed teh typos. 2008-09-11 01:25:59 +03:00
Marius Vollmer
2733ae2ff2 Document rewriting. 2008-09-11 01:07:17 +03:00
Marius Vollmer
1017a27bcf Updated manual. 2008-09-07 20:54:40 +03:00
Marius Vollmer
c8cdc5eda1 Manual updates. 2008-08-31 21:50:20 +03:00
Marius Vollmer
a93f24b1c4 Acknowledge Phil. 2008-08-24 21:15:35 +03:00
Marius Vollmer
7ae8fabb8a Typo in manual. 2008-08-24 01:08:58 +03:00
Marius Vollmer
ea626dbb0e Fix two bugs from introducing the item abstraction.
* magit.el (magit-unstage-item): It's magit-diff-or-hunk-item-file,
not magit-diffor-hunk-item-file, stupid.
(magit-visit-item): magit-diff-item-position does not exist, use nil
instead.
2008-08-21 22:58:33 +03:00
Marius Vollmer
022463442b Bind magit-unstage-all to 'U'.
* magit.el (magit-unstage-all): New.
2008-08-21 00:19:15 +03:00
Marius Vollmer
151ae0a8a3 Redone key bindings for pulling, leaving 'U' free for unstage-all. 2008-08-21 00:18:04 +03:00
Marius Vollmer
822adda331 Omit empty sections.
* magit.el (magit-insert-section): Insert final newline only when
inserted output is not empty.  Delete title when it is.
2008-08-20 23:57:07 +03:00
Marius Vollmer
e110ed056a Acknowledgements. 2008-08-19 23:40:38 +03:00
Marius Vollmer
5e6ac7730e Move with n and p, like God intended.
* magit.el (magit-mode-map): Put magit-next-section and
magit-previous-section on 'n' and 'p', respectively.  Put
magit-display-process on '$'.
2008-08-19 02:06:08 +03:00
Marius Vollmer
a21e998bac Manual fixes. 2008-08-17 02:59:15 +03:00
Marius Vollmer
6538ce4e4a Manual improvements and updates. 2008-08-17 02:38:37 +03:00
Marius Vollmer
48386c915c Unified keymaps, make resetting use the commit at point instead of
asking, changed Unpushed commits to Recent commits.
2008-08-17 02:38:36 +03:00
Marius Vollmer
7a57506ae0 Updated manual. 2008-08-14 02:10:24 +03:00
Marius Vollmer
e37626e24a Manual improvements. 2008-08-14 02:05:19 +03:00
Marius Vollmer
52c2e3e4ee Speling fixes. 2008-08-14 02:01:21 +03:00
Marius Vollmer
636c6768e3 Manual improvements. 2008-08-14 01:51:07 +03:00
Marius Vollmer
62b5fd8fc1 Doc updates. 2008-08-14 01:07:44 +03:00
Marius Vollmer
62643f94ff Chapter renamings. 2008-08-13 06:15:13 +03:00
Marius Vollmer
e8cc5fdf1b Updated manual menus. 2008-08-13 05:35:43 +03:00
Marius Vollmer
22ee4f7685 Rebasing. 2008-08-13 05:28:16 +03:00
Marius Vollmer
14b1153589 Manual additions. 2008-08-13 05:06:37 +03:00
Marius Vollmer
067e7156f8 More manual stuff, use "Magit" and "Git" spelling. 2008-08-13 01:54:06 +03:00
Marius Vollmer
e4aceaf6b8 Manual additions. 2008-08-13 00:22:35 +03:00
Marius Vollmer
11689b7dc7 Manual additions. 2008-08-13 00:15:14 +03:00
Marius Vollmer
ff389d33be Use 's' for staging, not 'a'. 2008-08-13 00:01:10 +03:00
Marius Vollmer
ff21f5abfc Some content for the manual. 2008-08-12 17:40:17 +03:00
Marius Vollmer
343382cdae Added empty manual. 2008-08-12 04:41:14 +03:00