764dfde554 · matheusbsbs/matheus-bagliano

@@ -1,8 +1,8 @@

1 -Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)

2 -X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1

3 -X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458

1 +Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06)

2 +X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed

3 +X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3

4

5 -What's cooking in git.git (Sep 2008, #05; Mon, 29)

5 +What's cooking in git.git (Oct 2008, #01; Mon, 06)

6 --------------------------------------------------

7

8 Here are the topics that have been cooking. Commits prefixed

@@ -12,203 +12,211 @@ in 'next'.

12 The topics list the commits in reverse chronological order. The topics

13 meant to be merged to the maintenance series have "maint-" in their names.

14

15 -If I have dropped anything recently its not because I don't want

16 -to apply it, it just slipped through the cracks. Please feel free

17 -to give me a gentle prod (and a patch resend or a pointer to the

18 -series on gmane). Thanks.

15 +Topics aren't sorted by name; I have tried to cluster them together

16 +to tell the story of how 'next' and 'pu' have evolved this past week.

17

18 ----------------------------------------------------------------

19 [New Topics]

20

23 -* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits

24 - - gitweb: generate parent..current URLs

25 - - gitweb: parse parent..current syntax from pathinfo

26 - - gitweb: generate project/action/hash URLs

27 - - gitweb: parse project/action/hash_base:filename PATH_INFO

21 +* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit

22 + . docs: Improve the description of describe --tags

23

29 -This series just came in today. I haven't had a chance to look at

30 -it beyond stashing in `pu`.

24 +I'm probably going to drop this topic if I can ever get around to

25 +formally writing and posting sp/describe-lwtag for review.

26

32 -* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits

33 - - send-email: signedoffcc -> signedoffbycc, but handle both

34 - - Docs: send-email: Create logical groupings for man text

35 - - Docs: send-email: Remove unnecessary config variable description

36 - - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to

37 - - send-email: change --no-validate to boolean --[no-]validate

38 - - Docs: send-email: Man page option ordering

39 - - Docs: send-email usage text much sexier

40 - - Docs: send-email's usage text and man page mention same options

27 +* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit

28 + - [WIP] Change meaning of --tags and --all

29

42 -This series has already gone through 3 iterations before I could

43 -start to carry it in-tree. I haven't had a chance to read it yet

44 -myself, so its sitting around in `pu` for futher review.

30 +Modifies "git describe --tags" to allow matching against lightweight

31 +tags even when an annotated tag is found in the history. Its not

32 +in next because I haven't formally written a commit message and

33 +posted the patch for discussion on the list.

34

46 -* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits

47 - - gitweb: Sort the list of forks on the summary page by age

48 - - gitweb: Clean-up sorting of project list

35 +This is a fairly significant change in behavior. Its most certainly

36 +1.6.1 material, but many argue the change is the _correct_ behavior

37 +and the current behavior in 1.6.0 is buggy.

38

50 -I forgot to look at this series today. I meant to review and try

51 -to merge it to `next` before publishing. Will do that tomorrow.

39 +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits

40 + - diff: add filter for converting binary to text

41 + - diff: introduce diff.<driver>.binary

42 + - diff: unify external diff and funcname parsing code

43 + - t4012: use test_cmp instead of cmp

44

53 -* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits

54 - - git pull: Support --preserve-merges as a flag to rebase

55 - - git rebase: Support non-interactive merge-preserving rebase

56 - - Prepare for non-interactive merge-preserving rebase

45 +A general cleanup on how diff drivers are implemented. Its still

46 +missing documentation updates and tests but doesn't break anything

47 +current as far as I can tell. It needs more review before it can

48 +be slated for 'next'.

49

58 -Andreas says there's some issues in here. I'm waiting for a respin

59 -on the series before I look at it futher.

50 +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit

51 + - Do not rename read-only files during a push

52

61 -* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit

62 - - make prune report removed objects on -v

53 +Supposedly fixes pack file renames on Windows, but it makes the

54 +test suite fail on Linux. I haven't debugged why yet. Its very

55 +likely we need a replacement patch before this can move forward.

56

64 -Just came in today. Looks sane. I'll drop it onto `next` tomorrow.

57 +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit

58 + - format-patch: autonumber by default

59

66 -----------------------------------------------------------------

67 -[Graduated to "master"]

68 -

69 -* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits

70 - + builtin-merge: release the lockfile in try_merge_strategy()

