mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 18:46:11 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
42,229 Commits 6 Branches 940 Tags 373 MiB
C 49.9%
Shell 38.8%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Other 1.6%
Go to file
Jeff King 01143847db add--interactive: allow custom diff highlighting programs 
The patch hunk selector of add--interactive knows how ask
git for colorized diffs, and correlate them with the
uncolored diffs we apply. But there's not any way for
somebody who uses a diff-filter tool like contrib's
diff-highlight to see their normal highlighting.

This patch lets users define an arbitrary shell command to
pipe the colorized diff through. The exact output shouldn't
matter (since we just show the result to humans) as long as
it is line-compatible with the original diff (so that
hunk-splitting can split the colorized version, too).

I left two minor issues with the new system that I don't
think are worth fixing right now, but could be done later:

  1. We only filter colorized diffs. Theoretically a user
     could want to filter a non-colorized diff, but I find
     it unlikely in practice. Users who are doing things
     like diff-highlighting are likely to want color, too.

  2. add--interactive will re-colorize a diff which has been
     hand-edited, but it won't have run through the filter.
     Fixing this is conceptually easy (just pipe the diff
     through the filter), but practically hard to do without
     using tempfiles (it would need to feed data to and read
     the result from the filter without deadlocking; this
     raises portability questions with respect to Windows).

