0ba4c9bd88 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Apr 2013, #02; Fri, 5)

4 -X-master-at: 21ccebec0dd1d7e624ea2f22af6ac93686daf34f

5 -X-next-at: 2c8b7bf47c81acd2a76c1f9c3be2a1f102b76d31

3 +Subject: What's cooking in git.git (Apr 2013, #03; Sun, 7)

4 +X-master-at: 52a3e011c779456e63b6274af0024eeb92dd7888

5 +X-next-at: b213c0d2377aff930c500c0ac0d580a34e76686d

6

7 -What's cooking in git.git (Apr 2013, #02; Fri, 5)

7 +What's cooking in git.git (Apr 2013, #03; Sun, 7)

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

9

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

@@ -24,262 +24,154 @@ of the repositories listed at

24 --------------------------------------------------

25 [Graduated to "master"]

26

27 -* bk/document-commit-tree-S (2013-03-25) 1 commit

28 - (merged to 'next' on 2013-03-26 at 8ee205f)

29 - + commit-tree: document -S option consistently

30 -

31 -

32 -* jc/apply-ws-fix-tab-in-indent (2013-03-29) 2 commits

33 - (merged to 'next' on 2013-03-29 at 26eb6e9)

34 - + test: resurrect q_to_tab

35 - (merged to 'next' on 2013-03-26 at 46c6bda)

36 - + apply --whitespace=fix: avoid running over the postimage buffer

37 -

38 - "git apply --whitespace=fix" was not prepared to see a line getting

39 - longer after fixing whitespaces (e.g. tab-in-indent aka Python).

40 -

41 -

42 -* jc/directory-attrs-regression-fix (2013-03-28) 6 commits

43 - (merged to 'next' on 2013-03-29 at a3dce2b)

44 - + t: check that a pattern without trailing slash matches a directory

45 - + dir.c::match_pathname(): pay attention to the length of string parameters

46 - + dir.c::match_pathname(): adjust patternlen when shifting pattern

47 - + dir.c::match_basename(): pay attention to the length of string parameters

48 - + attr.c::path_matches(): special case paths that end with a slash

49 - + attr.c::path_matches(): the basename is part of the pathname

50 -

51 - Fix 1.8.1.x regression that stopped matching "dir" (without

52 - trailing slash) to a directory "dir".

53 -

54 -

55 -* jc/merge-tag-object (2013-04-01) 3 commits

56 - (merged to 'next' on 2013-04-03 at 94b5c7d)

57 - + t6200: test message for merging of an annotated tag

58 - + t6200: use test_config/test_unconfig

59 - (merged to 'next' on 2013-03-29 at aeec39c)

60 - + merge: a random object may not necssarily be a commit

61 -

62 - "git merge $(git rev-parse v1.8.2)" behaved quite differently from

63 - "git merge v1.8.2" as if v1.8.2 were written as v1.8.2^0 and did

64 - not pay much attention to the annotated tag payload.

65 -

66 - This makes the code notice the type of the tag object, in addition

67 - to the dwim_ref() based classification the current code uses

68 - (i.e. the name appears in refs/tags/) to decide when to special

69 - case merging of tags.

70 -

71 -

72 -* jc/sha1-name-object-peeler (2013-03-31) 2 commits

73 - (merged to 'next' on 2013-04-01 at cdb4a18)

74 - + peel_onion(): teach $foo^{object} peeler

75 - + peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish

76 - (this branch is used by mh/rev-parse-verify-doc.)

77 -

78 - There was no good way to ask "I have a random string that came from

79 - outside world. I want to turn it into a 40-hex object name while

80 - making sure such an object exists". A new peeling suffix ^{object}

81 - can be used for that purpose, together with "rev-parse --verify".

82 -

83 -

84 -* jc/t5516-pushInsteadOf-vs-pushURL (2013-03-28) 1 commit

85 - (merged to 'next' on 2013-04-01 at bed2879)

86 - + t5516: test interaction between pushURL and pushInsteadOf correctly

87 -

88 - Update a test to match the documented interaction between pushURL

89 - and pushInsteadOf.

90 -

91 -

92 -* jk/check-corrupt-objects-carefully (2013-03-29) 10 commits

93 - (merged to 'next' on 2013-03-29 at b6a04a7)

94 - + clone: leave repo in place after checkout errors

95 - + clone: run check_everything_connected

96 - + clone: die on errors from unpack_trees

