4071fba232 · matheusbsbs/matheus-bagliano

@@ -1,158 +1,87 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2015, #04; Mon, 13)

4 -X-master-at: 01977f46cb48e2894e335667eaabce274174ac5e

5 -X-next-at: 96fd69be6df34ee40ec1cf02764f3ddd6e3f6a83

3 +Subject: What's cooking in git.git (Jul 2015, #05; Mon, 20)

4 +X-master-at: fbdeabf1f0992e41237caee8fc357849e0038a82

5 +X-next-at: 76e840bed084a99e9de166e429c25bc0b2d6a698

6

7 -What's cooking in git.git (Jul 2015, #04; Mon, 13)

7 +What's cooking in git.git (Jul 2015, #05; Mon, 20)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -2.5.0-rc2 today, 2.5.0-rc3 next week today. We'll judge when to end

15 -the cycle, reviewing what we have, at that point.

16 -

14 You can find the changes described here in the integration branches

15 of the repositories listed at

16

17 http://git-blame.blogspot.com/p/git-public-repositories.html

18

19 --------------------------------------------------

23 -[Graduated to "master"]

24 -

25 -* es/worktree-add (2015-07-12) 24 commits

26 - (merged to 'next' on 2015-07-12 at 4926868)

27 - + Revert "checkout: retire --ignore-other-worktrees in favor of --force"

28 - (merged to 'next' on 2015-07-10 at 304e329)

29 - + checkout: retire --ignore-other-worktrees in favor of --force

30 - + worktree: add: auto-vivify new branch when <branch> is omitted

31 - + worktree: add: make -b/-B default to HEAD when <branch> is omitted

32 - + worktree: extract basename computation to new function

33 - + checkout: require worktree unconditionally

34 - + checkout: retire --to option

35 - + tests: worktree: retrofit "checkout --to" tests for "worktree add"

36 - + worktree: add -b/-B options

37 - + worktree: add --detach option

38 - + worktree: add --force option

39 - + worktree: introduce "add" command

40 - + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout

41 - + checkout: make --to unconditionally verbose

42 - + checkout: prepare_linked_checkout: drop now-unused 'new' argument

43 - + checkout: relocate --to's "no branch specified" check

44 - + checkout: fix bug with --to and relative HEAD

45 - + Documentation/git-worktree: add EXAMPLES section

46 - + Documentation/git-worktree: add high-level 'lock' overview

47 - + Documentation/git-worktree: split technical info from general description

48 - + Documentation/git-worktree: add BUGS section

49 - + Documentation: move linked worktree description from checkout to worktree

50 - + Documentation/git-worktree: associate options with commands

51 - + Documentation/git-checkout: fix incorrect worktree prune command

52 - (this branch is used by es/worktree-add-cleanup; uses nd/multiple-work-trees.)

53 -

54 - Update to the "linked checkout" in 2.5.0-rc1.

55 -

56 - Instead of "checkout --to" that does not do what "checkout"

57 - normally does, move the functionality to "git worktree add".

58 -

59 - As this makes the end-user experience of the "worktree add" more or

60 - less complete, I am tempted to say we should cook the other topic

61 - that removes the internal "new-worktree-mode" hack from "checkout"

62 - a bit longer in 'next', and release 2.5 final without that one.

63 -

64 -

65 -* et/http-proxyauth (2015-06-29) 1 commit

66 - (merged to 'next' on 2015-07-09 at cf80874)

67 - + http: always use any proxy auth method available

68 -

69 - We used to ask libCURL to use the most secure authentication method

70 - available when talking to an HTTP proxy only when we were told to

71 - talk to one via configuration variables. We now ask libCURL to

72 - always use the most secure authentication method, because the user

73 - can tell libCURL to use an HTTP proxy via an environment variable

74 - without using configuration variables.

75 -

76 -

77 -* jc/fsck-retire-require-eoh (2015-06-28) 1 commit

78 - (merged to 'next' on 2015-07-09 at dbc292b)

79 - + fsck: it is OK for a tag and a commit to lack the body

80 -

81 - A fix to a minor regression to "git fsck" in v2.2 era that started

82 - complaining about a body-less tag object when it lacks a separator

83 - empty line after its header to separate it with a non-existent body.

20 +[New Topics]

21

22 +* zb/userdiff-fountain (2015-07-17) 1 commit

23 + - userdiff: add support for Fountain documents

24

86 -* jc/unexport-git-pager-in-use-in-pager (2015-07-03) 1 commit

87 - (merged to 'next' on 2015-07-09 at bff19cd)

88 - + pager: do not leak "GIT_PAGER_IN_USE" to the pager

25 + New userdiff pattern definition for fountain screenwriting markup

26 + format.

27

90 - When you say "!<ENTER>" while running say "git log", you'd confuse

91 - yourself in the resulting shell, that may look as if you took

92 - control back to the original shell you spawned "git log" from but

93 - that isn't what is happening. To that new shell, we leaked

94 - GIT_PAGER_IN_USE environment variable that was meant as a local

95 - communication between the original "Git" and subprocesses that was

96 - spawned by it after we launched the pager, which caused many

97 - "interesting" things to happen, e.g. "git diff | cat" still paints

98 - its output in color by default.

28 + Needs another reroll? ($gmane/274354)

29

100 - Stop leaking that environment variable to the pager's half of the

101 - fork; we only need it on "Git" side when we spawn the pager.

30

31 +* as/sparse-checkout-removal (2015-07-17) 1 commit

32 + - unpack-trees: don't update files with CE_WT_REMOVE set

33

104 -* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits

105 - (merged to 'next' on 2015-07-09 at b844d9a)

106 - + rebase -i: do not leave a CHERRY_PICK_HEAD file behind

107 - + t3404: demonstrate CHERRY_PICK_HEAD bug

34 + Duy's replacement needs to be applied ($gmane/274158).

35

109 - Abandoning an already applied change in "git rebase -i" with

110 - "--continue" left CHERRY_PICK_HEAD and confused later steps.

36

37 +* cb/uname-in-untracked (2015-07-17) 1 commit

38 + - untracked: fix detection of uname(2) failure

39

113 -* kb/config-unmap-before-renaming (2015-06-30) 1 commit

114 - (merged to 'next' on 2015-07-10 at 6b89478)

115 - + config.c: fix writing config files on Windows network shares

40 + An experimental "untracked cache" feature used to use uname(2) in a

41 + slightly unportable way.

42

117 - "git config" failed to update the configuration file when the

118 - underlying filesystem is incapable of renaming a file that is still

119 - open.

43 + Will merge to 'next'.

44

45

122 -* kb/use-nsec-doc (2015-07-01) 1 commit

123 - (merged to 'next' on 2015-07-09 at e7e5a05)

124 - + Makefile / racy-git.txt: clarify USE_NSEC prerequisites

46 +* jc/rerere-multi (2015-07-20) 5 commits

47 + - t4200: rerere a merge with two identical conflicts

48 + - rerere: delay the recording of preimage for the first time

49 + - rerere: handle leftover rr-cache/$ID directory and postimage files

50 + - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id

51 + - rerere: split conflict ID further

52 + (this branch uses jc/rerere.)

53

126 - Clarify in the Makefile a guideline to decide use of USE_NSEC.

54 + This is a contination of jc/rerere topic.

55

56

129 -* mh/strbuf-read-file-returns-ssize-t (2015-07-03) 1 commit

130 - (merged to 'next' on 2015-07-09 at 0d8544e)

131 - + strbuf: strbuf_read_file() should return ssize_t

57 +* bw/portability-solaris (2015-07-20) 3 commits

58 + - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris

59 + - tests: fix sed usage in tests to work around broken xpg4/sed on Solaris

