v1.5.0.txt update (Johannes's suggestions)
Junio C Hamano committed
Jan 21, 2007 at 17:04 UTC
3b172087e0935841c44cf4d26e94036bf0308127
1 file changed
+28
-18
v1.5.0.txt
+28
-18
@@ -80,7 +80,7 @@ Updates in v1.5.0 since v1.4.4 series
80
otherwise ignored files with an -f option.
81
82
- git-add tries to be more friendly to users by offering an
83
- interactive mode.
83
+ interactive mode ("git-add -i").
84
85
- git-commit <path> used to refuse to commit if <path> was
86
different between HEAD and the index (i.e. update-index was
@@ -107,7 +107,9 @@ Updates in v1.5.0 since v1.4.4 series
107
- git-clone always uses what is known as "separate remote"
108
layout for a newly created repository with a working tree;
109
i.e. tracking branches in $GIT_DIR/refs/remotes/origin/ are
110
- used to track branches from the origin.
110
+ used to track branches from the origin, instead of
111
+ $GIT_DIR/refs/heads/, making the difference between remotely
112
+ tracked and local branches more obvious.
113
114
- New branches that appear on the origin side after a clone is
115
made are also tracked automatically. This is done with an
@@ -118,10 +120,12 @@ Updates in v1.5.0 since v1.4.4 series
120
in individually if you plan to fetch into the repository with
121
older versions of git (but why would you?).
122
121
- - git-branch and git-show-branch know remote tracking branches.
123
+ - git-branch and git-show-branch know remote tracking branches
124
+ (use the command line switch "-r" to list only tracked branches).
125
126
- git-push can now be used to delete a remote branch or a tag.
124
- This requires the updated git on the remote side.
127
+ This requires the updated git on the remote side (use "git
128
+ push <remote> :refs/heads/<branch>" to delete "branch").
129
130
- git-push more agressively keeps the transferred objects
131
packed. Earlier we recommended to monitor amount of loose
@@ -153,10 +157,14 @@ Updates in v1.5.0 since v1.4.4 series
157
158
* Reflog
159
156
- - Reflog records the history of where the tip of each branch
157
- was at each moment. This facility is enabled by default for
158
- repositories with working trees, and can be accessed with the
159
- "branch@{time}" and "branch@{Nth}" notation.
160
+ - Reflog records the history from the view point of the local
161
+ repository. In other words, regardless of the real history,
162
+ the reflog shows the history as seen by one particular
163
+ repository (this enables you to ask "what was the current
164
+ revision in _this_ repository, yesterday at 1pm?"). This
165
+ facility is enabled by default for repositories with working
166
+ trees, and can be accessed with the "branch@{time}" and
167
+ "branch@{Nth}" notation.
168
169
- "git show-branch" learned showing the reflog data with the
170
new --reflog option. "git log" has --walk-reflogs option to
@@ -208,18 +216,20 @@ Updates in v1.5.0 since v1.4.4 series
216
217
- After detaching your HEAD, you can go back to an existing
218
branch with usual "git checkout $branch". Also you can
211
- start a new branch using "git checkout -b $newbranch".
219
+ start a new branch using "git checkout -b $newbranch" to
220
+ start a new branch at that commit.
221
222
- You can even pull from other repositories, make merges and
223
commits while your HEAD is detached. Also you can use "git
215
- reset" to jump to arbitrary commit.
224
+ reset" to jump to arbitrary commit, while still keeping your
225
+ HEAD detached.
226
217
- Going back to undetached state by "git checkout $branch" can
218
- lose the current stat you arrived in these ways, and "git
219
- checkout" refuses when the detached HEAD is not pointed by
220
- any existing ref (an existing branch, a remote tracking
221
- branch or a tag). This safety can be overriden with "git
222
- checkout -f $branch".
227
+ Going back to attached state (i.e. on a particular branch) by
228
+ "git checkout $branch" can lose the current stat you arrived
229
+ in these ways, and "git checkout" refuses when the detached
230
+ HEAD is not pointed by any existing ref (an existing branch,
231
+ a remote tracking branch or a tag). This safety can be
232
+ overriden with "git checkout -f $branch".
233
234
235
* Packed refs
@@ -248,7 +258,7 @@ Updates in v1.5.0 since v1.4.4 series
258
All 3-way file-level merges are now done internally.
259
260
- The original implementation of git-merge-recursive which was
251
- in Python has been removed; we have C implementation of it
261
+ in Python has been removed; we have a C implementation of it
262
now.
263
264
- git-shortlog is no longer a Perl script. It no longer
@@ -298,7 +308,7 @@ Updates in v1.5.0 since v1.4.4 series
308
309
- The default suffix for git-format-patch output is now ".patch",
310
not ".txt". This can be changed with --suffix=.txt option,
301
- or "format.suffix = .txt" in the configuration.
311
+ or setting the config variable "format.suffix" to ".txt".
312
313
314
* Foreign SCM interfaces