1
0
mirror of https://github.com/git/git.git synced 2024-10-21 16:18:11 +02:00
git/Documentation
Justin Frankel 4e5dd044c6 merge-recursive: options to ignore whitespace changes
Add support for merging with ignoring line endings (specifically
--ignore-space-at-eol) when using recursive merging.  This is
as a strategy-option, so that you can do:

	git merge --strategy-option=ignore-space-at-eol <branch>

and

	git rebase --strategy-option=ignore-space-at-eol <branch>

This can be useful for coping with line-ending damage (Xcode 3.1 has a
nasty habit of converting all CRLFs to LFs, and VC6 tends to just use
CRLFs for inserted lines).

The only option I need is ignore-space-at-eol, but while at it,
include the other xdiff whitespace options (ignore-space-change,
ignore-all-space), too.

[jn: with documentation]

Signed-off-by: Justin Frankel <justin@cockos.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-27 10:08:50 -07:00
..
howto Teach rebase the --no-ff option. 2010-03-24 14:42:57 -07:00
pt_BR
technical ll-merge: replace flag argument with options struct 2010-08-26 09:18:51 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt blame-options.txt: Add default value for -M/-C options. 2010-05-07 09:34:59 -07:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt Merge branch 'sb/format-patch-signature' 2010-06-22 09:45:22 -07:00
date-formats.txt
diff-format.txt
diff-generate-patch.txt
diff-options.txt Merge branch 'jk/diff-m-doc' 2010-06-13 11:22:27 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt everyday: fsck and gc are not everyday operations 2010-03-16 19:25:20 -07:00
fetch-options.txt
fix-texi.perl
git-add.txt add-interactive: Clarify “remaining hunks in the file” 2010-06-13 10:05:02 -07:00
git-am.txt Merge branch 'sh/am-keep-cr' 2010-03-10 15:32:34 -08:00
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt
git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt
git-branch.txt Merge branch 'maint' 2010-04-17 12:40:45 -07:00
git-bundle.txt
git-cat-file.txt git-cat-file.txt: Document --textconv 2010-06-24 13:10:59 -07:00
git-check-attr.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt Merge branch 'jn/checkout-doc' into maint 2010-06-22 09:31:47 -07:00
git-cherry-pick.txt Documentation/cherry-pick: describe passing more than one commit 2010-06-02 10:10:05 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt Sync with Git 1.7.0.3 2010-03-21 17:03:57 -07:00
git-commit-tree.txt
git-commit.txt Merge branch 'maint' 2010-06-07 15:46:01 -07:00
git-config.txt
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
git-daemon.txt
git-describe.txt Documentation: explain the meaning of "-g" in git-describe output 2010-03-24 11:31:45 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt
git-difftool.txt
git-fast-export.txt
git-fast-import.txt
git-fetch-pack.txt
git-fetch.txt fetch/push: fix usage strings 2010-04-09 21:23:10 -07:00
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt for-each-ref: Field with abbreviated objectname 2010-05-18 21:49:04 -07:00
git-format-patch.txt format-patch: Add a signature option (--signature) 2010-06-16 10:08:59 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' 2010-05-21 04:02:18 -07:00
git-get-tar-commit-id.txt
git-grep.txt Documentation: grep: fix asciidoc problem with -- 2010-06-25 08:57:17 -07:00
git-gui.txt
git-hash-object.txt hash-object: support --stdin-paths with --no-filters 2010-03-05 02:57:54 -08:00
git-help.txt
git-http-backend.txt Documentation: Clarify support for smart HTTP backend 2010-03-30 16:49:19 -07:00
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt Merge branch 'rr/imap-send-unconfuse-from-line' 2010-04-03 12:28:42 -07:00
git-index-pack.txt
git-init-db.txt
git-init.txt
git-instaweb.txt git-instaweb: Add support for running gitweb via 'plackup' 2010-06-02 11:54:06 -07:00
git-log.txt Merge branch 'jn/notes-doc' 2010-06-13 11:21:06 -07:00
git-lost-found.txt
git-ls-files.txt
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt git-mailinfo documentation: clarify -u/--encoding 2010-06-13 20:18:23 -07:00
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt merge: --log appends shortlog to message if specified 2010-05-10 12:02:20 -07:00
git-mergetool--lib.txt
git-mergetool.txt
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt Merge branch 'mg/notes-dry-run' 2010-06-13 11:22:39 -07:00
git-pack-objects.txt
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt
git-push.txt Merge branch 'maint' 2010-04-09 22:43:18 -07:00
git-quiltimport.txt
git-read-tree.txt Documentation/git-read-tree: clarify 2-tree merge 2010-03-15 15:25:17 -07:00
git-rebase.txt rebase -i -p: document shortcomings 2010-06-11 08:44:13 -07:00
git-receive-pack.txt
git-reflog.txt Merge branch 'maint-1.6.6' into maint 2010-03-21 17:00:22 -07:00
git-relink.txt
git-remote-helpers.txt Documentation/remote-helpers: Fix typos and improve language 2010-04-18 13:56:29 -07:00
git-remote.txt Merge branch 'jn/remote-set-branches' 2010-06-18 11:16:55 -07:00
git-repack.txt
git-replace.txt
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt Documentation: improve description of "git reset --keep" 2010-03-08 18:16:05 -08:00
git-rev-list.txt
git-rev-parse.txt Merge branch 'gb/maint-submodule-env' into maint 2010-03-08 00:36:02 -08:00
git-revert.txt Documentation/revert: describe passing more than one commit 2010-06-02 10:10:07 -07:00
git-rm.txt
git-send-email.txt Merge branch 'tr/send-email-8bit' 2010-06-27 12:07:45 -07:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt shortlog: Document and test --format option 2010-05-04 15:30:59 -07:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt Documentation: show-ref <pattern>s are optional 2010-03-31 14:22:17 -07:00
git-show.txt
git-stage.txt
git-stash.txt
git-status.txt Documentation+t5708: document and test status -s -b 2010-06-03 15:02:12 -07:00
git-stripspace.txt
git-submodule.txt git-submodule foreach: Add $toplevel variable 2010-05-25 09:04:24 -07:00
git-svn.txt git-svn documentation: minor grammar fix 2010-05-09 01:25:18 -07:00
git-symbolic-ref.txt
git-tag.txt
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt Documentation: git-add does not update files marked "assume unchanged" 2010-05-08 11:12:28 -07:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-write-tree.txt
git.txt Merge branch 'ld/discovery-limit-to-fs' (early part) 2010-05-21 04:02:15 -07:00
gitattributes.txt Avoid conflicts when merging branches with mixed normalization 2010-07-02 15:43:15 -07:00
gitcli.txt
gitcore-tutorial.txt
gitcvs-migration.txt
gitdiffcore.txt Documentation/gitdiffcore: fix order in pickaxe description 2010-05-18 21:55:11 -07:00
gitglossary.txt
githooks.txt notes: implement helpers needed for note copying during rewrite 2010-03-12 21:55:39 -08:00
gitignore.txt gitignore.5: Clarify matching rules 2010-05-31 18:11:10 -07:00
gitk.txt
gitmodules.txt
gitrepository-layout.txt
gittutorial-2.txt
gittutorial.txt
gitworkflows.txt
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh Do not use "diff" found on PATH while building and installing 2010-05-31 16:59:27 -07:00
mailmap.txt
Makefile Documentation/Makefile: fix interrupted builds of user-manual.xml 2010-04-21 23:46:51 -07:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt Avoid conflicts when merging branches with mixed normalization 2010-07-02 15:43:15 -07:00
merge-options.txt Merge branch 'maint' 2010-04-13 18:21:29 -07:00
merge-strategies.txt merge-recursive: options to ignore whitespace changes 2010-08-27 10:08:50 -07:00
pretty-formats.txt pretty: Introduce ' ' modifier to add space if non-empty 2010-06-16 14:45:09 -07:00
pretty-options.txt Documentation/pretty-{formats,options}: better reference for "format:<string>" 2010-06-02 10:03:53 -07:00
pull-fetch-param.txt
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
RelNotes-1.5.4.6.txt
RelNotes-1.5.4.7.txt
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt
RelNotes-1.5.5.2.txt
RelNotes-1.5.5.3.txt
RelNotes-1.5.5.4.txt
RelNotes-1.5.5.5.txt
RelNotes-1.5.5.6.txt
RelNotes-1.5.5.txt
RelNotes-1.5.6.1.txt
RelNotes-1.5.6.2.txt
RelNotes-1.5.6.3.txt
RelNotes-1.5.6.4.txt
RelNotes-1.5.6.5.txt
RelNotes-1.5.6.6.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt
RelNotes-1.6.0.3.txt
RelNotes-1.6.0.4.txt
RelNotes-1.6.0.5.txt
RelNotes-1.6.0.6.txt
RelNotes-1.6.0.txt
RelNotes-1.6.1.1.txt
RelNotes-1.6.1.2.txt
RelNotes-1.6.1.3.txt
RelNotes-1.6.1.4.txt
RelNotes-1.6.1.txt
RelNotes-1.6.2.1.txt
RelNotes-1.6.2.2.txt
RelNotes-1.6.2.3.txt
RelNotes-1.6.2.4.txt
RelNotes-1.6.2.5.txt
RelNotes-1.6.2.txt
RelNotes-1.6.3.1.txt
RelNotes-1.6.3.2.txt
RelNotes-1.6.3.3.txt
RelNotes-1.6.3.4.txt
RelNotes-1.6.3.txt
RelNotes-1.6.4.1.txt
RelNotes-1.6.4.2.txt
RelNotes-1.6.4.3.txt
RelNotes-1.6.4.4.txt
RelNotes-1.6.4.txt
RelNotes-1.6.5.1.txt
RelNotes-1.6.5.2.txt
RelNotes-1.6.5.3.txt
RelNotes-1.6.5.4.txt
RelNotes-1.6.5.5.txt
RelNotes-1.6.5.6.txt
RelNotes-1.6.5.7.txt
RelNotes-1.6.5.8.txt
RelNotes-1.6.5.txt
RelNotes-1.6.6.1.txt
RelNotes-1.6.6.2.txt
RelNotes-1.6.6.txt
RelNotes-1.7.0.1.txt
RelNotes-1.7.0.2.txt Git 1.7.0.2 2010-03-07 11:07:51 -08:00
RelNotes-1.7.0.3.txt Git 1.7.0.3 2010-03-21 17:01:22 -07:00
RelNotes-1.7.0.4.txt Git 1.7.0.4 2010-03-31 15:12:08 -07:00
RelNotes-1.7.0.5.txt Git 1.7.0.5 2010-04-11 13:42:33 -07:00
RelNotes-1.7.0.6.txt Git 1.7.0.6 2010-04-22 23:04:21 -07:00
RelNotes-1.7.0.txt
RelNotes-1.7.1.1.txt Update draft release notes to 1.7.1.1 2010-06-22 09:33:03 -07:00
RelNotes-1.7.1.txt Git 1.7.1 2010-04-23 18:27:17 -07:00
RelNotes-1.7.2.txt Git 1.7.2-rc0 2010-06-27 12:16:06 -07:00
rev-list-options.txt Documentation/rev-list-options.txt: Explain --ancestry-path 2010-06-06 10:16:31 -07:00
SubmittingPatches Merge branch 'rr/doc-submitting' into maint 2010-06-16 16:23:14 -07:00
urls-remotes.txt
urls.txt Documentation/urls: Rewrite to accomodate <transport>::<address> 2010-04-18 13:56:05 -07:00
user-manual.conf
user-manual.txt