Go to file
Junio C Hamano ec7fc0b1a4 builtin-apply.c: pay attention to -p<n> when determining the name
The patch structure has def_name component that is used to validate the
sanity of a "diff --git" patch by checking pathnames that appear on the
patch header lines for consistency.  The git_header_name() function is
used to compute this out of "diff --git a/... b/..." line, but the code
always stripped one level of prefix (i.e. "a/" and "b/"), without paying
attention to -p<n> option.  Code in find_name() function that parses other
lines in the patch header (e.g. "--- a/..." and "+++ b/..." lines) however
did strip the correct number of leading paths prefixes, and the sanity
check between these computed values failed.

Teach git_header_name() to honor -p<n> option like find_name() function
does.

Found and reported by Steven J. Murdoch who also wrote tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-26 19:02:24 -08:00
Documentation pack-objects: split implications of --all-progress from progress activation 2009-11-23 21:33:09 -08:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
compat Merge branch 'ms/msvc' 2009-10-09 00:02:23 -07:00
contrib bash: add support for 'git replace' 2009-10-09 15:36:41 -07:00
git-gui
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-09-20 23:47:52 -07:00
gitweb Merge branch 'pb/maint-gitweb-blob-lineno' into maint 2009-11-15 23:07:38 -08:00
perl perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR 2009-09-25 14:00:04 -07:00
ppc
t builtin-apply.c: pay attention to -p<n> when determining the name 2009-11-26 19:02:24 -08:00
templates Merge branch 'bs/maint-pre-commit-hook-sample' into maint 2009-11-16 00:03:15 -08:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' into maint 2009-09-16 14:27:08 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -07:00
.gitignore Add intermediate build products to .gitignore 2009-11-08 17:04:50 -08:00
.mailmap Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
COPYING
GIT-VERSION-GEN Git 1.6.5.3 2009-11-16 00:05:12 -08:00
INSTALL INSTALL: Describe dependency knobs from Makefile 2009-09-10 21:34:43 -07:00
Makefile Merge branch 'tz/maint-rpm' into maint 2009-11-15 23:08:42 -08:00
README README: git lives at http://git-scm.com these days 2009-10-07 12:47:24 -07:00
RelNotes Git 1.6.5.3 2009-11-16 00:05:12 -08:00
abspath.c abspath.c: move declaration of 'len' into inner block and use appropriate type 2009-08-27 16:20:53 -07:00
advice.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
advice.h status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/maint-archive-prefix' 2009-10-09 16:27:16 -07:00
archive.h
attr.c attr: plug minor memory leak 2009-06-30 16:12:24 -07:00
attr.h
base85.c
bisect.c git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
bisect.h
blob.c
blob.h
branch.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
branch.h
builtin-add.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
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 git-archive: infer output format from filename when unspecified 2009-09-13 13:54:39 -07:00
builtin-bisect--helper.c
builtin-blame.c blame: make sure that the last line ends in an LF 2009-10-21 17:16:58 -07:00
builtin-branch.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-bundle.c Update the usage bundle string. 2009-09-18 19:47:15 -07:00
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c check-ref-format -h: it does not know the --print option yet 2009-11-10 20:45:23 -08:00
builtin-checkout-index.c
builtin-checkout.c Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint 2009-09-16 14:26:56 -07:00
builtin-clean.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-clone.c clone: detect extra arguments 2009-10-30 15:18:11 -07:00
builtin-commit-tree.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-commit.c git commit --dry-run -v: show diff in color when asked 2009-08-15 02:33:21 -07:00
builtin-config.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-count-objects.c
builtin-describe.c Do not fail "describe --always" in a tag-less repository 2009-10-23 12:00:41 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c Show usage string for 'git log -h', 'git show -h' and 'git diff -h' 2009-08-07 14:40:29 -07:00
builtin-fast-export.c git fast-export: add --no-data option 2009-07-31 07:48:09 -07:00
builtin-fetch--tool.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-fetch-pack.c
builtin-fetch.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-fmt-merge-msg.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-for-each-ref.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-fsck.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
builtin-gc.c gc --auto --quiet: make the notice a bit less verboase 2009-10-21 15:28:42 -07:00
builtin-grep.c Merge branch 'maint-1.6.4' into maint 2009-10-16 23:47:58 -07:00
builtin-help.c help -a: do not unnecessarily look for a repository 2009-10-28 10:42:17 -07:00
builtin-init-db.c Merge branch 'ns/init-mkdir' 2009-08-05 12:39:33 -07:00
builtin-log.c format-patch: make "-p" suppress diffstat 2009-11-08 17:01:36 -08:00
builtin-ls-files.c Merge branch 'jk/maint-1.6.3-ls-files-i' into maint 2009-11-15 23:07:32 -08:00
builtin-ls-remote.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
builtin-ls-tree.c
builtin-mailinfo.c builtin-mailinfo.c: check error status from rewind and ftruncate 2009-09-29 09:40:55 -07:00
builtin-mailsplit.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-merge-base.c git-merge-base/git-show-branch: Cleanup documentation and usage 2009-08-05 10:28:05 -07:00
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c
builtin-merge.c merge: do not setup worktree twice 2009-11-10 10:50:19 -08:00
builtin-mktree.c
builtin-mv.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-name-rev.c
builtin-pack-objects.c pack-objects: split implications of --all-progress from progress activation 2009-11-23 21:33:09 -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 Merge branch 'jk/maint-push-config' into maint 2009-11-15 23:07:17 -08:00
builtin-read-tree.c read-tree: Fix regression with creation of a new index file. 2009-08-17 09:20:52 -07:00
builtin-receive-pack.c receive-pack: run "gc --auto --quiet" and optionally "update-server-info" 2009-10-21 15:32:32 -07:00
builtin-reflog.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-remote.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-replace.c
builtin-rerere.c
builtin-reset.c Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
builtin-rev-list.c
builtin-rev-parse.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-revert.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-rm.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-send-pack.c pack-objects: split implications of --all-progress from progress activation 2009-11-23 21:33:09 -08:00
builtin-shortlog.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-show-branch.c Merge branch 'maint' 2009-10-04 14:48:51 -07:00
builtin-show-ref.c show-ref: migrate to parse-options 2009-06-20 23:50:42 -07:00
builtin-stripspace.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-symbolic-ref.c
builtin-tag.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-tar-tree.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-unpack-objects.c Merge branch 'jc/maint-unpack-objects-strict' into maint 2009-09-16 14:45:18 -07:00
builtin-update-index.c
builtin-update-ref.c
builtin-update-server-info.c update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
builtin-upload-archive.c Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint 2009-06-21 21:08:05 -07:00
builtin-verify-pack.c Merge branch 'maint' 2009-08-07 22:35:17 -07:00
builtin-verify-tag.c verify-tag: migrate to parse-options 2009-07-10 23:57:15 -07:00
builtin-write-tree.c write-tree: migrate to parse-options 2009-07-10 23:56:40 -07:00
builtin.h update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
bundle.c pack-objects: split implications of --all-progress from progress activation 2009-11-23 21:33:09 -08:00
bundle.h
cache-tree.c Improve on the 'invalid object' error message at commit time 2009-07-14 13:50:33 -07:00
cache-tree.h
cache.h Merge branch 'jc/maint-blank-at-eof' into maint 2009-11-15 23:06:34 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'maint' 2009-07-22 21:56:46 -07:00
command-list.txt
commit.c Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint 2009-11-15 16:38:47 -08:00
commit.h Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
config.c Merge branch 'jk/unwanted-advices' 2009-09-13 01:33:18 -07:00
config.mak.in configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests 2009-07-22 21:56:51 -07:00
configure.ac remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
connect.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
convert.c run_command: return exit code as positive value 2009-07-05 12:16:27 -07:00
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
csum-file.h
ctype.c
daemon.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
date.c Fix '--relative-date' 2009-10-03 06:04:38 -04:00
decorate.c
decorate.h
delta.h
diff-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
diff-lib.c Merge branch 'jc/shortstatus' 2009-08-28 19:38:19 -07:00
diff-no-index.c
diff.c Merge branch 'js/maint-diff-color-words' into maint 2009-11-16 00:01:56 -08:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
dir.h clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
editor.c
entry.c check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
environment.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import.c::validate_raw_date(): really validate the value 2009-10-07 13:05:03 -07:00
fetch-pack.h
fixup-builtins
fsck.c Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'jk/maint-add-p-empty' into maint 2009-11-16 00:02:44 -08:00
git-am.sh git-am: force egrep to use correct characters set 2009-09-25 15:35:05 -07:00
git-archimport.perl
git-bisect.sh git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
git-compat-util.h add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl cvsimport: fix relative argument filenames 2009-10-19 00:31:02 -07:00
git-cvsserver.perl git-cvsserver: no longer use deprecated 'git-subcommand' commands 2009-09-02 18:41:42 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: make the usage string fit on 80 chars terminals. 2009-08-18 13:35:55 -07:00
git-instaweb.sh instaweb: restart server if already running 2009-11-23 21:31:01 -08:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: improve advice for unconfigured error case 2009-10-09 11:22:43 -07:00
git-quiltimport.sh
git-rebase--interactive.sh rebase -i: more graceful handling of invalid commands 2009-10-27 23:12:44 -07:00
git-rebase.sh rebase: use plumbing to show dirty state 2009-09-11 21:41:15 -07:00
git-relink.perl
git-repack.sh Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
git-request-pull.sh request-pull: optionally show a patch as well 2009-07-29 11:02:49 -07:00
git-send-email.perl Merge branch 'jp/maint-send-email-fold' into maint 2009-10-23 22:30:42 -07:00
git-sh-setup.sh
git-stash.sh Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
git-submodule.sh typo fix: Directory `...' exist, ...: s/exist/exists/ 2009-09-29 08:30:13 -07:00
git-svn.perl git-svn: hide find_parent_branch output in double quiet mode 2009-10-10 00:00:40 -07:00
git-web--browse.sh web--browse: fix Mac OS X GUI detection for 10.6 2009-09-14 02:27:25 -07:00
git.c Merge branch 'db/vcs-helper' 2009-09-13 01:31:55 -07:00
git.spec.in Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h Documentation: undocument gc'd function graph_release() 2009-11-19 23:05:17 -08:00
grep.c grep: simplify -p output 2009-07-02 21:36:42 -07:00
grep.h Merge branch 'maint' 2009-09-13 01:30:53 -07:00
hash-object.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
hash.c
hash.h
help.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
help.h
http-fetch.c git-http-fetch: not a builtin 2009-08-05 18:37:12 -07:00
http-push.c http-push: fix xml_entities() string parsing overrun 2009-07-06 09:36:08 -07:00
http-walker.c Merge branch 'rc/maint-http-local-slot-fix' into maint 2009-06-21 21:15:31 -07:00
http.c Merge branch 'maint' 2009-09-14 14:48:27 -07:00
http.h
ident.c
imap-send.c imap-send.c: fix compiler warnings for OpenSSL 1.0 2009-10-31 14:28:18 -07:00
index-pack.c increase portability of NORETURN declarations 2009-10-01 04:12:21 -04:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
ll-merge.h
lockfile.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
log-tree.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
mailmap.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
mailmap.h
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c merge-recursive: give less scary messages when merge did not start 2009-09-08 14:46:36 -07:00
merge-recursive.h
merge-tree.c
mktag.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
pack-refs.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack-refs.h
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h
pack-write.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack.h
pager.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
parse-options.h Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
patch-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
patch-id.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pkt-line.h
preload-index.c janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
pretty.c git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
progress.c change throughput display units with fast links 2009-10-14 01:19:29 -07:00
progress.h
quote.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
quote.h
reachable.c
reachable.h
read-cache.c reset: make the reminder output consistent with "checkout" 2009-08-21 21:19:35 -07:00
reflog-walk.c
reflog-walk.h
refs.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
refs.h
remote-curl.c Allow curl helper to work without a local repository 2009-11-03 21:41:01 -08:00
remote.c Add url.<base>.pushInsteadOf: URL rewriting for push only 2009-09-08 01:18:46 -07:00
remote.h Merge branch 'mg/pushurl' 2009-06-20 21:47:27 -07:00
replace_object.c
rerere.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
rerere.h
revision.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
revision.h improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
run-command.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
run-command.h Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
send-pack.h transport: pass "quiet" flag to pack-objects 2009-08-05 20:14:09 -07:00
server-info.c
setup.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Fix incorrect error check while reading deflated pack data 2009-10-21 23:19:47 -07:00
sha1_name.c sha1_name.c: avoid unnecessary strbuf_release 2009-07-16 15:09:21 -07:00
shallow.c
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
strbuf.h strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
string-list.c
string-list.h
symlinks.c lstat_cache: guard against full match of length of 'name' parameter 2009-07-29 20:20:12 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c refactor test-date interface 2009-08-30 22:04:46 -07:00
test-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
test-dump-cache-tree.c
test-genrandom.c test-genrandom: ensure stdout is set to _O_BINARY on Windows 2009-09-21 00:36:12 -07:00
test-match-trees.c
test-parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
test-path-utils.c
test-sha1.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
test-sha1.sh
test-sigchain.c
thread-utils.c Make usage of windows.h lean and mean 2009-09-18 20:00:42 -07:00
thread-utils.h
trace.c
transport-helper.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
transport.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
transport.h Merge branch 'db/vcs-helper' 2009-09-13 01:31:55 -07:00
tree-diff.c Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' 2009-07-01 19:40:47 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-file.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
unpack-trees.c Merge branch 'maint' 2009-07-18 16:57:47 -07:00
unpack-trees.h read-tree: migrate to parse-options 2009-06-27 14:11:28 -07:00
upload-pack.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
usage.c add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
userdiff.c
userdiff.h
utf8.c
utf8.h
var.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
walker.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
walker.h
wrapper.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
write_or_die.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
ws.c Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07:00
wt-status.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
wt-status.h wt-status: collect untracked files in a separate "collect" phase 2009-08-10 12:56:43 -07:00
xdiff-interface.c userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00
xdiff-interface.h userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00

README

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

	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.