diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
| commit | 8807d321af394ffb2180d085669337bcd5018c50 (patch) | |
| tree | 2956464a49a82a210612a2ea030a6affc12a67aa /Documentation | |
| parent | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 (diff) | |
| parent | 0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035 (diff) | |
| download | git-8807d321af394ffb2180d085669337bcd5018c50.tar.gz git-8807d321af394ffb2180d085669337bcd5018c50.tar.xz | |
Merge branch 'maint'
* maint:
GIT 1.5.0.2
git-remote: support remotes with a dot in the name
Documentation: describe "-f/-t/-m" options to "git-remote add"
diff --cc: fix display of symlink conflicts during a merge.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.5.0.2.txt | 28 | ||||
| -rw-r--r-- | Documentation/git-remote.txt | 13 |
2 files changed, 30 insertions, 11 deletions
diff --git a/Documentation/RelNotes-1.5.0.2.txt b/Documentation/RelNotes-1.5.0.2.txt index 4dc134485..b061e50ff 100644 --- a/Documentation/RelNotes-1.5.0.2.txt +++ b/Documentation/RelNotes-1.5.0.2.txt @@ -6,6 +6,14 @@ Fixes since v1.5.0.1 * Bugfixes + - Automated merge conflict handling when changes to symbolic + links conflicted were completely broken. The merge-resolve + strategy created a regular file with conflict markers in it + in place of the symbolic link. The default strategy, + merge-recursive was even more broken. It removed the path + that was pointed at by the symbolic link. Both of these + problems have been fixed. + - 'git diff maint master next' did not correctly give combined diff across three trees. @@ -39,21 +47,19 @@ Fixes since v1.5.0.1 impossible to repack after accumulating many (small) packs in the repository. + - 'git-diff' to review the combined diff during a conflicted + merge were not reading the working tree version correctly + when changes to a symbolic link conflicted. It should have + read the data using readlink(2) but read from the regular + file the symbolic link pointed at. + + - 'git-remote' did not like period in a remote's name. + * Documentation updates - added and clarified core.bare, core.legacyheaders configurations. - updated "git-clone --depth" documentation. -* Assorted git-gui fixes. - --- -exec >/var/tmp/1 -O=v1.5.0.1-35-gffa84ff -echo O=`git describe maint` -git shortlog --no-merges $O..maint - -#Local Variables: -#mode: text -#End: +* Assorted git-gui fixes. diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 250761f97..266faade3 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -32,6 +32,19 @@ subcommands are available to perform operations on the remotes. Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>. ++ +With `-f` option, `git fetch <name>` is run immediately after +the remote information is set up. ++ +With `-t <branch>` option, instead of the default glob +refspec for the remote to track all branches under +`$GIT_DIR/remotes/<name>/`, a refspec to track only `<branch>` +is created. You can give more than one `-t <branch>` to track +multiple branche without grabbing all branches. ++ +With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set +up to point at remote's `<master>` branch instead of whatever +branch the `HEAD` at the remote repository actually points at. 'show':: |