1. Stefan Saasen
  2. git


Junio C Hamano  committed e38f2a8 Merge

Sync with

  • Participants
  • Parent commits cea667e, 5fb41b8
  • Branches master

Comments (0)

Files changed (1)

File Documentation/RelNotes/

View file
  • Ignore whitespace
    fast-forwarding from emptiness to the version being pulled, with
    the usual protection against overwriting untracked files.
+ * "git submodule" that is run while a merge in the superproject is in
+   conflicted state tried to process each conflicted submodule up to
+   three times.
  * "git status" spent all the effort to notice racily-clean index entries
    but didn't update the index file to help later operations go faster in
    some cases.
 And other minor fixes and documentation updates.
-exec >/var/tmp/1
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint