Skip to content
This repository
branch: master

Apr 16, 2014

  1. Jonas Bernoulli

    magit-process-quote-arguments: flatten list of arguments

    authored April 17, 2014
  2. Jonas Bernoulli

    Merge remote-tracking branch 'origin/master'

    authored April 16, 2014
  3. Jonas Bernoulli

    magit-revert-buffer-hook: run in magit-revert-buffers

    authored April 16, 2014

Apr 15, 2014

  1. Jonas Bernoulli

    Merge pull request #1341 from mgalgs/no-merges

    magit-key-mode-popup-logging: support --no-merges option
    authored April 15, 2014

Apr 14, 2014

  1. Mitchel Humpherys

    magit-key-mode-popup-logging: support --no-merges option

    authored April 14, 2014

Apr 12, 2014

  1. Jonas Bernoulli

    magit-show: bugfix

    `magit-diff-range' returns a cons cell of atoms.
    authored April 12, 2014
  2. Jonas Bernoulli

    Merge pull request #1340 from dachary/wip-test

    stub test for magit-get-next-tag
    authored April 12, 2014

Apr 11, 2014

  1. Loic Dachary

    stub test for magit-get-next-tag

    Signed-off-by: Loic Dachary <loic@dachary.org>
    authored April 11, 2014

Apr 09, 2014

  1. Jonas Bernoulli

    Merge pull request #1331 from mgalgs/rewrite-diff-pending-stuff

    Don't try to run magit-rewrite-diff-pending from magit-status-sections-hook
    authored April 09, 2014
  2. Mitchel Humpherys

    Don't try to run magit-rewrite-diff-pending from magit-status-section…

    …s-hook
    
    In [9a4e236: "Transition machinery for magit-insert-pending-changes"] an
    obsolete function alias and "transition" function were introduced to
    help users that may have customized `magit-status-sections-hook' to know
    that `magit-rewrite-diff-pending' no longer exists. However, it really
    never makes sense to run `magit-rewrite-diff-pending' from
    `magit-status-sections-hook' and in some configurations the actual
    "help" message is hidden by the error from
    magit-rewrite-diff-pending. Fix this unnecessary confusion by *not*
    running `magit-rewrite-diff-pending' from the shim function.
    authored April 08, 2014

Apr 07, 2014

  1. Jonas Bernoulli

    Merge pull request #1328 from mgalgs/obsolete-alias

    Transition machinery for magit-insert-pending-changes
    authored April 07, 2014
  2. Mitchel Humpherys

    Transition machinery for magit-insert-pending-changes

    If users have customized their `magit-status-sections-hook' then it can
    be confusing when they update magit and suddenly start getting error
    messages due to `magit-insert-pending-changes' not being defined
    anymore. Define a an obsolete function alias to a shim function that
    displays a message to the user about what's going on.
    
    See also: 3823518
    authored April 07, 2014

