1c3f427882 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2009, #04; Wed, 09)

3 -X-master-at: 80d93611c55fec171e0d9aba98db079952f9d7aa

4 -X-next-at: 245e2a65f71e0255a90a3c45ea82bcdd19f85eff

2 +Subject: What's cooking in git.git (Dec 2009, #05; Mon, 28)

3 +X-master-at: c2ff10c98e22ae64d553273e6d67bb123a1c916f

4 +X-next-at: ba67783643e94c85cfa57edf932dea2abdf68711

5

6 -What's cooking in git.git (Dec 2009, #04; Wed, 09)

6 +What's cooking in git.git (Dec 2009, #05; Mon, 28)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -14,89 +14,140 @@ still holding onto them.

14 --------------------------------------------------

15 [Graduated to "master"]

16

17 -* jk/maint-add-p-delete-fix (2009-12-08) 1 commit.

18 - (merged to 'next' on 2009-12-08 at 3c2c08a)

19 - + add-interactive: fix deletion of non-empty files

20 -

21 -Fixes a regression in 1.6.5.3.

17 +* sr/vcs-helper (2009-12-07) 14 commits

18 + (merged to 'next' on 2009-12-07 at 8f041bc)

19 + + tests: handle NO_PYTHON setting

20 + (merged to 'next' on 2009-12-03 at e45b562)

21 + + builtin-push: don't access freed transport->url

22 + (merged to 'next' on 2009-11-27 at 83268ab)

23 + + Add Python support library for remote helpers

24 + + Basic build infrastructure for Python scripts

25 + + Allow helpers to report in "list" command that the ref is unchanged

26 + + Fix various memory leaks in transport-helper.c

27 + + Allow helper to map private ref names into normal names

28 + + Add support for "import" helper command

29 + + Allow specifying the remote helper in the url

30 + + Add a config option for remotes to specify a foreign vcs

31 + + Allow fetch to modify refs

32 + + Use a function to determine whether a remote is valid

33 + + Allow programs to not depend on remotes having urls

34 + + Fix memory leak in helper method for disconnect

35

23 -* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit.

24 - (merged to 'next' on 2009-12-03 at 2ced03c)

25 - + pull: clarify advice for the unconfigured error case

36 +* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit

37 + (merged to 'next' on 2009-10-11 at 043acdf)

38 + + send-email: make --no-chain-reply-to the default

39

27 -Replaces old 'jn/rfc-pull-rebase-error-message' topic.

40 +* jc/1.7.0-push-safety (2009-02-09) 2 commits

41 + (merged to 'next' on 2009-10-11 at 81b8128)

42 + + Refuse deleting the current branch via push

43 + + Refuse updating the current branch in a non-bare repository via push

44

29 ---------------------------------------------------

30 -[New Topics]

45 +* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits

46 + (merged to 'next' on 2009-10-11 at 546c74d)

47 + + diff.c: fix typoes in comments

48 + + Make test case number unique

49 + + diff: Rename QUIET internal option to QUICK

50 + + diff: change semantics of "ignore whitespace" options

51 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

52

32 -* cc/reset-more (2009-12-08) 6 commits

33 - - Documentation: reset: add some tables to describe the different options

34 - - Documentation: reset: describe new "--keep-local-changes" option

35 - - reset: add test cases for "--keep-local-changes" option

36 - - reset: add option "--keep-local-changes" to "git reset"

37 - - reset: use "unpack_trees()" directly instead of "git read-tree"

38 - - reset: add a few tests for "git reset --merge"

53 +This changes exit code from "git diff --ignore-whitespace" and friends

54 +when there is no actual output.

55

40 -The documentation is much clearer than the previous round in describing

41 -what it does, but I find it a bit unclear in describing what it is _good_

42 -for (iow, scenarios and use cases).

56 +* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit

57 + (merged to 'next' on 2009-11-21 at 3375bf4)

58 + + No diff -b/-w output for all-whitespace changes

59 + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

60

44 -Breaks 'pu' and does not pass test on its own yet.

