diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 07:32:03 +0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 07:32:03 +0400 |
| commit | 317efa63fc457d1a726902ddf97298c201df627c (patch) | |
| tree | d4f38c3fd8ec2a422c4db76e00b784f760540f1f /Documentation | |
| parent | 54f0db79ca11d08a448e45cfcb6e4304c6d16014 (diff) | |
| parent | 09955207d148c5f3964002b7f3a4e13db3050777 (diff) | |
Merge branch 'maint'
* maint:
Document additional 1.5.3.5 fixes in release notes
Avoid 'expr index' on Mac OS X as it isn't supported
filter-branch: update current branch when rewritten
fix filter-branch documentation
helpful error message when send-pack finds no refs in common.
Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
Correct typos in release notes for 1.5.3.5
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.5.3.5.txt | 19 | ||||
| -rw-r--r-- | Documentation/git-filter-branch.txt | 3 |
2 files changed, 18 insertions, 4 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt index 6a1901a96d..de38a84ad6 100644 --- a/Documentation/RelNotes-1.5.3.5.txt +++ b/Documentation/RelNotes-1.5.3.5.txt @@ -4,21 +4,36 @@ GIT v1.5.3.5 Release Notes Fixes since v1.5.3.4 -------------------- - * "git-config" silently ignored options after --list; now it wilh + * "git-config" silently ignored options after --list; now it will error out with a usage message. * "git-config --file" failed if the argument used a relative path as it changed directories before opening the file. + * "git-config", "git-diff", "git-apply" failed if run from a + subdirectory with relative GIT_DIR and GIT_WORK_TREE set. + * "git-add -i" did not handle single line hunks correctly. + * "git-rebase -i" failed if external diff drivers were used for one + or more files in a commit. It now avoids calling the external + diff drivers. + * "git-log --follow" did not work unless diff generation (e.g. -p) was also requested. * "git-log" printed extra newlines between commits when a diff was generated internally (e.g. -S or --follow) but not displayed. - * Documention updates for supported (but previously undocumented) + * "git-push" error message is more helpful when pushing to a + repository with no matching refs and none specified. + + * "git-filter-branch" now updates the working directory when it + has finished filtering the current branch. + + * "git-instaweb" no longer fails on Mac OS X. + + * Documentation updates for supported (but previously undocumented) options of "git-archive" and "git-reflog". * "make clean" no longer deletes the configure script that ships diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index c878ed395e..ba9b4fbca7 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -180,8 +180,7 @@ A significantly faster version: git filter-branch --index-filter 'git update-index --remove filename' HEAD -------------------------------------------------------------------------- -Now, you will get the rewritten history saved in the branch 'newbranch' -(your current branch is left untouched). +Now, you will get the rewritten history saved in HEAD. To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in |