Anonymous committed 5fb41b8


Signed-off-by: Junio C Hamano <>

Comments (0)

Files changed (3)


    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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.