diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 22:15:48 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 22:15:48 +0400 |
| commit | e3d44930318ed3746fe6da51913602d4fad8daaf (patch) | |
| tree | b0261d0a69cdbdf78a6bbc485324f76a6f1a2c26 /Documentation | |
| parent | b72c6161f1f34985e4a13f8c4c9ba9e55b3d1496 (diff) | |
| parent | f893b7420cdf085dfde809d4ea97cb8c03b81c94 (diff) | |
Sync with maint
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.8.3.4.txt | 15 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.txt new file mode 100644 index 0000000000..24ee2b8017 --- /dev/null +++ b/Documentation/RelNotes/1.8.3.4.txt @@ -0,0 +1,15 @@ +Git v1.8.3.4 Release Notes +========================== + +This update is mostly to propagate documentation fixes and test +updates from the master front back to the maintenance track. + +Fixes since v1.8.3.3 +-------------------- + + * The bisect log listed incorrect commits when bisection ends with + only skipped ones. + + * The test coverage framework was left broken for some time. + + * The test suite for HTTP transport did not run with Apache 2.4. diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a404b47b7b..f445cb38fa 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git reset' [-q] [<tree-ish>] [--] <paths>... -'git reset' (--patch | -p) [<tree-sh>] [--] [<paths>...] +'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION |