1. 05 Nov, 2017 8 commits
  2. 04 Nov, 2017 1 commit
  3. 03 Nov, 2017 6 commits
  4. 02 Nov, 2017 2 commits
    • Jonas Bernoulli's avatar
    • Jonas Bernoulli's avatar
      Support one-section magit-selections · 115041d4
      Jonas Bernoulli authored
      For a long time Magit supported selecting two or more sibling sections
      using the region and then acting on that selection instead of only on
      the current section.  Single-section selections were not supported and
      a region that did not span multiple siblings was not visualized as a
      selection, instead the underlying region was visualized as it is in
      non-magit buffers.
      The change users will notice first is that when they press C-SPC to
      set the beginning of the region/magit-selection on a section heading,
      then the magit-selection is visualized.  Previously not even the
      region was shown after just pressing C-SPC, because the mark and the
      point were identical, so there was no non-empty region to visualize.
      For the time being most commands continue to behave exactly as before
      when there is a one-section selection: the act on the current section
      instead.  While a one-section selection is a selection that contains
      nothing but the current section, this difference between the current
      section and a set consisting of only the current section is still
      relevant.  It affects whether and how commands ask for confirmation
      and/or offer the user to act on something else instead.
      The reason I decided against supporting one-section selections in the
      past is that it is a bit unfortunate to visualize the selection and
      then the invoked command does not actually use it.  But this is no
      different from a multi-section selection being visualized and then
      invoking a command that isn't magit-selection aware at all.  Or from
      having the region visualized in any Emacs buffer and then invoking any
      command that doesn't behave differently when the region is active.
      Beginning with this commit only a handful of commands begin using a
      one-section selection.  Most importantly, and this is what motivated
      this change, it is now possible to use `magit-branch-spinoff' after
      selecting just HEAD to create a new branch rewinding the previously
      current branch by a single commit.  Previously it was only possible
      to rewind it to its upstream or to rewind it by at least two commits.
      The other commands that respect one-section selections are:
      - magit-am-apply-patches
      - magit-cherry-apply
      - magit-cherry-pick
      - magit-revert
      - magit-revert-no-commit
      - magit-stash-drop
      - magit-tag-delete
      The recently added commands `magit-previous-line' and
      `magit-next-line' now forgo moving on the first shift-selection move
      when point is on a section heading, not just when inside a hunk body.
      Closes #2920.
      Closes #3026.
  5. 01 Nov, 2017 1 commit
    • Jonas Bernoulli's avatar
      magit-diff-highlight-list: fix invalid-selection special case · edbab840
      Jonas Bernoulli authored
      When the region was active but was not valid as a magit-selection
      while beginning and/or ending inside a list section, then the heading
      and children before the beginning of the region were not properly
      highlighted to indicate that the list section is the current section.
      This issue was introduced in 339e4f01, which did not consider this
      special case of the special case it addressed.
      Re #3238.
  6. 31 Oct, 2017 1 commit
  7. 30 Oct, 2017 3 commits
  8. 29 Oct, 2017 3 commits
    • Kyle Meyer's avatar
      manual: add FAQ entry about ambiguous refnames · 31ecddd4
      Kyle Meyer authored
      Closes #3223.
    • Jonas Bernoulli's avatar
      magit-visit-ref: offer plain checkout in addition to reset · a12cdfcf
      Jonas Bernoulli authored
      When `create-branch' is a member of `magit-visit-ref-behavior' then
      "visiting" a remote branch causes the creation and checkout of a local
      branch by the same name.  If the local branch already exists, then the
      user was offered to reset it to the current tip of the remote branch.
      Now the user can also choose to check it out as-is, and when both tips
      are the same commit, then the local branch is checked out without the
      user having to confirm that.
      Closes #3009.
    • Jonas Bernoulli's avatar
      magit-visit-ref: drop prefix before calling magit-show-commit · ae1bc41f
      Jonas Bernoulli authored
      Unless `focus-on-ref' is a member of `magit-visit-ref-behavior', the
      prefix argument was simply passed along to `magit-show-commit', which
      was inconvenient because that then prompted for the commit to show
      instead of just showing the commit at point (tag or tip of branch).
      Now we drop the prefix argument before calling `magit-show-commit',
      but only if that command would not have been called without a prefix
      argument anyway.
      Closes #3009.
  9. 27 Oct, 2017 13 commits
  10. 26 Oct, 2017 2 commits