summaryrefslogtreecommitdiff
path: root/sequencer.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-23 02:22:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-23 02:22:08 (GMT)
commit9fd389b65002e0e23deb2c7328360f246afec0d4 (patch)
tree6f18d8e46376adb637fddb8fca407c54021365bc /sequencer.h
parente14d63198867c545d0662afc00bf7be048bf2231 (diff)
parentc427b211b3f5d3f967e5fc7abd526b02f83a7246 (diff)
downloadgit-9fd389b65002e0e23deb2c7328360f246afec0d4.zip
git-9fd389b65002e0e23deb2c7328360f246afec0d4.tar.gz
git-9fd389b65002e0e23deb2c7328360f246afec0d4.tar.bz2
Merge branch 'jn/revert-quit'
* jn/revert-quit: revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit
Diffstat (limited to 'sequencer.h')
-rw-r--r--sequencer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h
index 905d295..f435fdb 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -13,7 +13,7 @@
*
* With the aggressive flag, it additionally removes SEQ_OLD_DIR,
* ignoring any errors. Inteded to be used by the sequencer's
- * '--reset' subcommand.
+ * '--quit' subcommand.
*/
void remove_sequencer_state(int aggressive);