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

94 commits

Author SHA1 Message Date
Yann Hodique
367461f0a1 Magit extensions documentation 
documentation for Magit extensions

Signed-off-by: Yann Hodique <yann.hodique@gmail.com>
 2010-09-18 13:57:32 +02:00
Phil Jackson
6bc6aabe0e Updated manual. 2010-09-11 17:30:14 +01:00
Chris Bernard
5299f8aa16 Add stash apply/pop "--index" option, toggled if there's a prefix arg (C-u) given to 'a' or 'A' 2010-09-04 05:08:48 +08:00
Christian Kluge
1d662c5343 Typo he -> the 2010-09-01 20:39:46 +08:00
Phil Jackson
861e555983 Pull uses --rebase with prefix arg. 2010-08-09 22:58:11 +01:00
Nathan Weizenbaum
6f2100c72c Merge branch 'master' into empty-commit 2010-08-01 15:48:55 -07:00
Phil Jackson
64756e9940 Update manual with regards to the svn change. 2010-07-06 11:03:18 +01:00
Phil Jackson
fd6f6d5ea7 Manual entry for new branch mode binding. 2010-06-29 22:55:40 +01:00
Nathan Weizenbaum
9cc5e7e5d2 Document the new branch behavior. 2010-06-24 17:17:58 -07:00
Nathan Weizenbaum
8e3916d2f4 Add a note in the manual about C-c C-e. 2010-06-24 16:33:15 -07:00
Nathan Weizenbaum
fe7656731b Add a prefix arg to magit-remote-update to prompt for a remote. 2010-06-10 13:06:51 +01:00
Nathan Weizenbaum
3096eafb8a Bind : to run Git commands directly. 
I chose : as the binding for similarity with M-:.
 2010-06-06 16:13:02 -07:00
Phil Jackson
75941be63b Gave `magit-log-grep' a key binding (s - search). 2010-05-11 10:06:33 +01:00
Rémi Vanicat
12a4e8cbdb Add encoding declaration to magit.texi 
When generating html file, makeinfo need this information to put the
correct charset.
 2010-05-09 17:49:59 +01:00
Phil Jackson
5c206c4bf4 Mention 'e' being the new 'l' in log view. 2010-05-06 12:38:59 +01:00
Phil Jackson
a347b0de48 Minor doc changes. 2010-04-25 17:42:10 +01:00
Rémi Vanicat
2348c70ff1 Added a function to grow the number of log in the log view 
The log view will show an help at its end when there is more log to
view, and the function is bound to "l" in log view.
 2010-04-25 17:25:06 +01:00
Moritz Bunkus
ad686c5938 Provide useful functions for the branch list 
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.
 2010-03-30 14:53:45 +01:00
Phil Jackson
f9283aaa0d Merge remote branch 'refs/remotes/philjackson/svn-find-rev' 2010-03-26 14:00:13 +00:00
Phil Jackson
a421f9f936 Merge remote branch 'refs/remotes/philjackson/squashable-merges' 2010-03-10 21:12:32 +00:00
Marius Vollmer
e70654686c Acknowledge Rémi Vanicat. 2009-11-09 11:14:44 +02:00
Phil Jackson
83992a9ec2 `magit-svn-find-rev' now supports the prefix arg. 
* magit.el (magit-svn-find-rev): Prefix support for branch name.
* magit.texi: Documenting magit-svn-find-rev.
 2009-11-06 14:52:33 +00:00
Phil Jackson
333e7d0cb7 Squashable, manual merges. 
* magit.el (magit-manual-merge): Given a prefix arg, add --squash and remove --no-ff.
* magit.texi: Docs for the above.
 2009-10-28 20:13:28 +00:00
Marius Vollmer
ea6105fbbf Support for magit-repo-dirs and nice completion based on it. 
Thanks to Travis B. Hartwell for the initial implementation!
 2009-07-28 02:25:44 +03:00
Marius Vollmer
9dfd604cd8 Optionally stage also untracked files in magit-stage-all. 2009-07-27 23:47:21 +03:00
Marius Vollmer
aec91c216f Stage all untracked files when on "Untracked files" title. 
* magit.el (magit-stage-item): Here.
 2009-07-27 23:15:56 +03:00
