c59130ad58 · matheusbsbs/matheus-bagliano

@@ -1,117 +1,90 @@

1 -What's in git.git (Jul 2008, issue #05; Tue, 15)

1 +What's in git.git (Jul 2008, issue #06; Sat, 19)

2

3 - maint 191a8e3 (GIT 1.5.6.3, 2008-07-13)

4 - master fcab40a (Merge branch 'mv/merge-in-c', 2008-07-15)

3 + maint a1b6fb0 (GIT 1.5.6.4, 2008-07-19)

4 + master 09651dd (Getting closer to 1.6.0-rc0, 2008-07-19)

5 ------------------------------------------------------------------------

6

7 -"Merge-in-C" is in, so is "rename .dotest", and remaining Windows bits.

8 -Now it is almost there for 1.6.0-rc0.

7 +* The 'maint' branch is at 1.5.6.4.

8

10 -* The 'master' branch has these since the last announcement.

9 +* The 'master' branch has these since the last announcement

10 + in addition to what is already in 1.5.6.4.

11

12 -Alexander N. Gavrilov (1):

13 - Fix quadratic performance in rewrite_one.

12 +Alexander Gavrilov (3):

13 + Avoid rescanning unchanged entries in search for copies.

14 + Do not try to detect move/copy for entries below threshold.

15 + Support gitlinks in fast-import.

16

15 -Brian Gernhardt (1):

16 - Documentation: mention ORIG_HEAD in am, merge, and rebase

17 +Eric Raible (1):

18 + Teach lookup_prog not to select directories

19

18 -Ciaran McCreesh (1):

19 - Make git-add -i accept ranges like 7-

20 +Eric Wong (1):

21 + t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"

22

21 -Dmitry Kakurin (1):

22 - Fixed text file auto-detection: treat EOF character 032 at the end of

23 - file as printable

23 +Fabian Emmes (2):

24 + Testsuite: Unset CVS_SERVER

25 + testsuite for cvs co -c

26

25 -Frederik Schwarzer (1):

26 - git-svn: typofix

27 +Johannes Sixt (1):

28 + builtin-clone: rewrite guess_dir_name()

29

28 -Ian Katz (1):

29 - tutorial: use prompt with user names in example, to clarify who is doing

30 - what

31 -

32 -Johannes Schindelin (6):

33 - Convert CR/LF to LF in tag signatures

34 - Add pretty format %aN which gives the author name, respecting .mailmap

35 - Move MERGE_RR from .git/rr-cache/ into .git/

36 - git-gui: MERGE_RR lives in .git/ directly with newer Git versions

37 - shortlog: support --pretty=format: option

38 - Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

39 -

40 -João Abecasis (1):

41 - git-svn: find-rev and rebase for SVN::Mirror repositories

42 -

43 -Junio C Hamano (10):

44 - Introduce get_merge_bases_many()

45 - Introduce reduce_heads()

46 - Teach "am" and "rebase" to mark the original position with ORIG_HEAD

47 - branch --contains: default to HEAD

48 - branch --merged/--no-merged: allow specifying arbitrary commit

49 - Teach merge.log to "git-merge" again

30 +Junio C Hamano (9):

31 + git-rebase: report checkout failure

32 + t/aggregate-results: whitespace fix

33 Update draft release notes for 1.6.0

51 - reduce_heads(): protect from duplicate input

52 - tutorial: clarify "pull" is "fetch + merge"

53 - Update draft release notes to 1.6.0

54 -

55 -Lukas Sandström (1):

56 - git-mailinfo: Fix getting the subject from the in-body [PATCH] line

57 -

58 -Mark Levedahl (2):

59 - git-submodule - make "submodule add" more strict, and document it

60 - git-submodule - register submodule URL if adding in place

61 -

62 -Mike Pape (1):

63 - We need to check for msys as well as Windows in add--interactive.

64 -

65 -Miklos Vajna (15):

66 - Move split_cmdline() to alias.c

67 - Move commit_list_count() to commit.c

68 - Move parse-options's skip_prefix() to git-compat-util.h

69 - Add new test to ensure git-merge handles pull.twohead and pull.octopus

70 - Move read_cache_unmerged() to read-cache.c

