diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
| commit | d55e7c3acf72413563e695a19f7f66efac442064 (patch) | |
| tree | b12d163ceb3e56e36a90c82b9c075a3401cd00d3 /Documentation | |
| parent | 03618b9df84a0e94e36fdb27060e605e85b956e9 (diff) | |
| parent | 8492f00b4f28471af84d3887096257822c4d2bc9 (diff) | |
| download | git-d55e7c3acf72413563e695a19f7f66efac442064.tar.gz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug
Conflicts:
RelNotes
git-rebase--interactive.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.5.3.5.txt | 25 | ||||
| -rw-r--r-- | Documentation/git-archive.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-reflog.txt | 5 |
3 files changed, 35 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt new file mode 100644 index 0000000000..6a1901a96d --- /dev/null +++ b/Documentation/RelNotes-1.5.3.5.txt @@ -0,0 +1,25 @@ +GIT v1.5.3.5 Release Notes +========================== + +Fixes since v1.5.3.4 +-------------------- + + * "git-config" silently ignored options after --list; now it wilh + 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-add -i" did not handle single line hunks correctly. + + * "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) + options of "git-archive" and "git-reflog". + + * "make clean" no longer deletes the configure script that ships + with the git tarball, making multiple architecture builds easier. diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index e1e2d60fef..7cd6526552 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>] - [--remote=<repo>] <tree-ish> [path...] + [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> + [path...] DESCRIPTION ----------- @@ -52,6 +53,10 @@ OPTIONS Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository. +--exec=<git-upload-archive>:: + Used with --remote to specify the path to the + git-upload-archive executable on the remote side. + <tree-ish>:: The tree or commit to produce an archive for. diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index 5180f6810d..5c7316ceb8 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -16,7 +16,7 @@ The command takes various subcommands, and different options depending on the subcommand: [verse] -git reflog expire [--dry-run] [--stale-fix] +git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>... git reflog [show] [log-options] @@ -68,6 +68,9 @@ them. --all:: Instead of listing <refs> explicitly, prune all refs. +--verbose:: + Print extra information on screen. + Author ------ Written by Junio C Hamano <junkio@cox.net> |