mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 10:13:18 +01:00
Code Activity
Mirror of https://github.com/git/git
16315 commits 6 branches 956 tags 504 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Jeff King 9cb92c390c diff: add filter for converting binary to text 
When diffing binary files, it is sometimes nice to see the
differences of a canonical text form rather than either a
binary patch or simply "binary files differ."

Until now, the only option for doing this was to define an
external diff command to perform the diff. This was a lot of
work, since the external command needed to take care of
doing the diff itself (including mode changes), and lost the
benefit of git's colorization and other options.

This patch adds a text conversion option, which converts a
file to its canonical format before performing the diff.
This is less flexible than an arbitrary external diff, but
is much less work to set up. For example:

  $ echo '*.jpg diff=exif' >>.gitattributes
  $ git config diff.exif.textconv exiftool
  $ git config diff.exif.binary false

allows one to see jpg diffs represented by the text output
of exiftool.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-18 08:02:55 -07:00
arm fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
compat cygwin: Use native Win32 API for stat 2008-09-30 14:30:06 -07:00
contrib Merge branch 'maint' 2008-10-17 01:52:32 -07:00
Documentation Merge branch 'pb/commit-where' 2008-10-18 07:07:23 -07:00
git-gui Merge git://repo.or.cz/git-gui 2008-09-25 08:41:07 -07:00
gitk-git Merge updated git-gui and gitk that call each other 2008-09-06 18:06:39 -07:00
gitweb Merge branch 'pb/gitweb-tagcloud' into pb/gitweb 2008-10-03 07:41:25 -07:00
mozilla-sha1 fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
perl Git.pm: Use File::Temp->tempfile instead of ->new 2008-09-10 11:45:22 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t t4012: use test_cmp instead of cmp 2008-10-18 07:20:36 -07:00
templates Fix permission bits on sources checked out with an overtight umask 2008-09-09 13:32:32 -07:00
xdiff xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less 2008-08-30 19:41:43 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -07:00
.gitignore Update .gitignore to ignore git-help 2008-08-13 23:46:03 -07:00
.mailmap .mailmap update 2008-07-19 11:25:51 -07:00
abspath.c is_directory(): a generic helper function 2008-09-09 09:27:45 -07:00
alias.c Move split_cmdline() to alias.c 2008-06-30 22:45:50 -07:00
alloc.c
archive-tar.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
archive-zip.c archive: remove unused headers 2008-07-19 11:17:43 -07:00
archive.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
archive.h archive: declare struct archiver where it's needed 2008-07-25 17:21:04 -07:00
attr.c Fix buffer overflow in prepare_attr_stack 2008-07-16 14:05:50 -07:00
attr.h
base85.c
blob.c
blob.h
branch.c Move MERGE_RR from .git/rr-cache/ into .git/ 2008-07-13 01:03:10 -07:00
branch.h
builtin-add.c git-add --intent-to-add (-N) 2008-08-31 16:22:05 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'maint' 2008-10-12 13:21:17 -07:00
builtin-archive.c Make git archive respect core.autocrlf when creating zip format archives 2008-09-18 19:49:28 -07:00
builtin-blame.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-branch.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-check-attr.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-check-ref-format.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-checkout-index.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-checkout.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-clean.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-clone.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-commit-tree.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
builtin-commit.c Merge branch 'pb/commit-where' 2008-10-18 07:07:23 -07:00
builtin-config.c Make non-static functions, that may be static, static 2008-07-23 18:38:14 -07:00
builtin-count-objects.c Correct output of git-count-objects. 2008-09-08 14:25:43 -07:00
builtin-describe.c Merge branch 'sb/dashless' 2008-07-16 17:22:50 -07:00
builtin-diff-files.c diff/diff-files: do not use --cc too aggressively 2008-09-18 10:49:03 -07:00
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-diff-tree.c Fix git-diff-tree --stdin 2008-09-10 15:00:17 -07:00
builtin-diff.c "git diff <tree>{3,}": do not reverse order of arguments 2008-10-12 12:36:19 -07:00
builtin-fast-export.c Fix a warning (on cygwin) to allow -Werror 2008-08-26 16:22:00 -07:00
builtin-fetch--tool.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-fetch-pack.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
builtin-fetch.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-fmt-merge-msg.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-for-each-ref.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
builtin-fsck.c Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long 2008-08-05 21:21:20 -07:00
builtin-gc.c Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set 2008-09-30 13:41:50 -07:00
builtin-grep.c git grep: Add "-z/--null" option as in GNU's grep. 2008-10-01 09:14:54 -07:00
builtin-help.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-http-fetch.c Merge branch 'ho/dashless' 2008-09-09 22:57:35 -07:00
builtin-init-db.c git init: --bare/--shared overrides system/global config 2008-10-08 07:18:44 -07:00
builtin-log.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-ls-files.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-ls-remote.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-ls-tree.c Add output flushing before fork() 2008-08-04 21:46:42 -07:00
builtin-mailinfo.c mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
builtin-mailsplit.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-merge-base.c parse-opt: migrate git-merge-base. 2008-10-02 18:46:02 -07:00
builtin-merge-file.c parse-opt: migrate builtin-merge-file. 2008-10-02 18:46:02 -07:00
builtin-merge-ours.c
builtin-merge-recursive.c Merge branch 'maint' into bc/master-diff-hunk-header-fix 2008-09-29 10:52:34 -07:00
builtin-merge.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-mv.c git-mv: Keep moved index entries inact 2008-07-27 15:05:19 -07:00
builtin-name-rev.c Merge branch 'maint' 2008-08-03 14:14:10 -07:00
builtin-pack-objects.c Replace xmalloc/memset(0) pairs with xcalloc 2008-10-08 07:30:59 -07:00
builtin-pack-refs.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-prune-packed.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-prune.c make prune report removed objects on -v 2008-09-30 14:30:00 -07:00
builtin-push.c Merge branch 'maint' 2008-10-08 08:05:43 -07:00
builtin-read-tree.c Merge branch 'jc/maint-checkout-keep-remove' into maint 2008-09-18 19:53:22 -07:00
builtin-receive-pack.c push: receiver end advertises refs from alternate repositories 2008-09-09 09:27:46 -07:00
builtin-reflog.c builtin-reflog: Allow reflog expire to name partial ref 2008-08-17 16:24:46 -07:00
builtin-remote.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-rerere.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-reset.c do not segfault if make_cache_entry failed 2008-10-06 07:19:36 -07:00
builtin-rev-list.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-rev-parse.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-revert.c cherry-pick/revert: make direct internal call to merge_tree() 2008-09-02 17:03:01 -07:00
builtin-rm.c git rm: refresh index before up-to-date check 2008-10-08 07:04:44 -07:00
builtin-send-pack.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
builtin-shortlog.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-show-branch.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-show-ref.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-stripspace.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-symbolic-ref.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-tag.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-tar-tree.c Cosmetical command name fix 2008-09-15 23:11:35 -07:00
builtin-unpack-objects.c Replace xmalloc/memset(0) pairs with xcalloc 2008-10-08 07:30:59 -07:00
builtin-update-index.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
builtin-update-ref.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin-upload-archive.c archive: define MAX_ARGS where it's needed 2008-07-25 17:20:55 -07:00
builtin-verify-pack.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
builtin-verify-tag.c builtin-verify-tag: fix -v option parsing 2008-07-28 23:02:11 -07:00
builtin-write-tree.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
builtin.h Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
bundle.c Teach git-bundle to read revision arguments from stdin like git-rev-list. 2008-07-07 01:31:24 -07:00
bundle.h
cache-tree.c cache-tree.c: make cache_tree_find() static 2008-07-16 08:50:27 -07:00
cache-tree.h cache-tree.c: make cache_tree_find() static 2008-07-16 08:50:27 -07:00
cache.h Merge branch 'dp/cywginstat' 2008-10-09 10:24:14 -07:00
check-builtins.sh
check-racy.c
check_bindir Move all dashed-form commands to libexecdir 2008-06-19 16:00:38 -07:00
color.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
color.h Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
combine-diff.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
command-list.txt
commit.c commit.c: make read_graft_file() static 2008-10-02 18:03:35 -07:00
commit.h commit.c: make read_graft_file() static 2008-10-02 18:03:35 -07:00
config.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
config.mak.in Merge branch 'jc/cc-ld-dynpath' 2008-09-07 23:45:56 -07:00
configure.ac configure: auto detect dynamic library path switches 2008-08-17 17:42:02 -07:00
connect.c push: prepare sender to receive extended ref information from the receiver 2008-09-09 09:27:46 -07:00
convert.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
copy.c copy.c: copy_fd - correctly report write errors 2008-04-22 21:21:08 -07:00
COPYING
csum-file.c Merge branch 'maint' 2008-10-10 08:39:20 -07:00
csum-file.h Merge branch 'maint' 2008-10-10 08:39:20 -07:00
ctype.c dir.c: Avoid c99 array initialization 2008-08-28 21:49:51 -07:00
daemon.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
date.c date/time: do not get confused by fractional seconds 2008-08-17 17:41:53 -07:00
decorate.c decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h
diff-delta.c
diff-lib.c diff: vary default prefix depending on what are compared 2008-08-30 20:53:24 -07:00
diff-no-index.c diff: vary default prefix depending on what are compared 2008-08-30 20:53:24 -07:00
diff.c diff: add filter for converting binary to text 2008-10-18 08:02:55 -07:00
diff.h Merge branch 'ho/dirstat-by-file' 2008-09-25 08:41:42 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diff: make "too many files" rename warning optional 2008-05-03 13:40:43 -07:00
diffcore.h diff: introduce diff.<driver>.binary 2008-10-18 08:02:26 -07:00
dir.c dir.c: make dir_add_name() and dir_add_ignored() static 2008-10-02 17:46:09 -07:00
dir.h dir.c: make dir_add_name() and dir_add_ignored() static 2008-10-02 17:46:09 -07:00
dump-cache-tree.c
editor.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
entry.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
environment.c add have_git_dir() function 2008-09-30 14:30:06 -07:00
exec_cmd.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
exec_cmd.h Refactor, adding prepare_git_cmd(const char **argv) 2008-07-28 23:02:11 -07:00
fast-import.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
fetch-pack.h
fixup-builtins make remove-dashes: apply to scripts and programs as well, not just to builtins 2008-07-11 21:13:17 -07:00
fsck.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Make git-add -i accept ranges like 7- 2008-08-01 23:26:40 -07:00
git-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
git-archimport.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-bisect.sh bisect: remove "checkout_done" variable used when checking merge bases 2008-09-05 22:31:43 -07:00
git-compat-util.h cygwin: Use native Win32 API for stat 2008-09-30 14:30:06 -07:00
git-cvsexportcommit.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-cvsimport.perl Merge branch 'maint' 2008-08-05 21:21:08 -07:00
git-cvsserver.perl cvsserver: Add cvs co -c support 2008-07-19 11:17:43 -07:00
git-filter-branch.sh Merge branch 'tr/filter-branch' 2008-09-02 17:47:13 -07:00
git-instaweb.sh Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-lost-found.sh
git-merge-octopus.sh git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge 2008-07-30 00:20:51 -07:00
git-merge-one-file.sh git-merge-one-file: fix longstanding stupid thinko 2008-03-18 22:17:17 -07:00
git-merge-resolve.sh
git-mergetool.sh Remove the use of '--' in merge program invocation 2008-06-19 14:13:55 -07:00
git-parse-remote.sh
git-pull.sh Ignore dirty submodule states in "git pull --rebase" 2008-07-23 11:36:56 -07:00
git-quiltimport.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
git-rebase--interactive.sh rebase -i: do not fail when there is no commit to cherry-pick 2008-10-10 08:32:03 -07:00
git-rebase.sh Teach rebase -i to honor pre-rebase hook 2008-10-06 01:19:14 -07:00
git-relink.perl Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-repack.sh git-repack uses --no-repack-object, not --no-repack-delta. 2008-09-19 22:23:14 -07:00
git-request-pull.sh git-request-pull: replace call to deprecated peek-remote 2008-07-13 16:08:27 -07:00
git-send-email.perl send-email: signedoffcc -> signedoffbycc, but handle both 2008-10-01 08:56:58 -07:00
git-sh-setup.sh Make usage strings dash-less 2008-07-13 14:12:48 -07:00
git-stash.sh git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1) 2008-10-09 09:09:50 -07:00
git-submodule.sh Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
git-svn.perl Add git-svn branch to allow branch creation in SVN repositories 2008-10-06 09:00:55 -07:00
GIT-VERSION-GEN GIT 1.6.0.2 2008-09-12 16:18:47 -07:00
git-web--browse.sh git-web--browse: Support for using /bin/start on MinGW 2008-09-24 15:49:21 -07:00
git.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
git.spec.in Update RPM spec for the new location of git-cvsserver. 2008-09-15 21:03:59 -07:00
graph.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c git grep: Add "-z/--null" option as in GNU's grep. 2008-10-01 09:14:54 -07:00
grep.h git grep: Add "-z/--null" option as in GNU's grep. 2008-10-01 09:14:54 -07:00
hash-object.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
hash.c Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
hash.h Add 'const' where appropriate to index handling functions 2008-03-09 00:43:48 -08:00
help.c git wrapper: also use aliases to correct mistyped commands 2008-09-11 23:05:39 -07:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -07:00
http-push.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
http-walker.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
http.c Merge branch 'mh/maint-honor-no-ssl-verify' 2008-09-16 00:46:36 -07:00
http.h Work around gcc warnings from curl headers 2008-07-04 00:37:40 -07:00
ident.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
imap-send.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
index-pack.c Merge branch 'maint' 2008-10-10 08:39:20 -07:00
INSTALL separate build targets for man and html documentation 2008-09-10 15:41:51 -07:00
interpolate.c
interpolate.h
levenshtein.c git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
levenshtein.h git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
list-objects.c
list-objects.h
ll-merge.c git-merge-recursive: learn to honor merge.conflictstyle 2008-08-30 19:41:44 -07:00
ll-merge.h
lockfile.c rollback lock files on more signals than just SIGINT 2008-05-31 14:33:59 -07:00
log-tree.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
log-tree.h move load_ref_decorations() to log-tree.c and export it 2008-09-04 17:01:41 -07:00
mailmap.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
mailmap.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
Makefile diff: unify external diff and funcname parsing code 2008-10-18 08:02:21 -07:00
match-trees.c
merge-file.c
merge-index.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
merge-recursive.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
merge-recursive.h merge-recursive: move current_{file,directory}_set to struct merge_options 2008-09-04 22:50:43 -07:00
merge-tree.c Replace xmalloc/memset(0) pairs with xcalloc 2008-10-08 07:30:59 -07:00
mktag.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
mktree.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
name-hash.c Make hash_name_lookup able to do case-independent lookups 2008-04-09 01:22:25 -07:00
object.c
object.h Fix git-diff-tree --stdin 2008-09-10 15:00:17 -07:00
pack-check.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack-redundant.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
pack-refs.c Move pack_refs() and friends into libgit 2008-06-19 15:53:13 -07:00
pack-refs.h Move pack_refs() and friends into libgit 2008-06-19 15:53:13 -07:00
pack-revindex.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c spawn pager via run_command interface 2008-07-25 21:29:44 -07:00
parse-options.c Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
parse-options.h Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
patch-delta.c
patch-id.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
patch-ids.c
patch-ids.h
path.c Fix typo in comments of longest_ancestor_length() 2008-08-11 16:44:54 -07:00
pkt-line.c Cleanup xread() loops to use read_in_full() 2008-05-03 22:15:25 -07:00
pkt-line.h
pretty.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
progress.c progress.c: avoid use of dynamic-sized array 2008-06-08 13:56:32 -07:00
progress.h
quote.c shrink git-shell by avoiding redundant dependencies 2008-06-27 23:22:00 -07:00
quote.h Make private quote_path() in wt-status.c available as quote_path_relative() 2008-03-07 21:22:25 -08:00
reachable.c
reachable.h
read-cache.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
README
reflog-walk.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
reflog-walk.h
refs.c refs: improve comments about "reading" argument of "resolve_ref" 2008-09-09 08:34:00 -07:00
refs.h Allow for having for_each_ref() list extra refs 2008-05-04 17:41:44 -07:00
RelNotes Start draft release notes for 1.6.0.3 2008-09-19 23:15:13 -07:00
remote.c Merge branch 'maint' 2008-10-17 01:52:32 -07:00
remote.h remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static. 2008-09-25 08:00:28 -07:00
rerere.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
rerere.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
revision.c Merge branch 'tr/rev-list-reverse' 2008-09-18 20:18:37 -07:00
revision.h Merge branch 'tr/rev-list-reverse' 2008-09-18 20:18:37 -07:00
run-command.c run-command.c: remove run_command_v_opt_cd() 2008-10-02 18:02:44 -07:00
run-command.h run-command.c: remove run_command_v_opt_cd() 2008-10-02 18:02:44 -07:00
send-pack.h
server-info.c
setup.c make prefix_path() never return NULL 2008-10-06 00:37:30 -07:00
sha1-lookup.c sha1-lookup: make selection of 'middle' less aggressive 2008-04-09 01:30:18 -07:00
sha1-lookup.h sha1-lookup: more memory efficient search in sorted list of SHA-1 2008-04-09 01:23:52 -07:00
sha1_file.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
sha1_name.c Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}' 2008-08-21 23:30:17 -07:00
shallow.c
shell.c shell: do not play duplicated definition games to shrink the executable 2008-08-29 22:38:41 -07:00
shortlog.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
show-index.c Fix some warnings (on cygwin) to allow -Werror 2008-07-05 17:26:29 -07:00
sideband.c improve handling of sideband message display 2008-09-03 14:51:10 -07:00
sideband.h
strbuf.c Add some useful functions for strbuf manipulation. 2008-07-13 14:04:04 -07:00
strbuf.h editor.c: Libify launch_editor() 2008-07-25 17:09:38 -07:00
string-list.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
string-list.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
symlinks.c Optimize symlink/directory detection 2008-05-10 18:16:31 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c test-parse-options: use appropriate cast in length_callback 2008-08-13 18:11:44 -07:00
test-path-utils.c Add support for GIT_CEILING_DIRECTORIES 2008-05-23 14:15:01 -07:00
test-sha1.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
test-sha1.sh more tr portability test script fixes 2008-03-13 00:57:52 -07:00
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'maint' 2008-10-06 08:56:07 -07:00
transport.h Mark the list of refs to fetch as const 2008-05-04 17:41:44 -07:00
tree-diff.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
tree-walk.c Fix tree-walking compare_entry() in the presense of --prefix 2008-03-09 00:43:47 -08:00
tree-walk.h Make 'traverse_trees()' traverse conflicting DF entries in parallel 2008-03-09 00:43:47 -08:00
tree.c add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
tree.h add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
unpack-file.c Provide git_config with a callback-data parameter 2008-05-14 12:34:44 -07:00
unpack-trees.c checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
unpack-trees.h checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
update-server-info.c Make usage strings dash-less 2008-07-13 14:12:48 -07:00
upload-pack.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
usage.c usage.c: remove unused functions 2008-09-29 07:30:16 -07:00
userdiff.c diff: add filter for converting binary to text 2008-10-18 08:02:55 -07:00
userdiff.h diff: add filter for converting binary to text 2008-10-18 08:02:55 -07:00
utf8.c
utf8.h
var.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
walker.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
walker.h Make walker.fetch_ref() take a struct ref. 2008-04-26 17:36:17 -07:00
wrapper.c Move read_in_full() and write_in_full() to wrapper.c 2008-07-20 17:17:09 -07:00
write_or_die.c Move read_in_full() and write_in_full() to wrapper.c 2008-07-20 17:17:09 -07:00
ws.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
wt-status.c Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 2008-10-12 12:36:19 -07:00
wt-status.h Add argument 'no' commit/status option -u|--untracked-files 2008-06-09 15:48:19 -07:00
xdiff-interface.c Merge branch 'maint' 2008-10-17 01:52:32 -07:00
xdiff-interface.h Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

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.