Apr 06, 2014

  1. Jonas Bernoulli

    Merge pull request #1326 from jwiegley/master

    Fix magit-key-mode.el to refer to magit-diff-toggle-refine-hunk
    authored April 06, 2014
  2. Jonas Bernoulli

    add support for using unicode characters when drawing log graphs

    Add new function `magit-log-format-unicode-graph' and add it as a
    choice in option `magit-log-format-graph-function'.  Also add new
    option `magit-log-format-unicode-graph-alist' allowing users to
    choose the characters (unicode or not, actually) to be used.
    authored April 06, 2014
  3. John Wiegley

    Fix magit-key-mode.el to refer to magit-diff-toggle-refine-hunk

    authored April 06, 2014
  4. Jonas Bernoulli

    magit-emacsclient-executable: try more version suffixed names

    authored April 06, 2014

Apr 03, 2014

  1. Jonas Bernoulli

    sanitize some faces

    Remove the face `magit-header' instead make `magit-section-title'
    inherit from `header-line' directly, without the redirection through
    `magit-header'.
    
    The removed face was described as "Many Magit faces inherit from this
    one by default", but for those faces that are *not* used by "headers"
    aka "titles", doing so was wrong.  So do *not* change those faces to
    inherit from `magit-section-title' and instead use the same colors as
    for the respective `magit-log-head-label-*' faces, but don't put a
    `:box' around them.
    
    There is more wrong with these and other faces, but that will be
    fixed later.
    authored April 03, 2014
  2. Jonas Bernoulli

    magit-wash-branch: deal with remote names that have the same prefix

    Close #1319.
    authored April 03, 2014

Apr 02, 2014

  1. Jonas Bernoulli

    Merge pull request #1316 from lunaryorn/patch-1

    Fix quoting for default-value
    authored April 02, 2014
  2. Jonas Bernoulli

    Merge pull request #1315 from treese/fix-init

    Make interactive form return a list for magit-init.
    authored April 02, 2014
  3. Jonas Bernoulli

    magit-rewrite-pending-diff: new function

    This is a substitute for `magit-insert-pending-changes'.  The latter was
    problematic because its implementation has not kept up with improvements
    elsewhere.  I.e. the section it inserted was initially expanded and
    worse when the user did collapse it, it kept being re-expanded on every
    refresh.
    
    Unfortunately there is no easy fix.  The only place where we can
    currently prevent a diff from being expanded is in the "raw diff
    washing" code.  The pending changes section, unlike staged and unstaged,
    does not use raw washing.  It would be a major undertaking to teach the
    raw washing how to deal with pending changes.  I don't want to do that
    especially because having an additional raw washing cycle is a mistake
    itself, which I have already fixed on the `next' branch.
    authored April 02, 2014
  4. Sebastian Wiesner

    Fix quoting for default-value

    The argument to default-value needs to be quoted
    authored April 02, 2014
  5. Win Treese

    Make interactive form return a list for magit-init.

    authored April 01, 2014

Mar 31, 2014

  1. Jonas Bernoulli

    Merge pull request #1310 from dachary/wip-submodules

    proofread the submodule section
    authored March 31, 2014
  2. Jonas Bernoulli

    magit-commit-add-log: bugfix

    As suggested by Daniel Dehennin in #1309.
    authored March 31, 2014
  3. Loic Dachary

    proofread the submodule section

    Signed-off-by: Loic Dachary <loic@dachary.org>
    authored March 31, 2014
  4. Jonas Bernoulli

    Merge pull request #1308 from dachary/wip-c-c-c-a

    The C-c C-a binding in the change description is for Ack
    authored March 31, 2014
  5. Loic Dachary

    The C-c C-a binding in the change description is for Ack

    and not for toggling amend.
    authored March 31, 2014

Mar 28, 2014

  1. Jonas Bernoulli

    Merge branch 'improve--magit-copy-item-as-kill'

    authored March 28, 2014
  2. Jonas Bernoulli

    magit-copy-item-as-kill: cosmetics

    authored March 28, 2014
  3. Jonas Bernoulli

    magit-insert-status-{local,remote}-line: use `branch' as section type

    Adjust `magit-copy-item-as-kill' accordingly.
    authored March 28, 2014
  4. Marian Schubert

    Make possible to copy more stuff

    - local branch name
    - remote branch name
    - untracked files
    - (un)staged files
    authored March 28, 2014

Mar 27, 2014

  1. Jonas Bernoulli

    magit-{insert,put-face-property}: don't specify overlay priority

    We cannot specify the default priority because the overlays created to
    refine hunks (by code in `smerge-mode.el') also are created without the
    priority being explicitly specified.  When the priority is undefined,
    then it defaults to 1.  In our case there are several overlays with that
    priority at the same buffer position, but it seems the correct on wins.
    
    Apparently if there are multiple overlays with the same priority then
    the one which was created later is prioritized.  It so happens that this
    is what we need here, but we just got lucky and this should be fixed in
    Emacs.
    authored March 27, 2014

Mar 25, 2014

  1. Jonas Bernoulli

    magit-gitk-executable: fix setting default value

    authored March 25, 2014
  2. Jonas Bernoulli

    Merge branch 'mushroom'

    authored March 25, 2014
Something went wrong with that request. Please try again.