Here are the topics that have been cooking. Commits prefixed
@ -15,7 +15,41 @@ meant to be merged to the maintenance series have "maint-" in their names.
@@ -15,7 +15,41 @@ meant to be merged to the maintenance series have "maint-" in their names.
* ak/p4 (Thu Aug 14 23:40:39 2008 +0100) 14 commits
+ Utilise our new p4_read_pipe and p4_write_pipe wrappers
+ Add p4 read_pipe and write_pipe wrappers
+ Put in the two other configuration elements found in the source
+ Put some documentation in about the parameters that have been
added
@ -34,7 +68,7 @@ meant to be merged to the maintenance series have "maint-" in their names.
@@ -34,7 +68,7 @@ meant to be merged to the maintenance series have "maint-" in their names.
invocations
Warmly received by the primary contributor of git-p4; I do not mind
merging this before 1.6.0.
merging this before 1.6.0 (final call for "Yays").
* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
- Make builtin-revert.c use merge_recursive_generic()
@ -53,17 +87,17 @@ three-way merge" into library form.
@@ -53,17 +87,17 @@ three-way merge" into library form.
+ pack-objects: Allow missing base objects when creating thin packs
* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
- filter-branch: use --simplify-merges
- Merge branch 'jc/post-simplify' into tr/filter-branch
- filter-branch: fix ref rewriting with --subdirectory-filter
- filter-branch: Extend test to show rewriting bug
+ filter-branch: use --simplify-merges
+ Merge branch 'jc/post-simplify' into tr/filter-branch
+ filter-branch: fix ref rewriting with --subdirectory-filter
+ filter-branch: Extend test to show rewriting bug
* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
+ checkout --track: make up a sensible branch name if '-b' was
omitted
I like this low-impact usability enhancement; will most likely be in
master soon after 1.6.0.
master soon after 1.6.0, but not before.
* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
+ xdiff-interface: hide the whole "xdiff_emit_state" business from
@ -80,11 +114,8 @@ would be a separate topic.
@@ -80,11 +114,8 @@ would be a separate topic.
* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
+ Make cherry-pick use rerere for conflict resolution.
- revision --simplify-merges: prepare for incremental simplification
- revision --simplify-merges: make it a no-op without pathspec
+ revision --simplify-merges: use decoration instead of commit->util
field
+ Topo-sort before --simplify-merges
+ revision traversal: show full history with merge simplification
+ revision.c: whitespace fix
@ -117,6 +153,8 @@ Random collection of patches to queue for post-1.6.0 development.
@@ -117,6 +153,8 @@ Random collection of patches to queue for post-1.6.0 development.
"log --full-history" is with too much clutter, "log" itself is too cleverer
than some people, and here is the middle level of merge simplification.
I started making this incremental but the progress is not so great.
* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
- [do not merge -- original version] Add Git-aware CGI for Git-aware