97 - + add tests for cloning corrupted repositories

98 - + streaming_write_entry: propagate streaming errors

99 - + add test for streaming corrupt blobs

100 - + avoid infinite loop in read_istream_loose

101 - + read_istream_filtered: propagate read error from upstream

102 - + check_sha1_signature: check return value from read_istream

103 - + stream_blob_to_fd: detect errors reading from stream

104 -

105 - Have the streaming interface and other codepaths more carefully

106 - examine for corrupt objects.

107 -

108 -

109 -* jk/config-with-empty-section (2013-03-29) 1 commit

110 - (merged to 'next' on 2013-04-01 at 7972aa9)

111 - + t1300: document some aesthetic failures of the config editor

112 -

113 - Document that "git config --unset" does not remove an empty section

114 - head after removing the last variable in a section, and adding a

115 - new variable does not try to reuse a leftover empty section head.

116 -

117 -

118 -* jk/difftool-no-overwrite-on-copyback (2013-03-29) 5 commits

119 - (merged to 'next' on 2013-03-29 at 9f42d34)

120 - + t7800: run --dir-diff tests with and without symlinks

121 - + t7800: fix tests when difftool uses --no-symlinks

122 - + t7800: don't hide grep output

123 - + difftool: don't overwrite modified files

124 - + t7800: move '--symlinks' specific test to the end

125 -

126 - Try to be careful when difftool backend allows the user to write

127 - into the temporary files being shown *and* the user makes changes

128 - to the working tree at the same time. One of the changes has to be

129 - lost in such a case, but at least tell the user what he did.

130 -

131 -

132 -* jk/no-more-self-assignment (2013-03-25) 2 commits

133 - (merged to 'next' on 2013-03-26 at 31ec9ac)

134 - + match-trees: simplify score_trees() using tree_entry()

135 - + submodule: clarify logic in show_submodule_summary

136 -

137 - This started as a topic to reduce "type var = var" self assignment

138 - tricks that were used to squelch "variable used uninitialized perhaps?"

139 - warning from some compilers, but resulted in rewriting logic with

140 - a version that is simpler and easier to understand for humans.

141 -

142 -

143 -* jl/submodule-deinit (2013-04-01) 1 commit

144 - (merged to 'next' on 2013-04-03 at 2ef485c)

145 - + submodule deinit: clarify work tree removal message

146 -

147 - A finishing touch to the new topic in 1.8.3.

148 -

27 +* cn/commit-amend-doc (2013-04-05) 1 commit

28 + (merged to 'next' on 2013-04-05 at 4c42e59)

29 + + Documentation/git-commit: reword the --amend explanation

30 + (this branch is used by jc/detached-head-doc.)

31

150 -* jm/branch-rename-nothing-error (2013-03-31) 1 commit

151 - (merged to 'next' on 2013-04-01 at 5e5cdaf)

152 - + branch: give better message when no names specified for rename

32

154 - "git branch -m" without any argument noticed an error, but with an

155 - incorrect error message.

33 +* fc/remote-helpers-test-updates (2013-04-04) 4 commits

34 + (merged to 'next' on 2013-04-04 at 0612744)

35 + + remote-hg: fix hg-git test-case

36 + + remote-bzr: remove stale check code for tests

37 + + remote-helpers: fix the run of all tests

38 + + remote-bzr: avoid echo -n

39 + (this branch is used by fc/transport-helper-waitpid.)

40

41

158 -* js/iterm-is-on-osx (2013-03-29) 1 commit

159 - (merged to 'next' on 2013-04-01 at 201fed2)

160 - + git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X

42 +* jk/bisect-prn-unsigned (2013-04-03) 1 commit

43 + (merged to 'next' on 2013-04-04 at 2c4df36)

44 + + bisect: avoid signed integer overflow

45

162 - Add more logic to detect graphic environment of OS X by simply

163 - checking TERM_PROGRAM has some value, not Apple_Terminal, to detect

164 - iTerm.app and any other.

46

47 +* jk/diffcore-break-divzero (2013-04-03) 1 commit

48 + (merged to 'next' on 2013-04-04 at b7632e0)

49 + + diffcore-break: don't divide by zero

50

167 -* js/log-gpg (2013-03-27) 1 commit

168 - (merged to 'next' on 2013-03-29 at 9a1b2d3)

169 - + log: read gpg settings for signed commit verification

51