71 - + merge-recursive: get rid of virtual_id

72 - + merge-recursive: move current_{file,directory}_set to struct

73 - merge_options

74 - + merge-recursive: move the global obuf to struct merge_options

75 - + merge-recursive: get rid of the index_only global variable

76 - + merge-recursive: move call_depth to struct merge_options

77 - + cherry-pick/revert: make direct internal call to merge_tree()

78 - + builtin-merge: avoid run_command_v_opt() for recursive and subtree

79 - + merge-recursive: introduce merge_options

80 - + merge-recursive.c: Add more generic merge_recursive_generic()

81 - + Split out merge_recursive() to merge-recursive.c

82 -

83 -(Tip at 4271666)

84 -

85 -* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit

86 - + diff --dirstat-by-file: count changed files, not lines

87 -

88 -(Tip at fd33777)

89 -

90 -* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit

91 - + safe_create_leading_directories(): make it about "leading"

92 - directories

93 -

94 -(Tip at 5f0bdf5)

95 -

96 -* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit

97 - + git-apply:--include=pathspec

98 -

99 -(Tip at 6ecb1ee)

100 -

101 -* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits

102 - + t7603: add new testcases to ensure builtin-commit uses

103 - reduce_heads()

104 - + builtin-commit: use commit_tree()

105 - + commit_tree(): add a new author parameter

106 -

107 -(Tip at 7a172b0)

108 -

109 -* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit

110 - + git wrapper: also use aliases to correct mistyped commands

111 -

112 -(Tip at 746c221)

113 -

114 -* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits

115 - + Fix AsciiDoc errors in merge documentation

116 - + git-merge documentation: describe how conflict is presented

117 - + checkout --conflict=<style>: recreate merge in a non-default style

118 - + checkout -m: recreate merge when checking out of unmerged index

119 - + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-

120 - resolution'

121 - + git-merge-recursive: learn to honor merge.conflictstyle

122 - + merge.conflictstyle: choose between "merge" and "diff3 -m" styles

123 - + rerere: understand "diff3 -m" style conflicts with the original

124 - + rerere.c: use symbolic constants to keep track of parsing states

125 - + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or

126 - less

127 - + xmerge.c: minimum readability fixups

128 - + xdiff-merge: optionally show conflicts in "diff3 -m" style

129 - + xdl_fill_merge_buffer(): separate out a too deeply nested function

130 - + checkout --ours/--theirs: allow checking out one side of a

131 - conflicting merge

132 - + checkout -f: allow ignoring unmerged paths when checking out of

133 - the index

134 -

135 -(Tip at 3407a7a)

136 -

137 -* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits

138 - + push: receiver end advertises refs from alternate repositories

139 - + push: prepare sender to receive extended ref information from the

140 - receiver

141 - + receive-pack: make it a builtin

142 - + is_directory(): a generic helper function

143 -

144 -(Tip at d79796b)

145 -

146 -* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits

147 - + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-

148 - hunk-header-fix

149 - + diff hunk pattern: fix misconverted "\{" tex macro introducers

150 - + diff: fix "multiple regexp" semantics to find hunk header comment

151 - + diff: use extended regexp to find hunk headers

152 - + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-

153 - hunk-header-fix

154 - + diff: use extended regexp to find hunk headers

155 - + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-

156 - hunk-header-fix

157 - + diff.*.xfuncname which uses "extended" regex's for hunk header

158 - selection

159 - + diff.c: associate a flag with each pattern and use it for

160 - compiling regex

161 - + diff.c: return pattern entry pointer rather than just the hunk

162 - header pattern

163 -

164 -(Tip at 92bb978)

165 -

166 -* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits

167 - + wt-status: Teach how to discard changes in the working directory

168 - + wt-status: Split header generation into three functions

169 -

170 -(Tip at 4d6e4c4)

171 -

172 -* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit

173 - + make "git remote" report multiple URLs

174 -

175 -(Tip at 7d20e21)

176 -

177 -* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits

178 - + diff hunk pattern: fix misconverted "\{" tex macro introducers

179 - + diff: use extended regexp to find hunk headers

180 - + diff.*.xfuncname which uses "extended" regex's for hunk header

181 - selection

182 - + diff.c: associate a flag with each pattern and use it for

183 - compiling regex

184 - + diff.c: return pattern entry pointer rather than just the hunk

185 - header pattern

186 -

187 -(Tip at 96d1a8e)

