What's cooking (2010/01 #03)
Junio C Hamano committed
Jan 10, 2010 at 11:20 UTC
e9746c7ce587895794bfb2c6aea5119c3f11422a
1 file changed
+205
-207
whats-cooking.txt
+205
-207
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2010, #02; Thu, 07)
3
-X-master-at: d6f8fd0b3eeb4349493209740742d67616e0263c
4
-X-next-at: 5229608cd809769104adde442690de7ca1b6b5db
2
+Subject: What's cooking in git.git (Jan 2010, #03; Sun, 10)
3
+X-master-at: 637afcf4e07616d1dd15d33f56c6b72f90f39821
4
+X-next-at: e295b7f76150bd2ee9a82c569ccbbde6b8fba391
5
6
-What's cooking in git.git (Jan 2010, #02; Thu, 07)
6
+What's cooking in git.git (Jan 2010, #03; Sun, 10)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,72 +11,139 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-The tip of 'next' has been rebuilt on top of the current 'master'.
15
-
14
--------------------------------------------------
15
[Graduated to "master"]
16
19
-* mo/bin-wrappers (2009-12-02) 3 commits
20
- (merged to 'next' on 2010-01-03 at 8c5fa27)
21
- + INSTALL: document a simpler way to run uninstalled builds
22
- + run test suite without dashed git-commands in PATH
23
- + build dashless "bin-wrappers" directory similar to installed bindir
24
-
25
-* mv/commit-date (2009-12-03) 2 commits
26
- (merged to 'next' on 2010-01-03 at 1c45fdf)
27
- + Document date formats accepted by parse_date()
28
- + builtin-commit: add --date option
29
-
30
-* bg/maint-add-all-doc (2009-12-07) 4 commits
31
- (merged to 'next' on 2010-01-03 at b19a323)
32
- + squash! rm documentation--also mention add-u where we mention commit-a
33
- + git-rm doc: Describe how to sync index & work tree
34
- + git-add/rm doc: Consistently back-quote
35
- + Documentation: 'git add -A' can remove files
36
-
37
-* so/cvsserver-update (2009-12-07) 1 commit
38
- (merged to 'next' on 2010-01-03 at 99959b6)
39
- + cvsserver: make the output of 'update' more compatible with cvs.
40
-
41
-* mg/tag-d-show (2009-12-10) 1 commit
42
- (merged to 'next' on 2010-01-03 at 87657d2)
43
- + tag -d: print sha1 of deleted tag
44
-
45
-* sb/maint-octopus (2009-12-11) 3 commits
46
- (merged to 'next' on 2010-01-03 at ffe77d6)
47
- + octopus: remove dead code
48
- + octopus: reenable fast-forward merges
49
- + octopus: make merge process simpler to follow
50
-
51
-* js/filter-branch-prime (2009-12-15) 1 commit
52
- (merged to 'next' on 2010-01-03 at 7c90319)
53
- + filter-branch: remove an unnecessary use of 'git read-tree'
17
+* tr/http-updates (2009-12-28) 4 commits
18
+ (merged to 'next' on 2010-01-02 at cf25698)
19
+ + Remove http.authAny
20
+ + Allow curl to rewind the RPC read buffer
21
+ + Add an option for using any HTTP authentication scheme, not only basic
22
+ + http: maintain curl sessions
23
+
24
+* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
25
+ (merged to 'next' on 2010-01-02 at 190d63b)
26
+ + reset: unbreak hard resets with GIT_WORK_TREE
27
+
28
+* jk/push-to-delete (2009-12-30) 1 commit
29
+ (merged to 'next' on 2010-01-03 at 9ee293b)
30
+ + builtin-push: add --delete as syntactic sugar for :foo
31
+
32
+* mm/config-path (2009-12-30) 1 commit
33
+ (merged to 'next' on 2010-01-03 at 9c0e81a)
34
+ + builtin-config: add --path option doing ~ and ~user expansion.
35
+
36
+* pm/cvs-environ (2009-12-30) 1 commit
37
+ (merged to 'next' on 2010-01-03 at 4c22932)
38
+ + CVS Server: Support reading base and roots from environment
39
+
40
+* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
41
+ (merged to 'next' on 2010-01-03 at b785974)
42
+ + bash completion: factor submodules into dirty state
43
+
44
+* bg/maint-remote-update-default (2009-12-31) 1 commit
45
+ (merged to 'next' on 2010-01-03 at 113009e)
46
+ + Fix "git remote update" with remotes.defalt set
47
+
48
+* mm/diag-path-in-treeish (2009-12-07) 1 commit
49
+ (merged to 'next' on 2010-01-06 at 6b4201e)
50
+ + Detailed diagnosis when parsing an object name fails.
51
+
52
+* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
53
+ (merged to 'next' on 2010-01-06 at 03e00cd)
54
+ + General --quiet improvements
55
56
--------------------------------------------------
57
[New Topics]
58
58
-* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
59
- - checkout -m path: fix recreating conflicts
59
+* bk/fix-relative-gitdir-file (2010-01-08) 2 commits
60
+ - Handle relative paths in submodule .git files
61
+ - Test update-index for a gitlink to a .git file
62
+
63
+* jc/ident (2010-01-08) 3 commits
64
+ - ident.c: treat $EMAIL as giving user.email identity explicitly
65
+ (merged to 'next' on 2010-01-10 at f1f9ded)
66
+ + ident.c: check explicit identity for name and email separately
67
+ + ident.c: remove unused variables
68
+
69
+* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits
70
+ - ls-files: fix overeager pathspec optimization
71
+ - read_directory(): further split treat_path()
72
+ - read_directory_recursive(): refactor handling of a single path into a separate function
73
+ - t3001: test ls-files -o ignored/dir
74
+
75
+* js/exec-error-report (2010-01-10) 4 commits
76
+ - Improve error message when a transport helper was not found
77
+ - start_command: detect execvp failures early
78
+ - run-command: move wait_or_whine earlier
79
+ - start_command: report child process setup errors to the parent's stderr
80
+ (this branch uses il/vcs-helper.)
81
61
-* jn/makefile (2010-01-06) 4 commits
62
- - Makefile: consolidate .FORCE-* targets
63
- - Makefile: learn to generate listings for targets requiring special flags
64
- - Makefile: use target-specific variable to pass flags to cc
65
- - Makefile: regenerate assembler listings when asked
82
+--------------------------------------------------
83
+[Stalled]
84
+
85
+* ap/merge-backend-opts (2008-07-18) 6 commits
86
+ - Document that merge strategies can now take their own options
87
+ - Extend merge-subtree tests to test -Xsubtree=dir.
88
+ - Make "subtree" part more orthogonal to the rest of merge-recursive.
89
+ - Teach git-pull to pass -X<option> to git-merge
90
+ - git merge -X<option>
91
+ - git-merge-file --ours, --theirs
92
+
93
+"git pull" patch needs sq-then-eval fix to protect it from $IFS
94
+but otherwise seemed good.
95
+
96
+* jh/commit-status (2009-12-07) 1 commit
97
+ - [test?] Add commit.status, --status, and --no-status
98
+
99
+Needs tests.
100
+
101
+* mh/rebase-fixup (2009-12-07) 2 commits
102
+ (merged to 'next' on 2010-01-06 at c4779a7)
103
+ + Add a command "fixup" to rebase --interactive
104
+ + t3404: Use test_commit to set up test repository
105
+ (this branch is used by ns/rebase-auto-squash.)
106
+
107
+Expecting further improvements to skip opening the editor if a pick is
108
+followed only by "fixup" and no "squash".
109
+
110
+* ns/rebase-auto-squash (2009-12-08) 1 commit
111
+ (merged to 'next' on 2010-01-06 at da4e2f5)
112
+ + rebase -i --autosquash: auto-squash commits
113
+ (this branch uses mh/rebase-fixup.)
114
+
115
+Blocked by the above.
116
+
117
+* jh/notes (2009-12-07) 11 commits
118
+ - Refactor notes concatenation into a flexible interface for combining notes
119
+ - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
120
+ - Notes API: for_each_note(): Traverse the entire notes tree with a callback
121
+ - Notes API: get_note(): Return the note annotating the given object
122
+ - Notes API: add_note(): Add note objects to the internal notes tree structure
123
+ - Notes API: init_notes(): Initialize the notes tree from the given notes ref
124
+ - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
125
+ - Minor style fixes to notes.c
126
+ (merged to 'next' on 2010-01-02 at ae42130)
127
+ + Add more testcases to test fast-import of notes
128
+ + Rename t9301 to t9350, to make room for more fast-import tests
129
+ + fast-import: Proper notes tree manipulation
130
+
131
+http://thread.gmane.org/gmane.comp.version-control.git/134738
132
+
133
+What's the status of the fourth and later patches on this topic? Overall
134
+it looked reasonable, if I recall correctly what I thought when I reviewed
135
+it last time, and I am tempted to merge it to 'next' soonish. Please
136
+file complaints before I do so if people have objections.
137
+
138
+Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183
139
140
--------------------------------------------------
141
[Will graduate after a bit more cooking]
142
70
-* tr/http-updates (2009-12-28) 4 commits
71
- (merged to 'next' on 2010-01-02 at cf25698)
72
- + Remove http.authAny
73
- + Allow curl to rewind the RPC read buffer
74
- + Add an option for using any HTTP authentication scheme, not only basic
75
- + http: maintain curl sessions
76
-
143
* nd/sparse (2010-01-04) 25 commits
78
- - t7002: test for not using external grep on skip-worktree paths
79
- - t7002: set test prerequisite "external-grep" if supported
144
+ (merged to 'next' on 2010-01-10 at fa73d6e)
145
+ + t7002: test for not using external grep on skip-worktree paths
146
+ + t7002: set test prerequisite "external-grep" if supported
147
(merged to 'next' on 2010-01-02 at 5499bbe)
148
+ grep: do not do external grep on skip-worktree entries
149
+ commit: correctly respect skip-worktree bit
@@ -102,34 +169,62 @@ The tip of 'next' has been rebuilt on top of the current 'master'.
169
+ Add test-index-version
170
+ update-index: refactor mark_valid() in preparation for new options
171
105
-* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
106
- (merged to 'next' on 2010-01-02 at 190d63b)
107
- + reset: unbreak hard resets with GIT_WORK_TREE
172
+I've queued the (close to) original tests for external grep, but as a belt
173
+and suspender measure Nguyễn may also want to add the whitebox test
174
+in the review thread.
175
109
-* jk/push-to-delete (2009-12-30) 1 commit
110
- (merged to 'next' on 2010-01-03 at 9ee293b)
111
- + builtin-push: add --delete as syntactic sugar for :foo
112
-
113
-* mm/config-path (2009-12-30) 1 commit
114
- (merged to 'next' on 2010-01-03 at 9c0e81a)
115
- + builtin-config: add --path option doing ~ and ~user expansion.
116
-
117
-* pm/cvs-environ (2009-12-30) 1 commit
118
- (merged to 'next' on 2010-01-03 at 4c22932)
119
- + CVS Server: Support reading base and roots from environment
176
+* cc/reset-more (2010-01-08) 8 commits
177
+ (merged to 'next' on 2010-01-10 at 84730de)
178
+ + t7111: check that reset options work as described in the tables
179
+ (merged to 'next' on 2010-01-06 at 96639cb)
180
+ + Documentation: reset: add some missing tables
181
+ (merged to 'next' on 2010-01-04 at 8802c2c)
182
+ + Fix bit assignment for CE_CONFLICTED
183
+ (merged to 'next' on 2010-01-03 at f83d4c6)
184
+ + "reset --merge": fix unmerged case
185
+ + reset: use "unpack_trees()" directly instead of "git read-tree"
186
+ + reset: add a few tests for "git reset --merge"
187
+ + Documentation: reset: add some tables to describe the different options
188
+ + reset: improve mixed reset error message when in a bare repo
189
121
-* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
122
- (merged to 'next' on 2010-01-03 at b785974)
123
- + bash completion: factor submodules into dirty state
190
+* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
191
+ (merged to 'next' on 2010-01-03 at 92d7d15)
192
+ + archive: complain about path specs that don't match anything
193
125
-* bg/maint-remote-update-default (2009-12-31) 1 commit
126
- (merged to 'next' on 2010-01-03 at 113009e)
127
- + Fix "git remote update" with remotes.defalt set
194
+* il/vcs-helper (2010-01-09) 9 commits
195
+ (merged to 'next' on 2010-01-10 at 11e448e)
196
+ + Reset possible helper before reusing remote structure
197
+ (merged to 'next' on 2010-01-06 at 7c79f42)
198
+ + Remove special casing of http, https and ftp
199
+ + Support remote archive from all smart transports
200
+ + Support remote helpers implementing smart transports
201
+ + Support taking over transports
202
+ + Refactor git transport options parsing
203
+ + Pass unknown protocols to external protocol handlers
204
+ + Support mandatory capabilities
205
+ + Add remote helper debug mode
206
+ (this branch is used by js/exec-error-report.)
207
208
--------------------------------------------------
209
[Cooking]
210
132
-* da/difftool (2009-12-22) 2 commits
211
+* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit
212
+ (merged to 'next' on 2010-01-10 at df14116)
213
+ + checkout -m path: fix recreating conflicts
214
+
215
+* jn/makefile (2010-01-06) 4 commits
216
+ (merged to 'next' on 2010-01-10 at f5a5d42)
217
+ + Makefile: consolidate .FORCE-* targets
218
+ + Makefile: learn to generate listings for targets requiring special flags
219
+ + Makefile: use target-specific variable to pass flags to cc
220
+ + Makefile: regenerate assembler listings when asked
221
+
222
+* da/difftool (2010-01-09) 6 commits
223
+ (merged to 'next' on 2010-01-10 at 749c870)
224
+ + git-diff.txt: Link to git-difftool
225
+ + difftool: Allow specifying unconfigured commands with --extcmd
226
+ + difftool--helper: Remove use of the GIT_MERGE_TOOL variable
227
+ + difftool--helper: Update copyright and remove distracting comments
228
(merged to 'next' on 2010-01-06 at e957395)
229
+ git-difftool: Add '--gui' for selecting a GUI tool
230
+ t7800-difftool: Set a bogus tool for use by tests
@@ -140,7 +235,7 @@ The tip of 'next' has been rebuilt on top of the current 'master'.
235
- gitweb: Add option to force version match
236
- gitweb: Load checking
237
143
-Will merge to 'next', unless I hear objections within a few days.
238
+Hold: Warthog on 2010-01-06, http://article.gmane.org/gmane.comp.version-control.git/136306
239
240
* tc/test-locate-httpd (2010-01-02) 1 commit
241
(merged to 'next' on 2010-01-06 at 9d913e5)
@@ -157,53 +252,36 @@ Will merge to 'next', unless I hear objections within a few days.
252
253
Resurrected from "Ejected" category. This is fix for a tricky codepath
254
and testing and improving before it hits 'next' by brave souls is greatly
160
-appreciated. I am not very happy about the solution myself.
161
-
162
-* cc/reset-more (2010-01-08) 8 commits
163
- - t7111: check that reset options work as described in the tables
164
- (merged to 'next' on 2010-01-06 at 96639cb)
165
- + Documentation: reset: add some missing tables
166
- (merged to 'next' on 2010-01-04 at 8802c2c)
167
- + Fix bit assignment for CE_CONFLICTED
168
- (merged to 'next' on 2010-01-03 at f83d4c6)
169
- + "reset --merge": fix unmerged case
170
- + reset: use "unpack_trees()" directly instead of "git read-tree"
171
- + reset: add a few tests for "git reset --merge"
172
- + Documentation: reset: add some tables to describe the different options
173
- + reset: improve mixed reset error message when in a bare repo
255
+appreciated (I am using this in my private build).
256
257
* jc/branch-d (2009-12-29) 1 commit
176
- - branch -d: base the "already-merged" safety on the branch it merges with
177
-
178
-http://thread.gmane.org/gmane.comp.version-control.git/135837/focus=135863
179
-I am tempted to merge this to 'next', but please stop me if people see issues
180
-in it.
258
+ (merged to 'next' on 2010-01-10 at 61a14b7)
259
+ + branch -d: base the "already-merged" safety on the branch it merges with
260
261
* jc/rerere (2009-12-04) 1 commit
183
- - Teach --[no-]rerere-autoupdate option to merge, revert and friends
262
+ (merged to 'next' on 2010-01-10 at e295b7f)
263
+ + Teach --[no-]rerere-autoupdate option to merge, revert and friends
264
265
* jk/run-command-use-shell (2010-01-01) 8 commits
186
- - t4030, t4031: work around bogus MSYS bash path conversion
187
- - diff: run external diff helper with shell
188
- - textconv: use shell to run helper
189
- - editor: use run_command's shell feature
190
- - run-command: optimize out useless shell calls
191
- - run-command: convert simple callsites to use_shell
192
- - t0021: use $SHELL_PATH for the filter script
193
- - run-command: add "use shell" option
266
+ (merged to 'next' on 2010-01-10 at 7479e2a)
267
+ + t4030, t4031: work around bogus MSYS bash path conversion
268
+ + diff: run external diff helper with shell
269
+ + textconv: use shell to run helper
270
+ + editor: use run_command's shell feature
271
+ + run-command: optimize out useless shell calls
272
+ + run-command: convert simple callsites to use_shell
273
+ + t0021: use $SHELL_PATH for the filter script
274
+ + run-command: add "use shell" option
275
276
Shuffled the commits in the topic, following J6t's suggestion in
277
http://thread.gmane.org/gmane.comp.version-control.git/136128
278
198
-* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
199
- (merged to 'next' on 2010-01-03 at 92d7d15)
200
- + archive: complain about path specs that don't match anything
201
-
279
* tc/clone-v-progress (2009-12-26) 4 commits
203
- - clone: use --progress to force progress reporting
204
- - clone: set transport->verbose when -v/--verbose is used
205
- - git-clone.txt: reword description of progress behaviour
206
- - check stderr with isatty() instead of stdout when deciding to show progress
280
+ (merged to 'next' on 2010-01-10 at ec2bfd7)
281
+ + clone: use --progress to force progress reporting
282
+ + clone: set transport->verbose when -v/--verbose is used
283
+ + git-clone.txt: reword description of progress behaviour
284
+ + check stderr with isatty() instead of stdout when deciding to show progress
285
286
Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
287
@@ -225,12 +303,8 @@ Perhaps needs an entry in the Release Notes, but otherwise looked Ok.
303
- resolve-undo: record resolved conflicts in a new index extension section
304
- builtin-merge.c: use standard active_cache macros
305
228
-Will wait a bit more before moving it to 'next'.
229
-
230
-* jh/commit-status (2009-12-07) 1 commit
231
- - [test?] Add commit.status, --status, and --no-status
232
-
233
-Needs tests.
306
+Will wait a bit more before moving it to 'next'. J6t spotted an issue
307
+with "rerere forget" and has a test script.
308
309
* jc/checkout-merge-base (2010-01-07) 4 commits
310
(merged to 'next' on 2010-01-07 at 5229608)
@@ -240,7 +314,7 @@ Needs tests.
314
+ "rebase --onto A...B" replays history on the merge base between A and B
315
+ "checkout A...B" switches to the merge base between A and B
316
243
-* tr/http-push-ref-status (2009-12-24) 6 commits
317
+* tr/http-push-ref-status (2010-01-08) 6 commits
318
- transport-helper.c::push_refs(): emit "no refs" error message
319
- transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
320
- transport.c::transport_push(): make ref status affect return value
@@ -248,90 +322,14 @@ Needs tests.
322
- t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
323
- t5541-http-push.sh: add tests for non-fast-forward pushes
324
251
-Peff: $gmane/136169, 136167, 136168
252
-RC: $gmane/136172
253
-
254
-* il/vcs-helper (2009-12-09) 8 commits
255
- (merged to 'next' on 2010-01-06 at 7c79f42)
256
- + Remove special casing of http, https and ftp
257
- + Support remote archive from all smart transports
258
- + Support remote helpers implementing smart transports
259
- + Support taking over transports
260
- + Refactor git transport options parsing
261
- + Pass unknown protocols to external protocol handlers
262
- + Support mandatory capabilities
263
- + Add remote helper debug mode
264
-
265
-* mm/diag-path-in-treeish (2009-12-07) 1 commit
266
- (merged to 'next' on 2010-01-06 at 6b4201e)
267
- + Detailed diagnosis when parsing an object name fails.
268
-
269
-* mh/rebase-fixup (2009-12-07) 2 commits
270
- (merged to 'next' on 2010-01-06 at c4779a7)
271
- + Add a command "fixup" to rebase --interactive
272
- + t3404: Use test_commit to set up test repository
273
- (this branch is used by ns/rebase-auto-squash.)
274
-
275
-Initial round of "fixup" action that is similar to "squash" action in
276
-"rebase -i" that excludes the commit log message from follow-up commits
277
-when composing the log message for the updated one. Expected is a further
278
-improvement to skip opening the editor if a pick is followed only by
279
-"fixup" and no "squash".
280
-
281
-* ns/rebase-auto-squash (2009-12-08) 1 commit
282
- (merged to 'next' on 2010-01-06 at da4e2f5)
283
- + rebase -i --autosquash: auto-squash commits
284
- (this branch uses mh/rebase-fixup.)
285
-
286
-* jh/notes (2009-12-07) 11 commits
287
- - Refactor notes concatenation into a flexible interface for combining notes
288
- - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
289
- - Notes API: for_each_note(): Traverse the entire notes tree with a callback
290
- - Notes API: get_note(): Return the note annotating the given object
291
- - Notes API: add_note(): Add note objects to the internal notes tree structure
292
- - Notes API: init_notes(): Initialize the notes tree from the given notes ref
293
- - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
294
- - Minor style fixes to notes.c
295
- (merged to 'next' on 2010-01-02 at ae42130)
296
- + Add more testcases to test fast-import of notes
297
- + Rename t9301 to t9350, to make room for more fast-import tests
298
- + fast-import: Proper notes tree manipulation
299
-
300
-http://thread.gmane.org/gmane.comp.version-control.git/134738
301
-
302
-What's the status of the fourth and later patches on this topic? Overall
303
-it looked reasonable, if I recall correctly what I thought when I reviewed
304
-it last time, and I am tempted to merge it to 'next' soonish. Please
305
-file complaints before I do so if people have objections.
306
-
307
-http://mid.gmane.org/201001051231.43048.johan@herland.net Hold!
308
-
309
-* fc/opt-quiet-gc-reset (2009-12-02) 1 commit
310
- (merged to 'next' on 2010-01-06 at 03e00cd)
311
- + General --quiet improvements
325
+Rerolled.
326
327
* sr/gfi-options (2009-12-04) 7 commits
314
- - fast-import: add (non-)relative-marks feature
315
- - fast-import: allow for multiple --import-marks= arguments
316
- - fast-import: test the new option command
317
- - fast-import: add option command
318
- - fast-import: add feature command
319
- - fast-import: put marks reading in its own function
320
- - fast-import: put option parsing code in separate functions
321
-
322
-http://thread.gmane.org/gmane.comp.version-control.git/134540
323
-
324
-I haven't seen comments on this round, and I am tempted to merge it to
325
-'next' soonish. Please file complaints before I do so if people have
326
-objections.
327
-
328
-* ap/merge-backend-opts (2008-07-18) 6 commits
329
- - Document that merge strategies can now take their own options
330
- - Extend merge-subtree tests to test -Xsubtree=dir.
331
- - Make "subtree" part more orthogonal to the rest of merge-recursive.
332
- - Teach git-pull to pass -X<option> to git-merge
333
- - git merge -X<option>
334
- - git-merge-file --ours, --theirs
335
-
336
-"git pull" patch needs sq-then-eval fix to protect it from $IFS
337
-but otherwise seemed good.
328
+ (merged to 'next' on 2010-01-10 at 8b305fb)
329
+ + fast-import: add (non-)relative-marks feature
330
+ + fast-import: allow for multiple --import-marks= arguments
331
+ + fast-import: test the new option command
332
+ + fast-import: add option command
333
+ + fast-import: add feature command
334
+ + fast-import: put marks reading in its own function
335
+ + fast-import: put option parsing code in separate functions