171 - Teach "show/log" honor gpg.program configuration just like other

172 - parts of the code that use GnuPG.

52 +* jk/filter-branch-come-back-to-original (2013-04-02) 1 commit

53 + (merged to 'next' on 2013-04-04 at 621684a)

54 + + filter-branch: return to original dir after filtering

55

56 + When used with "-d temporary-directory" option, "git filter-branch"

57 + failed to come back to the original working tree to perform the

58 + final clean-up procedure.

59

175 -* mh/rev-parse-verify-doc (2013-04-02) 1 commit

176 - (merged to 'next' on 2013-04-03 at a09c332)

177 - + rev-parse: clarify documentation for the --verify option

60

179 - "rev-parse --verify" was documented in a misleading way.

61 +* jk/rm-removed-paths (2013-04-04) 3 commits

62 + (merged to 'next' on 2013-04-05 at ce9a926)

63 + + t3600: document failure of rm across symbolic links

64 + + t3600: test behavior of reverse-d/f conflict

65 + + rm: do not complain about d/f conflicts during deletion

66

67 + A handful of test cases and a corner case bugfix for "git rm".

68

182 -* nd/checkout-paths-reduce-match-pathspec-calls (2013-03-27) 1 commit

183 - (merged to 'next' on 2013-03-29 at fbcc004)

184 - + checkout: avoid unnecessary match_pathspec calls

69

186 - Consolidate repeated pathspec matches on the same paths, while

187 - fixing a bug in "git checkout dir/" code started from an unmerged

188 - index.

70 +* jk/set-upstream-error-cases (2013-04-02) 5 commits

71 + (merged to 'next' on 2013-04-04 at b58c26b)

72 + + branch: give advice when tracking start-point is missing

73 + + branch: mention start_name in set-upstream error messages

74 + + branch: improve error message for missing --set-upstream-to ref

75 + + branch: factor out "upstream is not a branch" error messages

76 + + t3200: test --set-upstream-to with bogus refs

77

78 + The handing by "git branch --set-upstream-to" against various forms

79 + of errorneous inputs was suboptimal and has been improved.

80

191 -* rr/prompt-revert-head (2013-03-31) 1 commit

192 - (merged to 'next' on 2013-04-01 at 1fc21eb)

193 - + bash: teach __git_ps1 about REVERT_HEAD

81

195 - The prompt string generator did not notice when we are in a middle

196 - of a "git revert" session.

82 +* mg/texinfo-5 (2013-04-03) 1 commit

83 + (merged to 'next' on 2013-04-04 at bd84440)

84 + + Documentation: Strip texinfo anchors to avoid duplicates

85

86 + Strip @anchor elements in the texinfo output of the documentation,

87 + as a single document created by concatenating our entire manual set

88 + will produce many duplicates that makes newer texinfo unhappy.

89

199 -* rr/send-email-perl-critique (2013-03-31) 3 commits

200 - (merged to 'next' on 2013-04-03 at d552868)

201 - + send-email: use the three-arg form of open in recipients_cmd

202 - + send-email: drop misleading function prototype

203 - + send-email: use "return;" not "return undef;" on error codepaths

90

205 - Broken down from an earlier discussion to pick up reasonable bits

206 - with explanation, to demonstrate how it should be done.

91 +* mm/status-during-revert (2013-04-02) 2 commits

92 + (merged to 'next' on 2013-04-04 at 1282528)

93 + + status: show commit sha1 in "You are currently reverting" message

94 + + status: show 'revert' state and status hint

95

96 + "git status" learned to report that you are in the middle of a

97 + revert session, just like it does for a cherry-pick and a bisect

98 + session.

99

209 -* rs/submodule-summary-limit (2013-04-01) 1 commit

210 - (merged to 'next' on 2013-04-01 at 3c18cfe)

211 - + submodule summary: support --summary-limit=<n>

100

213 - "submodule summary --summary-limit" option did not support

214 - "--option=value" form.

101 +* rr/triangle (2013-04-02) 6 commits

102 + (merged to 'next' on 2013-04-04 at 2d2c8ee)

103 + + remote.c: introduce branch.<name>.pushremote

104 + + remote.c: introduce remote.pushdefault

105 + + remote.c: introduce a way to have different remotes for fetch/push

106 + + t5516 (fetch-push): drop implicit arguments from helper functions

107 + + t5516 (fetch-push): update test description

108 + + remote.c: simplify a bit of code using git_config_string()

