mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Git 1.7.4-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
477039c53c
commit
adf872e783
|
@ -66,7 +66,7 @@ Updates since v1.7.3
|
|||
objects unnecessarily.
|
||||
|
||||
* "git diff" and "git grep" learned what functions and subroutines
|
||||
in Fortran look like.
|
||||
in Fortran and Perl look like.
|
||||
|
||||
* "git fetch" learned the "--recurse-submodules" option.
|
||||
|
||||
|
@ -91,6 +91,14 @@ Updates since v1.7.3
|
|||
directory in one branch while a new file is created in place of that
|
||||
directory in the other branch.
|
||||
|
||||
* "git merge" learned the "--abort" option, synonymous to
|
||||
"git reset --merge" when a merge is in progress.
|
||||
|
||||
* "git notes" learned the "merge" subcommand to merge notes refs.
|
||||
In addition to the default manual conflict resolution, there are
|
||||
also several notes merge strategies for automatically resolving
|
||||
notes merge conflicts.
|
||||
|
||||
* "git rebase --autosquash" can use SHA-1 object names to name the
|
||||
commit which is to be fixed up (e.g. "fixup! e83c5163").
|
||||
|
||||
|
@ -146,6 +154,6 @@ release, unless otherwise noted.
|
|||
|
||||
---
|
||||
exec >/var/tmp/1
|
||||
O=v1.7.4-rc1
|
||||
O=v1.7.4-rc2
|
||||
echo O=$(git describe master)
|
||||
git shortlog --no-merges ^maint ^$O master
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
GVF=GIT-VERSION-FILE
|
||||
DEF_VER=v1.7.4-rc1
|
||||
DEF_VER=v1.7.4-rc2
|
||||
|
||||
LF='
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue