mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint'
* maint: builtin-fast-export: Only output a single parent per line Release Notes for 1.5.5.2 Conflicts: RelNotes
This commit is contained in:
commit
8366b7baae
27
Documentation/RelNotes-1.5.5.2.txt
Normal file
27
Documentation/RelNotes-1.5.5.2.txt
Normal file
|
@ -0,0 +1,27 @@
|
|||
GIT v1.5.5.2 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.5.5.1
|
||||
--------------------
|
||||
|
||||
* "git repack -n" was mistakenly made no-op earlier.
|
||||
|
||||
* "git imap-send" wanted to always have imap.host even when use of
|
||||
imap.tunnel made it unnecessary.
|
||||
|
||||
* reflog syntax that uses time e.g. "HEAD@{10 seconds ago}:path" did not
|
||||
stop parsing at the closing "}".
|
||||
|
||||
* "git rev-parse --symbolic-full-name ^master^2" printed solitary "^",
|
||||
but it should print nothing.
|
||||
|
||||
* "git commit" did not detect when it failed to write tree objects.
|
||||
|
||||
* "git fetch" sometimes transferred too many objects unnecessarily.
|
||||
|
||||
* a path specification "a/b" in .gitattributes file should not match
|
||||
"sub/a/b".
|
||||
|
||||
* various gitweb fixes.
|
||||
|
||||
Also comes with various documentation updates.
|
|
@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
|
|||
continue;
|
||||
if (i == 0)
|
||||
printf("from :%d\n", mark);
|
||||
else if (i == 1)
|
||||
printf("merge :%d", mark);
|
||||
else
|
||||
printf(" :%d", mark);
|
||||
printf("merge :%d\n", mark);
|
||||
i++;
|
||||
}
|
||||
if (i > 1)
|
||||
printf("\n");
|
||||
|
||||
log_tree_diff_flush(rev);
|
||||
rev->diffopt.output_format = saved_output_format;
|
||||
|
|
Loading…
Reference in a new issue