I've punted on both issues for now, and if somebody really
cares later, they can do a patch on top.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2016-02-28 10:53:54 -08:00
Documentation add--interactive: allow custom diff highlighting programs 2016-02-28 10:53:54 -08:00
block-sha1 sha1: provide another level of indirection for the SHA-1 functions 2015-11-05 10:35:11 -08:00
builtin Merge branch 'js/config-set-in-non-repository' 2016-02-26 13:37:26 -08:00
compat Merge branch 'ps/config-error' 2016-02-26 13:37:19 -08:00
contrib Merge branch 'pw/completion-stash' into maint 2016-02-22 13:10:20 -08:00
ewah ewah: convert to REALLOC_ARRAY, etc 2016-02-22 14:51:09 -08:00
git-gui git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution 2015-12-27 15:33:13 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2015-12-21 08:56:16 -08:00
gitweb gitweb: squelch "uninitialized value" warning 2016-01-12 13:21:15 -08:00
mergetools mergetool: reorder vim/gvim buffers in three-way diffs 2016-02-12 10:14:09 -08:00
perl git-svn: apply "svn.pathnameencoding" before URL encoding 2016-02-22 02:29:36 +00:00
po l10n: ko.po: Add Korean translation 2016-01-03 19:07:29 +09:00
ppc sha1: provide another level of indirection for the SHA-1 functions 2015-11-05 10:35:11 -08:00
refs Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
t Merge branch 'mm/readme-markdown' 2016-02-26 13:37:28 -08:00
templates Merge branch 'ma/update-hooks-sample-typofix' 2016-02-26 13:37:28 -08:00
vcs-svn
…
xdiff Merge branch 'ps/plug-xdl-merge-leak' 2016-02-26 13:37:22 -08:00
.gitattributes
…
.gitignore gitignore: ignore generated test-fake-ssh executable 2016-02-08 12:18:51 -08:00
.mailmap mailmap: update my entry with new email address 2015-09-16 09:08:48 -07:00
.travis.yml add DEVELOPER makefile knob to check for acknowledged warnings 2016-02-25 12:49:45 -08:00
COPYING
…
GIT-VERSION-GEN Git 2.8-rc0 2016-02-26 13:45:26 -08:00
INSTALL
…
LGPL-2.1
…
Makefile Merge branch 'ls/makefile-cflags-developer-tweak' 2016-02-26 13:37:27 -08:00
README.md README.md: move down historical explanation about the name 2016-02-25 09:33:58 -08:00
RelNotes Start preparing for 2.7.2 2016-02-17 10:05:44 -08:00
abspath.c
…
aclocal.m4
…
advice.c merge: grammofix in please-commit-before-merge message 2015-10-02 14:29:56 -07:00
advice.h pull: check if in unresolved merge state 2015-06-18 13:17:16 -07:00
alias.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
alloc.c
…
archive-tar.c archive-tar: use xsnprintf for trivial formatting 2015-09-25 10:18:18 -07:00
archive-zip.c Merge branch 'rs/archive-zip-many' into maint 2015-09-03 19:18:01 -07:00
archive.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
archive.h
…
argv-array.c argv-array: add detach function 2016-02-22 14:50:32 -08:00
argv-array.h argv-array: add detach function 2016-02-22 14:50:32 -08:00
attr.c convert trivial cases to FLEX_ARRAY macros 2016-02-22 14:51:09 -08:00
attr.h
…
base85.c
…
bisect.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
bisect.h bisect: simplify the addition of new bisect terms 2015-08-03 11:42:41 -07:00
blob.c
…
blob.h
…
branch.c config: rename git_config_set to git_config_set_gently 2016-02-22 10:23:55 -08:00
branch.h branch: report errors in tracking branch setup 2016-02-22 10:23:30 -08:00
builtin.h Merge branch 'sb/submodule-helper' 2015-10-05 12:30:19 -07:00
bulk-checkin.c use xsnprintf for generating git object headers 2015-09-25 10:18:18 -07:00
bulk-checkin.h
…
bundle.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
bundle.h
…
cache-tree.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
cache-tree.h cache-tree: introduce write_index_as_tree() 2015-08-04 22:02:11 -07:00
cache.h Merge branch 'ps/config-error' 2016-02-26 13:37:19 -08:00
check-builtins.sh
…
check-racy.c
…
check_bindir
…
color.c color: add color_set helper for copying raw colors 2015-10-05 11:08:05 -07:00
color.h color: add color_set helper for copying raw colors 2015-10-05 11:08:05 -07:00
column.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
column.h
…
combine-diff.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
command-list.txt Merge branch 'nd/multiple-work-trees' 2015-07-13 14:02:02 -07:00
commit-slab.h Merge branch 'jc/commit-slab' 2015-08-03 11:01:21 -07:00
commit.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
commit.h Merge branch 'jk/date-mode-format' 2015-08-03 11:01:27 -07:00
config.c Merge branch 'ps/config-error' 2016-02-26 13:37:19 -08:00
config.mak.in
…
config.mak.uname mingw: do not trust MSYS2's MinGW gettext.sh 2016-01-26 13:42:59 -08:00
configure.ac Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint 2015-12-01 17:19:06 -05:00
connect.c connect & http: support -4 and -6 switches for remote operations 2016-02-12 11:34:14 -08:00
connect.h connect & http: support -4 and -6 switches for remote operations 2016-02-12 11:34:14 -08:00
connected.c
…
connected.h
…
convert.c Merge branch 'tb/conversion' 2016-02-26 13:37:23 -08:00
convert.h ls-files: add eol diagnostics 2016-01-18 19:48:43 -08:00
copy.c copy.c: make copy_fd() report its status silently 2015-05-19 14:48:54 -07:00
credential-cache--daemon.c Merge branch 'jg/credential-cache-chdir-to-sockdir' 2016-02-26 13:37:20 -08:00
credential-cache.c am, credential-cache: add angle brackets to usage string 2015-10-16 10:43:41 -07:00
credential-store.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
credential.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
credential.h
…
csum-file.c sha1fd_check: die when we cannot open the file 2015-03-19 13:35:15 -07:00
csum-file.h
…
ctype.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
daemon.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
date.c date: make "local" orthogonal to date format 2015-09-03 15:45:26 -07:00
decorate.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
decorate.h
…
delta.h
…
diff-delta.c
…
diff-lib.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
diff-no-index.c Merge branch 'nd/diff-with-path-params' into maint 2016-02-05 14:54:15 -08:00
diff.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
diff.h Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
diffcore-break.c
…
diffcore-delta.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
diffcore-order.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
diffcore-pickaxe.c react to errors in xdi_diff 2015-09-28 14:57:10 -07:00
diffcore-rename.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
diffcore.h
…
dir.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
dir.h dir.c: support marking some patterns already matched 2016-02-15 15:32:32 -08:00
editor.c
…
entry.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
environment.c Merge branch 'cc/untracked' 2016-02-10 14:20:06 -08:00
exec_cmd.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
exec_cmd.h prepare_{git,shell}_cmd: use argv_array 2016-02-22 14:51:09 -08:00
fast-import.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
fetch-pack.c fetch-pack: ignore SIGPIPE in sideband demuxer 2016-02-25 13:51:47 -08:00
fetch-pack.h
…
fmt-merge-msg.h
…
fsck.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
fsck.h fsck: git receive-pack: support excluding objects from fsck'ing 2015-06-23 14:27:37 -07:00
generate-cmdlist.sh generate-cmdlist: re-implement as shell script 2015-08-25 11:24:31 -07:00
gettext.c introduce "format" date-mode 2015-06-29 11:39:10 -07:00
gettext.h Merge branch 'ye/http-accept-language' 2015-03-06 15:02:25 -08:00
git-add--interactive.perl add--interactive: allow custom diff highlighting programs 2016-02-28 10:53:54 -08:00
git-archimport.perl
…
git-bisect.sh bisect: allow setting any user-specified in 'git bisect start' 2015-08-03 11:42:43 -07:00
git-compat-util.h Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
git-cvsexportcommit.perl
…
git-cvsimport.perl Merge branch 'cn/cvsimport-perl-update' 2015-06-25 11:08:08 -07:00
git-cvsserver.perl git-cvsserver.perl: fix typo 2016-02-17 10:00:53 -08:00
git-difftool--helper.sh
…
git-difftool.perl difftool: ignore symbolic links in use_wt_file 2015-10-29 13:43:10 -07:00
git-filter-branch.sh Merge branch 'jk/filter-branch-no-index' into maint 2016-02-05 14:54:13 -08:00
git-instaweb.sh git-instaweb: use @SHELL_PATH@ instead of /bin/sh 2015-03-10 15:10:35 -07:00
git-merge-octopus.sh
…
git-merge-one-file.sh Merge branch 'jk/no-diff-emit-common' 2016-02-26 13:37:14 -08:00
git-merge-resolve.sh
…
git-mergetool--lib.sh mergetool-lib: fix default tool selection 2015-06-19 11:20:52 -07:00
git-mergetool.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-p4.py git-p4.py: add support for filetype change 2016-01-13 09:06:54 -08:00
git-parse-remote.sh
…
git-quiltimport.sh git-quiltimport: add commandline option --series <file> 2015-09-01 11:10:07 -07:00
git-rebase--am.sh rebase: return non-zero error code if format-patch fails 2015-07-08 15:36:42 -07:00
git-rebase--interactive.sh rebase -i: remember merge options beyond continue actions 2015-12-11 12:44:44 -08:00
git-rebase--merge.sh
…
git-rebase.sh Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint 2016-02-05 14:54:13 -08:00
git-relink.perl
…
git-remote-testgit.sh
…
git-request-pull.sh
…
git-send-email.perl Merge branch 'ew/send-email-mutt-alias-fix' into maint 2016-02-05 14:54:09 -08:00
git-sh-i18n.sh
…
git-sh-setup.sh Merge branch 'nd/multiple-work-trees' 2015-05-11 14:23:39 -07:00
git-stash.sh Merge branch 'nk/stash-show-config' 2015-10-05 12:30:10 -07:00
git-submodule.sh submodule: try harder to fetch needed sha1 by direct fetching sha1 2016-02-24 15:24:49 -08:00
git-svn.perl git-svn: parse authors file more leniently 2015-09-10 17:59:38 +00:00
git-web--browse.sh
…
git.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
git.rc
…
git.spec.in
…
gpg-interface.c verify-commit: add option to print raw gpg status information 2015-06-22 14:20:47 -07:00
gpg-interface.h verify-commit: add option to print raw gpg status information 2015-06-22 14:20:47 -07:00
graph.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
graph.h
…
grep.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
grep.h
…
hashmap.c convert trivial cases to FLEX_ARRAY macros 2016-02-22 14:51:09 -08:00
hashmap.h
…
help.c convert trivial cases to FLEX_ARRAY macros 2016-02-22 14:51:09 -08:00
help.h
…
hex.c add reentrant variants of sha1_to_hex and find_unique_abbrev 2015-09-25 10:18:18 -07:00
http-backend.c Convert struct object to object_id 2015-11-20 08:02:05 -05:00
http-fetch.c
…
http-push.c http-push: stop using name_path 2016-02-12 12:51:05 -08:00
http-walker.c http-walker: store url in a strbuf 2015-09-25 10:18:18 -07:00
http.c Merge branch 'ce/https-public-key-pinning' 2016-02-24 13:25:58 -08:00
http.h Merge branch 'ew/force-ipv4' 2016-02-24 13:25:54 -08:00
ident.c Merge branch 'da/user-useconfigonly' 2016-02-17 10:13:31 -08:00
imap-send.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
khash.h convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
kwset.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
kwset.h kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
levenshtein.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
levenshtein.h
…
line-log.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
line-log.h
…
line-range.c
…
line-range.h
…
list-objects.c list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
list-objects.h list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
ll-merge.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
ll-merge.h
…
lockfile.c lockfile: remove function "hold_lock_file_for_append" 2015-08-28 11:32:01 -07:00
lockfile.h lockfile: remove function "hold_lock_file_for_append" 2015-08-28 11:32:01 -07:00
log-tree.c convert trivial cases to FLEX_ARRAY macros 2016-02-22 14:51:09 -08:00
log-tree.h
…
mailinfo.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
mailinfo.h mailinfo: remove calls to exit() and die() deep in the callchain 2015-10-21 15:59:34 -07:00
mailmap.c mailmap: replace strcpy with xstrdup 2015-09-25 10:18:18 -07:00
mailmap.h
…
match-trees.c
…
merge-blobs.c Merge branch 'jk/no-diff-emit-common' 2016-02-26 13:37:14 -08:00
merge-blobs.h
…
merge-recursive.c merge-recursive: find-renames resets threshold 2016-02-24 10:39:02 -08:00
merge-recursive.h merge-recursive: option to disable renames 2016-02-17 10:20:51 -08:00
merge.c Convert struct object to object_id 2015-11-20 08:02:05 -05:00
mergesort.c
…
mergesort.h
…
name-hash.c convert trivial cases to FLEX_ARRAY macros 2016-02-22 14:51:09 -08:00
notes-cache.c notes: allow treeish expressions as notes ref 2016-01-12 15:10:01 -08:00
notes-cache.h
…
notes-merge.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
notes-merge.h notes: extract enum notes_merge_strategy to notes-utils.h 2015-08-17 15:36:23 -07:00
notes-utils.c notes: allow treeish expressions as notes ref 2016-01-12 15:10:01 -08:00
notes-utils.h notes: extract parse_notes_merge_strategy to notes-utils 2015-08-17 15:38:32 -07:00
notes.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
notes.h Merge branch 'jk/notes-merge-from-anywhere' 2016-02-03 14:15:59 -08:00
object.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
object.h Remove get_object_hash. 2015-11-20 08:02:05 -05:00
pack-bitmap-write.c list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
pack-bitmap.c list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
pack-bitmap.h
…
pack-check.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
pack-objects.c
…
pack-objects.h
…
pack-revindex.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
pack-revindex.h pack-revindex: store entries directly in packed_git 2015-12-21 14:36:28 -08:00
pack-write.c
…
pack.h
…
pager.c Merge branch 'jc/am-i-v-fix' 2016-02-24 13:26:01 -08:00
parse-options-cb.c Merge branch 'kn/for-each-tag-branch' 2015-10-05 12:30:03 -07:00
parse-options.c parse-options: allow -h as a short option 2015-11-20 08:02:07 -05:00
parse-options.h parse-options: allow -h as a short option 2015-11-20 08:02:07 -05:00
patch-delta.c
…
patch-ids.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
patch-ids.h
…
path.c Merge branch 'js/dirname-basename' into maint 2016-02-05 14:54:17 -08:00
pathspec.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
pathspec.h
…
pkt-line.c pkt-line: show packets in async processes as "sideband" 2015-09-01 15:11:57 -07:00
pkt-line.h
…
preload-index.c
…
pretty.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
prio-queue.c
…
prio-queue.h
…
progress.c use xmallocz to avoid size arithmetic 2016-02-22 14:51:09 -08:00
progress.h
…
prompt.c
…
prompt.h
…
quote.c quote: move comment before sq_quote_buf() 2015-10-07 15:12:01 -07:00
quote.h
…
reachable.c list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
reachable.h
…
read-cache.c Merge branch 'nd/ita-cleanup' into maint 2016-02-22 13:10:21 -08:00
ref-filter.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
ref-filter.h branch.c: use 'ref-filter' APIs 2015-09-25 08:54:54 -07:00
reflog-walk.c Merge branch 'dk/reflog-walk-with-non-commit' into maint 2016-02-05 14:54:10 -08:00
reflog-walk.h convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
refs.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
refs.h Merge branch 'dt/initial-ref-xn-commit-doc' 2016-02-26 13:37:27 -08:00
remote-curl.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
remote-testsvn.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
remote.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
remote.h remote: simplify remote_is_configured() 2016-02-16 13:33:12 -08:00
replace_object.c register_replace_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
rerere.c Merge branch 'jk/rerere-xsnprintf' 2016-02-17 10:13:33 -08:00
rerere.h Merge branch 'jc/rerere' 2015-10-05 12:30:05 -07:00
resolve-undo.c
…
resolve-undo.h
…
revision.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
revision.h list-objects: pass full pathname to callbacks 2016-02-12 12:51:17 -08:00
run-command.c Merge branch 'jk/epipe-in-async' 2016-02-26 13:37:26 -08:00
run-command.h Merge branch 'jk/epipe-in-async' 2016-02-26 13:37:26 -08:00
send-pack.c Convert struct ref to use object_id. 2015-11-20 08:02:05 -05:00
send-pack.h push: support signing pushes iff the server supports it 2015-08-19 12:58:45 -07:00
sequencer.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
sequencer.h
…
server-info.c Convert struct object to object_id 2015-11-20 08:02:05 -05:00
setup.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
sh-i18n--envsubst.c
…
sha1-array.c
…
sha1-array.h
…
sha1-lookup.c
…
sha1-lookup.h
…
sha1_file.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
sha1_name.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
shallow.c use st_add and st_mult for allocation size computation 2016-02-22 14:51:09 -08:00
shell.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
shortlog.h
…
show-index.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
sideband.c convert trivial sprintf / strcpy calls to xsnprintf 2015-09-25 10:18:18 -07:00
sideband.h
…
sigchain.c sigchain: add command to pop all common signals 2015-12-16 12:06:08 -08:00
sigchain.h sigchain: add command to pop all common signals 2015-12-16 12:06:08 -08:00
split-index.c ewah: add convenient wrapper ewah_serialize_strbuf() 2015-03-12 13:45:16 -07:00
split-index.h
…
strbuf.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
strbuf.h Merge branch 'jc/strbuf-getline' 2016-01-28 16:10:14 -08:00
streaming.c Merge branch 'sb/plug-streaming-leak' 2015-04-14 11:49:09 -07:00
streaming.h
…
string-list.c
…
string-list.h
…
submodule-config.c config: add 'origin_type' to config_source struct 2016-02-22 09:36:33 -08:00
submodule-config.h push: add recurseSubmodules config option 2015-11-20 08:02:07 -05:00
submodule.c Merge branch 'ps/config-error' 2016-02-26 13:37:19 -08:00
submodule.h Merge branch 'sb/submodule-parallel-fetch' 2016-01-12 15:16:54 -08:00
symlinks.c
…
tag.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
tag.h
…
tar.h
…
tempfile.c register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
tempfile.h register_tempfile(): new function to handle an existing temporary file 2015-08-10 12:57:14 -07:00
test-chmtime.c
…
test-config.c
…
test-ctype.c
…
test-date.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
test-delta.c
…
test-dump-cache-tree.c test-dump-cache-tree: avoid overflow of cache-tree name 2015-09-25 10:18:18 -07:00
test-dump-split-index.c commit: don't rewrite shared index unnecessarily 2015-08-31 08:41:07 -07:00
test-dump-untracked-cache.c test-dump-untracked-cache: don't modify the untracked cache 2016-01-27 12:30:07 -08:00
test-fake-ssh.c mingw: fix t5601-clone.sh 2016-01-27 14:27:19 -08:00
test-genrandom.c
…
test-hashmap.c
…
test-index-version.c
…
test-line-buffer.c
…
test-match-trees.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
test-mergesort.c
…
test-mktemp.c
…
test-parse-options.c parse-options: move unsigned long option parsing out of pack-objects.c 2015-06-22 15:07:21 -07:00
test-path-utils.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
test-prio-queue.c
…
test-read-cache.c
…
test-regex.c
…
test-revision-walking.c convert "enum date_mode" into a struct 2015-06-29 11:39:07 -07:00
test-run-command.c run-command: add an asynchronous parallel child processor 2015-12-16 12:06:08 -08:00
test-scrap-cache-tree.c
…
test-sha1-array.c test-sha1-array: read command stream with strbuf_getline() 2016-01-15 10:35:08 -08:00
test-sha1.c
…
test-sha1.sh test-sha1.sh: use the $( ... ) construct for command substitution 2015-12-27 15:33:13 -08:00
test-sigchain.c
…
test-string-list.c
…
test-submodule-config.c submodule: use new config API for worktree configurations 2015-08-19 11:43:10 -07:00
test-subprocess.c
…
test-svn-fe.c
…
test-urlmatch-normalization.c
…
test-wildmatch.c
…
thread-utils.c thread-utils.c: detect CPU count on older BSD-like systems 2015-03-10 15:13:28 -07:00
thread-utils.h
…
trace.c trace: use strbuf for quote_crnl output 2015-09-25 10:18:18 -07:00
trace.h pkt-line: support tracing verbatim pack contents 2015-06-16 13:24:22 -07:00
trailer.c interpret-trailers: add option for in-place editing 2016-01-14 12:22:17 -08:00
trailer.h interpret-trailers: add option for in-place editing 2016-01-14 12:22:17 -08:00
transport-helper.c Merge branch 'ew/force-ipv4' 2016-02-24 13:25:54 -08:00
transport.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
transport.h connect & http: support -4 and -6 switches for remote operations 2016-02-12 11:34:14 -08:00
tree-diff.c tree-diff: catch integer overflow in combine_diff_path allocation 2016-02-19 09:40:37 -08:00
tree-walk.c do_compare_entry: use already-computed path 2016-01-05 13:39:46 -08:00
tree-walk.h do_compare_entry: use already-computed path 2016-01-05 13:39:46 -08:00
tree.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
tree.h Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint 2015-06-25 11:02:10 -07:00
unicode_width.h
…
unimplemented.sh unimplemented.sh: use the $( ... ) construct for command substitution 2015-12-27 15:33:13 -08:00
unix-socket.c
…
unix-socket.h
…
unpack-trees.c unpack-trees: fix accidentally quadratic behavior 2016-01-22 13:03:10 -08:00
unpack-trees.h
…
update_unicode.sh
…
upload-pack.c Remove get_object_hash. 2015-11-20 08:02:05 -05:00
url.c use strbuf_complete to conditionally append slash 2015-10-05 11:08:06 -07:00
url.h
…
urlmatch.c
…
urlmatch.h
…
usage.c vreportf: avoid intermediate buffer 2015-08-11 14:29:36 -07:00
userdiff.c userdiff: add support for Fountain documents 2015-07-23 14:44:51 -07:00
userdiff.h diff: clarify textconv interface 2016-02-22 10:40:35 -08:00
utf8.c utf8: add function to align a string into given strbuf 2015-09-17 10:02:48 -07:00
utf8.h utf8: add function to align a string into given strbuf 2015-09-17 10:02:48 -07:00
varint.c
…
varint.h
…
version.c
…
version.h
…
versioncmp.c versionsort: support reorder prerelease suffixes 2015-02-27 13:38:22 -08:00
walker.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
walker.h
…
wildmatch.c
…
wildmatch.h
…
worktree.c worktree.c: fix indentation 2016-01-19 11:22:29 -08:00
worktree.h worktree: add details to the worktree struct 2015-10-08 11:57:07 -07:00
wrap-for-bin.sh test: facilitate debugging Git executables in tests with gdb 2015-10-30 14:02:38 -07:00
wrapper.c Merge branch 'jk/tighten-alloc' 2016-02-26 13:37:16 -08:00
write_or_die.c write_or_die: handle EPIPE in async threads 2016-02-25 13:51:45 -08:00
ws.c
…
wt-status.c strbuf: introduce strbuf_getline_{lf,nul}() 2016-01-15 10:12:51 -08:00
wt-status.h wt-status: move #include "pathspec.h" to the header 2015-08-21 14:49:27 -07:00
xdiff-interface.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
xdiff-interface.h xdiff: reject files larger than ~1GB 2015-09-28 14:57:23 -07:00
zlib.c zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} 2015-03-05 15:46:03 -08:00

README.md

Git - fast, scalable, distributed revision control system

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 version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

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

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.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).

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 (read Documentation/SubmittingPatches for instructions on patch submission). 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://news.gmane.org/gmane.comp.version-control.git/, http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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