109

110 + Support "pull from one place, push to another place" workflow

111 + better by introducing remote.pushdefault (overrides the "origin"

112 + thing) and branch.*.pushremote (overrides the branch.*.remote).

113

217 -* sg/gpg-sig (2013-03-31) 5 commits

218 - (merged to 'next' on 2013-04-03 at 9c13a17)

219 - + pretty printing: extend %G? to include 'N' and 'U'

220 - + merge/pull Check for untrusted good GPG signatures

221 - + merge/pull: verify GPG signatures of commits being merged

222 - + commit.c/GPG signature verification: Also look at the first GPG status line

223 - + Move commit GPG signature verification to commit.c

114

225 - Teach "merge/pull" to optionally verify and reject commits that are

226 - not signed properly.

115 +* tb/shared-perm (2013-04-05) 2 commits

116 + (merged to 'next' on 2013-04-05 at 2481155)

117 + + path.c: optimize adjust_shared_perm()

118 + + path.c: simplify adjust_shared_perm()

119

120 + Simplifies adjust_shared_perm() implementation.

121

229 -* sw/safe-create-leading-dir-race (2013-03-26) 1 commit

230 - (merged to 'next' on 2013-03-26 at 744bb50)

231 - + safe_create_leading_directories: fix race that could give a false negative

122 +--------------------------------------------------

123 +[New Topics]

124

125 +* fc/send-email-annotate (2013-04-07) 6 commits

126 + - format-patch: trivial cleanups

127 + - format-patch: add format.coverLetter configuration variable

128 + - log: update to OPT_BOOL

129 + - format-patch: refactor branch name calculation

130 + - format-patch: improve head calculation for cover-letter

131 + - send-email: make annotate configurable

132

234 -* tb/cygwin-shared-repository (2013-03-25) 1 commit

235 - (merged to 'next' on 2013-03-29 at dbeb068)

236 - + Make core.sharedRepository work under cygwin 1.7

237 - (this branch is used by tb/shared-perm.)

133

239 - Cygwin port has a faster-but-lying lstat(2) emulation whose

240 - incorrectness does not matter in practice except for a few

241 - codepaths, and setting permission bits to directories is a codepath

242 - that needs to use a more correct one.

134 +* jk/http-error-messages (2013-04-06) 9 commits

135 + - http: drop http_error function

136 + - remote-curl: die directly with http error messages

137 + - http: re-word http error message

138 + - http: simplify http_error helper function

139 + - remote-curl: consistently report repo url for http errors

140 + - remote-curl: always show friendlier 404 message

141 + - remote-curl: let servers override http 404 advice

142 + - remote-curl: show server content on http errors

143 + - http: add HTTP_KEEP_ERROR option

144

145

245 -* tr/log-tree-optim (2013-03-28) 1 commit

246 - (merged to 'next' on 2013-03-29 at 5a6795d)

247 - + Avoid loading commits twice in log with diffs

146 +* jk/show-branch-strbuf (2013-04-06) 1 commit

147 + - show-branch: use strbuf instead of static buffer

148

249 - Optimize "log" that shows the difference between the parent and the

250 - child.

149

150 +* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit

151 + - bundle: Accept prerequisites without commit messages

152

253 -* tr/valgrind (2013-04-01) 4 commits

254 - (merged to 'next' on 2013-04-01 at a973c52)

255 - + tests: notice valgrind error in test_must_fail

256 - + tests --valgrind: provide a mode without --track-origins

257 - + tests: parameterize --valgrind option

258 - + t/README: --valgrind already implies -v

153

260 - Let us use not just memgrind but other *grind debuggers.

154 +* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits

155 + - fmt-merge-msg: use core.commentchar in tag signatures completely

156 + - fmt-merge-msg: respect core.commentchar in people credits

157

158 --------------------------------------------------

263 -[New Topics]

264 -

265 -* cn/commit-amend-doc (2013-04-05) 1 commit

266 - (merged to 'next' on 2013-04-05 at 4c42e59)

267 - + Documentation/git-commit: reword the --amend explanation

268 - (this branch is used by jc/detached-head-doc.)

269 -

270 - Will merge to 'master'.

159 +[Stalled]

160

161 +* jc/format-patch (2013-02-21) 2 commits

162 + - format-patch: --inline-single

163 + - format-patch: rename "no_inline" field

164

