summaryrefslogtreecommitdiff
path: root/git-rebase-script
AgeCommit message (Collapse)AuthorFilesLines
2005-08-18Also make git-rebase-script stricter about dirty working tree.Libravatar Junio C Hamano1-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>
2005-08-18Stupid typo fix for git rebase.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-17Make rebase script saner.Libravatar Junio C Hamano1-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>
2005-08-15Audit rev-parse users.Libravatar Junio C Hamano1-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>
2005-08-09Teach format-patch, rebase and cherry a..b formatLibravatar Junio C Hamano1-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>
2005-08-09git-commit: log parameter updates.Libravatar Junio C Hamano1-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>
2005-07-22[PATCH] Audit rev-parse users.Libravatar Junio C Hamano1-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>
2005-06-25[PATCH] git-rebase-script: rebase local commits to new upstream head.Libravatar Junio C Hamano1-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>