Update release notes
As 1.7.4.3 has backmerged a handful of fixes from the master, drop these entries from 1.7.5 release notes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 3, 2011 at 00:18 UTC
cb35c0646d2b6a911f516ac2e45d2e23b038f646
2 files changed
+21
-23
Documentation/RelNotes/1.7.5.txt
+18
-22
@@ -14,8 +14,9 @@ Updates since v1.7.4
14
15
* Update to more modern HP-UX port.
16
17
- * The codebase is getting prepared for i18n/l10n; no translated/translatable
18
- strings in the code yet.
17
+ * The codebase is getting prepared for i18n/l10n; no translated
18
+ strings nor translation mechanism in the code yet, but the strings
19
+ are being marked for l10n.
20
21
* The bash completion script can now complete symmetric difference
22
for "git diff" command, e.g. "git diff ...bra<TAB>".
@@ -27,10 +28,6 @@ Updates since v1.7.4
28
* "git apply -v" reports offset lines when the patch does not apply at
29
the exact location recorded in the diff output.
30
30
- * "git branch --track" (and "git checkout --track --branch") used to
31
- allow setting up a random non-branch that does not make sense to follow
32
- as the "upstream". The command correctly diagnoses it as an error.
33
-
31
* "git config" used to be also known as "git repo-config", but the old
32
name is now officially deprecated.
33
@@ -63,6 +60,12 @@ Updates since v1.7.4
60
* "git grep --no-index" did not honor pathspecs correctly, returning
61
paths outside the specified area.
62
63
+ * "git init" learned the --separate-git-dir option to allow the git
64
+ directory for a new repository created elsewhere and linked via the
65
+ gitdir mechanism. This is primarily to help submodule support later
66
+ to switch between a branch of superproject that has the submodule
67
+ and another that does not.
68
+
69
* "git log" type commands now understand globbing pathspecs. You
70
can say "git log -- '*.txt'" for example.
71
@@ -71,6 +74,10 @@ Updates since v1.7.4
74
or highlighting equivalent changes that appear on both sides of a
75
symmetric difference (e.g. "log --cherry A...B").
76
77
+ * A lazy "git merge" that didn't say what to merge used to be an error.
78
+ When run on a branch that has an upstream defined, however, the command
79
+ now merges from the configured upstream.
80
+
81
* "git mergetool" learned how to drive "beyond compare 3" as well.
82
83
* "git rerere forget" without pathspec used to forget all the saved
@@ -104,17 +111,6 @@ Fixes since v1.7.4
111
All of the fixes in the v1.7.4.X maintenance series are included in this
112
release, unless otherwise noted.
113
107
- * "git apply" used to confuse lines updated by previous hunks as lines
108
- that existed before when applying a hunk, contributing misapplication
109
- of patches with offsets.
110
-
111
- * "git checkout $other_branch" silently removed untracked symbolic links
112
- in the working tree that are in the way in order to check out paths
113
- under it from the named branch (js/checkout-untracked-symlink).
114
-
115
- * "git diff --quiet" did not work very well with the "--diff-filter"
116
- option (jc/maint-diff-q-filter).
117
-
114
* "git fetch" from a client that is mostly following the remote
115
needlessly told all of its refs to the server for both sides to
116
compute the set of objects that need to be transferred efficiently,
@@ -128,13 +124,13 @@ release, unless otherwise noted.
124
reachable from the refs in their common alternate object store,
125
causing it to fetch unnecessary objects (jc/maint-fetch-alt).
126
131
- * "git stash apply" reported the result of its operation by running
132
- "git status" from the top-level of the working tree; it should (and
133
- now does) run it from the user's working directory
134
- (pk/stash-apply-status-relative).
127
+ * "git pull" into an empty branch should have behaved as if
128
+ fast-forwarding from emptiness to the version being pulled, with
129
+ the usual protection against overwriting untracked files (need to
130
+ cherry-pick 4b3ffe5).
131
132
---
133
exec >/var/tmp/1
138
-O=v1.7.5-rc0
134
+O=v1.7.5-rc0-99-g8f84c95
135
echo O=$(git describe 'master')
136
git shortlog --no-merges ^maint ^$O master
Documentation/git.txt
+3
-1
@@ -44,9 +44,11 @@ unreleased) version of git, that is available from 'master'
44
branch of the `git.git` repository.
45
Documentation for older releases are available here:
46
47
-* link:v1.7.4.1/git.html[documentation for release 1.7.4.1]
47
+* link:v1.7.4.3/git.html[documentation for release 1.7.4.3]
48
49
* release notes for
50
+ link:RelNotes/1.7.4.3.txt[1.7.4.3],
51
+ link:RelNotes/1.7.4.2.txt[1.7.4.2],
52
link:RelNotes/1.7.4.1.txt[1.7.4.1],
53
link:RelNotes/1.7.4.txt[1.7.4].
54