60 + - tests: modify tr expressions so that xpg4/tr handles it on Solaris

61

133 - Avoid possible ssize_t to int truncation.

62 + Needs another reroll? ($gmane/274296)

63

64

136 -* nd/multiple-work-trees (2015-06-29) 2 commits

137 - (merged to 'next' on 2015-06-29 at fd4eb60)

138 - + worktree: new place for "git prune --worktrees"

139 - (merged to 'next' on 2015-06-24 at 7c3f918)

140 - + checkout: don't check worktrees when not necessary

141 - (this branch is used by es/worktree-add and es/worktree-add-cleanup.)

65 +* es/worktree-add (2015-07-20) 5 commits

66 + (merged to 'next' on 2015-07-20 at 76e840b)

67 + + config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"

68 + + Documentation/git-worktree: wordsmith worktree-related manpages

69 + + Documentation/config: fix stale "git prune --worktree" reference

70 + + Documentation/git-worktree: fix incorrect reference to file "locked"

71 + + Documentation/git-worktree: consistently use term "linked working tree"

72 + (this branch is used by es/worktree-add-cleanup.)

73

143 - "git checkout [<tree-ish>] <paths>" spent unnecessary cycles

144 - checking if the current branch was checked out elsewhere, when we

145 - know we are not switching the branches ourselves.

74 + Will merge to 'master'.

75

76

148 -* ss/clone-guess-dir-name-simplify (2015-07-09) 1 commit

149 - (merged to 'next' on 2015-07-10 at 8a62f4d)

150 - + clone: simplify string handling in guess_dir_name()

77 +* sg/bash-prompt-untracked-optim (2015-07-20) 2 commits

78 + - bash prompt: faster untracked status indicator with untracked directories

79 + - bash prompt: test untracked files status indicator with untracked dirs

80

152 - Code simplification.

81 + Will merge to 'next'.

82

83 --------------------------------------------------

155 -[New Topics]

84 +[Graduated to "master"]

85

86 * jc/diff-ws-error-highlight (2015-07-12) 1 commit

87 (merged to 'next' on 2015-07-12 at 15b60ce)

@@ -161,72 +90,13 @@ of the repositories listed at

90 A hotfix to a new feature in 2.5.0-rc.

91

92

164 -* es/worktree-add-cleanup (2015-07-13) 17 commits

165 - - checkout: drop intimate knowledge of new worktree initial population

166 - - worktree: populate via "git reset --hard" rather than "git checkout"

167 - - worktree: avoid resolving HEAD unnecessarily

168 - - worktree: make setup of new HEAD distinct from worktree population

169 - - fixup! worktree: detect branch symref/detach and error conditions locally

170 - - worktree: detect branch symref/detach and error conditions locally

171 - - worktree: add_worktree: construct worktree-population command locally

172 - - worktree: make branch creation distinct from worktree population

173 - - worktree: make --detach mutually exclusive with -b/-B

174 - - worktree: introduce options container

175 - - worktree: simplify new branch (-b/-B) option checking

176 - - branch: publish die_if_checked_out()

177 - - checkout: generalize die_if_checked_out() branch name argument

178 - - checkout: die_if_checked_out: simplify strbuf management

179 - - checkout: improve die_if_checked_out() robustness

180 - - checkout: name check_linked_checkouts() more meaningfully

181 - - checkout: avoid resolving HEAD unnecessarily

182 -

183 - Remove the "new-worktree-mode" hack in "checkout" that was added in

184 - nd/multiple-work-trees topic by updating the implementation of new

185 - "worktree add".

186 -

187 - Need to look at the fixup! more and then amend it. After that

188 - will think if this should be part of 2.5 final. My current

189 - thinking is we should ship 2.5 with es/worktree-add but not this

190 - one, as the end-user experience would not change.

191 -

192 -

193 -* ib/scripted-parse-opt-better-hint-string (2015-07-13) 1 commit

194 - - rev-parse --parseopt: allow [*=?!] in argument hints