61 +Likewise but for the output of "diff --git" headers.

62

46 -* tr/http-push-ref-status (2009-12-08) 3 commits

47 - - transport-helper.c::push_refs(): emit "no refs" error message

48 - - transport.c::transport_push(): make ref status affect return value

49 - - refactor ref status logic for pushing

63 +* jk/1.7.0-status (2009-12-11) 16 commits

64 + (merged to 'next' on 2009-12-24 at e9929b3)

65 + + status/commit: do not suggest "reset HEAD <path>" while merging

66 + + commit/status: "git add <path>" is not necessarily how to resolve

67 + + commit/status: check $GIT_DIR/MERGE_HEAD only once

68 + (merged to 'next' on 2009-12-08 at 9b57d84)

69 + + t7508-status: test all modes with color

70 + + t7508-status: status --porcelain ignores relative paths setting

71 + (merged to 'next' on 2009-12-07 at 7723acf)

72 + + status: reduce duplicated setup code

73 + + status: disable color for porcelain format

74 + (merged to 'next' on 2009-12-05 at 44dcefd)

75 + + status -s: obey color.status

76 + + builtin-commit: refactor short-status code into wt-status.c

77 + (merged to 'next' on 2009-11-27 at 91691ec)

78 + + t7508-status.sh: Add tests for status -s

79 + + status -s: respect the status.relativePaths option

80 + (merged to 'next' on 2009-11-21 at 884bb56)

81 + + docs: note that status configuration affects only long format

82 + (merged to 'next' on 2009-10-11 at 65c8513)

83 + + commit: support alternate status formats

84 + + status: add --porcelain output format

85 + + status: refactor format option parsing

86 + + status: refactor short-mode printing to its own function

87 + (this branch uses jc/1.7.0-status.)

88

51 ---------------------------------------------------

52 -[Stalled]

89 +Gives the --short output format to post 1.7.0 "git commit --dry-run" that

90 +is similar to that of post 1.7.0 "git status".

91

54 -* je/send-email-no-subject (2009-08-05) 1 commit.

55 - (merged to 'next' on 2009-10-11 at 1b99c56)

56 - + send-email: confirm on empty mail subjects

92 +* jc/1.7.0-status (2009-09-05) 4 commits

93 + (merged to 'next' on 2009-10-11 at 9558627)

94 + + status: typo fix in usage

95 + + git status: not "commit --dry-run" anymore

96 + + git stat -s: short status output

97 + + git stat: the beginning of "status that is not a dry-run of commit"

98 + (this branch is used by jk/1.7.0-status.)

99

58 -The existing tests cover the positive case (i.e. as long as the user says

59 -"yes" to the "do you really want to send this message that lacks subject",

60 -the message is sent) of this feature, but the feature itself needs its own

61 -test to verify the negative case (i.e. does it correctly stop if the user

62 -says "no"?)

100 +With this, "git status" is no longer "git commit --dry-run".

101

64 -* jc/checkout-merge-base (2009-11-20) 2 commits

65 - - "rebase --onto A...B" replays history on the merge base between A and B

66 - - "checkout A...B" switches to the merge base between A and B

102 +--------------------------------------------------

103 +[New Topics]

104

68 -I've been using the first one for a while myself but do not see many users

69 -want this (yet); the new feature is not urgent anyway.

105 +* jc/cache-unmerge (2009-12-25) 9 commits

106 + - rerere forget path: forget recorded resolution

107 + - rerere: refactor rerere logic to make it independent from I/O

108 + - rerere: remove silly 1024-byte line limit

109 + - resolve-undo: teach "update-index --unresolve" to use resolve-undo info

110 + - resolve-undo: "checkout -m path" uses resolve-undo information

111 + - resolve-undo: allow plumbing to clear the information

112 + - resolve-undo: basic tests

113 + - resolve-undo: record resolved conflicts in a new index extension section

114 + - builtin-merge.c: use standard active_cache macros

115

71 -* tr/maint-merge-ours-clarification (2009-11-15) 1 commit

72 - (merged to 'next' on 2009-11-21 at fadaf7b)

73 - + rebase: refuse to rebase with -s ours

116 +* js/filter-branch-prime (2009-12-15) 1 commit

117 + - filter-branch: remove an unnecessary use of 'git read-tree'

118

75 -I do not think we reached a concensus for solving conflicts between "give

76 -them rope" and "protect users from clearly meaningless combinations". The

77 -author obviously is for the latter (and I am inclined to agree); Dscho

78 -seems to think otherwise.

119 +* mg/tag-d-show (2009-12-10) 1 commit

120 + - tag -d: print sha1 of deleted tag

121

80 -* jc/fix-tree-walk (2009-10-22) 8 commits

81 - (merged to 'next' on 2009-10-22 at 10c0c8f)

82 - + Revert failed attempt since 353c5ee

83 - + read-tree --debug-unpack

84 - (merged to 'next' on 2009-10-11 at 0b058e2)

85 - + unpack-trees.c: look ahead in the index

86 - + unpack-trees.c: prepare for looking ahead in the index

87 - + Aggressive three-way merge: fix D/F case

88 - + traverse_trees(): handle D/F conflict case sanely

89 - + more D/F conflict tests

90 - + tests: move convenience regexp to match object names to test-lib.sh

122 +* sb/maint-octopus (2009-12-11) 3 commits

123 + - octopus: remove dead code

124 + - octopus: reenable fast-forward merges

125 + - octopus: make merge process simpler to follow

126

92 -This has some stupid bugs and reverted from 'next' until I can fix it, but

93 -the "temporarily" turned out to be very loooong. Sigh. We won't have a

94 -proper fix in 1.6.6.

127 +* il/exec-error-report (2009-12-24) 2 commits

128 + - Improve transport helper exec failure reporting

129 + - Report exec errors from run-command

130

131 --------------------------------------------------

132 [Cooking]

133

99 -* bg/maint-add-all-doc (2009-12-07) 4 commits.

134 +* jh/commit-status (2009-12-07) 1 commit

135 + - [test?] Add commit.status, --status, and --no-status

136 +

137 +* jc/checkout-merge-base (2009-11-20) 2 commits

138 + (merged to 'next' on 2009-12-24 at ff4d1d4)

139 + + "rebase --onto A...B" replays history on the merge base between A and B

140 + + "checkout A...B" switches to the merge base between A and B

141 +

142 +* tr/http-push-ref-status (2009-12-24) 6 commits

143 + - transport-helper.c::push_refs(): emit "no refs" error message

144 + - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed

145 + - transport.c::transport_push(): make ref status affect return value

146 + - refactor ref status logic for pushing

147 + - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs

148 + - t5541-http-push.sh: add tests for non-fast-forward pushes

149 +

150 +* bg/maint-add-all-doc (2009-12-07) 4 commits

151 - squash! rm documentation--also mention add-u where we mention commit-a

152 - git-rm doc: Describe how to sync index & work tree

153 - git-add/rm doc: Consistently back-quote

@@ -114,16 +165,21 @@ because I wrote the initial version) and this neatly fix it as well.

165 - Pass unknown protocols to external protocol handlers

166 - Support mandatory capabilities

167 - Add remote helper debug mode

117 - (this branch uses early parts of sr/vcs-helper.)

118 -

119 -Yet another round.

120 -

121 -* jh/commit-status (2009-12-07) 1 commit

122 - - [test?] Add commit.status, --status, and --no-status

168

169 * mm/diag-path-in-treeish (2009-12-07) 1 commit

170 - Detailed diagnosis when parsing an object name fails.

171

172 +* mh/rebase-fixup (2009-12-07) 2 commits

173 + - Add a command "fixup" to rebase --interactive

174 + - t3404: Use test_commit to set up test repository

175 + (this branch is used by ns/rebase-auto-squash.)

176 +

177 +Initial round of "fixup" action that is similar to "squash" action in

178 +"rebase -i" that excludes the commit log message from follow-up commits

179 +when composing the log message for the updated one. Expected is a further

