1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/Documentation
Thomas Rast ac083c47ea git-add--interactive: manual hunk editing mode
Adds a new option 'e' to the 'add -p' command loop that lets you edit
the current hunk in your favourite editor.

If the resulting patch applies cleanly, the edited hunk will
immediately be marked for staging. If it does not apply cleanly, you
will be given an opportunity to edit again. If all lines of the hunk
are removed, then the edit is aborted and the hunk is left unchanged.

Applying the changed hunk(s) relies on Johannes Schindelin's new
--recount option for git-apply.

Note that the "real patch" test intentionally uses
  (echo e; echo n; echo d) | git add -p
even though the 'n' and 'd' are superfluous at first sight.  They
serve to get out of the interaction loop if git add -p wrongly
concludes the patch does not apply.

Many thanks to Jeff King <peff@peff.net> for lots of help and
suggestions.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-02 15:31:49 -07:00
..
howto update-hook-example: optionally allow non-fast-forward 2008-06-25 22:41:10 -07:00
technical api-parse-options.txt: Introduce documentation for parse options API 2008-06-22 18:14:58 -07:00
.gitattributes
.gitignore doc: adding gitman.info and *.texi to .gitignore 2008-06-12 14:28:53 -07:00
asciidoc.conf pack.indexversion config option now defaults to 2 2008-06-25 21:30:55 -07:00
blame-options.txt Docs: Use "-l::\n--long\n" format in OPTIONS sections 2008-06-08 13:46:38 -07:00
build-docdep.perl
callouts.xsl
cat-texi.perl Documentation: exclude @pxref{[REMOTES]} from texinfo intermediate output 2008-06-12 14:21:05 -07:00
cmd-list.perl
CodingGuidelines CodingGuidelines: Add a note to avoid assignments inside if() 2008-05-24 22:13:19 -07:00
config.txt Merge branch 'np/pack-default' 2008-07-01 16:22:07 -07:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt Documentation: fix links to tutorials and other new manual pages 2008-07-01 17:20:09 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt git-gc --prune is deprecated 2008-04-22 21:53:37 -07:00
fetch-options.txt Docs: Use "-l::\n--long\n" format in OPTIONS sections 2008-06-08 13:46:38 -07:00
fix-texi.perl
git-add.txt git-add--interactive: manual hunk editing mode 2008-07-02 15:31:49 -07:00
git-am.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-annotate.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-apply.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-archimport.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-archive.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-bisect.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-blame.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-branch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-bundle.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-cat-file.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-check-attr.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-check-ref-format.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-checkout-index.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-checkout.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-cherry-pick.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-cherry.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-citool.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-clean.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-clone.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-commit-tree.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-commit.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-config.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-count-objects.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-cvsexportcommit.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-cvsimport.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-cvsserver.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-daemon.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-describe.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-diff-files.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-diff-index.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-diff-tree.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-diff.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-fast-export.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-fast-import.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-fetch-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-fetch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-filter-branch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-fmt-merge-msg.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-for-each-ref.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-format-patch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-fsck-objects.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-fsck.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-gc.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-get-tar-commit-id.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-grep.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-gui.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-hash-object.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-help.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-http-fetch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-http-push.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-imap-send.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-index-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-init-db.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-init.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-instaweb.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-log.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-lost-found.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-ls-files.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-ls-remote.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-ls-tree.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-mailinfo.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-mailsplit.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-merge-base.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-merge-file.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-merge-index.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-merge-one-file.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-merge-tree.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-merge.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-mergetool.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-mktag.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-mktree.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-mv.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-name-rev.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-pack-objects.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-pack-redundant.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-pack-refs.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-parse-remote.txt Documentation: don't assume git-sh-setup and git-parse-remote are in PATH 2008-06-29 23:28:47 -07:00
git-patch-id.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-peek-remote.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-prune-packed.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-prune.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-pull.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-push.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-quiltimport.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-read-tree.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-rebase.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-receive-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-reflog.txt documentation: move git(7) to git(1) 2008-06-06 11:18:28 -07:00
git-relink.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-remote.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-repack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-repo-config.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-request-pull.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-rerere.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-reset.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-rev-list.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-rev-parse.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-revert.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-rm.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-send-email.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-send-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-sh-setup.txt Documentation: don't assume git-sh-setup and git-parse-remote are in PATH 2008-06-29 23:28:47 -07:00
git-shell.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-shortlog.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-show-branch.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-show-index.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-show-ref.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-show.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-stash.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-status.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-stripspace.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-submodule.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-svn.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-symbolic-ref.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-tag.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-tar-tree.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-tools.txt
git-unpack-file.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-unpack-objects.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-update-index.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-update-ref.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-update-server-info.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-upload-archive.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-upload-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-var.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git-verify-pack.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-verify-tag.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-web--browse.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-whatchanged.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
git-write-tree.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
git.txt Documentation: Point to gitcli(7) from git(1) 2008-07-02 11:54:19 -07:00
gitattributes.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitcli.txt gitcli: Document meaning of --cached and --index 2008-07-01 17:29:38 -07:00
gitcore-tutorial.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitcvs-migration.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitdiffcore.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitglossary.txt documentation: move git(7) to git(1) 2008-06-06 11:18:28 -07:00
githooks.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00
gitignore.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitk.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gitmodules.txt documentation: move git(7) to git(1) 2008-06-06 11:18:28 -07:00
gitrepository-layout.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gittutorial-2.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
gittutorial.txt Documentation formatting and cleanup 2008-07-01 17:20:16 -07:00
glossary-content.txt glossary: improve a few links 2008-06-01 22:26:37 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
Makefile documentation: move git(7) to git(1) 2008-06-06 11:18:28 -07:00
manpage-1.72.xsl
merge-config.txt add merge.renamelimit config option 2008-05-03 13:39:51 -07:00
merge-options.txt Docs: Use "-l::\n--long\n" format in OPTIONS sections 2008-06-08 13:46:38 -07:00
merge-strategies.txt Documentation/git-merge: document subtree strategy. 2008-03-19 01:43:02 -07:00
pretty-formats.txt document --pretty=tformat: option 2008-06-12 22:22:36 -07:00
pretty-options.txt
pull-fetch-param.txt Clarify description of <repository> argument to pull/fetch for naming remotes. 2008-05-31 14:46:24 -07:00
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
RelNotes-1.5.0.5.txt
RelNotes-1.5.0.6.txt
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt
RelNotes-1.5.2.3.txt
RelNotes-1.5.2.4.txt
RelNotes-1.5.2.5.txt
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
RelNotes-1.5.3.2.txt
RelNotes-1.5.3.3.txt
RelNotes-1.5.3.4.txt
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.6.txt
RelNotes-1.5.3.7.txt
RelNotes-1.5.3.8.txt
RelNotes-1.5.3.txt
RelNotes-1.5.4.1.txt
RelNotes-1.5.4.2.txt
RelNotes-1.5.4.3.txt
RelNotes-1.5.4.4.txt
RelNotes-1.5.4.5.txt GIT 1.5.4.5 2008-03-27 20:36:35 -07:00
RelNotes-1.5.4.6.txt GIT 1.5.4.6 2008-06-26 17:11:21 -07:00
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt GIT 1.5.5.1 2008-04-20 11:36:53 -07:00
RelNotes-1.5.5.2.txt Release Notes for 1.5.5.2 2008-05-25 21:11:24 -07:00
RelNotes-1.5.5.3.txt GIT 1.5.5.3 2008-05-27 22:32:47 -07:00
RelNotes-1.5.5.4.txt GIT 1.5.5.4 2008-06-07 11:45:48 -07:00
RelNotes-1.5.5.5.txt GIT 1.5.5.5 2008-06-26 17:59:51 -07:00
RelNotes-1.5.5.txt GIT 1.5.5 2008-04-07 21:57:43 -07:00
RelNotes-1.5.6.1.txt GIT 1.5.6.1 2008-06-25 17:13:48 -07:00
RelNotes-1.5.6.2.txt Start draft release notes for 1.5.6.2 2008-07-01 17:09:21 -07:00
RelNotes-1.5.6.txt GIT 1.5.6 2008-06-18 13:09:43 -07:00
RelNotes-1.6.0.txt Update draft release notes for 1.6.0 2008-07-01 17:47:31 -07:00
rev-list-options.txt Docs: Use "-l::\n--long\n" format in OPTIONS sections 2008-06-08 13:46:38 -07:00
SubmittingPatches Add a helper script to send patches with Mozilla Thunderbird 2008-06-19 22:40:42 -07:00
urls-remotes.txt Clarify description of <repository> argument to pull/fetch for naming remotes. 2008-05-31 14:46:24 -07:00
urls.txt
user-manual.conf
user-manual.txt Documentation: be consistent about "git-" versus "git " 2008-07-01 17:20:15 -07:00