195 -

196 - The "rev-parse --parseopt" mode parsed the option specification

197 - and the argument hint in a strange way to allow '=' and other

198 - special characters in the option name while forbidding them from

199 - the argument hint. This made it impossible to define an option

200 - like "--pair <key>=<value>" with "pair=key=value" specification,

201 - which instead would have defined a "--pair=key <value>" option.

202 -

203 - Will merge to 'next'.

204 -

205 -

206 -* mh/fast-import-optimize-current-from (2015-07-13) 1 commit

207 - - fast-import: do less work when given "from" matches current branch head

208 -

209 - Often a fast-import stream builds a new commit on top of the

210 - previous commit it built, and it often unconditionally emits a

211 - "from" command to specify the first parent, which can be omitted in

212 - such a case. This caused fast-import to forget the tree of the

213 - previous commit and then re-read it from scratch, which was

214 - inefficient. Optimize for this common case.

215 -

216 - Will merge to 'next'.

217 -

218 -

219 -* mh/notes-allow-reading-treeish (2015-07-13) 1 commit

220 - - notes: allow treeish expressions as notes ref

93 +* jk/still-interesting (2015-06-29) 1 commit

94 + (merged to 'next' on 2015-07-09 at e19fc0e)

95 + + revision.c: remove unneeded check for NULL

96

222 - Some "git notes" operations, e.g. "git log --notes=<note>", should

223 - be able to read notes from any tree-ish that is shaped like a notes

224 - tree, but the notes infrastructure required that the argument must

225 - be a ref under refs/notes/. Loosen it to require a valid ref only

226 - when the operation would update the notes (in which case we must

227 - have a place to store the updated notes tree, iow, a ref).

97 + Code clean-up.

98

229 - Needs update to docs.

99 + Will merge to 'master'.

100

101 --------------------------------------------------

102 [Stalled]

@@ -423,6 +293,79 @@ of the repositories listed at

293 --------------------------------------------------

294 [Cooking]

295

296 +* es/worktree-add-cleanup (2015-07-20) 22 commits

297 + - checkout: drop intimate knowledge of newly created worktree

298 + - worktree: populate via "git reset --hard" rather than "git checkout"

299 + - worktree: avoid resolving HEAD unnecessarily

300 + - worktree: make setup of new HEAD distinct from worktree population

301 + - worktree: detect branch-name/detached and error conditions locally

302 + - worktree: add_worktree: construct worktree-population command locally

303 + - worktree: elucidate environment variables intended for child processes

304 + - worktree: make branch creation distinct from worktree population

305 + - worktree: add: suppress auto-vivication with --detach and no <branch>

306 + - worktree: make --detach mutually exclusive with -b/-B

307 + - worktree: introduce options container

308 + - worktree: simplify new branch (-b/-B) option checking

309 + - worktree: improve worktree setup message

310 + - branch: publish die_if_checked_out()

311 + - checkout: teach check_linked_checkout() about symbolic link HEAD

312 + - checkout: check_linked_checkout: simplify symref parsing

313 + - checkout: check_linked_checkout: improve "already checked out" aesthetic

314 + - checkout: generalize die_if_checked_out() branch name argument

315 + - checkout: die_if_checked_out: simplify strbuf management

316 + - checkout: improve die_if_checked_out() robustness

317 + - checkout: name check_linked_checkouts() more meaningfully

318 + - checkout: avoid resolving HEAD unnecessarily

319 + (this branch uses es/worktree-add.)

320 +

321 + Remove the "new-worktree-mode" hack in "checkout" that was added in

322 + nd/multiple-work-trees topic by updating the implementation of new

323 + "worktree add".

324 +

325 + Will merge to 'next'.

326 +

327 +

328 +* ib/scripted-parse-opt-better-hint-string (2015-07-15) 1 commit

329 + (merged to 'next' on 2015-07-17 at 7bb1674)