60 +Fails the test suite; some of the test vectors need to be updated

61 +to account for the new default. Someone who cares about this

62 +change should follow through on the test suite update, or this may

63 +get dropped.

64 +

65 +* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit

66 + + Fix interactive rebase on dropped commits.

67 +

68 +This merged to next, then was reverted out this morning, due to

69 +the introduction of the sh/maint-rebase3. Its dead and will be

70 +dropped from the next "What's cooking" release notes.

71 +

72 +* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit

73 + - rebase--interactive: fix parent rewriting for dropped commits

74 +

75 +A replacement for sh/maint-intrebase. Its in pu because I have

76 +gotten 3 different versions of this patch, two of them posted a

77 +full 4 days after I merged the first version into next. I felt

78 +burned by the patch author for not keeping up with my tree, so I'm

79 +not merging the patch to next.

80 +

81 +At this point its going to sit in pu until Junio comes back.

82 +I think the topic needs a few more days to settle to see if the

83 +patch author is going to submit any more revisions.

84 +

85 +* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit

86 + + rebase --no-verify

87 +

88 +This adds --no-verify to git rebase, to avoid the pre-rebase hook.

89 +Lacks documentation but otherwise looks sound.

90 +

91 +* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit

92 + + builtin-commit: use reduce_heads() only when appropriate

93 +

94 +Fixes "git merge --no-ff --no-commit".

95 +

96 +* dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits

97 + + cygwin: Use native Win32 API for stat

98 + + mingw: move common functionality to win32.h

99 + + add have_git_dir() function

100 +

101 +Performance improvement for Cygwin, bypassing the Cygwin stat

102 +function and using one more like MinGW uses. Probably ready for

103 +master on the next round. Several Cygwin users have given praise

104 +to the series.

105 +

106 +* js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit

107 + + Teach git diff about Objective-C syntax

108 +

109 +Adds support for Objective-C function headers. I don't use

110 +Objective-C so I can't comment on how good/bad the patterns are

111 +for the language. Feedback (and improvements if necessary) from

112 +Objective-C users would be appreciated.

113 +

114 +* dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit

115 + + Add git-svn branch to allow branch creation in SVN repositories

116 +

117 +Adds "git svn branch" to build branches remotely in SVN.

118 +

119 +Might be ready for master, it has an ACK from Eric. Slated into next

120 +just because I wasn't sure if Junio merges such things immediately

121 +into master or lets them cook for a bit.

122 +

123 +* pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits

124 + + Merge branch 'pb/gitweb-tagcloud' into pb/gitweb

125 + + gitweb: Support for simple project search form

126 + + gitweb: Make the by_tag filter delve in forks as well

127 + + gitweb: Support for tag clouds

128 + + gitweb: Add support for extending the action bar with custom links

129 + + gitweb: Sort the list of forks on the summary page by age

130 + + gitweb: Clean-up sorting of project list

131 +

132 +I may have been a bad interm maintainer here by shoving together

133 +two different gitweb series from Pasky. Overall the combined set

134 +looks ready to me.

135 +

136 +* ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits

137 + + parse-opt: migrate builtin-merge-file.

138 + + parse-opt: migrate git-merge-base.

139 + + parse-opt: migrate fmt-merge-msg.

140 +

141 +* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit

142 + + git grep: Add "-z/--null" option as in GNU's grep.

143 +

144 +* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit

145 + + builtin-merge: refresh the index before calling a strategy

146 +

147 +* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit

148 + + xdiff-interface.c: strip newline (and cr) from line before pattern

149 + matching

150 +

151 +* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit

152 + + rebase: Support preserving merges in non-interactive mode

153 +

154 +These last five all look ready for master, but should cook longer

155 +than just a few days.

156

157 ----------------------------------------------------------------

158 [Old New Topics]

159

192 -* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits

193 - - grep: skip files that have not been checked out

160 +* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits

161 + + bash completion: Add --[no-]validate to "git send-email"

162 + + send-email: signedoffcc -> signedoffbycc, but handle both

163 + + Docs: send-email: Create logical groupings for man text

164 + + Docs: send-email: Create logical groupings for --help text

165 + + Docs: send-email: Remove unnecessary config variable description

166 + + Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to

167 + + send-email: change --no-validate to boolean --[no-]validate

168 + + Docs: send-email: Man page option ordering

169 + + Docs: send-email usage text much sexier

