Skip to content
Commits on Apr 25, 2016
  1. @tarsius

    add v2.6.3 release notes stub

    tarsius committed Apr 25, 2016
  2. @tarsius

    reset Package-Requires for Melpa

    tarsius committed Apr 25, 2016
  3. @tarsius

    release version 2.6.2

    tarsius committed Apr 25, 2016
  4. @tarsius

    AUTHORS.md: update link

    tarsius committed Apr 25, 2016
  5. @tarsius

    manual: improve FAQ headings

    tarsius committed Apr 25, 2016
  6. @tarsius

    manual: extend FAQ

    tarsius committed Apr 25, 2016
  7. @tarsius
  8. @tarsius
  9. @tarsius

    magit-insert-submodules: shorten section heading

    tarsius committed Apr 25, 2016
    Do so for consistency with other module sections.
  10. @tarsius
Commits on Apr 24, 2016
  1. @tarsius
  2. @tarsius
  3. @tarsius

    magit-submodule-add: reuse the already configure name

    tarsius committed Apr 24, 2016
    If one adds a submodule and then (potentially accidentally) unstaged the
    submodule again, then the changes to .gitsubmodules persist.  When later
    re-adding the repository `magit-submodule-add' now offers the already
    configure submodule name as default choice.
  4. @tarsius

    magit-submodule-add: offer relative paths for completion

    tarsius committed Apr 24, 2016
    Instead of using `read-file-name', which allows selecting a path which
    is not a repository, use `magit-completing-read' to select the relative
    name of a known repository located inside the outer repository.
    
    This also fixes a second issue: Previously an absolute path may have
    been used as initial input.  If the user used that and the chosen
    repository was not located at the top-level of the outer repository,
    then `read-file-name' considered that an invalid choice and prompted
    again, this time without a default.
  5. @tarsius

    magit-insert-unpulled-from-upstream-or-recent: even if no upstream

    tarsius committed Apr 24, 2016
    Show the recent commits if the upstream is not configured.
    A faulty test used to prevent that.
Commits on Apr 23, 2016
  1. @johnmastro

    magit-file-popup: autoload it

    johnmastro committed Apr 23, 2016
Commits on Apr 21, 2016
  1. @tarsius

    magit-commit-squash-internal: commit synchronously before rebase

    tarsius committed Apr 21, 2016
    Previously it was possible for the commit process to still hold the lock
    on index.lock, when the rebase process was trying to acquire it.  Now we
    run the commit process synchronously if we are going to also rebase, and
    we also forgo refreshing between the two processes.  If we don't rebase,
    then still commit asynchronously and refresh.
  2. @tarsius

    2.6.2.txt: update

    tarsius committed Apr 21, 2016
Commits on Apr 20, 2016
  1. @tarsius

    git-rebase-mode: disable save-place-local-mode

    tarsius committed Apr 21, 2016
    Do so in a way compatible with older Emacsen,
    i.e. set the local value of `save-place' to nil.
  2. @tarsius
Commits on Apr 18, 2016
  1. @npostavs

    magit-cygwin-mount-points: use magit-git-executable

    npostavs committed Apr 14, 2016
    Instead of hardcoding "git" as the executable.  This lets the default
    value for magit-cygwin-mount-points correspond to the user's choice for
    magit-git-executable.
  2. @kyleam

    magit-diff-wash-diff: fix -L kludge false positive

    kyleam committed Apr 17, 2016
    f06edb2 (magit-log-{popup,buffer-file}: add ‘-L’ argument, 2015-09-30)
    stripped the first two characters of the file name to account for
    --no-prefix not working with when -L is used with git log.  However,
    magit-diff-wash-diff is also called in log mode when --patch is used
    without --graph, and in this case --no-prefix has an effect, so the file
    name gets truncated.  Check that -L is in magit-refresh-args to avoid
    this.
    
    Fixes #2622.
Commits on Apr 16, 2016
  1. @tarsius

    magit-merge-editmsg: always use --no-ff

    tarsius committed Apr 16, 2016
    Use `--no-ff' even if it is not specified in the popup.  Otherwise Git
    would to a fast-forward merge if possible, which clearly isn't what one
    would expect to happen.  The intention is to create a merge commit, but
    have the opportunity to change the commit message before creating that
    commit.  To not create the commit but still perform (and finish) the
    merge, is something very different.
    
    Fixes #2620.
  2. @tarsius

    magit-merge-nocommit: always use --no-ff

    tarsius committed Apr 16, 2016
    Use `--no-ff' even if it is not specified in the popup.  Otherwise Git
    would to a fast-forward merge if possible, which clearly isn't what one
    would expect to happen.  The intention is to create a merge commit, but
    have the opportunity to inspect the merge before creating that commit.
    To not create the commit but still perform (and finish) the merge, is
    something very different.
    
    Fixes #2620.
Commits on Apr 14, 2016
  1. @tarsius

    add v2.6.2 release notes stub

    tarsius committed Apr 14, 2016
  2. @tarsius

    reset Package-Requires for Melpa

    tarsius committed Apr 14, 2016
  3. @tarsius

    release version 2.6.1

    tarsius committed Apr 14, 2016
  4. @tarsius
Commits on Apr 13, 2016
  1. @tarsius
  2. @tarsius
Commits on Apr 12, 2016
  1. @kyleam @tarsius

    git-commit-propertize-diff: use font-lock-ensure

    kyleam committed with tarsius Apr 10, 2016
    36be43d (use font-lock-flush instead of font-lock-ensure, 2015-08-15)
    changed this to use font-lock-flush.  However, based on tests with a
    somewhat recent build of the emacs-25 branch (cf79616) and on this
    discussion [1], I don't think font-lock-flush will reliably highlight
    the diff.  Also, the initial issue that 36be43d was addressing is, I
    think, due to a bug in Emacs's font-lock-ensure (bug#22399) that has now
    been fixed (21beb19, 2016-01-25).
    
    [1]: https://lists.gnu.org/archive/html/emacs-devel/2016-02/msg01481.html
  2. @kyleam @tarsius

    git-commit-propertize-diff: highlight full diff

    kyleam committed with tarsius Apr 10, 2016
    * Start diff highlighting at beginning of diff line rather than after
      "diff --git".
    
    * Highlight last change.
    
    Fixes #2616.
  3. @tarsius

    complete da85444

    tarsius committed Apr 12, 2016
Commits on Apr 10, 2016
  1. @kyleam
  2. @tarsius

    add v2.6.1 release notes stub

    tarsius committed Apr 10, 2016
Something went wrong with that request. Please try again.