330 + + rev-parse --parseopt: allow [*=?!] in argument hints

331 +

332 + The "rev-parse --parseopt" mode parsed the option specification

333 + and the argument hint in a strange way to allow '=' and other

334 + special characters in the option name while forbidding them from

335 + the argument hint. This made it impossible to define an option

336 + like "--pair <key>=<value>" with "pair=key=value" specification,

337 + which instead would have defined a "--pair=key <value>" option.

338 +

339 + Will merge to 'master'.

340 +

341 +

342 +* mh/fast-import-optimize-current-from (2015-07-13) 1 commit

343 + (merged to 'next' on 2015-07-15 at 2be8b1f)

344 + + fast-import: do less work when given "from" matches current branch head

345 +

346 + Often a fast-import stream builds a new commit on top of the

347 + previous commit it built, and it often unconditionally emits a

348 + "from" command to specify the first parent, which can be omitted in

349 + such a case. This caused fast-import to forget the tree of the

350 + previous commit and then re-read it from scratch, which was

351 + inefficient. Optimize for this common case.

352 +

353 + Will merge to 'master'.

354 +

355 +

356 +* mh/notes-allow-reading-treeish (2015-07-13) 1 commit

357 + - notes: allow treeish expressions as notes ref

358 +

359 + Some "git notes" operations, e.g. "git log --notes=<note>", should

360 + be able to read notes from any tree-ish that is shaped like a notes

361 + tree, but the notes infrastructure required that the argument must

362 + be a ref under refs/notes/. Loosen it to require a valid ref only

363 + when the operation would update the notes (in which case we must

364 + have a place to store the updated notes tree, iow, a ref).

365 +

366 + Needs update to docs.

367 +

368 +

369 * dt/log-follow-config (2015-07-09) 1 commit

370 (merged to 'next' on 2015-07-10 at b8fbb43)

371 + log: add "log.follow" configuration variable

@@ -434,9 +377,10 @@ of the repositories listed at

377

378

379 * kn/tag-doc-fix (2015-07-10) 1 commit

437 - - Documentation/tag: remove double occurance of "<pattern>"

380 + (merged to 'next' on 2015-07-15 at 7bd6038)

381 + + Documentation/tag: remove double occurance of "<pattern>"

382

439 - Will merge to 'next'.

383 + Will merge to 'master'.

384

385

386 * se/doc-checkout-ours-theirs (2015-07-12) 1 commit

@@ -449,7 +393,7 @@ of the repositories listed at

393 the "checkout --ours/--theirs".

394

395

452 -* pt/am-tests (2015-07-07) 12 commits

396 +* pt/am-tests (2015-07-20) 12 commits

397 - t3901: test git-am encoding conversion

398 - t3418: non-interactive rebase --continue with rerere enabled

399 - t4150: tests for am --[no-]scissors

@@ -463,29 +407,33 @@ of the repositories listed at

407 - t4150: am fails if index is dirty

408 - t4150: am.messageid really adds the message id

409

466 - Sprinkle a few test prereqs ($gmane/273709)?

467 -

468 - Needs a reroll.

410 + Will merge to 'next'.

411

412

413 * kn/for-each-tag-branch (2015-07-13) 11 commits

472 - - for-each-ref: add '--contains' option

473 - - ref-filter: implement '--contains' option

474 - - parse-options.h: add macros for '--contains' option

475 - - parse-option: rename parse_opt_with_commit()

476 - - for-each-ref: add '--merged' and '--no-merged' options

477 - - ref-filter: implement '--merged' and '--no-merged' options

478 - - ref-filter: add parse_opt_merge_filter()

479 - - for-each-ref: add '--points-at' option

480 - - ref-filter: implement '--points-at' option

481 - - tag: libify parse_opt_points_at()

482 - - t6302: for-each-ref tests for ref-filter APIs

414 + (merged to 'next' on 2015-07-15 at bf5418f)