170 + + Docs: send-email's usage text and man page mention same options

171 +

172 +This series looks pretty good to me. It probably can merge to

173 +master on the next "What's cooking" cycle.

174 +

175 +----------------------------------------------------------------

176 +[Dropped Topics]

177 +

178 +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit

179 + + merge: remove deprecated summary and diffstat options and config

180 + variables

181 +

182 +This has been reverted from next and is being dropped. Its too

183 +soon to remove a feature that was just added in 1.5.6 timeframe.

184 +Perhaps in 1.7.0 this can be revisited.

185 +

186 +----------------------------------------------------------------

187 +[Stuck Topics]

188 +

189 +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits

190 + - grep: skip files outside sparse checkout area

191 - checkout_entry(): CE_NO_CHECKOUT on checked out entries.

195 - - Prevent diff machinery from examining worktree outside narrow

192 + - Prevent diff machinery from examining worktree outside sparse

193 checkout

197 - - Add tests for updating no-checkout entries in index

198 - - ls-files: add --narrow-checkout option to "will checkout" entries

194 + - ls-files: Add tests for --sparse and friends

195 - update-index: add --checkout/--no-checkout to update

196 CE_NO_CHECKOUT bit

197 - update-index: refactor mark_valid() in preparation for new options

198 + - ls-files: add options to support sparse checkout

199 - Introduce CE_NO_CHECKOUT bit

200 - Extend index to save more flags

201

205 -[jc: This is an early half of the earlier series (I haven't had

206 - chance to look at the updated series yet), and should be replaced

207 - with the updated one posted recently.]

202 +Recently updated with a repost. I've been too swamped at day-job

203 +to actively review the series. There has been some discussion on

204 +list about it so its not stalled, but it needs more eyeballs.

205

209 -I haven't touched this branch since I inherited it from Junio.

210 -I'd appreciate a resend or a pointer to the updated series so I

211 -can at least replace it.

206 +* gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits

207 + - gitweb: generate parent..current URLs

208 + - gitweb: parse parent..current syntax from pathinfo

209 + - gitweb: use_pathinfo filenames start with /

210 + - gitweb: generate project/action/hash URLs

211 + - gitweb: refactor input parameters parse/validation

212 + - gitweb: parse project/action/hash_base:filename PATH_INFO

213 +

214 +Still going through revisions on the git ML. Its great work and

215 +is heading in the right direction. But the discussion and patch

216 +generation rate is too high to merge the topic into next just yet.

217 +

218 +So its waiting for a re-roll of the series once discussion settles

219 +down and there is a final patch series available.

220

221 ----------------------------------------------------------------

222 [Stalled -- Needs Action to Proceed (or to be dropped)]

@@ -216,7 +224,8 @@ can at least replace it.

224 * pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit

225 - t7400: Add short "git submodule add" testsuite

226

219 -[jc: Waiting for a reroll.]

227 +Still waiting for a reroll. Should be dropped next week if we

228 +don't get one during this coming week.

229

230 * bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits

231 - Use xdiff caching to improve git blame performance

@@ -225,14 +234,14 @@ can at least replace it.

234 - Bypass textual patch generation and parsing in git blame

235 - Allow alternate "low-level" emit function from xdl_diff

236

228 -[jc: Réne had good comments on how the callback should be

229 - structured.]

237 +(jc: Réne had good comments on how the callback should be

238 + structured.)

239

240 * kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit

241 - git-am: Pass the --directory option through to git-apply

242

234 -[jc: I think this is still buggy and drops the option when am stops

235 - with conflicts.]

243 +(jc: I think this is still buggy and drops the option when am stops

244 + with conflicts.)

245

246 All three of these are stalled. I'm not going to drop them just

247 yet, but Junio's comments still hold. If there's no action on

@@ -245,11 +254,36 @@ these next week we may seem them drop off.

254 + git-add --intent-to-add (-N)

255

256 Teaches "git add" to record only the intent to add a path later.

248 -[jc: I rerolled this without the fake empty blob object.]

257 +(jc: I rerolled this without the fake empty blob object.)

258 +

259 +* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit

260 + + make prune report removed objects on -v

261 +

262 +This is a pretty trivial new feature.

263 +

264 +* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits

265 + + tutorial: update output of git commit

266 + + reformat informational commit message

267 + + git commit: Reformat output somewhat

268 + + builtin-commit.c: show on which branch a commit was added

