summaryrefslogtreecommitdiff
path: root/git-rebase-script
Commit message (Collapse)AuthorAgeFilesLines
* Also make git-rebase-script stricter about dirty working tree.Junio C Hamano2005-08-181-1/+3
| | | | | | | Otherwise the first commit rebase makes could include whatever dirty state the original working tree had. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Stupid typo fix for git rebase.Junio C Hamano2005-08-181-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make rebase script saner.Junio C Hamano2005-08-171-7/+10
| | | | | | | | 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 <junkio@cox.net>
* Audit rev-parse users.Junio C Hamano2005-08-151-1/+1
| | | | | | | 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 <junkio@cox.net>
* Teach format-patch, rebase and cherry a..b formatJunio C Hamano2005-08-091-8/+15
| | | | | | | | | 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 <junkio@cox.net>
* git-commit: log parameter updates.Junio C Hamano2005-08-091-1/+1
| | | | | | | | | | | | | | | | 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 <file> : a file (use '-' to read from stdin). -C <commit> : message in existing commit. -c <commit> : 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 <junkio@cox.net>
* [PATCH] Audit rev-parse users.Junio C Hamano2005-07-221-4/+4
| | | | | | | | 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 <junkio@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-rebase-script: rebase local commits to new upstream head.Junio C Hamano2005-06-251-0/+49
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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>