415 + + for-each-ref: add '--contains' option

416 + + ref-filter: implement '--contains' option

417 + + parse-options.h: add macros for '--contains' option

418 + + parse-option: rename parse_opt_with_commit()

419 + + for-each-ref: add '--merged' and '--no-merged' options

420 + + ref-filter: implement '--merged' and '--no-merged' options

421 + + ref-filter: add parse_opt_merge_filter()

422 + + for-each-ref: add '--points-at' option

423 + + ref-filter: implement '--points-at' option

424 + + tag: libify parse_opt_points_at()

425 + + t6302: for-each-ref tests for ref-filter APIs

426 (this branch uses kn/for-each-ref.)

427

485 - Was the GPG prereq the only thing that needed fixing?

428 + Port features over from tag -l and branch -l to for-each-ref

429 + so that eventually the unified implementation can be used to

430 + reimplement tag -l and branch -l, shared across all three, in

431 + a follow-up series or two.

432 +

433 + Will merge to 'master'.

434

435

488 -* pt/am-builtin (2015-07-08) 47 commits

436 +* pt/am-builtin (2015-07-20) 46 commits

437 - builtin-am: remove redirection to git-am.sh

438 - builtin-am: check for valid committer ident

439 - builtin-am: implement legacy -b/--binary option

@@ -509,7 +457,6 @@ of the repositories listed at

457 - builtin-am: implement -k/--keep, --keep-non-patch

458 - builtin-am: implement -u/--utf8

459 - builtin-am: handle stray state directory

512 - - fixup! builtin-am: bypass git-mailinfo when --rebasing

460 - builtin-am: bypass git-mailinfo when --rebasing

461 - builtin-am: implement --rebasing mode

462 - builtin-am: implement --3way, am.threeWay

@@ -520,11 +467,11 @@ of the repositories listed at

467 - builtin-am: reject patches when there's a session in progress

468 - builtin-am: implement --abort

469 - builtin-am: implement --skip

470 + - builtin-am: don't parse mail when resuming

471 - builtin-am: implement --resolved/--continue

472 - builtin-am: refuse to apply patches if index is dirty

473 - builtin-am: implement committing applied patch

474 - builtin-am: apply patch with git-apply

527 - - fixup! builtin-am: extract patch and commit info with git-mailinfo

475 - builtin-am: extract patch and commit info with git-mailinfo

476 - builtin-am: auto-detect mbox patches

477 - builtin-am: split out mbox/maildir patches with git-mailsplit

@@ -537,9 +484,6 @@ of the repositories listed at

484

485 Rewrite "am" in "C".

486

540 - Looks more-or-less ready. Any reroll needed other than squashing

541 - these fixup! in?

542 -

487

488 * ad/bisect-cleanup (2015-06-29) 6 commits

489 (merged to 'next' on 2015-07-09 at 75e2a06)

@@ -557,9 +501,10 @@ of the repositories listed at

501

502

503 * mh/fast-import-get-mark (2015-07-01) 1 commit

560 - - fast-import: add a get-mark command

504 + (merged to 'next' on 2015-07-15 at 5e034b9)

505 + + fast-import: add a get-mark command

506

562 - Will merge to 'next'.

507 + Will merge to 'master'.

508

509

510 * kb/i18n-doc (2015-07-01) 1 commit

@@ -569,14 +514,13 @@ of the repositories listed at

514 Will merge to 'master'.

515

516

572 -* dt/refs-backend-preamble (2015-07-08) 8 commits

517 +* dt/refs-backend-preamble (2015-07-13) 7 commits

518 - git-stash: use update-ref --create-reflog instead of creating files

519 - update-ref and tag: add --create-reflog arg

520 + - refs: add REF_FORCE_CREATE_REFLOG flag

521 - git-reflog: add exists command

522 - refs: new public ref function: safe_create_reflog

523 - refs: Break out check for reflog autocreation

578 - - bisect: treat BISECT_HEAD as a ref

