1. 06 Dec, 2017 13 commits
  2. 28 Nov, 2017 2 commits
  3. 27 Nov, 2017 6 commits
  4. 26 Nov, 2017 1 commit
  5. 21 Nov, 2017 10 commits
  6. 18 Nov, 2017 2 commits
  7. 17 Nov, 2017 2 commits
  8. 16 Nov, 2017 2 commits
  9. 15 Nov, 2017 2 commits
    • Elijah Newren's avatar
      merge-recursive: handle addition of submodule on our side of history · c641ca67
      Elijah Newren authored
      The code for a newly added path assumed that the path was a normal file,
      and thus checked for there being a directory still being in the way of
      the file.  Note that since unpack_trees() does path-in-the-way checks
      already, the only way for there to be a directory in the way at this
      point in the code, is if there is some kind of D/F conflict in the merge.
      For a submodule addition on HEAD's side of history, the submodule would
      have already been present.  This means that we do expect there to be a
      directory present but should not consider it to be "in the way"; instead,
      it's the expected submodule.  So, when there's a submodule addition from
      HEAD's side, don't bother checking the working copy for a directory in
      the way.
      Signed-off-by: Elijah Newren's avatarElijah Newren <newren@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    • Junio C Hamano's avatar
      Start preparation for 2.15.1 · 5a1f5c30
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>