Marius Vollmer
9f9370ce62 Document C-c C-s signoff toggling. 2009-06-06 15:23:29 +03:00
Marius Vollmer
e9c108a972 Document changes. 2009-06-06 15:06:46 +03:00
Marius Vollmer
4bc9bc2c73 Document new behavior of 'c' and 'C' during a rebase. 2009-03-22 01:54:52 +02:00
Marius Vollmer
904e6ee405 Document changes to pull. 2009-03-22 01:26:45 +02:00
Marius Vollmer
5c7b6b2efe Make 'i' toggle the ignore flag for wazzup. 
* magit.el (magit-write-file-lines): New.
(magit-wazzup-toggle-ignore): New, use it instead of magit-wazzup-ignore.
* magit.texi: Document it.
 2009-03-08 14:42:55 +02:00
Marius Vollmer
d9f86642ec Merge commit 'remi/master' 2009-03-08 03:50:29 +02:00
Marius Vollmer
3857ce227a Allow ignoring of branches in the Wazzup view. 
* magit.el (magit-wazzup-ignore): New.
(magit-refresh-wazzup-buffer): Read wazzup-exclude and optionally omit
the branches listed in it.  Added 'all' parameter to control this.
(magit-wazzup): Show all branches with prefix.
(magit-ignore-item): Call magit-wazzup-ignore for wazzup branches.
* magit.texi: Document it.
 2009-03-01 21:29:08 +02:00
Marius Vollmer
67a0c1ada7 Document C-c C-k in the *magit-log-edit* buffer. 2009-03-01 15:15:23 +02:00
Marius Vollmer
e6a1fd4e70 Tell people that they are going to do a hard reset. 
* magit.el (magit-reset-head): Reflect it in the prompt whether this
is going to be a hard reset or not.  Added optional argument instead
of using current-prefix-arg directly.
* magit.texi: Document it.
 2009-03-01 15:09:39 +02:00
Rémi Vanicat
1eac6b70c6 Use ediff interactive merge to help conflict resolution. 
Idea from smerge code, adapted to git, new key binding on "e"
 2009-03-01 13:01:19 +01:00
Marius Vollmer
5c3ac91e0f Documentation updates. 2009-03-01 03:00:23 +02:00
Marius Vollmer
27d53bd39e Document new behavior of 'c'. 2009-02-20 01:25:30 +02:00
Marius Vollmer
87a533d3d6 More docs. 2009-02-15 02:38:19 +02:00
Marius Vollmer
e6167b8080 Document that magit-status can create new Git repos. 2009-02-15 02:19:57 +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
45c6d95da4 Document M-s, M-S, M-h, and M-H. 2009-02-15 01:37:21 +02:00
Marius Vollmer
743987a30d Update acknowledgements. 2009-02-15 01:05:09 +02:00
Marius Vollmer
f89a045282 Only ever commit staged changes when amending a commit. 
The usual behavior of committing all unstaged changes when there are
no staged changes makes it impossible to amend a commit just to fix
the commit message, which is a quite common thing to do.

* magit.el (magit-log-edit-commit): Do not pass "--all" to git commit
when amending.
 2009-02-10 23:31:16 +02:00
Marius Vollmer
59bd8eccc7 Use the digits to hide and show sections. 
* magit.el (magit-section-lineage, magit-section-show-level, magit-show-level,
magit-define-level-shower-1): New.
(magit-mode-map): Bind the digits and M-digits to magit-show-level-N
and magit-show-level-N-all.
* magit.texi: Document it in a new chapter for Sections.
 2009-02-08 01:35:56 +02:00
Marius Vollmer
2904e79a08 Make magit-status prompt less. 
* magit.el (magit-status): Only read the top directory with e prefix
argument or when we are not inside a Git repository.
* magit.texi, NEWS: Document the new behavior.
 2009-02-07 22:50:51 +02:00
Marius Vollmer
3c6088efce Manual updates. 2009-02-07 21:40:25 +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
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