aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2014-11-16 21:39:05 -0500
committerRuss Cox <rsc@swtch.com>2014-11-16 21:48:16 -0500
commit0edb04685bfac6ba0373398f3e9ee561dbaae6bf (patch)
tree55f73849b1e3c092ba846273cc5e6601e9e461fd /man
parent294f22a4705f221b9f5cf0d8df0dc7cf7626b886 (diff)
downloadplan9port-0edb04685bfac6ba0373398f3e9ee561dbaae6bf.tar.gz
plan9port-0edb04685bfac6ba0373398f3e9ee561dbaae6bf.tar.bz2
plan9port-0edb04685bfac6ba0373398f3e9ee561dbaae6bf.zip
codereview: make commit -a the default; warn about uncommitted changes at upload
also update README.md for github Change-Id: I7d578a902ffed7f6d69780721e29a1972b6f6992
Diffstat (limited to 'man')
-rw-r--r--man/man1/codereview.126
1 files changed, 13 insertions, 13 deletions
diff --git a/man/man1/codereview.1 b/man/man1/codereview.1
index 0b713c45..ec528b22 100644
--- a/man/man1/codereview.1
+++ b/man/man1/codereview.1
@@ -13,18 +13,12 @@ codereview \- review of submitted changes (experimental)
]
.B create
.I name
-[
-.B -a
-]
.PP
.B codereview
[
.B -v
]
.B commit
-[
-.B -a
-]
.PP
.B codereview
[
@@ -60,6 +54,10 @@ and then commits them to a ``feature branch''
using
.I codereview
.IR create .
+Once a feature branch is created, files can still be edited, but they must then be
+incorporated into the change by using
+.I codereview
+.IR commit .
.I Git
requires that changes be added to a ``staging area'' before the initial commit,
using commands such as
@@ -69,16 +67,18 @@ and
.I git
.IR rm .
The
-.B -a
-option causes
.I codereview
.I create
-to add all local modifications to the staging area as part of the initial commit.
-.PP
-Once a feature branch is created, files can still be edited, but they must then be
-incorporated into the change by using
+and
.I codereview
-.IR commit .
+.I commit
+commands
+automatically move all local modifications to the staging area
+as part of the commit,
+using
+.I git
+.I commit
+.IR -a .
.PP
If other changes have been committed since the feature branch was created,
.I codereview