273 -* fc/remote-helpers-test-updates (2013-04-04) 4 commits

274 - (merged to 'next' on 2013-04-04 at 0612744)

275 - + remote-hg: fix hg-git test-case

276 - + remote-bzr: remove stale check code for tests

277 - + remote-helpers: fix the run of all tests

278 - + remote-bzr: avoid echo -n

279 - (this branch is used by fc/transport-helper-waitpid.)

165 + A new option to send a single patch to the standard output to be

166 + appended at the bottom of a message. I personally have no need for

167 + this, but it was easy enough to cobble together. Tests, docs and

168 + stripping out more MIMEy stuff are left as exercises to interested

169 + parties.

170

281 - Will merge to 'master'.

171 + Not ready for inclusion.

172

173 +--------------------------------------------------

174 +[Cooking]

175

176 * fc/remote-hg (2013-04-04) 13 commits

177 - remote-hg: push to the appropriate branch

@@ -302,44 +194,12 @@ of the repositories listed at

194 Expecting a reroll.

195

196

305 -* fc/transport-helper-waitpid (2013-04-04) 2 commits

197 +* fc/transport-helper-waitpid (2013-04-07) 3 commits

198 + - SQUASH???

199 - transport-helper: check if remote helper is alive

307 - - run-command: add new check_command helper

308 - (this branch uses fc/remote-helpers-test-updates.)

309 -

310 - Seems to be solving a real problem at a wrong level.

311 -

312 -

313 -* jk/bisect-prn-unsigned (2013-04-03) 1 commit

314 - (merged to 'next' on 2013-04-04 at 2c4df36)

315 - + bisect: avoid signed integer overflow

316 -

317 - Will merge to 'master'.

318 -

319 -

320 -* jk/diffcore-break-divzero (2013-04-03) 1 commit

321 - (merged to 'next' on 2013-04-04 at b7632e0)

322 - + diffcore-break: don't divide by zero

323 -

324 - Will merge to 'master'.

325 -

326 -

327 -* jk/filter-branch-come-back-to-original (2013-04-02) 1 commit

328 - (merged to 'next' on 2013-04-04 at 621684a)

329 - + filter-branch: return to original dir after filtering

330 -

331 - Will merge to 'master'.

332 -

333 -

334 -* jk/set-upstream-error-cases (2013-04-02) 5 commits

335 - (merged to 'next' on 2013-04-04 at b58c26b)

336 - + branch: give advice when tracking start-point is missing

337 - + branch: mention start_name in set-upstream error messages

338 - + branch: improve error message for missing --set-upstream-to ref

339 - + branch: factor out "upstream is not a branch" error messages

340 - + t3200: test --set-upstream-to with bogus refs

200 + - [EXPLAIN BETTER] run-command: add new check_command helper

201

342 - Will merge to 'master'.

202 + Waiting for a response to summarize what this topic is about here.

203

204

205 * js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits

@@ -371,14 +231,6 @@ of the repositories listed at

231 Will merge to 'master'.

232

233

374 -* mm/status-during-revert (2013-04-02) 2 commits

375 - (merged to 'next' on 2013-04-04 at 1282528)

376 - + status: show commit sha1 in "You are currently reverting" message

377 - + status: show 'revert' state and status hint

378 -

379 - Will merge to 'master'.

380 -

381 -

234 * po/help-guides (2013-04-03) 5 commits

235 (merged to 'next' on 2013-04-04 at 3d99b28)

236 + doc: include --guide option description for "git help"

@@ -401,17 +253,6 @@ of the repositories listed at

253 (they already do so when talking with smart HTTP clients).

254

255

404 -* jk/rm-removed-paths (2013-04-04) 3 commits

405 - (merged to 'next' on 2013-04-05 at ce9a926)

406 - + t3600: document failure of rm across symbolic links

407 - + t3600: test behavior of reverse-d/f conflict

408 - + rm: do not complain about d/f conflicts during deletion

409 -

410 - A handful of test cases and a corner case bugfix for "git rm".

411 -

412 - Will merge to 'master'.

413 -

414 -

256 * jl/submodule-mv (2013-04-03) 3 commits

257 - Teach mv to update the path entry in .gitmodules for moved submodules

258 - Teach mv to move submodules using a gitfile

@@ -425,17 +266,6 @@ of the repositories listed at

266 nd/magic-pathspecs topic.

267

268

428 -* mg/texinfo-5 (2013-04-03) 1 commit

429 - (merged to 'next' on 2013-04-04 at bd84440)

430 - + Documentation: Strip texinfo anchors to avoid duplicates

431 -

432 - Strip @anchor elements in the texinfo output of the documentation,

433 - as a single document created by concatenating our entire manual set

434 - will produce many duplicates that makes newer texinfo unhappy.

435 -

436 - Will merge to 'master'.

437 -

438 -

269 * sr/log-SG-no-textconv (2013-04-05) 6 commits

270 (merged to 'next' on 2013-04-05 at 7f06945)

271 + diffcore-pickaxe: unify code for log -S/-G

@@ -453,56 +283,38 @@ of the repositories listed at

283

284

285 * tr/perl-keep-stderr-open (2013-04-04) 2 commits

456 - - t9700: do not close STDERR

457 - - perl: redirect stderr to /dev/null instead of closing

286 + (merged to 'next' on 2013-04-07 at 04f737a)

287 + + t9700: do not close STDERR

288 + + perl: redirect stderr to /dev/null instead of closing

289

290 Closing (not redirecting to /dev/null) the standard error stream is

291 not a very smart thing to do. Later open may return file

292 descriptor #2 for unrelated purpose, and error reporting code may

293 write into them.

294

464 - Will merge to 'next'.

465 -

295

296 * jc/detached-head-doc (2013-04-05) 1 commit

297 - glossary: extend "detached HEAD" description

469 - (this branch uses cn/commit-amend-doc.)

298 +

299 + Will merge to 'next'.

300

301

302 * jk/diff-algo-finishing-touches (2013-04-05) 2 commits

303 - diff: allow unstuck arguments with --diff-algorithm

304 - git-merge(1): document diff-algorithm option to merge-recursive

305

306 + "git diff --diff-algorithm algo" is also understood as "git diff

307 + --diff-algorithm=algo".

308

477 -* jk/diff-graph-submodule-summary (2013-04-05) 1 commit

478 - - submodule: print graph output next to submodule log

479 -

480 ---------------------------------------------------

481 -[Stalled]

482 -

483 -* jc/format-patch (2013-02-21) 2 commits

484 - - format-patch: --inline-single

485 - - format-patch: rename "no_inline" field

486 -

487 - A new option to send a single patch to the standard output to be

488 - appended at the bottom of a message. I personally have no need for

489 - this, but it was easy enough to cobble together. Tests, docs and

490 - stripping out more MIMEy stuff are left as exercises to interested

491 - parties.

492 -

493 - Not ready for inclusion.

309 + Will merge to 'next'.

310

495 ---------------------------------------------------

496 -[Cooking]

311

498 -* tb/shared-perm (2013-04-05) 2 commits

499 - (merged to 'next' on 2013-04-05 at 2481155)

500 - + path.c: optimize adjust_shared_perm()

501 - + path.c: simplify adjust_shared_perm()

312 +* jk/diff-graph-submodule-summary (2013-04-05) 1 commit

313 + - submodule: print graph output next to submodule log

314

503 - Simplifies adjust_shared_perm() implementation.

315 + Make "git diff --graph" work better with submodule log output.

316

505 - Will merge to 'master'.

317 + Will merge to 'next'.

318

319

320 * nd/pretty-formats (2013-04-01) 12 commits

@@ -533,22 +345,6 @@ of the repositories listed at

345 Expecting a reroll.

346

347

536 -* rr/triangle (2013-04-02) 6 commits

537 - (merged to 'next' on 2013-04-04 at 2d2c8ee)

538 - + remote.c: introduce branch.<name>.pushremote

539 - + remote.c: introduce remote.pushdefault

540 - + remote.c: introduce a way to have different remotes for fetch/push

541 - + t5516 (fetch-push): drop implicit arguments from helper functions

542 - + t5516 (fetch-push): update test description

543 - + remote.c: simplify a bit of code using git_config_string()

544 -

545 - Support "pull from one place, push to another place" workflow

546 - better by introducing remote.pushdefault (overrides the "origin"

547 - thing) and branch.*.pushremote (overrides the branch.*.remote).

548 -

549 - Will merge to 'master'.

550 -

551 -

348 * ap/combine-diff-coalesce-lost (2013-03-25) 1 commit

349 (merged to 'next' on 2013-03-29 at f6a05ca)

350 + combine-diff: coalesce lost lines optimally

What's cooking (2013/04 #03)