Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
add: describe --patch like checkout, reset
author
Michael J Gruber
<git@drmicha.warpmail.net>
Tue, 15 Feb 2011 13:09:08 +0000
(14:09 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 15 Feb 2011 18:51:08 +0000
(10:51 -0800)
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/add.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3f40617
)
diff --git
a/builtin/add.c
b/builtin/add.c
index 12b964e642b91863776f161a7b2aab2ec216efcb..42c906ea06b3d20d88ed6ba1c83d894d4e24f163 100644
(file)
--- a/
builtin/add.c
+++ b/
builtin/add.c
@@
-317,7
+317,7
@@
static struct option builtin_add_options[] = {
OPT__VERBOSE(&verbose, "be verbose"),
OPT_GROUP(""),
OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
OPT__VERBOSE(&verbose, "be verbose"),
OPT_GROUP(""),
OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
- OPT_BOOLEAN('p', "patch", &patch_interactive, "
interactive patching
"),
+ OPT_BOOLEAN('p', "patch", &patch_interactive, "
select hunks interactively
"),
OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),
OPT_BOOLEAN('e', "edit", &edit_interactive, "edit current diff and apply"),
OPT__FORCE(&ignored_too, "allow adding otherwise ignored files"),
OPT_BOOLEAN('u', "update", &take_worktree_changes, "update tracked files"),