diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-04 02:54:33 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-04 02:54:33 +0400 |
| commit | 47829ed0105c863efb8cc304d09edf14283b32d9 (patch) | |
| tree | 4bc431a268bea4b0647ec20c785b1285d3f8dcc2 | |
| parent | 5498c5f05283cd248fd5e4f48cb8902e9ca6ce28 (diff) | |
| parent | 121f71f0da1bc9a4e1e96be2c3e683191a82a354 (diff) | |
Sync with 1.7.10.4
* maint:
Git 1.7.10.4
| -rw-r--r-- | Documentation/RelNotes/1.7.10.4.txt | 4 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt index 154bba46eb..326670df6e 100644 --- a/Documentation/RelNotes/1.7.10.4.txt +++ b/Documentation/RelNotes/1.7.10.4.txt @@ -22,4 +22,8 @@ Fixes since v1.7.10.3 read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should. + * When "git rebase" was given a bad commit to replay the history on, + its error message did not correctly give the command line argument + it had trouble parsing. + Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index f86ce05d16..55e405d644 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.10.3/git.html[documentation for release 1.7.10.3] +* link:v1.7.10.4/git.html[documentation for release 1.7.10.4] * release notes for + link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], |