Here is a list of topics that are cooking; the commits marked
with '+' are in 'next', '-' are in 'pu'. Dates are when the
topic was last touched [*1*].
----------------------------------------------------------------
* ap/clone-origin (Wed Dec 6 12:07:23 2006 +0000)
+ Explicitly add the default "git pull" behaviour to .git/config on clone
This makes 'git clone' to mark the local 'master' to explicitly
merge with the corresponding remote branch, which would be a
sensible default.
As discussed on the list earlier, I think it also would make
sense to forbid 'git pull' to make a merge when:
(1) branch.*.merge entries exist in $GIT_DIR/config (which
signals that the user is using this new mechanism), and
(2) branch.<current-branch>.merge entry does not exist for the
current branch.
I think it is sensible to merge to 'master' after that change.
* jc/3way (Wed Nov 29 18:53:13 2006 -0800)
+ git-merge: preserve and merge local changes when doing fast forward
This allows you to run a 'git merge' (or 'git pull') that
results in a fast-forward merge that updates a path your
working tree has modified locally; it merges your local changes
into the updated version, in the same way the branch switching
'git checkout -m' works. It has been in next for some time and
unless we hear somebody scream I think it is Ok to merge to
'master'.
* jc/blame-boundary (Fri Dec 1 20:45:45 2006 -0800)
- git-blame: show lines attributed to boundary commits differently.
This was discussed in a thread on grouping the short-log entries
differently and measuring the importance of each commit. While
it does not break things per-se, nobody seems to want to use it
for scripting yet, so it is staying in 'pu'.
* jc/commit-careful (Tue Oct 24 21:48:55 2006 -0700)
+ git-commit: show --summary after successful commit.
I think this is safe to merge to 'master'.
* jc/diff (Mon Sep 25 23:03:34 2006 -0700)
- para-walk: walk n trees, index and working tree in ...
