diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-14 15:59:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-14 15:59:04 -0700 |
| commit | 803527f1d9b284fa848d4a4bad23158c162a5d54 (patch) | |
| tree | ac45529372c3cd8682d6b26b9c8a96002595d326 | |
| parent | update-hook: fix incorrect use of git-describe and sed for finding previous tag (diff) | |
| parent | GIT 1.5.0.4 (diff) | |
| download | tgif-803527f1d9b284fa848d4a4bad23158c162a5d54.tar.xz | |
Merge GIT 1.5.0.4
| -rw-r--r-- | Documentation/RelNotes-1.5.0.4.txt | 24 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 2 | ||||
| -rwxr-xr-x | git-checkout.sh | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.0.4.txt b/Documentation/RelNotes-1.5.0.4.txt new file mode 100644 index 0000000000..b727a8d1e5 --- /dev/null +++ b/Documentation/RelNotes-1.5.0.4.txt @@ -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 + + diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 68de5881bd..c759efb7fc 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -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. diff --git a/git-checkout.sh b/git-checkout.sh index 6caa9fdcc6..fcadf200ee 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -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 |