Permalink
Switch branches/tags
Nothing to show
Commits on Dec 22, 2009
  1. Merge remote branch 'upstream/master'

    JD Huntington committed Dec 22, 2009
  2. Merge with upstream

    JD Huntington committed Dec 22, 2009
Commits on Nov 9, 2009
  1. Acknowledge Rémi Vanicat.

    Marius Vollmer committed Oct 25, 2009
  2. Always use magit-git-standard-options when calling git

    vanicat committed with Marius Vollmer Sep 12, 2009
Commits on Nov 7, 2009
  1. Use --decorate=full so that it works again with Git 1.6.4.

    * magit.el (magit-configure-have-decorate):
    (magit-refresh-log-buffer): Here.
    Marius Vollmer committed Nov 7, 2009
Commits on Sep 6, 2009
  1. Produce cleaner status buffer for unmerged files.

    By ignoring duplicate entries for the unmerged files.
    mvollmer committed Sep 6, 2009
  2. Towards 0.8.

    mvollmer committed Sep 6, 2009
Commits on Aug 18, 2009
  1. Don't use the heavy machinery to run "git update-index".

    And ignore exit code.
    Marius Vollmer committed Aug 18, 2009
Commits on Aug 17, 2009
  1. 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.
    Marius Vollmer committed Aug 17, 2009
  2. Speed up washing of untracked files a bit.

    Marius Vollmer committed Aug 17, 2009
Commits on Jul 28, 2009
  1. Hide diffs by default again.

    * magit.el (magit-wash-raw-diff): Here.
    mvollmer committed Jul 28, 2009
Commits on Jul 27, 2009
  1. Support for magit-repo-dirs and nice completion based on it.

    Thanks to Travis B. Hartwell for the initial implementation!
    mvollmer committed Jul 27, 2009
  2. Reinitialize modes when reverting file contents.

    * magit.el (magit-revert-buffers): Here, by passing nil for
    preserve-modes in the call to revert-buffer.
    mvollmer committed Jul 27, 2009
  3. Stage all untracked files when on "Untracked files" title.

    * magit.el (magit-stage-item): Here.
    mvollmer committed Jul 27, 2009
  4. 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.
    mvollmer committed Jul 27, 2009
  5. Document why empty diff sections are no problem.

    Remove debug output for numstat diffs.
    mvollmer committed Jul 27, 2009
Commits on Jul 15, 2009
Commits on Jul 14, 2009
  1. 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.
    mvollmer committed Jul 14, 2009
Commits on Jun 21, 2009
  1. Fix display of unmerged paths.

    * magit.el (magit-wash-diff-section): Pick out 'file' from match data.
    mvollmer committed Jun 21, 2009
Commits on Jun 8, 2009
  1. Hide status diffs by default again.

    * magit.el (magit-wash-diff): By binding magit-section-hidden-default
    appropriately here...
    (magit-wash-numstat-diff): ...and here.
    mvollmer committed Jun 8, 2009
Commits on Jun 7, 2009
  1. Don't include git-svn branches in the 'interesting branches'.

    * magit.el (magit-list-interesting-refs): Here.
    mvollmer committed Jun 7, 2009
  2. Make magit-ref-exists-p work.

    * magit.el (magit-ref-exists-p): Use correct invocation and turn exit
    code into a boolean.  (Saturday night hacking sessions are not my
    forte.  Sundays on the other hand...)
    mvollmer committed Jun 7, 2009
  3. Cosmetics.

    mvollmer committed Jun 7, 2009
  4. Directly look for git-svn ref name, don't use magit-list-interesting-…

    …refs.
    
    * magit.el (magit-get-svn-ref): Here, by using magit-ref-exists-p.
    mvollmer committed Jun 7, 2009
  5. Only discard staged diffs for files that don't have unstaged changes.

    The unstaged changes will be discarded, too, which might be unexpected.
    
    * magit.el (magit-discard-item): Here.
    mvollmer committed Jun 7, 2009
  6. Don't allow slashes in remote nicknames.

    * magit.el (magit-list-interesting-refs): Here.
    (magit-maybe-create-local-tracking-branch): And here.
    mvollmer committed Jun 7, 2009
  7. Fix display of unpushed/unpulled git-svn patches

    git-svn remotes are listed by "git show-ref" in a pattern that magit-list-interesting-refs did
    not support, e.g. "refs/remotes/git-svn".
    purcell committed with mvollmer Jun 7, 2009
  8. It' magit-wash-diff-section, not magit-wash-section-diff...

    * magit.el (magit-wash-diff): Here.
    mvollmer committed Jun 7, 2009