Phil Jackson
db53f15cb5
Merge remote branch 'refs/remotes/AlexeyVoinov/git-svn-fixes'
2010-03-11 11:18:30 +00:00
Alexey Voinov
4e59fade68
Fixed svn-ref-info for most non-standard layouts
2010-03-11 13:32:28 +03:00
Alexey Voinov
f65dfce86e
magit-get-all is wrapper for git config --get-all
2010-03-11 13:20:41 +03:00
Phil Jackson
dddfe3035e
Highlight only the diff markers (not the text after them).
2010-03-10 21:43:11 +00:00
Phil Jackson
f7f383bf1a
Removed redundant call from `magit-get-svn-ref-info'.
2010-03-10 21:38:56 +00:00
Phil Jackson
9325431ad4
Added `magit-omit-untracked-dir-contents' to optionally stop magit listing everything in an untracked directory.
2010-03-10 21:38:04 +00:00
Phil Jackson
282303265f
Merge remote branch 'refs/remotes/philjackson/git-svn-fixes-and-features'
2010-03-10 21:29:42 +00:00
Phil Jackson
10f88917ca
Bug fix: Commit buffer will fill if the commit is current and the buffer dead.
2010-03-10 21:21:33 +00:00
Phil Jackson
f9f1c00c78
C-u will now keep the index when stashing.
2010-03-10 21:19:46 +00:00
Phil Jackson
a421f9f936
Merge remote branch 'refs/remotes/philjackson/squashable-merges'
2010-03-10 21:12:32 +00:00
Phil Jackson
131f9d1db3
Merge remote branch 'refs/remotes/philjackson/magit-completing-read'
2010-03-10 21:08:32 +00:00
Rémi Vanicat
dc48483ad6
Make magit ask for ssh passphrase
...
Thanks to Rüdiger Sonderfeld <ruediger@c-plusplus.de>
2010-02-23 08:00:47 +01:00
Phil Jackson
f8f6a2c103
Use `magit-present-log-line-function'.
2009-12-16 14:57:16 +00:00
Marius Vollmer
e70654686c
Acknowledge Rémi Vanicat.
2009-11-09 11:14:44 +02:00
Rémi Vanicat
cea34e5f8c
[Tramp] Two more fix, make staging with magit on tramp dir possible
2009-11-09 11:14:44 +02:00
Rémi Vanicat
3b661f5db4
Always use magit-git-standard-options when calling git
2009-11-09 11:14:44 +02:00
Phil Jackson
dcbb449238
Box around labels.
2009-11-08 15:59:58 +00:00
Phil Jackson
5661df2222
Better label colours for lighter backgrounds.
2009-11-08 15:59:44 +00:00
Phil Jackson
02432300e1
Highlight refs according to their origin.
2009-11-08 14:54:53 +00:00
Marius Vollmer
d5b60fc53f
Use --decorate=full so that it works again with Git 1.6.4.
...
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
2009-11-08 13:45:20 +00:00
Marius Vollmer
78c098361c
Use --decorate=full so that it works again with Git 1.6.4.
...
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
2009-11-07 20:37:43 +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
869c6059b6
Basic functionality, only asking for revision.
2009-11-04 21:46:06 +00:00
Phil Jackson
c90f134a74
Moved graph to the second column.
2009-11-02 10:34:25 +00:00
Phil Jackson
2ec5ee71f1
Highlighting of sha and graph in log buffer.
2009-11-02 10:24:21 +00:00
Phil Jackson
e3a37dbc39
Set the remote string to the svn url and revision when in a git-svn repo.
2009-10-28 20:41:43 +00:00
Phil Jackson
8ea39540d9
A simple caching mechanism to ease the `magit-get-svn-ref-info' pain.
...
* magit.el: Every call to `magit-get-svn-ref-info', post the first, retrieves a cached list.
2009-10-28 20:37:35 +00:00
Phil Jackson
3bfe230051
More detailed and structured information from git-svn.
...
* magit.el (magit-svn-enabled): alist of git-svn information returned.
2009-10-28 20:33:35 +00:00
Phil Jackson
c368295a32
completing-read-configuration: Great with anything-completing-read' or perhaps
ido-completing-read'.
...
* magit.el: Added `magit-completing-read' variable, replaced `completing-read' references.
2009-10-28 20:19:02 +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
Phil Jackson
ee01adf1f3
`magit-get-svn-ref' now emulates the git-svn way of remote fetching.
...
* magit.el (magit-get-svn-ref): Parse log output for the remote svn url.
2009-10-28 19:54:11 +00:00
Marius Vollmer
e38987412d
Produce cleaner status buffer for unmerged files.
...
By ignoring duplicate entries for the unmerged files.
2009-09-06 20:27:18 +03:00
Marius Vollmer
2a8bb03a6f
Towards 0.8.
2009-09-06 18:06:47 +03:00
Marius Vollmer
fb7b135220
Don't use the heavy machinery to run "git update-index".
...
And ignore exit code.
2009-08-18 11:46:38 +03:00
Marius Vollmer
c8c6e01a15
Refresh the index before constructing the status buffer.
...
This should get rid of files that are spuriously listed as modified,
while they in fact aren't.
2009-08-17 20:10:08 +03:00
Marius Vollmer
60ae735a10
Speed up washing of untracked files a bit.
2009-08-17 20:07:09 +03:00
Marius Vollmer
6838ae135c
Hide diffs by default again.
...
* magit.el (magit-wash-raw-diff): Here.
2009-07-28 21:58:12 +03:00
Marius Vollmer
843814ac25
Make sure current-prefix-arg is a cons before caring it.
2009-07-28 02:32:19 +03: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
31b8be948a
Only revert buffers that belong to the current repo.
2009-07-28 00:21:34 +03:00
Marius Vollmer
3731a18b49
Reinitialize modes when reverting file contents.
...
* magit.el (magit-revert-buffers): Here, by passing nil for
preserve-modes in the call to revert-buffer.
2009-07-28 00:05:07 +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
6e33fdf6c7
Use diff-index and diff-files for the status buffer.
...
Instead of a --numstat diff. This gives more information.
* magit.el (magit-insert-diff-title): Factored out of
magit-wash-diff-section. Don't handle mode changes separately from
content changes.
(magit-wash-raw-diffs, magit-wash-raw-diff): New.
(magit-wash-numstat-diffs, magit-wash-numstat-diff): Removed.
(magit-insert-unstaged-changes): Use git diff-files.
(magit-insert-staged-changes): Use git diff-index.
2009-07-27 23:02:02 +03:00
Marius Vollmer
3e77accab9
Document why empty diff sections are no problem.
...
Remove debug output for numstat diffs.
2009-07-27 22:03:35 +03:00
Marius Vollmer
07269f1782
Mention performance improvements in NEWS.
2009-07-15 03:25:52 +03:00
Marius Vollmer
d5caf3c15a
Do not run Git via the shell, ever.
2009-07-15 02:15:54 +03:00
Marius Vollmer
06675c5b7d
Fix "resolge" type in error message.
2009-07-15 00:48:26 +03:00
Marius Vollmer
bd8fca2fb7
Make 'a' and 'v' work with whole diffs.
...
* magit.el (magit-apply-diff-item): Actually use *magit-tmp* as input
when running the command, instead of ignoring it. D'oh.
2009-07-15 00:42:33 +03:00
Marius Vollmer
ad04fba40a
Fix -U for diffs in the status buffer.
2009-06-21 22:13:21 +03:00