undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Avoid spurious error messages on error mistakes.
  contrib/examples/README: give an explanation of the status of these files
This commit is contained in:
Junio C Hamano 2009-01-13 01:25:55 -08:00
commit 3ea95d2b0e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/examples/README Normal file
View File

@ -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.

2
git-rebase--interactive.sh
View File

@ -349,7 +349,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