mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
Git 1.7.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0c41f33c19
commit
5fb41b883a
|
@ -24,14 +24,12 @@ Fixes since v1.7.4.3
|
||||||
fast-forwarding from emptiness to the version being pulled, with
|
fast-forwarding from emptiness to the version being pulled, with
|
||||||
the usual protection against overwriting untracked files.
|
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
|
* "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
|
but didn't update the index file to help later operations go faster in
|
||||||
some cases.
|
some cases.
|
||||||
|
|
||||||
And other minor fixes and documentation updates.
|
And other minor fixes and documentation updates.
|
||||||
|
|
||||||
---
|
|
||||||
exec >/var/tmp/1
|
|
||||||
O=v1.7.4.3-22-g8c8674f
|
|
||||||
echo O=$(git describe maint)
|
|
||||||
git shortlog --no-merges $O..maint
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
GVF=GIT-VERSION-FILE
|
GVF=GIT-VERSION-FILE
|
||||||
DEF_VER=v1.7.4.3
|
DEF_VER=v1.7.4.4
|
||||||
|
|
||||||
LF='
|
LF='
|
||||||
'
|
'
|
||||||
|
|
Loading…
Reference in a new issue