git/git-rebase-script, branch main

Big tool rename.

2005-09-08T00:45:20Z

As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano

Redo "revert" using three-way merge machinery.

2005-08-29T19:52:02Z

The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano

Also make git-rebase-script stricter about dirty working tree.

2005-08-18T23:30:36Z

Otherwise the first commit rebase makes could include whatever dirty state the original working tree had. Signed-off-by: Junio C Hamano

Stupid typo fix for git rebase.

2005-08-18T20:00:53Z

Signed-off-by: Junio C Hamano

Make rebase script saner.

2005-08-17T22:19:57Z

It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano

Audit rev-parse users.

2005-08-15T22:37:37Z

Make sure that we say --verify when we want to get a single SHA1 name. Also when we say --verify, --revs-only is redundant. Signed-off-by: Junio C Hamano

Teach format-patch, rebase and cherry a..b format

2005-08-10T06:38:50Z

Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano

git-commit: log parameter updates.

2005-08-10T05:28:22Z

While moving '-m' to make room for CVS compatible "here is the log message", enhance source of log parameters. -m 'message': a command line parameter. -F : a file (use '-' to read from stdin). -C : message in existing commit. -c : message in existing commit (allows further editing). Longer option names for these options are also available. While we are at it, get rid of shell array bashism. Signed-off-by: Junio C Hamano

[PATCH] Audit rev-parse users.

2005-07-23T03:34:16Z

This patch changes rev-parse users that pass a single argument that is supposed to be a rev parameter to use "--verify". Signed-off-by: Junio C Hamano Signed-off-by: Junio C Hamano

[PATCH] git-rebase-script: rebase local commits to new upstream head.

2005-06-25T23:52:16Z

Using git-cherry, forward port local commits missing from the new upstream head. This also depends on "-m" flag support in git-commit-script. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds