67faaaba83 · matheusbsbs/matheus-bagliano

@@ -16,13 +16,16 @@ on.

16 * gitk can call out to git-gui to view "git blame" output; git-gui in turn

17 can run gitk from its blame view.

18

19 -(portability)

19 +* Various git-gui updates including updated translations.

20 +

21 +* Various gitweb updates from repo.or.cz installation.

22

21 -* ...

23 +(portability)

24

23 -(documentation)

25 +* A few test scripts used nonportable "grep" that did not work well on

26 + some platforms, e.g. Solaris.

27

25 -* ...

28 +* Sample pre-auto-gc script has OS X support.

29

30 (performance)

31

@@ -35,6 +38,14 @@ on.

38 * Bash completion of refnames in a repository with massive number of

39 refs has been optimized.

40

41 +* Cygwin port uses native stat/lstat implementations when applicable,

42 + which leads to improved performance.

43 +

44 +* "git push" pays attention to alternate repositories to avoid sending

45 + unnecessary objects.

46 +

47 +* "git svn" can rebuild an out-of-date rev_map file.

48 +

49 (usability, bells and whistles)

50

51 * When you mistype a command name, git helpfully suggests what it guesses

@@ -42,6 +53,12 @@ on.

53 to a non-zero value to accept the suggestion when git can uniquely

54 guess.

55

56 +* "git add -N path..." adds the named paths as an empty blob, so that

57 + subsequent "git diff" will show a diff as if they are creation events.

58 +

59 +* "git apply" learned --include=paths option, similar to the existing

60 + --exclude=paths option.

61 +

62 * "git bisect" is careful about a user mistake and suggests testing of

63 merge base first when good is not a strict ancestor of bad.

64

@@ -49,6 +66,12 @@ on.

66 DWIMs to create a corresponding local branch "hack", i.e. acts as if you

67 said "git checkout --track -b hack origin/hack".

68

69 +* "git checkout --ours/--theirs" can be used to check out one side of a

70 + conflicting merge during conflict resolution.

71 +

72 +* "git checkout -m" can be used to recreate the initial conflicted state

73 + during conflict resolution.

74 +

75 * "git cherry-pick" can also utilize rerere for conflict resolution.

76

77 * "git commit --author=$name" can look up author name from existing

@@ -62,15 +85,20 @@ on.

85 * "git diff" learned to mimic --suppress-blank-empty from GNU diff via a

86 configuration option.

87

65 -* "git diff" learned to put more sensible hunk headers for Python and

66 - HTML contents.

88 +* "git diff" learned to put more sensible hunk headers for Python,

89 + HTML and ObjC contents.

90

91 * "git diff" learned to vary the a/ vs b/ prefix depending on what are

92 being compared, controlled by diff.mnemonicprefix configuration.

93

94 +* "git diff" learned --dirstat-by-file to count changed files, not number

95 + of lines, when summarizing the global picture.

96 +

97 * "git for-each-ref" learned "refname:short" token that gives an

98 unambiguously abbreviated refname.

99

100 +* "git grep" learned to accept -z similar to GNU grep.

101 +

102 * "git help" learned to use GIT_MAN_VIEWER environment variable before

103 using "man" program.

104

@@ -103,12 +131,18 @@ on.

131 * "git submodule sync" subcommands allows you to update the origin URL

132 recorded in submodule directories from the toplevel .gitmodules file.

133

134 +* "git svn branch" can create new branches on the other end.

135 +

136 (internal)

137

138 * "git hash-object" learned to lie about the path being hashed, so that

139 correct gitattributes processing can be done while hashing contents

140 stored in a temporary file.

141

142 +* various callers of git-merge-recursive avoid forking it as an external

143 + process.

144 +

145 +

146 Fixes since v1.6.0

147 ------------------

148

@@ -124,6 +158,11 @@ release, unless otherwise noted.

158 but we dropped support for such a use case long time ago. This has

159 been resurrected.

160

161 +* Giving 3 or more tree-ish to "git diff" is supposed to show the combined

162 + diff from second and subsequent trees to the first one. b75271d ("git

163 + diff <tree>{3,}": do not reverse order of arguments, 2008-10-10) needs

164 + to be cherry-picked to 'maint'.

165 +

166 * "git filter-branch" failed to rewrite a tag name with slashes in it.

167

168 * "git push --tags --all $there" failed with generic usage message without

@@ -135,6 +174,6 @@ release, unless otherwise noted.

174

175 --

176 exec >/var/tmp/1

138 -O=v1.6.0.2-295-g34a5d35

177 +O=v1.6.0.2-529-g769b008

178 echo O=$(git describe master)

179 git shortlog --no-merges $O..master ^maint

Update draft release notes to 1.6.1