180 +improvement to skip opening the editor if a pick is followed only by

181 +"fixup" and no "squash".

182 +

183 * ns/rebase-auto-squash (2009-12-08) 2 commits

184 - fixup! rebase -i --autosquash

185 - rebase -i --autosquash: auto-squash commits

@@ -142,8 +198,6 @@ Yet another round.

198 - Rename t9301 to t9350, to make room for more fast-import tests

199 - fast-import: Proper notes tree manipulation

200

145 -Rerolled and under discussion.

146 -

201 * fc/opt-quiet-gc-reset (2009-12-02) 1 commit

202 - General --quiet improvements

203

@@ -151,17 +205,6 @@ Rerolled and under discussion.

205 - Document date formats accepted by parse_date()

206 - builtin-commit: add --date option

207

154 -* mh/rebase-fixup (2009-12-07) 2 commits

155 - - Add a command "fixup" to rebase --interactive

156 - - t3404: Use test_commit to set up test repository

157 - (this branch is used by ns/rebase-auto-squash.)

158 -

159 -Initial round of "fixup" action that is similar to "squash" action in

160 -"rebase -i" that excludes the commit log message from follow-up commits

161 -when composing the log message for the updated one. Expected is a further

162 -improvement to skip opening the editor if a pick is followed only by

163 -"fixup" and no "squash".

164 -

208 * sr/gfi-options (2009-12-04) 7 commits

209 - fast-import: add (non-)relative-marks feature

210 - fast-import: allow for multiple --import-marks= arguments

@@ -171,8 +214,6 @@ improvement to skip opening the editor if a pick is followed only by

214 - fast-import: put marks reading in its own function

215 - fast-import: put option parsing code in separate functions

216

174 -Rerolled.

175 -

217 * ap/merge-backend-opts (2008-07-18) 6 commits

218 - Document that merge strategies can now take their own options

219 - Extend merge-subtree tests to test -Xsubtree=dir.

@@ -189,57 +230,16 @@ but otherwise seemed good.

230 - run test suite without dashed git-commands in PATH

231 - build dashless "bin-wrappers" directory similar to installed bindir

232

192 -Rerolled.

193 -

233 * tr/http-updates (2009-12-01) 3 commits

234 (merged to 'next' on 2009-12-07 at f08d447)

235 + Allow curl to rewind the RPC read buffer

236 + Add an option for using any HTTP authentication scheme, not only basic

237 + http: maintain curl sessions

238

200 -* jc/diff-whitespace-prepare (2009-11-28) 2 commits

201 - - diff: flip the default diff.bwoutputonly to true

202 - - diff: optionally allow traditional "-b/-w affects only output" semantics

203 - (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.)

204 -

205 -This was to redo the two -b/-w semantic changes to prepare the migration of

206 -existing users before 1.7.0 happens, but I think we should drop it.

207 -

208 -Comments?

209 -

210 -* sr/vcs-helper (2009-12-07) 14 commits

211 - (merged to 'next' on 2009-12-07 at 8f041bc)

212 - + tests: handle NO_PYTHON setting

213 - (merged to 'next' on 2009-12-03 at e45b562)

214 - + builtin-push: don't access freed transport->url

215 - (merged to 'next' on 2009-11-27 at 83268ab)

216 - + Add Python support library for remote helpers

217 - + Basic build infrastructure for Python scripts

218 - + Allow helpers to report in "list" command that the ref is unchanged

219 - + Fix various memory leaks in transport-helper.c

220 - + Allow helper to map private ref names into normal names

221 - + Add support for "import" helper command

222 - + Allow specifying the remote helper in the url

223 - + Add a config option for remotes to specify a foreign vcs

224 - + Allow fetch to modify refs

225 - + Use a function to determine whether a remote is valid

226 - + Allow programs to not depend on remotes having urls

227 - + Fix memory leak in helper method for disconnect

228 - (this branch shares commits with il/vcs-helper.)

229 -

230 -Should be among the first to graduate after 1.6.6 final.

