undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git 1.7.4-rc2

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-01-13 11:42:01 -08:00
parent 477039c53c
commit adf872e783
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/RelNotes/1.7.4.txt
View File

@ -66,7 +66,7 @@ Updates since v1.7.3
objects unnecessarily. objects unnecessarily.
* "git diff" and "git grep" learned what functions and subroutines * "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. * "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 one branch while a new file is created in place of that
directory in the other branch. 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 * "git rebase --autosquash" can use SHA-1 object names to name the
commit which is to be fixed up (e.g. "fixup! e83c5163"). commit which is to be fixed up (e.g. "fixup! e83c5163").
@ -146,6 +154,6 @@ release, unless otherwise noted.
--- ---
exec >/var/tmp/1 exec >/var/tmp/1
O=v1.7.4-rc1 O=v1.7.4-rc2
echo O=$(git describe master) echo O=$(git describe master)
git shortlog --no-merges ^maint ^$O master git shortlog --no-merges ^maint ^$O master

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.4-rc1 DEF_VER=v1.7.4-rc2
LF=' LF='
' '