No description
Find a file
Avery Pennarun ee2c79552a Teach git-pull to pass -X<option> to git-merge
This needs the usual sq then eval trick to allow IFS characters
in the option.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-17 22:45:17 -08:00
block-sha1
compat Explicitly truncate bswap operand to uint32_t 2009-11-25 00:16:38 -08:00
contrib git merge -X<option> 2010-01-17 22:45:06 -08:00
Documentation git-merge-file --ours, --theirs 2009-11-29 23:11:46 -08:00
git-gui
gitk-git
gitweb Merge branch 'mr/gitweb-snapshot' 2009-11-23 22:28:31 -08:00
perl
ppc
t Teach git-pull to pass -X<option> to git-merge 2010-01-17 22:45:17 -08:00
templates
xdiff git-merge-file --ours, --theirs 2009-11-29 23:11:46 -08:00
.gitattributes
.gitignore Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
.mailmap
abspath.c
advice.c merge-recursive: point the user to commit when file would be overwritten. 2009-11-22 16:07:27 -08:00
advice.h merge-recursive: point the user to commit when file would be overwritten. 2009-11-22 16:07:27 -08:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin-add.c
builtin-annotate.c
builtin-apply.c builtin-apply.c: pay attention to -p<n> when determining the name 2009-11-26 19:02:24 -08:00
builtin-archive.c
builtin-bisect--helper.c
builtin-blame.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
builtin-branch.c
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c
builtin-clean.c
builtin-clone.c
builtin-commit-tree.c
builtin-commit.c Merge branch 'mm/config-pathname-tilde-expand' 2009-11-22 16:28:38 -08:00
builtin-config.c
builtin-count-objects.c
builtin-describe.c describe: do not use unannotated tag even if exact match 2009-11-20 21:58:11 -08:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c Teach --stdin option to "log" family 2009-11-20 15:10:29 -08:00
builtin-diff.c
builtin-fast-export.c
builtin-fetch-pack.c
builtin-fetch.c Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c
builtin-gc.c
builtin-grep.c Merge branch 'bc/grep-i-F' 2009-11-22 16:28:29 -08:00
builtin-help.c
builtin-init-db.c
builtin-log.c Merge branch 'bg/format-patch-doc-update' 2009-11-20 23:47:10 -08:00
builtin-ls-files.c
builtin-ls-remote.c
builtin-ls-tree.c ls-tree: migrate to parse-options 2009-11-17 21:58:12 -08:00
builtin-mailinfo.c git am/mailinfo: Don't look at in-body headers when rebasing 2009-11-20 23:14:02 -08:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c git-merge-file --ours, --theirs 2009-11-29 23:11:46 -08:00
builtin-merge-ours.c
builtin-merge-recursive.c git merge -X<option> 2010-01-17 22:45:06 -08:00
builtin-merge.c git merge -X<option> 2010-01-17 22:45:06 -08:00
builtin-mktree.c
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'maint' 2009-11-23 21:54:39 -08:00
builtin-pack-refs.c
builtin-prune-packed.c prune-packed: only show progress when stderr is a tty 2009-11-23 21:29:45 -08:00
builtin-prune.c
builtin-push.c
builtin-read-tree.c
builtin-receive-pack.c Merge branch 'sp/smart-http' 2009-11-20 23:51:23 -08:00
builtin-reflog.c
builtin-remote.c Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
builtin-replace.c
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
builtin-rev-parse.c Merge branch 'jn/help-everywhere' 2009-11-20 23:44:52 -08:00
builtin-revert.c
builtin-rm.c
builtin-send-pack.c Merge branch 'maint' 2009-11-23 21:54:39 -08:00
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c
builtin-tar-tree.c
builtin-unpack-objects.c
builtin-update-index.c
builtin-update-ref.c
builtin-update-server-info.c
builtin-upload-archive.c Merge branch 'tc/format-attribute' 2009-11-22 16:28:14 -08:00
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h
bundle.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h Add a notice that only certain functions can print color escape codes 2009-11-27 00:28:40 -08:00
combine-diff.c
command-list.txt Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
commit.c Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
commit.h Merge branch 'sp/smart-http' 2009-11-20 23:51:23 -08:00
config.c Merge branch 'mm/config-pathname-tilde-expand' 2009-11-22 16:28:38 -08:00
config.mak.in
configure.ac
connect.c Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'tc/format-attribute' 2009-11-22 16:28:14 -08:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c diffcore-break: save cnt_data for other phases 2009-11-16 13:21:12 -08:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: reduce memory footprint by freeing blob data early 2009-11-20 22:13:47 -08:00
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jn/editor-pager' 2009-11-20 23:48:52 -08:00
git-am.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-archimport.perl
git-bisect.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-compat-util.h git merge -X<option> 2010-01-17 22:45:06 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-instaweb.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-mergetool.sh
git-notes.sh
git-parse-remote.sh
git-pull.sh Teach git-pull to pass -X<option> to git-merge 2010-01-17 22:45:17 -08:00
git-quiltimport.sh
git-rebase--interactive.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-rebase.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-stash.sh
git-submodule.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-svn.perl git svn: strip leading path when making empty dirs 2009-11-22 18:15:42 -08:00
GIT-VERSION-GEN
git-web--browse.sh
git.c git merge -X<option> 2010-01-17 22:45:06 -08:00
git.spec.in
graph.c
graph.h Documentation: undocument gc'd function graph_release() 2009-11-19 23:05:17 -08:00
grep.c grep: Allow case insensitive search of fixed-strings 2009-11-16 16:06:46 -08:00
grep.h grep: Allow case insensitive search of fixed-strings 2009-11-16 16:06:46 -08:00
hash-object.c
hash.c
hash.h
help.c
help.h
http-backend.c
http-fetch.c
http-push.c Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST 2009-11-22 22:56:54 -08:00
http-walker.c
http.c
http.h
ident.c
imap-send.c Merge branch 'tc/format-attribute' 2009-11-22 16:28:14 -08:00
index-pack.c
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c git merge -X<option> 2010-01-17 22:45:06 -08:00
ll-merge.h git merge -X<option> 2010-01-17 22:45:06 -08:00
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Makefile: do not clean arm directory 2009-11-28 10:09:56 -08:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c git merge -X<option> 2010-01-17 22:45:06 -08:00
merge-recursive.h git merge -X<option> 2010-01-17 22:45:06 -08:00
merge-tree.c
mktag.c
name-hash.c
notes.c
notes.h
object.c
object.h
pack-check.c
pack-redundant.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c Merge branch 'mm/config-pathname-tilde-expand' 2009-11-22 16:28:38 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes
remote-curl.c remote-curl.c: fix rpc_out() 2009-11-23 21:25:55 -08:00
remote.c Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
remote.h
replace_object.c
rerere.c
rerere.h
revision.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
revision.h Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c git merge -X<option> 2010-01-17 22:45:06 -08:00
strbuf.h
string-list.c
string-list.h
submodule.c submodule.c: Squelch a "use before assignment" warning 2009-11-20 21:58:11 -08:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Merge branch 'sp/smart-http' 2009-11-20 23:51:23 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-file.c
unpack-trees.c Merge branch 'jc/fix-tree-walk' (early part) 2009-11-20 23:55:50 -08:00
unpack-trees.h
upload-pack.c Merge branch 'sp/smart-http' 2009-11-20 23:51:23 -08:00
usage.c Fix truncated usage messages 2009-11-22 16:14:48 -08:00
userdiff.c
userdiff.h
utf8.c strbuf_add_wrapped_text(): skip over colour codes 2009-11-23 15:36:07 -08:00
utf8.h
var.c
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.