What's cooking in git.git (Jul 2008, issue #09; Sun, 20)
Junio C Hamano committed
Jul 20, 2008 at 22:59 UTC
935571c21269bf2d72f6bf6306d38118aeeb1d7f
1 file changed
+38
-20
whatscooking.txt
+38
-20
@@ -1,4 +1,4 @@
1
-What's cooking in git.git (Jul 2008, issue #08; Sat, 19)
1
+What's cooking in git.git (Jul 2008, issue #09; Sun, 20)
2
--------------------------------------------------------
3
4
Here are the topics that have been cooking. Commits prefixed
@@ -23,11 +23,20 @@ Tentative schedule, my wishful thinking:
23
- 1.6.0-rc3 (Aug 6)
24
- 1.6.0 (Aug 10)
25
26
-No real activity on 'next', as I was busy tending bugfixes and pushing out
27
-v1.5.6.4 today.
26
+----------------------------------------------------------------
27
+[New Topics]
28
+
29
+* pb/sane-mv (Mon Jul 21 02:25:56 2008 +0200) 2 commits
30
+ - git-mv: Keep moved index entries inact
31
+ - git-mv: Remove dead code branch
32
+
33
+Running "git mv A B" when you have local changes to A automatically staged
34
+it while moving it to B, which was a longstanding nonsense. This attempts
35
+to fix it. Pasky has other plans to build on a more solidified foundation
36
+to enhance the command to work with submodules better on top of this.
37
38
----------------------------------------------------------------
30
-[Will merge to "master" soon]
39
+[Graduated to "master"]
40
41
* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit
42
+ git am --abort
@@ -54,6 +63,30 @@ clearer.
63
* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit
64
+ Reword "your branch has diverged..." lines to reduce line length
65
66
+* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
67
+ + Teach git-merge -X<option> again.
68
+ + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
69
+ + builtin-merge.c: use parse_options_step() "incremental parsing"
70
+ machinery
71
+ + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
72
+
73
+* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits
74
+ - Document that merge strategies can now take their own options
75
+ + Make "subtree" part more orthogonal to the rest of merge-
76
+ recursive.
77
+ + Teach git-pull to pass -X<option> to git-merge
78
+ + Teach git-merge to pass -X<option> to the backend strategy module
79
+ + git-merge-recursive-{ours,theirs}
80
+ + git-merge-file --ours, --theirs
81
+
82
+It appears nobody wants "theirs" nor "ours", so I'll soon apply a
83
+wholesale revert for these series to 'next', and then these will be
84
+dropped when we rewind 'next' after 1.6.0 final.
85
+
86
+Please make sure next time somebody asks "ours/theirs" merge on the list
87
+and #git s/he is quickly told that it was unanimously rejected so that
88
+people do not have to waste time rehashing the topic ever again.
89
+
90
----------------------------------------------------------------
91
[Stalled/Needs more work]
92
@@ -91,21 +124,6 @@ I haven't looked at the updated series yet. I should, but nobody else
124
seems to be looking at these patches, which is somewhat depressing but
125
understandable. Summer is slower ;-)
126
94
-* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits
95
- . t7403: Submodule git mv, git rm testsuite
96
- . git rm: Support for removing submodules
97
- . git mv: Support moving submodules
98
- . submodule.*: Introduce simple C interface for submodule lookup by
99
- path
100
- . git submodule add: Fix naming clash handling
101
- . t7400: Add short "git submodule add" testsuite
102
- . git-mv: Remove dead code branch
103
-
104
-Long overdue usability improvement series for submodule. Very much
105
-welcomed. It would be nice to have some submodule improvements in 1.6.0,
106
-but it would take us a few more rounds to hit 'next' with this, and it
107
-will not be in 'master' when 1.6.0 ships.
108
-
127
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
128
- [BROKEN wrt shallow clones] Ignore graft during object transfer
129
@@ -125,7 +143,7 @@ This is for peeling the line from the blamed version to see what's behind
143
it, which may or may not help applications like gitweb.
144
145
----------------------------------------------------------------
128
-[Will drop]
146
+[Dropped]
147
148
* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
149
+ Teach git-merge -X<option> again.