Merge GIT 1.5.0.4
This commit is contained in:
commit
803527f1d9
24
Documentation/RelNotes-1.5.0.4.txt
Normal file
24
Documentation/RelNotes-1.5.0.4.txt
Normal file
@ -0,0 +1,24 @@
|
||||
GIT v1.5.0.4 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.5.0.3
|
||||
--------------------
|
||||
|
||||
* Bugfixes
|
||||
|
||||
- git.el does not add duplicate sign-off lines.
|
||||
|
||||
- git-commit shows the full stat of the resulting commit, not
|
||||
just about the files in the current directory, when run from
|
||||
a subdirectory.
|
||||
|
||||
- "git-checkout -m '@{8 hours ago}'" had a funny failure from
|
||||
eval; fixed.
|
||||
|
||||
- git-gui updates.
|
||||
|
||||
* Documentation updates
|
||||
|
||||
* User manual updates
|
||||
|
||||
|
@ -86,7 +86,7 @@ OPTIONS
|
||||
Remove the line matching the key from config file.
|
||||
|
||||
--unset-all::
|
||||
Remove all matching lines from config file.
|
||||
Remove all lines matching the key from config file.
|
||||
|
||||
-l, --list::
|
||||
List all variables set in config file.
|
||||
|
@ -205,7 +205,7 @@ else
|
||||
work=`git write-tree` &&
|
||||
git read-tree --reset -u $new || exit
|
||||
|
||||
eval GITHEAD_$new=${new_name:-${branch:-$new}} &&
|
||||
eval GITHEAD_$new='${new_name:-${branch:-$new}}' &&
|
||||
eval GITHEAD_$work=local &&
|
||||
export GITHEAD_$new GITHEAD_$work &&
|
||||
git merge-recursive $old -- $new $work
|
||||
|
Loading…
Reference in New Issue
Block a user