user/sven/git.git/git-rebase.sh, branch v1.4.4.4

git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.

2006-10-04T22:02:04Z

Signed-off-by: Robert Shearman Signed-off-by: Junio C Hamano

git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.

2006-10-04T22:02:04Z

This reduces the number of conflicts when rebasing after a series of patches to the same piece of code is committed upstream. Signed-off-by: Robert Shearman Signed-off-by: Junio C Hamano

Deprecate merge-recursive.py

2006-09-25T03:33:35Z

This renames merge-recursive written in Python to merge-recursive-old, and makes merge-recur as a synonym to merge-recursive. We do not remove merge-recur yet, but we will remove merge-recur and merge-recursive-old in a few releases down the road. Signed-off-by: Junio C Hamano

Merge branch 'master' into js/c-merge-recursive

2006-08-13T01:35:14Z

Adjust to hold_lock_file_for_update() change on the master.

rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.

2006-07-31T07:15:59Z

Signed-off-by: Robert Shearman Signed-off-by: Junio C Hamano

rebase: Fix the detection of fast-forwarding of the current branch to upstream.

2006-07-31T07:15:59Z

Previously, a rebasing operation with on a branch that is just tracking an upstream branch would output a confusing "Nothing to do" due to no patches being given to git-am. The test brings the behaviour back into line with that of just before e646c9c8c0aa995eac284ea0a2117add19c4461c. Signed-off-by: Robert Shearman Signed-off-by: Junio C Hamano

Merge branch 'js/read-tree' into js/c-merge-recursive

2006-07-31T06:42:10Z

* js/read-tree: (107 commits) read-tree: move merge functions to the library read-trees: refactor the unpack_trees() part tar-tree: illustrate an obscure feature better git.c: allow alias expansion without a git directory setup_git_directory_gently: do not barf when GIT_DIR is given. Build on Debian GNU/kFreeBSD Call setup_git_directory() much earlier Call setup_git_directory() early Display an error from update-ref if target ref name is invalid. Fix http-fetch t4103: fix binary patch application test. git-apply -R: binary patches are irreversible for now. Teach git-apply about '-R' Makefile: ssh-pull.o depends on ssh-fetch.c log and diff family: honor config even from subdirectories git-reset: detect update-ref error and report it. lost-found: use fsck-objects --full Teach git-http-fetch the --stdin switch Teach git-local-fetch the --stdin switch Make pull() support fetching multiple targets at once ...

recur vs recursive: help testing without touching too many stuff.

2006-07-14T06:10:19Z

During git-merge-recur development, you could set an environment variable GIT_USE_RECUR_FOR_RECURSIVE to use WIP recur in place of the recursive strategy. Signed-off-by: Junio C Hamano

Status update on merge-recursive in C

2006-07-14T06:10:19Z

This is just an update for people being interested. Alex and me were busy with that project for a few days now. While it has progressed nicely, there are quite a couple TODOs in merge-recursive.c, just search for "TODO". For impatient people: yes, it passes all the tests, and yes, according to the evil test Alex did, it is faster than the Python script. But no, it is not yet finished. Biggest points are: - there are still three external calls - in the end, it should not be necessary to write the index more than once (just before exiting) - a lot of things can be refactored to make the code easier and shorter BTW we cannot just plug in git-merge-tree yet, because git-merge-tree does not handle renames at all. This patch is meant for testing, and as such, - it compile the program to git-merge-recur - it adjusts the scripts and tests to use git-merge-recur instead of git-merge-recursive - it provides "TEST", a script to execute the tests regarding -recursive - it inlines the changes to read-cache.c (read_cache_from(), discard_cache() and refresh_cache_entry()) Brought to you by Alex Riesen and Dscho Signed-off-by: Junio C Hamano

Record rebase changes as 'rebase' in the reflog.

2006-07-14T06:08:24Z

Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano