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