71 - git-fmt-merge-msg: make it usable from other builtins

72 - Introduce get_octopus_merge_bases() in commit.c

73 - Add new test to ensure git-merge handles more than 25 refs.

74 - Add new test case to ensure git-merge reduces octopus parents when

75 - possible

76 - Add new test case to ensure git-merge prepends the custom merge message

77 - git-commit-tree: make it usable from other builtins

78 - Fix t7601-merge-pull-config.sh on AIX

79 - Build in merge

80 - t6021: add a new test for git-merge-resolve

81 - Add a new test for git-merge-resolve

82 -

83 -Nicolas Pitre (1):

84 - restore legacy behavior for read_sha1_file()

85 -

86 -Olivier Marin (1):

87 - builtin-rerere: more carefully find conflict markers

88 -

89 -Pavel Roskin (1):

90 - t9600: allow testing with cvsps 2.2, including beta versions

91 -

92 -Pierre Habouzit (1):

93 - parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

94 -

95 -Shawn O. Pearce (3):

96 - bash completion: Append space after file names have been completed

97 - bash completion: Resolve git show ref:path<tab> losing ref: portion

98 - bash completion: Remove dashed command completion support

99 -

100 -Soeren Finster (1):

101 - git-gui: Exit shortcut in MacOSX repaired

102 -

103 -Steffen Prohaska (3):

104 - Move code interpreting path relative to exec-dir to new function

105 - system_path()

106 - help.c: Add support for htmldir relative to git_exec_path()

107 - help (Windows): Display HTML in default browser using Windows' shell API

108 -

109 -Stephan Beyer (1):

110 - rerere: Separate libgit and builtin functions

111 -

112 -Sverre Hvammen Johansen (1):

113 - reduce_heads(): thinkofix

114 -

115 -Teemu Likonen (1):

116 - bash: Add long option completion for 'git send-email'

34 + read-cache.c: typofix

35 + mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line

36 + builtin-remote.c: fix earlier "skip_prefix()" conversion

37 + t9001 (send-email): Do not use hardcoded /bin/sh in test

38 + .mailmap update

39 + Getting closer to 1.6.0-rc0

40 +

41 +Lars Noschinski (2):

42 + cvsserver: Add support for packed refs

43 + cvsserver: Add cvs co -c support

44 +

45 +Lukas Sandström (3):

46 + Make some strbuf_*() struct strbuf arguments const.

47 + Add some useful functions for strbuf manipulation.

48 + git-mailinfo: use strbuf's instead of fixed buffers

49 +

50 +Miklos Vajna (4):

51 + t0001-init.sh: change confusing directory name

52 + t1007-hash-object.sh: use quotes for the test description

53 + git-bisect: use dash-less form on git bisect log

54 + make remove-dashes: apply to scripts and programs as well, not just to

55 + builtins

56 +

57 +Nanako Shiraishi (3):

58 + cache-tree.c: make cache_tree_find() static

59 + builtin-describe.c: make a global variable "pattern" static

60 + parse-options.c: make check_typos() static

61 +

62 +Peter Harris (1):

63 + Add ANSI control code emulation for the Windows console

64 +

65 +Petr Baudis (5):

66 + Documentation/git-submodule.txt: Add Description section

67 + Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles

68 + Documentation/git-submodule.txt: Further clarify the description

69 + Documentation: How to ignore local changes in tracked files

70 + Documentation/git-merge.txt: Partial rewrite of How Merge Works

71 +

72 +René Scharfe (8):

73 + archive: remove args member from struct archiver

74 + add context pointer to read_tree_recursive()

75 + archive: add baselen member to struct archiver_args

76 + archive: centralize archive entry writing

77 + archive: unify file attribute handling

78 + archive: remove extra arguments parsing code

79 + archive: make zip compression level independent from core git

80 + archive: remove unused headers

81 +

82 +Stephan Beyer (4):

83 + t/test-lib.sh: exit with small negagive int is ok with test_must_fail

84 + t/: Use "test_must_fail git" instead of "! git"

85 + Make usage strings dash-less

86 + Link git-shell only to a subset of libgit.a

87 +

88 +SungHyun Nam (1):

89 + t/Makefile: use specified shell when running aggregation script

90