231 -

232 -* tr/reset-checkout-patch (2009-11-19) 1 commit.

233 - (merged to 'next' on 2009-11-22 at b224950)

234 - + {checkout,reset} -p: make patch direction configurable

235 -

236 -I do not particularly like a configuration like this that changes the

237 -behaviour of a command in a drastic way---it will make helping others

238 -much harder.

239 -

240 -Comments?

241 -

242 -* nd/sparse (2009-11-25) 20 commits.

239 +* nd/sparse (2009-12-14) 22 commits

240 + (merged to 'next' on 2009-12-24 at 1fa9ff3)

241 + + commit: correctly respect skip-worktree bit

242 + + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID

243 (merged to 'next' on 2009-11-25 at 71380f5)

244 + tests: rename duplicate t1009

245 (merged to 'next' on 2009-11-23 at f712a41)

@@ -263,127 +263,45 @@ Comments?

263 + Add test-index-version

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

265

266 -There were some test glitches reported and at least one test seems to

267 -be broken in the sense that it is not testing what it is trying to.

268 -Fix-up expected.

269 -

266 --------------------------------------------------

271 -[For 1.7.0]

272 -

273 -* jk/1.7.0-status (2009-12-08) 13 commits.

274 - (merged to 'next' on 2009-12-08 at 9b57d84)

275 - + t7508-status: test all modes with color

276 - + t7508-status: status --porcelain ignores relative paths setting

277 - (merged to 'next' on 2009-12-07 at 7723acf)

278 - + status: reduce duplicated setup code

279 - + status: disable color for porcelain format

280 - (merged to 'next' on 2009-12-05 at 44dcefd)

281 - + status -s: obey color.status

282 - + builtin-commit: refactor short-status code into wt-status.c

283 - (merged to 'next' on 2009-11-27 at 91691ec)

284 - + t7508-status.sh: Add tests for status -s

285 - + status -s: respect the status.relativePaths option

286 - (merged to 'next' on 2009-11-21 at 884bb56)

287 - + docs: note that status configuration affects only long format

288 - (merged to 'next' on 2009-10-11 at 65c8513)

289 - + commit: support alternate status formats

290 - + status: add --porcelain output format

291 - + status: refactor format option parsing

292 - + status: refactor short-mode printing to its own function

293 - (this branch uses jc/1.7.0-status.)

294 -

295 -Gives the --short output format to post 1.7.0 "git commit --dry-run" that

296 -is similar to that of post 1.7.0 "git status".

297 -

298 -Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a

299 -few commits at the tip, as "docs: affects only long format" describes a

300 -limitation that has disappeared.

267 +[Ejected]

268

302 -* jc/1.7.0-status (2009-09-05) 4 commits.

303 - (merged to 'next' on 2009-10-11 at 9558627)

304 - + status: typo fix in usage

305 - + git status: not "commit --dry-run" anymore

306 - + git stat -s: short status output

307 - + git stat: the beginning of "status that is not a dry-run of commit"

308 - (this branch is used by jk/1.7.0-status.)

309 -

310 -With this, "git status" is no longer "git commit --dry-run".

311 -

312 -* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.

313 - (merged to 'next' on 2009-10-11 at 043acdf)

314 - + send-email: make --no-chain-reply-to the default

315 -

316 -As the title says.

317 -

318 -* jc/1.7.0-push-safety (2009-02-09) 2 commits.

319 - (merged to 'next' on 2009-10-11 at 81b8128)

320 - + Refuse deleting the current branch via push

321 - + Refuse updating the current branch in a non-bare repository via push

322 -

323 -* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.

324 - (merged to 'next' on 2009-10-11 at 546c74d)

325 - + diff.c: fix typoes in comments

326 - + Make test case number unique

327 - + diff: Rename QUIET internal option to QUICK

328 - + diff: change semantics of "ignore whitespace" options

