1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Find a file
Thomas Rast 4f353658b9 Implement 'git checkout --patch'
This introduces a --patch mode for git-checkout.  In the index usage

  git checkout --patch -- [files...]

it lets the user discard edits from the <files> at the granularity of
hunks (by selecting hunks from 'git diff' and then reverse applying
them to the worktree).

We also accept a revision argument.  In the case

  git checkout --patch HEAD -- [files...]

we offer hunks from the difference between HEAD and the worktree, and
reverse applies them to both index and worktree, allowing you to
discard staged changes completely.  In the non-HEAD usage

  git checkout --patch <revision> -- [files...]

it offers hunks from the difference between the worktree and
<revision>.  The chosen hunks are then applied to both index and
worktree.

The application to worktree and index is done "atomically" in the
sense that we first check if the patch applies to the index (it should
always apply to the worktree).  If it does not, we give the user a
choice to either abort or apply to the worktree anyway.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-15 15:18:05 -07:00
arm
compat MinGW: truncate exit()'s argument to lowest 8 bits 2009-07-05 12:16:26 -07:00
contrib Show the presence of untracked files in the bash prompt. 2009-07-24 09:27:18 -07:00
Documentation Implement 'git checkout --patch' 2009-08-15 15:18:05 -07:00
git-gui Merge git://repo.or.cz/git-gui 2009-05-01 22:11:57 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-06-20 11:54:37 -07:00
gitweb gitweb: update Git homepage URL 2009-07-13 11:09:02 -07:00
mozilla-sha1
perl Git.pm: Always set Repository to absolute path if autodetecting 2009-05-09 08:25:55 -07:00
ppc
t Implement 'git checkout --patch' 2009-08-15 15:18:05 -07:00
templates Merge branch 'hv/sample-update' 2009-05-23 01:39:15 -07:00
xdiff refactor: use bitsizeof() instead of 8 * sizeof() 2009-07-22 21:57:41 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -07:00
.gitignore Merge branch 'da/difftool' 2009-04-17 21:42:12 -07:00
.mailmap
abspath.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
alias.c Merge branch 'jk/maint-1.6.0-trace-argv' into maint 2009-05-25 19:03:20 -07:00
alloc.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
archive-tar.c archive-tar.c: squelch a type mismatch warning 2009-05-08 23:57:29 -07:00
archive-zip.c
archive.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c attr: plug minor memory leak 2009-06-30 16:12:24 -07:00
attr.h attr: add GIT_ATTR_INDEX "direction" 2009-04-17 21:05:49 -07:00
base85.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
bisect.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
bisect.h bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
blob.c
blob.h
branch.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin-add.c builtin-add: refactor the meat of interactive_add() 2009-08-14 12:40:09 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-archive.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-bisect--helper.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-blame.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-branch.c Merge branch 'maint' 2009-07-24 09:27:09 -07:00
builtin-bundle.c
builtin-cat-file.c Merge branch 'sb/opt-filename' 2009-05-31 16:57:42 -07:00
builtin-check-attr.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-check-ref-format.c strbuf_check_branch_ref(): a helper to check a refname for a branch 2009-03-22 23:52:11 -07:00
builtin-checkout-index.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-checkout.c Implement 'git checkout --patch' 2009-08-15 15:18:05 -07:00
builtin-clean.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
builtin-clone.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -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 Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-describe.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c Remove unused assignments 2009-03-14 13:36:34 -07:00
builtin-diff.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-fast-export.c Merge branch 'maint' 2009-07-24 09:27: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 fetch-pack: close output channel after sideband demultiplexer terminates 2009-06-08 21:18:41 -07:00
builtin-fetch.c quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -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 Merge branch 'ak/maint-for-each-ref-no-lookup' 2009-06-18 10:33:09 -07:00
builtin-fsck.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-gc.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-grep.c Merge branch 'rs/grep-p' 2009-07-09 00:59:58 -07:00
builtin-help.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
builtin-http-fetch.c
builtin-init-db.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-log.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-ls-files.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
builtin-ls-remote.c
builtin-ls-tree.c Produce a nicer output in case of sha1_object_info failures in ls-tree -l 2009-03-20 09:35:21 -07:00
builtin-mailinfo.c Revert "mailinfo: Remove only one set of square brackets" 2009-07-15 15:10:06 -07:00
builtin-mailsplit.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-merge-base.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-file.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-ours.c
builtin-merge-recursive.c MinGW: Fix compiler warning in merge-recursive 2009-05-23 01:54:45 -07:00
builtin-merge.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-mktree.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-mv.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-name-rev.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-pack-objects.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
builtin-pack-refs.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-prune-packed.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-prune.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-push.c push: do not give big warning when no preference is configured 2009-07-18 17:20:52 -07:00
builtin-read-tree.c Merge branch 'jc/maint-read-tree-multi' 2009-04-22 19:36:19 -07:00
builtin-receive-pack.c receive-pack: do not send error details to the client 2009-06-21 20:19:21 -07:00
builtin-reflog.c Fix more typos/spelling in comments 2009-04-22 19:03:39 -07:00
builtin-remote.c Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' 2009-07-01 19:40:54 -07:00
builtin-rerere.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-reset.c Implement 'git reset --patch' 2009-08-15 15:17:47 -07:00
builtin-rev-list.c bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
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 Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-shortlog.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-show-branch.c show-branch: don't use LASTARG_DEFAULT with OPTARG 2009-06-09 00:15:57 -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 parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-tag.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -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 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-update-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
builtin-update-ref.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01: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 Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
builtin-write-tree.c write-tree --ignore-cache-tree 2009-05-20 11:07:07 -07:00
builtin.h build-in git-mktree 2009-05-10 12:41:35 -07:00
bundle.c Terminate argv with NULL before calling setup_revisions() 2009-05-21 08:56:24 -07: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 Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
cache.h Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
color.h graph API: Added logic for colored edges 2009-04-13 22:41:25 -07:00
combine-diff.c Merge branch 'maint' 2009-07-22 21:56:46 -07:00
command-list.txt difftool: move 'git-difftool' out of contrib 2009-04-07 22:19:56 -07:00
commit.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
commit.h builtin-add: refactor the meat of interactive_add() 2009-08-14 12:40:09 -07:00
config.c After renaming a section, print any trailing variable definitions 2009-07-24 23:42:44 -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 configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing 2009-07-22 21:57:41 -07:00
connect.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
convert.c
copy.c
COPYING
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
csum-file.h
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
date.c Work around BSD whose typeof(tv.tv_sec) != time_t 2009-05-05 22:19:14 -07:00
decorate.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
decorate.h
delta.h Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
diff-delta.c
diff-lib.c Merge branch 'jc/cache-tree' 2009-06-20 21:47:30 -07:00
diff-no-index.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
diff.c Merge branch 'rs/grep-p' 2009-07-09 00:59:58 -07:00
diff.h Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking 2009-03-04 00:56:51 -08:00
diffcore-break.c Remove unused function scope local variables 2009-03-07 20:52:17 -08:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c pickaxe: count regex matches only once 2009-03-21 23:18:53 -07:00
diffcore-rename.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
diffcore.h
dir.c Avoid using 'lstat()' to figure out directories 2009-07-09 20:05:19 -07:00
dir.h Simplify read_directory[_recursive]() arguments 2009-07-09 01:11:28 -07:00
editor.c
entry.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
environment.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
exec_cmd.c Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 2009-04-08 23:01:10 -07:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -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 Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
generate-cmdlist.sh generate-cmdlist.sh: avoid selecting synopsis at wrong place 2008-11-30 18:16:32 -08:00
git-add--interactive.perl Implement 'git checkout --patch' 2009-08-15 15:18:05 -07:00
git-am.sh Merge branch 'gb/am-foreign' 2009-07-06 09:38:33 -07:00
git-archimport.perl
git-bisect.sh bisect: make "git bisect" use new "--next-all" bisect-helper function 2009-05-10 14:30:33 -07:00
git-compat-util.h janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: run post-update hook *after* update. 2009-01-30 21:11:46 -08:00
git-difftool--helper.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-difftool.perl Explain seemingly pointless use of system in difftool 2009-04-24 01:20:35 -07:00
git-filter-branch.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-instaweb.sh git-instaweb: fix lighttpd configuration on cygwin 2009-03-10 23:16:52 -07:00
git-lost-found.sh lost-found: use git rev-parse -q 2008-12-03 14:27:17 -08:00
git-merge-octopus.sh
git-merge-one-file.sh Clarify kind of conflict in merge-one-file helper 2009-05-09 00:27:39 -07:00
git-merge-resolve.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-mergetool--lib.sh mergetool--lib: add support for araxis merge 2009-05-24 11:21:05 -07:00
git-mergetool.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-parse-remote.sh parse-remote: remove unused functions 2009-06-11 19:50:45 -07:00
git-pull.sh Merge branch 'sb/pull-rebase' 2009-06-20 21:47:13 -07:00
git-quiltimport.sh git-quiltimport: preserve standard input to be able to read user input 2009-02-25 00:49:13 -08:00
git-rebase--interactive.sh Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint 2009-06-11 14:14:00 -07:00
git-rebase.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -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: really really disable pager 2009-07-01 13:20:00 -07:00
git-send-email.perl Merge branch 'jk/maint-send-email-alias-loop' 2009-07-25 00:44:45 -07:00
git-sh-setup.sh git-sh-setup: introduce say() for quiet options 2009-06-18 09:50:31 -07:00
git-stash.sh git stash: modernize use of "dashed" git-XXX calls 2009-07-22 21:57:41 -07:00
git-submodule.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -07:00
git-svn.perl git svn: fix shallow clone when upstream revision is too new 2009-07-22 23:45:29 -07:00
GIT-VERSION-GEN GIT 1.6.3.3 2009-06-21 21:15:50 -07:00
git-web--browse.sh git: browsing paths with spaces when using the start command 2009-06-01 00:22:01 -07:00
git.c Merge branch 'js/run-command-updates' (early part) 2009-07-09 00:59:32 -07:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c janitor: use NULL and not 0 for pointers. 2009-07-22 21:57:41 -07:00
graph.h
grep.c grep: simplify -p output 2009-07-02 21:36:42 -07:00
grep.h grep -p: support user defined regular expressions 2009-07-01 19:16:50 -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 janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
help.h
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 'ml/http' 2009-07-09 01:00:36 -07:00
http.h http*: add helper methods for fetching objects (loose) 2009-06-06 11:03:11 -07:00
ident.c Add backslash to list of 'crud' characters in real name 2008-12-02 15:29:13 -08:00
imap-send.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
index-pack.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08:00
levenshtein.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
levenshtein.h
list-objects.c Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
list-objects.h Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
ll-merge.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
ll-merge.h
lockfile.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
log-tree.c log-tree: fix confusing comment 2009-07-01 11:16:54 -07:00
log-tree.h format-patch: --attach/inline uses filename instead of SHA1 2009-03-22 21:45:19 -07:00
mailmap.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
Makefile Merge branch 'maint' 2009-07-24 09:27:09 -07:00
match-trees.c
merge-file.c
merge-index.c Simplify some instances of run_command() by using run_command_v_opt(). 2009-06-09 00:15:57 -07:00
merge-recursive.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
merge-recursive.h
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
name-hash.c
object.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c Don't expect verify_pack() callers to set pack_size 2009-06-06 10:56:27 -07:00
pack-redundant.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08: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 pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
parse-options.h Merge branch 'sb/parse-options-integer' 2009-06-18 10:36:22 -07:00
patch-delta.c Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
patch-id.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
patch-ids.c patch-ids: use the new generic "sha1_pos" function to lookup sha1 2009-04-04 22:57:42 -07:00
patch-ids.h
path.c diff: generate pretty filenames in prep_temp_blob() 2009-05-31 17:57:59 -07:00
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 Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility 2009-05-18 20:53:12 -07:00
progress.c progress bar: round to the nearest instead of truncating down 2009-04-25 08:54:18 -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 quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
read-cache.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
README README: fix path to "gitcvs-migration.txt" and be more consistent 2009-02-25 00:49:54 -08:00
reflog-walk.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
reflog-walk.h make oneline reflog dates more consistent with multiline format 2009-03-20 00:57:27 -07:00
refs.c Merge branch 'maint' 2009-07-24 09:27:09 -07:00
refs.h Change prettify_ref to prettify_refname 2009-05-13 20:55:48 -07:00
RelNotes GIT 1.6.3.3 2009-06-21 21:15:50 -07:00
remote.c Merge branch 'cb/maint-fetch-refspec-wo-dst' 2009-07-06 09:39:38 -07:00
remote.h Merge branch 'mg/pushurl' 2009-06-20 21:47:27 -07:00
rerere.c replace direct calls to unlink(2) with unlink_or_warn 2009-04-29 18:37:41 -07:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c Make 'git show' more useful 2009-07-14 13:50:29 -07:00
revision.h git log: add '--merges' flag to match '--no-merges' 2009-06-29 12:32:51 -07:00
run-command.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
run-command.h fix portability problem with IS_RUN_COMMAND_ERR 2009-04-01 11:05:54 -07:00
send-pack.h allow OFS_DELTA objects during a push 2009-05-01 22:06:41 -07:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
setup.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
sha1-lookup.c sha1-lookup: fix up the assertion message 2009-04-06 00:56:27 -07:00
sha1-lookup.h sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 2009-04-04 22:57:39 -07:00
sha1_file.c refactor: use bitsizeof() instead of 8 * sizeof() 2009-07-22 21:57:41 -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 recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sideband.h recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c fread does not return negative on error 2009-06-23 16:57:15 -07:00
strbuf.h Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
string-list.c string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
string-list.h string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
symlinks.c Export thread-safe version of 'has_symlink_leading_path()' 2009-07-09 20:05:19 -07:00
tag.c
tag.h
tar.h
test-chmtime.c test-chmtime: work around Windows limitation 2009-06-01 00:10:08 -07:00
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c
test-delta.c
test-dump-cache-tree.c add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c test-genrandom: Add newline to usage string 2009-04-23 01:29:00 -07:00
test-match-trees.c
test-parse-options.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
test-path-utils.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
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 t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c
thread-utils.h
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport.c Merge branch 'ld/push-porcelain-output-format' 2009-07-09 01:07:54 -07:00
transport.h add --porcelain option to git-push 2009-06-27 22:26:58 -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 Fix off-by-one in read_tree_recursive 2009-04-20 13:44:14 -07:00
tree.h
unimplemented.sh Makefile: allow building without perl 2009-04-08 22:14:56 -07:00
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 Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
update-server-info.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
upload-pack.c upload-pack: squelch progress indicator if client cannot see it 2009-06-18 11:38:43 -07:00
usage.c die_errno(): double % in strerror() output just in case 2009-06-27 11:14:53 -07:00
userdiff.c avoid exponential regex match for java and objc function names 2009-06-18 09:52:10 -07:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec 2009-06-06 13:21:05 -07:00
utf8.h utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
var.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08: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 Fix severe breakage in "git-apply --whitespace=fix" 2009-07-25 01:29:20 -07:00
wt-status.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
wt-status.h
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

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

	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.or.cz/
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.