From 47a845bfc3a9e1d378c43c3b3ea4291d5d79eca8 Mon Sep 17 00:00:00 2001 From: "jidanni@jidanni.org" Date: Tue, 13 Jan 2009 09:19:42 +0800 Subject: contrib/examples/README: give an explanation of the status of these files We attempt to give an explanation of the status of the files in this directory. Signed-off-by: jidanni Signed-off-by: Junio C Hamano --- contrib/examples/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contrib/examples/README diff --git a/contrib/examples/README b/contrib/examples/README new file mode 100644 index 000000000..6946f3dd2 --- /dev/null +++ b/contrib/examples/README @@ -0,0 +1,3 @@ +These are original scripted implementations, kept primarily for their +reference value to any aspiring plumbing users who want to learn how +pieces can be fit together. -- cgit v1.2.1 From 12dd1112886f18730ee471420619e77783cd5943 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Tue, 13 Jan 2009 00:09:36 +0100 Subject: Avoid spurious error messages on error mistakes. Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 124cb5846..59c148ff6 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -309,7 +309,7 @@ do_next () { squash|s) comment_for_reflog squash - has_action "$DONE" || + test -f "$DONE" && has_action "$DONE" || die "Cannot 'squash' without a previous commit" mark_action_done -- cgit v1.2.1