What's cooking (2011/05 #02)
Junio C Hamano committed
May 4, 2011 at 19:33 UTC
15fe668dc749b12d538aad2d550b9e57647d613f
1 file changed
+214
-288
whats-cooking.txt
+214
-288
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #01; Sun, 1)
3
-X-master-at: 791a765e54b9b4c8d2cf4f069222e31cef8aa24e
4
-X-next-at: b50356093b95c296fb375196ef0251da18b66448
2
+Subject: What's cooking in git.git (May 2011, #02; Wed, 4)
3
+X-master-at: 505a138cbd5c45d890d180383c8bd808ee8105aa
4
+X-next-at: 76e37e21d4a31e0ad0e9ef50ca7dc8e2402a26b1
5
6
-What's cooking in git.git (May 2011, #01; Sun, 1)
6
+What's cooking in git.git (May 2011, #02; Wed, 4)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,145 +12,153 @@ only in 'pu' while commits prefixed with '+' are in 'next'.
12
The main part of this cycle is expected to run thru May, aiming for a
13
feature freeze in early June.
14
15
-The week #2 of this cycle starts on May 2nd.
15
+We are in the middle of week #2 of this cycle.
16
17
--------------------------------------------------
18
[New Topics]
19
20
-* im/hashcmp-optim (2011-04-28) 1 commit
21
- - hashcmp(): inline memcmp() by hand to optimize
22
-
23
-Will merge to "next".
20
+* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
21
+ - specifying ranges: we did not mean to make ".." an empty set
22
25
-* jc/add-delete-default (2011-04-19) 1 commit
26
- - git add: notice removal of tracked paths by default
27
- (this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
23
+Updated documentation.
24
29
-* kk/maint-prefix-in-config-mak (2011-04-28) 1 commit
30
- - Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
25
+* mg/diff-stat-count (2011-05-03) 2 commits
26
+ - diff-options.txt: describe --stat-{width,name-width,count}
27
+ - diff: introduce --stat-count to limit the stat lines
28
32
-Wait for msysgit folks to Ack, and then merge to "next".
29
+There was a miscounting spotted. Need another round.
30
34
-* sg/completion-updates (2011-04-28) 3 commits
35
- - completion: don't declare 'local words' to make zsh happy
36
- - completion: remove unnecessary _get_comp_words_by_ref() invocations
37
- - completion: don't modify the $cur variable in completion functions
31
+* mk/grep-pcre (2011-05-03) 3 commits
32
+ - git-grep: Learn PCRE
33
+ - Documentation: Add --line-number to git-grep synopsis
34
+ - [Missing sign-off and justification] grep: Put calls to fixmatch() and regmatch() into patmatch()
35
39
-Will merge to "next".
36
+There was a re-roll but I haven't picked it up yet.
37
41
-* jk/merge-one-file-working-tree (2011-04-29) 2 commits
42
- - merge-one-file: fix broken merges with alternate work trees
43
- - add tests for merge-index / merge-one-file
38
+* vh/config-interactive-singlekey-doc (2011-05-02) 1 commit
39
+ - config.txt: 'interactive.singlekey; is used by...
40
45
-Will merge to "next".
41
+Will merge to 'next' but I recall we discussed the need for more cross
42
+references and description of the configuration variable in Patch mode
43
+documentation.
44
47
-* js/blame-parsename (2011-04-21) 1 commit
48
- (merged to 'next' on 2011-04-29 at 5fde945)
49
- + blame: tolerate bogus e-mail addresses a bit better
45
+* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
46
+ - merge: fix branch.<name>.mergeoptions
47
51
-Will merge to "master" by the end of week #2.
52
-
53
-* jn/ctags (2011-04-29) 6 commits
54
- - gitweb: Optional grouping of projects by category
55
- - gitweb: Modularized git_get_project_description to be more generic
56
- - gitweb: Split git_project_list_body in two functions
57
- - gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
58
- - gitweb: Change the way "content tags" ('ctags') are handled
59
- - gitweb: Restructure projects list generation
48
+Fix branch.<name>.mergeoptions that does not override merge.<option>
49
61
-* js/info-man-path (2011-05-01) 1 commit
62
- - git: add --info-path and --man-path options
50
+* jc/require-work-tree-exists (2011-05-04) 1 commit
51
+ - require-work-tree wants more than what its name says
52
64
-* cj/p4merge (2011-05-01) 1 commit
65
- - Pass empty file to p4merge where no base is suitable.
53
+Make "git pull" run from a random place work as long as GIT_DIR and
54
+GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
55
+is a sane use case, though.
56
57
--------------------------------------------------
58
[Graduated to "master"]
59
70
-* en/merge-recursive (2011-03-17) 4 commits
71
- (merged to 'next' on 2011-04-25 at 8027acd)
72
- + merge-recursive: tweak magic band-aid
73
- + merge-recursive: When we detect we can skip an update, actually skip it
74
- + t6022: New test checking for unnecessary updates of files in D/F conflicts
75
- + t6022: New test checking for unnecessary updates of renamed+modified files
76
-
77
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
78
- (merged to 'next' on 2011-04-25 at c37610d)
79
- + git diff -D: omit the preimage of deletes
80
-
81
-* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
82
- (merged to 'next' on 2011-04-25 at 25c195e)
83
- + diffcore-rename: fall back to -C when -C -C busts the rename limit
84
- + diffcore-rename: record filepair for rename src
85
- + diffcore-rename: refactor "too many candidates" logic
86
- + builtin/diff.c: remove duplicated call to diff_result_code()
87
-
88
-* jh/dirstat (2011-04-12) 4 commits
89
- (merged to 'next' on 2011-04-25 at cb277e6)
90
- + --dirstat: In case of renames, use target filename instead of source filename
91
- + Teach --dirstat not to completely ignore rearranged lines within a file
92
- + --dirstat-by-file: Make it faster and more correct
93
- + --dirstat: Describe non-obvious differences relative to --stat or regular diff
94
- (this branch is used by jh/dirstat-lines.)
95
-
96
-* mz/rebase (2011-02-28) 34 commits
97
- (merged to 'next' on 2011-04-25 at 4bbed46)
98
- + rebase: define options in OPTIONS_SPEC
99
- + Makefile: do not install sourced rebase scripts
100
- + rebase: use @{upstream} if no upstream specified
101
- + rebase -i: remove unnecessary state rebase-root
102
- + rebase -i: don't read unused variable preserve_merges
103
- + git-rebase--am: remove unnecessary --3way option
104
- + rebase -m: don't print exit code 2 when merge fails
105
- + rebase -m: remember allow_rerere_autoupdate option
106
- + rebase: remember strategy and strategy options
107
- + rebase: remember verbose option
108
- + rebase: extract code for writing basic state
109
- + rebase: factor out sub command handling
110
- + rebase: make -v a tiny bit more verbose
111
- + rebase -i: align variable names
112
- + rebase: show consistent conflict resolution hint
113
- + rebase: extract am code to new source file
114
- + rebase: extract merge code to new source file
115
- + rebase: remove $branch as synonym for $orig_head
116
- + rebase -i: support --stat
117
- + rebase: factor out call to pre-rebase hook
118
- + rebase: factor out clean work tree check
119
- + rebase: factor out reference parsing
120
- + rebase: reorder validation steps
121
- + rebase -i: remove now unnecessary directory checks
122
- + rebase: factor out command line option processing
123
- + rebase: align variable content
124
- + rebase: align variable names
125
- + rebase: stricter check of standalone sub command
126
- + rebase: act on command line outside parsing loop
127
- + rebase: improve detection of rebase in progress
128
- + rebase: remove unused rebase state 'prev_head'
129
- + rebase: read state outside loop
130
- + rebase: refactor reading of state
131
- + rebase: clearer names for directory variables
132
-
133
-* rs/strbuf-setlen-assert (2011-04-27) 1 commit
134
- (merged to 'next' on 2011-04-28 at d1e8d0d)
135
- + strbuf: clarify assertion in strbuf_setlen()
136
-
137
-Will merge to "master" by the end of week #1.
138
-
139
-* sp/maint-clear-postfields (2011-04-26) 1 commit
140
- (merged to 'next' on 2011-04-26 at 0082503)
141
- + http: clear POSTFIELDS when initializing a slot
142
-
143
-Fixes a rather nasty bug we had since the beginning of smart-HTTP
144
-but has become a lot easier to trigger since 1.7.5, introducing a
145
-regression.
146
-
147
-* vh/git-svn-doc (2011-04-26) 3 commits
148
- (merged to 'next' on 2011-04-28 at 5556e8c)
149
- + git-svn.txt: small typeface improvements
150
- + git-svn.txt: move option descriptions
151
- + git-svn.txt: fix usage of --add-author-from
152
-
153
-Will merge to "master" by the end of week #1.
60
+* ab/i18n-fixup (2011-04-14) 24 commits
61
+ (merged to 'next' on 2011-04-25 at 32fef07)
62
+ + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
63
+ + i18n: use test_i18n{grep,cmp} in t7508
64
+ + i18n: use test_i18ngrep in t7506
65
+ + i18n: use test_i18ngrep and test_i18ncmp in t7502
66
+ + i18n: use test_i18ngrep in t7501
67
+ + i18n: use test_i18ncmp in t7500
68
+ + i18n: use test_i18ngrep in t7201
69
+ + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
70
+ + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
71
+ + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
72
+ + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
73
+ + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
74
+ + i18n: use test_i18ngrep in lib-httpd and t2019
75
+ + i18n: do not overuse C_LOCALE_OUTPUT (grep)
76
+ + i18n: use test_i18ncmp in t1200 and t2200
77
+ + i18n: .git file is not a human readable message (t5601)
78
+ + i18n: do not overuse C_LOCALE_OUTPUT
79
+ + i18n: mark init-db messages for translation
80
+ + i18n: mark checkout plural warning for translation
81
+ + i18n: mark checkout --detach messages for translation
82
+ + i18n: mark clone nonexistent repository message for translation
83
+ + i18n: mark merge CHERRY_PICK_HEAD messages for translation
84
+ + i18n: mark merge "upstream" messages for translation
85
+ + i18n: mark merge "Could not read from" message for translation
86
+
87
+* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
88
+ (merged to 'next' on 2011-04-26 at 8e59a0e)
89
+ + gitweb: supply '-n' to gzip for identical output
90
+
91
+* jh/notes-add-ui (2011-03-30) 1 commit
92
+ (merged to 'next' on 2011-04-25 at 4fb1ac2)
93
+ + Make "git notes add" more user-friendly when there are existing notes
94
+
95
+* jk/format-patch-multiline-header (2011-04-14) 1 commit
96
+ (merged to 'next' on 2011-04-26 at 3d5eda3)
97
+ + format-patch: wrap email addresses after long names
98
+
99
+* jk/notes-ui-updates (2011-04-14) 8 commits
100
+ (merged to 'next' on 2011-04-25 at 4216d33)
101
+ + contrib/completion: --notes, --no-notes
102
+ + log/pretty-options: Document --[no-]notes and deprecate old notes options
103
+ + revision.c: make --no-notes reset --notes list
104
+ + revision.c: support --notes command-line option
105
+ + notes: refactor display notes default handling
106
+ + notes: refactor display notes extra refs field
107
+ + revision.c: refactor notes ref expansion
108
+ + notes: make expand_notes_ref globally accessible
109
+
110
+* jm/mergetool-submodules (2011-04-13) 1 commit
111
+ (merged to 'next' on 2011-04-26 at 40892cf)
112
+ + mergetool: Teach about submodules
113
+
114
+* jn/format-patch-doc (2011-04-18) 6 commits
115
+ (merged to 'next' on 2011-04-26 at 3f64325)
116
+ + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
117
+ + Documentation: publicize hints for sending patches with GMail
118
+ + Documentation: publicize KMail hints for sending patches inline
119
+ + Documentation: hints for sending patches inline with Thunderbird
120
+ + Documentation: explain how to check for patch corruption
121
+ + Merge v1.7.5-rc2 into jn/format-patch-doc
122
+ (this branch uses jn/maint-format-patch-doc.)
123
+
124
+* jn/maint-format-patch-doc (2011-04-14) 1 commit
125
+ (merged to 'next' on 2011-04-26 at 400cf42)
126
+ + Documentation: describe the format of messages with inline patches
127
+ (this branch is used by jn/format-patch-doc.)
128
+
129
+* mg/rev-list-count-cherry (2011-04-26) 1 commit
130
+ (merged to 'next' on 2011-04-26 at dc3e80a)
131
+ + rev-list --count: separate count for --cherry-mark
132
+
133
+* ml/test-readme (2011-04-26) 1 commit
134
+ (merged to 'next' on 2011-04-26 at d1efe84)
135
+ + t/README: unify documentation of test function args
136
+
137
+* mz/maint-rename-unmerged (2011-03-23) 1 commit
138
+ (merged to 'next' on 2011-04-25 at 038a8c3)
139
+ + diffcore-rename: don't consider unmerged path as source
140
+
141
+* nd/maint-setup (2011-03-26) 2 commits
142
+ (merged to 'next' on 2011-04-25 at fd45c63)
143
+ + Kill off get_relative_cwd()
144
+ + setup: return correct prefix if worktree is '/'
145
+
146
+* nm/submodule-update-force (2011-04-01) 1 commit
147
+ (merged to 'next' on 2011-04-25 at 270fffc)
148
+ + submodule: Add --force option for git submodule update
149
+
150
+* ss/cherry-pick-x-doc (2011-04-15) 1 commit
151
+ (merged to 'next' on 2011-04-26 at c9a6f83)
152
+ + doc: Clarify that "cherry-pick -x" does not use "git notes"
153
+
154
+* ss/doc-svn (2011-04-19) 1 commit
155
+ (merged to 'next' on 2011-04-26 at a723b91)
156
+ + remove noise and inaccuracies from git-svn docs
157
+
158
+* vr/merge-base-doc (2011-04-15) 2 commits
159
+ (merged to 'next' on 2011-04-26 at e906ba3)
160
+ + Restructure documentation for git-merge-base.
161
+ + Documentation: update to git-merge-base --octopus
162
163
--------------------------------------------------
164
[Stalled]
@@ -172,6 +180,16 @@ Will merge to "master" by the end of week #1.
180
181
Rerolled. Waiting for comments.
182
183
+* jn/ctags (2011-04-29) 6 commits
184
+ - gitweb: Optional grouping of projects by category
185
+ - gitweb: Modularized git_get_project_description to be more generic
186
+ - gitweb: Split git_project_list_body in two functions
187
+ - gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
188
+ - gitweb: Change the way "content tags" ('ctags') are handled
189
+ - gitweb: Restructure projects list generation
190
+
191
+Waiting for comments.
192
+
193
* jk/maint-merge-rename-create (2011-03-25) 3 commits
194
- merge: turn on rewrite detection
195
- merge: handle renames with replacement content
@@ -179,13 +197,6 @@ Rerolled. Waiting for comments.
197
198
Peff wanted to reroll this, so this is taken out of "next".
199
182
-* dm/http-cleanup (2011-03-30) 2 commits
183
- - http-push: refactor curl_easy_setup madness
184
- - http: make curl callbacks match contracts from curl header
185
-
186
-The second one will probably need re-rolling on top of
187
-sp/maint-clear-postfields after it settles.
188
-
200
* rr/rerere-clear-libify (2011-04-13) 1 commit
201
- rerere: Expose an API corresponding to 'clear' functionality
202
@@ -216,16 +227,66 @@ current usage context.
227
--------------------------------------------------
228
[Cooking]
229
230
+* dm/http-cleanup (2011-05-05) 4 commits
231
+ - t5541-http-push: add test for chunked
232
+ - http-push: refactor curl_easy_setup madness
233
+ - http-push: use const for strings in signatures
234
+ - http: make curl callbacks match contracts from curl header
235
+
236
+* im/hashcmp-optim (2011-04-28) 1 commit
237
+ (merged to 'next' on 2011-05-02 at f131195)
238
+ + hashcmp(): inline memcmp() by hand to optimize
239
+
240
+* jc/add-delete-default (2011-04-19) 1 commit
241
+ - git add: notice removal of tracked paths by default
242
+ (this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
243
+
244
+* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
245
+ - config.mak.in: allow "configure --sysconfdir=/else/where"
246
+ - Makefile: allow sysconfdir to be used from configure
247
+ (merged to 'next' on 2011-05-02 at c747ba3)
248
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
249
+
250
+Fixed up after hitting 'next'.
251
+
252
+* sg/completion-updates (2011-04-28) 3 commits
253
+ (merged to 'next' on 2011-05-02 at 0fd443a)
254
+ + completion: don't declare 'local words' to make zsh happy
255
+ + completion: remove unnecessary _get_comp_words_by_ref() invocations
256
+ + completion: don't modify the $cur variable in completion functions
257
+
258
+Has this one settled?
259
+
260
+* jk/merge-one-file-working-tree (2011-04-29) 2 commits
261
+ (merged to 'next' on 2011-05-02 at 308fe21)
262
+ + merge-one-file: fix broken merges with alternate work trees
263
+ + add tests for merge-index / merge-one-file
264
+
265
+* js/blame-parsename (2011-04-21) 1 commit
266
+ (merged to 'next' on 2011-04-29 at 5fde945)
267
+ + blame: tolerate bogus e-mail addresses a bit better
268
+
269
+Will merge to "master" by the end of week #2.
270
+
271
+* js/info-man-path (2011-05-02) 2 commits
272
+ (merged to 'next' on 2011-05-02 at 20a15dd)
273
+ + Documentation: clarify meaning of --html-path, --man-path, and --info-path
274
+ + git: add --info-path and --man-path options
275
+
276
+* cj/p4merge (2011-05-01) 1 commit
277
+ (merged to 'next' on 2011-05-02 at 7197ef3)
278
+ + Pass empty file to p4merge where no base is suitable.
279
+
280
* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
220
- - Look for password in both CVS and CVSNT password files.
281
+ (merged to 'next' on 2011-05-02 at 5a89e3e)
282
+ + Look for password in both CVS and CVSNT password files.
283
284
* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
223
- - "add -p": work-around an old laziness that does not coalesce hunks
224
- - add--interactive.perl: factor out repeated --recount option
225
- - t3701: Editing a split hunk in an "add -p" session
226
- - add -p: 'q' should really quit
227
-
228
-Now out of "Stalled" category with tests.
285
+ (merged to 'next' on 2011-05-02 at e57b66f)
286
+ + "add -p": work-around an old laziness that does not coalesce hunks
287
+ + add--interactive.perl: factor out repeated --recount option
288
+ + t3701: Editing a split hunk in an "add -p" session
289
+ + add -p: 'q' should really quit
290
291
* ld/p4-preserve-user-names (2011-04-21) 1 commit
292
(merged to 'next' on 2011-04-29 at 25116c8)
@@ -245,38 +306,17 @@ Will merge to "master" by the end of week #2.
306
+ Add several testcases for --dirstat and friends
307
308
* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
248
- - git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
249
-
250
-Will merge to "next".
309
+ (merged to 'next' on 2011-05-02 at 9a159a5)
310
+ + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
311
312
* mg/alias-expose-prefix (2011-04-27) 2 commits
253
- - handle_alias: provide GIT_PREFIX to !alias
254
- - t1020: test !alias in subdirectory
255
-
256
-Will merge to "next".
313
+ (merged to 'next' on 2011-05-02 at 1c01d3a)
314
+ + handle_alias: provide GIT_PREFIX to !alias
315
+ + t1020: test !alias in subdirectory
316
317
* mg/diff-uiconfig-doc (2011-04-27) 1 commit
259
- - config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
260
-
261
-Will merge to "next".
262
-
263
-* mg/rev-list-count-cherry (2011-04-26) 1 commit
264
- (merged to 'next' on 2011-04-26 at dc3e80a)
265
- + rev-list --count: separate count for --cherry-mark
266
-
267
-Will merge to "master" by the end of week #2.
268
-
269
-* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
270
- (merged to 'next' on 2011-04-26 at 8e59a0e)
271
- + gitweb: supply '-n' to gzip for identical output
272
-
273
-Will merge to "master" by the end of week #2.
274
-
275
-* ml/test-readme (2011-04-26) 1 commit
276
- (merged to 'next' on 2011-04-26 at d1efe84)
277
- + t/README: unify documentation of test function args
278
-
279
-Will merge to "master" by the end of week #2.
318
+ (merged to 'next' on 2011-05-02 at 579a515)
319
+ + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
320
321
* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
322
(merged to 'next' on 2011-04-28 at 587f2d4)
@@ -310,6 +350,8 @@ Will merge to "master" by the end of week #2.
350
+ send-pack: avoid deadlock when pack-object dies early
351
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
352
353
+Will merge to "master" by the end of week #2.
354
+
355
* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
356
(merged to 'next' on 2011-04-28 at db7e04a)
357
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
@@ -317,31 +359,6 @@ Will merge to "master" by the end of week #2.
359
360
Will merge to "master" by the end of week #2.
361
320
-* jk/format-patch-multiline-header (2011-04-14) 1 commit
321
- (merged to 'next' on 2011-04-26 at 3d5eda3)
322
- + format-patch: wrap email addresses after long names
323
-
324
-Will merge to "master" by the end of week #2.
325
-
326
-* jn/maint-format-patch-doc (2011-04-14) 1 commit
327
- (merged to 'next' on 2011-04-26 at 400cf42)
328
- + Documentation: describe the format of messages with inline patches
329
- (this branch is used by jn/format-patch-doc.)
330
-
331
-Will merge to "master" by the end of week #2.
332
-
333
-* jn/format-patch-doc (2011-04-18) 6 commits
334
- (merged to 'next' on 2011-04-26 at 3f64325)
335
- + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
336
- + Documentation: publicize hints for sending patches with GMail
337
- + Documentation: publicize KMail hints for sending patches inline
338
- + Documentation: hints for sending patches inline with Thunderbird
339
- + Documentation: explain how to check for patch corruption
340
- + Merge v1.7.5-rc2 into jn/format-patch-doc
341
- (this branch uses jn/maint-format-patch-doc.)
342
-
343
-Will merge to "master" by the end of week #2.
344
-
362
* jn/run-command-error-failure (2011-04-20) 2 commits
363
(merged to 'next' on 2011-04-26 at a1f171e)
364
+ run-command: handle short writes and EINTR in die_child
@@ -349,98 +366,6 @@ Will merge to "master" by the end of week #2.
366
367
Will merge to "master" by the end of week #2.
368
352
-* ss/cherry-pick-x-doc (2011-04-15) 1 commit
353
- (merged to 'next' on 2011-04-26 at c9a6f83)
354
- + doc: Clarify that "cherry-pick -x" does not use "git notes"
355
-
356
-Will merge to "master" by the end of week #2.
357
-
358
-* ss/doc-svn (2011-04-19) 1 commit
359
- (merged to 'next' on 2011-04-26 at a723b91)
360
- + remove noise and inaccuracies from git-svn docs
361
-
362
-Will merge to "master" by the end of week #2.
363
-
364
-* vr/merge-base-doc (2011-04-15) 2 commits
365
- (merged to 'next' on 2011-04-26 at e906ba3)
366
- + Restructure documentation for git-merge-base.
367
- + Documentation: update to git-merge-base --octopus
368
-
369
-Will merge to "master" by the end of week #2.
370
-
371
-* jm/mergetool-submodules (2011-04-13) 1 commit
372
- (merged to 'next' on 2011-04-26 at 40892cf)
373
- + mergetool: Teach about submodules
374
-
375
-Will merge to "master" by the end of week #2.
376
-
377
-* ab/i18n-fixup (2011-04-14) 24 commits
378
- (merged to 'next' on 2011-04-25 at 32fef07)
379
- + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
380
- + i18n: use test_i18n{grep,cmp} in t7508
381
- + i18n: use test_i18ngrep in t7506
382
- + i18n: use test_i18ngrep and test_i18ncmp in t7502
383
- + i18n: use test_i18ngrep in t7501
384
- + i18n: use test_i18ncmp in t7500
385
- + i18n: use test_i18ngrep in t7201
386
- + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
387
- + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
388
- + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
389
- + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
390
- + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
391
- + i18n: use test_i18ngrep in lib-httpd and t2019
392
- + i18n: do not overuse C_LOCALE_OUTPUT (grep)
393
- + i18n: use test_i18ncmp in t1200 and t2200
394
- + i18n: .git file is not a human readable message (t5601)
395
- + i18n: do not overuse C_LOCALE_OUTPUT
396
- + i18n: mark init-db messages for translation
397
- + i18n: mark checkout plural warning for translation
398
- + i18n: mark checkout --detach messages for translation
399
- + i18n: mark clone nonexistent repository message for translation
400
- + i18n: mark merge CHERRY_PICK_HEAD messages for translation
401
- + i18n: mark merge "upstream" messages for translation
402
- + i18n: mark merge "Could not read from" message for translation
403
-
404
-Will merge to "master" by the end of week #2.
405
-
406
-* nm/submodule-update-force (2011-04-01) 1 commit
407
- (merged to 'next' on 2011-04-25 at 270fffc)
408
- + submodule: Add --force option for git submodule update
409
-
410
-Will merge to "master" by the end of week #2.
411
-
412
-* jh/notes-add-ui (2011-03-30) 1 commit
413
- (merged to 'next' on 2011-04-25 at 4fb1ac2)
414
- + Make "git notes add" more user-friendly when there are existing notes
415
-
416
-Will merge to "master" by the end of week #2.
417
-
418
-* jk/notes-ui-updates (2011-04-14) 8 commits
419
- (merged to 'next' on 2011-04-25 at 4216d33)
420
- + contrib/completion: --notes, --no-notes
421
- + log/pretty-options: Document --[no-]notes and deprecate old notes options
422
- + revision.c: make --no-notes reset --notes list
423
- + revision.c: support --notes command-line option
424
- + notes: refactor display notes default handling
425
- + notes: refactor display notes extra refs field
426
- + revision.c: refactor notes ref expansion
427
- + notes: make expand_notes_ref globally accessible
428
-
429
-Will merge to "master" by the end of week #2.
430
-
431
-* nd/maint-setup (2011-03-26) 2 commits
432
- (merged to 'next' on 2011-04-25 at fd45c63)
433
- + Kill off get_relative_cwd()
434
- + setup: return correct prefix if worktree is '/'
435
-
436
-Will merge to "master" by the end of week #2.
437
-
438
-* mz/maint-rename-unmerged (2011-03-23) 1 commit
439
- (merged to 'next' on 2011-04-25 at 038a8c3)
440
- + diffcore-rename: don't consider unmerged path as source
441
-
442
-Will merge to "master" by the end of week #2.
443
-
369
* nd/struct-pathspec (2011-04-05) 5 commits
370
(merged to 'next' on 2011-04-25 at 65dbe80)
371
+ pathspec: rename per-item field has_wildcard to use_wildcard
@@ -462,11 +387,12 @@ basic semantics into a not-so-horrible shape.
387
388
Will merge to "master" by the end of week #2.
389
465
---------------------------------------------------
390
+----------------------------------------------------------------
391
[Discarded]
392
468
-* mg/show-without-prune (2011-04-01) 1 commit
469
- . builtin/show: do not prune by pathspec
393
+* mg/branch-wildcard-config (2011-05-02) 1 commit
394
+ - Add default merge options for all branches
395
+
396
+It seems a separate merge.ff configuration would be more favourable
397
+than this approach.
398
471
-I wanted to like this, but it still feels like too much magic. Will wait
472
-for the topic to resurface.