269 +

270 +I think this topic is settled for now.

271

250 -I'm inclined to merge this next week.

272 +* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit

273 + + Makefile: do not set NEEDS_LIBICONV for Solaris 8

274

252 -(Tip at 3942581)

275 +* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits

276 + + rebase -i: remove leftover debugging

277 + + rebase -i: proper prepare-commit-msg hook argument when squashing

278 +

279 +* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit

280 + + git-stash.sh: fix flawed fix of invalid ref handling (commit

281 + da65e7c1)

282 +

283 +The latter three are ready for 'maint'. I felt burned by a bad

284 +commit into made directly into maint earlier in the week so these

285 +wound up getting queued into 'next' first, even though they are

286 +certainly maint material.

287

288 ----------------------------------------------------------------

289 [Actively Cooking]

@@ -258,25 +292,15 @@ I'm inclined to merge this next week.

292 + Documentation: Refer to git-rebase(1) to warn against rewriting

293 + Documentation: new upstream rebase recovery section in git-rebase

294

261 -[jc: My impression from the last round of discusson on the third

295 +(jc: My impression from the last round of discusson on the third

296 patch in this series (not queued here) was that as long as we

297 do not present it as "One True Workflow", the description was

298 a good starting point, possibly others to add other recommended

265 - flows later.]

299 + flows later.)

300

267 -I haven't looked at this series yet. Based on Junios remarks above

301 +I haven't looked at this series yet. Based on Junio's remarks above

302 I'm looking for more input on this series before it goes anywhere.

303

270 -* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit

271 - + builtin-commit.c: show on which branch a commit was added

272 -

273 -[jc: Tentatively kicked back to "still cooking" status after

274 - Jeff voiced his annoyance. I personally do not like making this

275 - multi-line as Jeff suggested as an alternative (the message already

276 - is too verbose to my taste).]

277 -

278 -Agree with Junio. Hence its still here.

279 -

304 * lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit

305 + date/time: do not get confused by fractional seconds

306

@@ -292,7 +316,8 @@ has no notes on this branch and why it hasn't merged yet.

316 - revision --simplify-merges: incremental simplification

317 - revision --simplify-merges: prepare for incremental simplification

318

295 -[jc: I started making this incremental but the progress is not so great.]

319 +(jc: I started making this incremental but the progress is not

320 + so great.)

321

322 * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits

323 - git-am --forge: add Signed-off-by: line for the author

@@ -303,39 +328,29 @@ has no notes on this branch and why it hasn't merged yet.

328 - Add "git am -s" test

329 - git-am: refactor code to add signed-off-by line for the committer

330

306 -[jc: The one at second from the tip needs reworking.]

331 +(jc: The one at second from the tip needs reworking.)

332

333 * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit

334 - "git push": tellme-more protocol extension

335

311 -* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit

312 - . WIP: start teaching the --whitespace=fix to merge machinery

313 -

314 -This has a merge conflict with `next` and isn't even in pu right now.

336 +This is a great idea, but IIRC its implementation has a deadlock

337 +during communication between the peers. Someone needs to pick up

338 +this topic and resolve the deadlock before it can continue.

339

340 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits

341 - blame: show "previous" information in --porcelain/--incremental

342 format

343 - git-blame: refactor code to emit "porcelain format" output

344

321 -I should look at this in more detail. We may be able to merge it

322 -to next soon-ish.

323 -

324 -* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit

325 - + merge: remove deprecated summary and diffstat options and config

326 - variables

345 +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit

346 + . WIP: start teaching the --whitespace=fix to merge machinery

347

328 -[jc: This was previously in "will be in master soon" category,

329 - but it turns out that the synonyms to the ones this one deletes

330 - are fairly new invention that happend in 1.5.6 timeframe, and

331 - we cannot do this just yet. Perhaps in 1.7.0, but with the loud

332 - whining about moving git-foo out of $PATH we have been hearing,

333 - it might not be a bad idea to drop this.]

348 +This has a merge conflict with `next` and isn't even in pu right now.

349

350 * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit

351 - diff: enable "too large a rename" warning when -M/-C is explicitly

352 asked for

353

339 -[jc: This would be the right thing to do for command line use,

354 +(jc: This would be the right thing to do for command line use,

355 but gitk will be hit due to tcl/tk's limitation, so I am holding

341 - this back for now.]

356 + this back for now.)

What's cooking (2008/10 #01)