diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 20:35:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 20:35:36 +0400 |
| commit | 262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch) | |
| tree | 1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /Documentation | |
| parent | 6df2ffaeef3f593214e88d9c148a7f3504f13e5e (diff) | |
| parent | a4c24549acf16f7917ea3ddd811c6c61afc5689c (diff) | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression
Conflicts:
diff.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.7.1.1.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt index e0386a43f0..bfdb5ba064 100644 --- a/Documentation/RelNotes-1.7.1.1.txt +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -28,6 +28,9 @@ Fixes since v1.7.1 * "git checkout" and "git rebase" overwrote paths that are marked "assume unchanged". + * "git commit --amend" on a commit with an invalid author-name line that + lacks the display name didn't work. + * "git describe" did not tie-break tags that point at the same commit correctly; newer ones are preferred by paying attention to the tagger date now. @@ -49,14 +52,25 @@ Fixes since v1.7.1 * "git log --abbrev=$num --format='%h' ignored --abbrev=$num. + * "git ls-files ../out/side/cwd" refused to work. + + * "git merge --log" used to replace the custom message given by "-m" with + the shortlog, instead of appending to it. + * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but ignored the option itself, resulting in a bogus attempt to merge unrelated commit. + * "git reset --hard" started from a wrong directory and a working tree in + a nonstandard location is in use got confused. + * "git send-email" lacked a way to specify the domainname used in the EHLO/HELO exchange, causing rejected connection from picky servers. It learned --smtp-domain option to solve this issue. + * "git show -C -C" and other corner cases lost diff metainfo output + in 1.7.0. + * "git stash" incorrectly lost paths in the working tree that were previously removed from the index. @@ -65,3 +79,10 @@ Fixes since v1.7.1 * "git status" showed excess "hints" even when advice.statusHints is set to false. And other minor fixes and documentation updates. + + +-- +exec >/var/tmp/1 +O=v1.7.1-195-gb2ebbd8 +echo O=$(git describe HEAD) +git shortlog --no-merges HEAD ^$O |