579 - - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

524 - refs.c: add err arguments to reflog functions

525

526 In preparation for allowing different "backends" to store the refs

@@ -602,15 +546,6 @@ of the repositories listed at

546 Will merge to 'master'.

547

548

605 -* jk/still-interesting (2015-06-29) 1 commit

606 - (merged to 'next' on 2015-07-09 at e19fc0e)

607 - + revision.c: remove unneeded check for NULL

608 -

609 - Code clean-up.

610 -

611 - Will merge to 'master'.

612 -

613 -

549 * nd/export-worktree (2015-06-26) 1 commit

550 (merged to 'next' on 2015-07-09 at 1581a9b)

551 + setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

@@ -621,10 +556,9 @@ of the repositories listed at

556 Will merge to 'master'.

557

558

624 -* jc/rerere (2015-07-06) 19 commits

625 - . t4200: rerere a merge with two identical conflicts

626 - . rerere: un-nest merge() further

627 - . rerere: use "struct rerere_id" instead of "char *" for conflict ID

559 +* jc/rerere (2015-07-18) 18 commits

560 + - rerere: un-nest merge() further

561 + - rerere: use "struct rerere_id" instead of "char *" for conflict ID

562 - rerere: call conflict-ids IDs

563 - rerere: further clarify do_rerere_one_path()

564 - rerere: further de-dent do_plain_rerere()

@@ -641,6 +575,7 @@ of the repositories listed at

575 - rerere: lift PATH_MAX limitation

576 - rerere: plug conflict ID leaks

577 - rerere: fix an off-by-one non-bug

578 + (this branch is used by jc/rerere-multi.)

579

580 Code clean-up and minor fixes (so far).

581

@@ -843,6 +778,8 @@ of the repositories listed at

778 Add an environment variable to tell Git to look into refs hierarchy

779 other than refs/replace/ for the object replacement data.

780

781 + Will merge to 'master'.

782 +

783

784 * gp/status-rebase-i-info (2015-07-06) 4 commits

785 (merged to 'next' on 2015-07-10 at b121298)

@@ -889,6 +826,8 @@ of the repositories listed at

826 Various enhancements around "git am" reading patches generated by

827 foreign SCM.

828

829 + Will merge to 'master'.

830 +

831

832 * pt/pull-builtin (2015-06-18) 19 commits

833 (merged to 'next' on 2015-07-10 at 07b1794)

@@ -979,16 +918,17 @@ of the repositories listed at

918

919

920 * gr/rebase-i-drop-warn (2015-06-30) 3 commits

982 - - git rebase -i: add static check for commands and SHA-1

983 - - git rebase -i: warn about removed commits

984 - - git-rebase -i: add command "drop" to remove a commit

921 + (merged to 'next' on 2015-07-15 at 6f4f2c8)

922 + + git rebase -i: add static check for commands and SHA-1

923 + + git rebase -i: warn about removed commits

924 + + git-rebase -i: add command "drop" to remove a commit

925

926 Add "drop commit-object-name subject" command as another way to

927 skip replaying of a commit in "rebase -i", and then punish those

928 who do not use it (and instead just remove the lines) by throwing

929 a warning.

930

991 - Will merge to 'next'.

931 + Will merge to 'master'.

932

933

934 * jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit

@@ -1035,12 +975,13 @@ of the repositories listed at

975

976

977 * jc/commit-slab (2015-05-22) 1 commit

1038 - - commit-slab: introduce slabname##_peek() function

978 + (merged to 'next' on 2015-07-15 at 4c83475)

979 + + commit-slab: introduce slabname##_peek() function

980

981 Memory use reduction when commit-slab facility is used to annotate

982 sparsely (which is not recommended in the first place).

983

1043 - Will merge to 'next'.

984 + Will merge to 'master'.

985

986

987 * jc/clone-bundle (2015-04-30) 1 commit

What's cooking (2015/07 #05)