329 - (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

330 -

331 -This changes exit code from "git diff --ignore-whitespace" and friends

332 -when there is no actual output. It is a backward incompatible change,

333 -and jc/diff-whitespace-prepare topic is meant to ease the transition.

334 -

335 -* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit

336 - (merged to 'next' on 2009-11-21 at 3375bf4)

337 - + No diff -b/-w output for all-whitespace changes

338 - (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.)

339 -

340 -Likewise but for the output of "diff --git" headers.

341 -

342 -* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits

343 - - diff: disable diff.bwoutputonly warning

344 - - diff: flip the diff.bwoutputonly default to false

345 - (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.)

346 -

347 -And this is to actually flip the default and eventually remove the warning.

348 -As I am contemplating of dropping jc/diff-whitespace-prepare, this should

349 -also be dropped as well.

350 -

351 -* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit

352 - - send-email: make --no-chain-reply-to the default

353 -

354 -And this is to actually flip the default in 1.7.0.

269 +* je/send-email-no-subject (2009-08-05) 1 commit

270 + (merged to 'next' on 2009-10-11 at 1b99c56)

271 + + send-email: confirm on empty mail subjects

272

356 ---------------------------------------------------

357 -[Reverted from 'next']

358 -

359 -* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits.

360 - (merged to 'next' on 2009-11-25 at 8aa62a0)

361 - + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)"

362 - (merged to 'next' on 2009-11-22 at 4ba5880)

363 - + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)

364 -

365 -This is a revert of the tip one I merged prematurely to 'next'. The real

366 -fix from Ramsay is already in 'master'.

367 -

368 -* ks/precompute-completion (2009-11-15) 4 commits.

369 - (merged to 'next' on 2009-11-15 at 23cdb96)

370 - + Revert ks/precompute-completion series

371 - (merged to 'next' on 2009-10-28 at cd5177f)

372 - + completion: ignore custom merge strategies when pre-generating

373 - (merged to 'next' on 2009-10-22 at f46a28a)

374 - + bug: precomputed completion includes scripts sources

375 - (merged to 'next' on 2009-10-14 at adf722a)

376 - + Speedup bash completion loading

377 -

378 -Reverted out of 'next', to be replaced with jn/faster-completion-startup

379 -topic.

273 +* jc/fix-tree-walk (2009-10-22) 8 commits

274 + (merged to 'next' on 2009-10-22 at 10c0c8f)

275 + + Revert failed attempt since 353c5ee

276 + + read-tree --debug-unpack

277 + (merged to 'next' on 2009-10-11 at 0b058e2)

278 + + unpack-trees.c: look ahead in the index

279 + + unpack-trees.c: prepare for looking ahead in the index

280 + + Aggressive three-way merge: fix D/F case

281 + + traverse_trees(): handle D/F conflict case sanely

282 + + more D/F conflict tests

283 + + tests: move convenience regexp to match object names to test-lib.sh

284

381 ---------------------------------------------------

382 -[Haven't been purged from 'pu' yet]

285 +This has some stupid bugs and reverted from 'next' until I can fix it, but

286 +the "temporarily" turned out to be very loooong.

287

384 -* jc/grep-full-tree (2009-11-24) 1 commit.

385 - - grep: --full-tree

288 +* jc/grep-full-tree (2009-11-24) 1 commit

289 + . grep: --full-tree

290

291 The interaction with this option and pathspecs need to be worked out

292 better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from

293 all the header files in the tree, for example.

294 +

295 +* cc/reset-more (2009-12-08) 6 commits

296 + . Documentation: reset: add some tables to describe the different options

297 + . Documentation: reset: describe new "--keep-local-changes" option

298 + . reset: add test cases for "--keep-local-changes" option

299 + . reset: add option "--keep-local-changes" to "git reset"

300 + . reset: use "unpack_trees()" directly instead of "git read-tree"

301 + . reset: add a few tests for "git reset --merge"

302 +

303 +The documentation is much clearer than the previous round in describing

304 +what it does, but I find it a bit unclear in describing what it is _good_

305 +for (iow, scenarios and use cases).

306 +

307 +Breaks 'pu' and does not pass test on its own yet.

What's cooking (2009/12 #05)