development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with maint

Browse source
This commit is contained in:
Junio C Hamano 2013-07-19 11:15:48 -07:00
parent b72c6161f1 f893b7420c
commit e3d4493031
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Documentation/RelNotes/1.8.3.4.txt Normal file
View file

@ -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.

2
Documentation/git-reset.txt
View file

@ -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

2
builtin/apply.c
View file

@ -722,7 +722,7 @@ static char *find_name(const char *line, char *def, int p_value, int terminate)
static char *find_name_traditional(const char *line, char *def, int p_value)
{
size_t len = strlen(line);
size_t len;
size_t date_len;
if (*line == '"') {

2
http-push.c
View file

@ -663,7 +663,7 @@ static void add_fetch_request(struct object *obj)
static int add_send_request(struct object *obj, struct remote_lock *lock)
{
struct transfer_request *request = request_queue_head;
struct transfer_request *request;
struct packed_git *target;
/* Keep locks active */