No description
Find a file
Junio C Hamano 02f4db83bd Merge branch 'da/mergetool-temporary-filename'
Tweak the names of the three throw-away files "git mergetool" comes
up with to feed the merge tool backend, so that a file with a
single dot in its name in the original (e.g. "hello.c") will have
only one dot in these variants (e.g. "hello_BASE_4321.c").

* da/mergetool-temporary-filename:
  mergetool: use more conservative temporary filenames
2014-10-21 13:28:20 -07:00
block-sha1 Merge branch 'jk/pack-bitmap' 2014-02-27 14:01:48 -08:00
builtin Merge branch 'rs/ref-transaction' 2014-10-21 13:28:10 -07:00
compat mingw.h: add dummy functions for sigset_t operations 2014-09-22 13:41:52 -07:00
contrib Merge branch 'ss/contrib-subtree-contacts' 2014-10-20 12:25:16 -07:00
Documentation Update draft release notes to 2.2 2014-10-20 13:07:32 -07:00
ewah ewah: delete unused ewah_read_mmap_native declaration 2014-04-29 12:43:16 -07:00
git-gui Merge git://repo.or.cz/git-gui 2014-06-26 13:44:11 -07:00
gitk-git Merge branch 'master' of git://ozlabs.org/~paulus/gitk 2014-08-10 11:03:03 -07:00
gitweb gitweb: use start_form, not startform that was removed in CGI.pm 4.04 2014-10-16 13:12:34 -07:00
mergetools mergetools: add vimdiff3 mode 2014-04-22 12:49:07 -07:00
perl Merge branch 'mm/pager-less-sans-S' 2014-06-06 11:02:59 -07:00
po l10n: de.po: use comma before "um" 2014-09-25 20:26:27 +02:00
ppc
t Merge branch 'da/mergetool-tests' 2014-10-21 13:28:14 -07:00
templates pre-push.sample: Write error message to stderr 2014-09-11 15:26:35 -07:00
vcs-svn strbuf: introduce starts_with() and ends_with() 2013-12-05 14:12:52 -08:00
xdiff git-merge-file: do not add LF at EOF while applying unrelated change 2014-06-30 14:07:58 -07:00
.gitattributes
.gitignore Merge branch 'cc/interpret-trailers' 2014-10-20 12:25:32 -07:00
.mailmap Sync with v2.0.3 2014-07-23 11:36:40 -07:00
abspath.c abspath: convert absolute_path() to strbuf 2014-08-26 11:06:06 -07:00
aclocal.m4
advice.c merge, pull: stop advising 'commit -a' in case of conflict 2014-08-28 10:29:53 -07:00
advice.h Merge branch 'jc/push-2.0-default-to-simple' 2014-03-07 15:13:15 -08:00
alias.c alias.c: replace git_config() with git_config_get_string() 2014-08-07 13:33:29 -07:00
alloc.c alloc: factor out commit index 2014-07-28 10:14:33 -07:00
archive-tar.c Revert "archive: honor tar.umask even for pax headers" 2014-10-20 12:04:46 -07:00
archive-zip.c Merge branch 'sb/archive-zip-double-assignment-fix' into maint 2013-07-19 10:40:53 -07:00
archive.c Merge branch 'nd/archive-pathspec' 2014-10-08 13:05:26 -07:00
archive.h archive: convert to use parse_pathspec 2013-07-15 10:56:07 -07:00
argv-array.c argv-array: drop "detach" code 2014-05-15 09:49:12 -07:00
argv-array.h argv-array: drop "detach" code 2014-05-15 09:49:12 -07:00
attr.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c Merge branch 'jk/name-decoration-alloc' 2014-09-11 10:33:36 -07:00
bisect.h
blob.c add object_as_type helper for casting objects 2014-07-28 10:14:33 -07:00
blob.h
branch.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
branch.h
builtin.h trailer: add interpret-trailers command 2014-10-13 13:55:27 -07:00
bulk-checkin.c cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
bulk-checkin.h cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
bundle.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
bundle.h
cache-tree.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
cache-tree.h Merge branch 'dt/cache-tree-repair' 2014-09-11 10:33:32 -07:00
cache.h refs.c: allow listing and deleting badly named refs 2014-10-15 10:47:26 -07:00
check-builtins.sh check-builtins.sh: use the $(...) construct for command substitution 2014-03-25 13:42:52 -07:00
check-racy.c
check_bindir check_bindir: avoid "test <cond> -a/-o <cond>" 2014-06-09 14:47:06 -07:00
color.c color_parse: do not mention variable name in error message 2014-10-14 11:01:21 -07:00
color.h color_parse: do not mention variable name in error message 2014-10-14 11:01:21 -07:00
column.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
column.h
combine-diff.c Merge branch 'jk/pretty-empty-format' into maint 2014-09-19 14:05:09 -07:00
command-list.txt Documentation: add documentation for 'git interpret-trailers' 2014-10-13 13:59:49 -07:00
commit-slab.h use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
commit.c Merge branch 'jc/push-cert' 2014-10-08 13:05:25 -07:00
commit.h Merge branch 'da/styles' 2014-09-19 11:38:35 -07:00
config.c Merge branch 'mh/lockfile' 2014-10-14 10:49:45 -07:00
config.mak.in Merge branch 'jc/remove-export-from-config-mak-in' 2013-04-01 09:00:02 -07:00
config.mak.uname Merge branch 'jc/config-mak-document-darwin-vs-macosx' 2014-09-09 12:54:05 -07:00
configure.ac autoconf: check for setitimer() 2014-08-29 10:45:32 -07:00
connect.c Merge branch 'rs/more-uses-of-skip-prefix' 2014-09-19 11:38:35 -07:00
connect.h connect.c: refactor url parsing 2013-12-09 14:54:48 -08:00
connected.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
connected.h connected.c: add new variant that runs with --shallow-file 2013-12-10 16:14:18 -08:00
convert.c Merge branch 'sp/stream-clean-filter' 2014-10-08 13:05:32 -07:00
convert.h convert: stream from fd to required clean filter to reduce used address space 2014-08-28 10:25:15 -07:00
copy.c copy_fd(): do not close the input file descriptor 2014-08-28 10:25:14 -07:00
COPYING
credential-cache--daemon.c credential-cache: close stderr in daemon process 2014-09-16 11:11:58 -07:00
credential-cache.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
credential-store.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
credential.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
credential.h
csum-file.c Merge branch 'jk/sha1write-void' 2014-01-10 10:33:09 -08:00
csum-file.h Merge branch 'jk/sha1write-void' 2014-01-10 10:33:09 -08:00
ctype.c
daemon.c Merge branch 'rs/daemon-fixes' 2014-10-14 10:49:23 -07:00
date.c Merge branch 'jk/commit-author-parsing' 2014-09-19 11:38:33 -07:00
decorate.c hashmap: factor out getting a hash code from a SHA1 2014-07-07 13:56:24 -07:00
decorate.h
delta.h comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
diff-delta.c create_delta_index: simplify condition always evaluating to true 2013-08-18 12:56:23 -07:00
diff-lib.c Merge branch 'jk/diff-files-assume-unchanged' into maint 2014-06-25 11:47:09 -07:00
diff-no-index.c Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint 2014-04-09 11:59:16 -07:00
diff.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
diff.h Merge branch 'ks/tree-diff-nway' 2014-06-03 12:06:40 -07:00
diffcore-break.c diffcore-break: don't divide by zero 2013-04-03 12:48:02 -07:00
diffcore-delta.c
diffcore-order.c Merge branch 'nd/no-more-fnmatch' 2014-03-14 14:25:31 -07:00
diffcore-pickaxe.c pickaxe: simplify kwset loop in contains() 2014-03-24 15:13:17 -07:00
diffcore-rename.c diff.c: allow to pass more flags to diff_populate_filespec 2014-08-18 10:16:35 -07:00
diffcore.h diff --stat: mark any file larger than core.bigfilethreshold binary 2014-08-18 10:16:45 -07:00
dir.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
dir.h prep_exclude: remove the artificial PATH_MAX limit 2014-07-14 15:24:34 -07:00
editor.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
entry.c read-cache: mark updated entries for split index 2014-06-13 11:49:40 -07:00
environment.c setup_git_env(): introduce git_path_from_env() helper 2014-06-25 10:33:27 -07:00
exec_cmd.c use strbuf_add_absolute_path() to add absolute paths 2014-08-26 11:06:06 -07:00
exec_cmd.h Add the LAST_ARG_MUST_BE_NULL macro 2013-07-19 09:26:15 -07:00
fast-import.c refs.c: pass the ref log message to _create/delete/update instead of _commit 2014-10-15 10:47:22 -07:00
fetch-pack.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
fetch-pack.h Merge branch 'nd/shallow-clone' 2014-01-17 12:21:20 -08:00
fmt-merge-msg.h
fsck.c fsck: check tag objects' headers 2014-09-11 10:44:26 -07:00
fsck.h fsck_object(): allow passing object data separately from the object itself 2014-09-10 13:54:21 -07:00
generate-cmdlist.sh
gettext.c gettext.c: detect the vsnprintf bug at runtime 2013-12-04 16:10:51 -08:00
gettext.h
git-add--interactive.perl Merge branch 'jl/nor-or-nand-and' 2014-04-08 12:00:28 -07:00
git-am.sh Merge branch 'jl/nor-or-nand-and' 2014-04-08 12:00:28 -07:00
git-archimport.perl git-archimport: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-bisect.sh grammofix in user-facing messages 2014-09-02 12:00:30 -07:00
git-compat-util.h wrapper.c: add a new function unlink_or_msg 2014-10-15 10:47:21 -07:00
git-cvsexportcommit.perl git-cvsexportcommit: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsimport.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh difftool: display the number of files in the diff queue in the prompt 2013-12-06 14:00:27 -08:00
git-difftool.perl difftool: support repositories with .git-files 2014-02-24 09:53:57 -08:00
git-filter-branch.sh filter-branch: eliminate duplicate mapped parents 2014-07-01 08:30:41 -07:00
git-instaweb.sh git-instaweb: add support for Apache 2.4 2014-05-27 12:57:19 -07:00
git-merge-octopus.sh
git-merge-one-file.sh Merge branch 'kb/p4merge' 2013-03-26 13:15:24 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-mergetool.sh Merge branch 'da/mergetool-temporary-filename' 2014-10-21 13:28:20 -07:00
git-p4.py git-p4: fix submit in non --prepare-p4-only mode 2014-06-13 11:04:04 -07:00
git-parse-remote.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-pull.sh merge, pull: stop advising 'commit -a' in case of conflict 2014-08-28 10:29:53 -07:00
git-quiltimport.sh git-sh-setup.sh: add variable to use the stuck-long mode 2014-02-03 12:11:10 -08:00
git-rebase--am.sh rebase: omit patch-identical commits with --fork-point 2014-07-16 13:07:40 -07:00
git-rebase--interactive.sh rebase: omit patch-identical commits with --fork-point 2014-07-16 13:07:40 -07:00
git-rebase--merge.sh Merge branch 'bc/fix-rebase-merge-skip' into maint 2014-07-16 11:16:16 -07:00
git-rebase.sh rebase: omit patch-identical commits with --fork-point 2014-07-16 13:07:40 -07:00
git-relink.perl git-relink: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-remote-testgit.sh Merge branch 'ep/shell-assign-and-export-vars' into maint 2014-07-22 10:22:57 -07:00
git-request-pull.sh Merge branch 'lt/request-pull' 2014-05-19 10:35:36 -07:00
git-send-email.perl Merge branch 'mt/send-email-cover-to-cc' 2014-06-20 13:12:20 -07:00
git-sh-i18n.sh remove #!interpreter line from shell libraries 2013-11-26 14:23:56 -08:00
git-sh-setup.sh pager: remove 'S' from $LESS by default 2014-05-07 13:41:04 -07:00
git-stash.sh Merge branch 'da/rev-parse-verify-quiet' 2014-09-29 12:36:10 -07:00
git-submodule.sh git-submodule.sh: avoid "echo" path-like values 2014-06-19 13:30:03 -07:00
git-svn.perl git-svn: delay term initialization 2014-09-14 08:08:54 +00:00
GIT-VERSION-GEN Git 2.1.2 2014-09-29 22:15:00 -07:00
git-web--browse.sh git-web--browse.sh: use the $( ... ) construct for command substitution 2014-04-23 15:17:02 -07:00
git.c Merge branch 'cc/interpret-trailers' 2014-10-20 12:25:32 -07:00
git.rc Makefile: Fix compilation of Windows resource file 2014-01-23 10:00:28 -08:00
git.spec.in
gpg-interface.c Merge branch 'jc/push-cert' 2014-10-08 13:05:25 -07:00
gpg-interface.h gpg-interface: move parse_signature() to where it should be 2014-09-15 13:23:20 -07:00
graph.c Merge branch 'rs/graph-simplify' 2014-09-29 12:36:11 -07:00
graph.h Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
grep.c color_parse: do not mention variable name in error message 2014-10-14 11:01:21 -07:00
grep.h grep: allow to use textconv filters 2013-05-10 10:27:31 -07:00
hashmap.c hashmap: add string interning API 2014-07-07 13:56:38 -07:00
hashmap.h hashmap: add string interning API 2014-07-07 13:56:38 -07:00
help.c Merge branch 'sb/help-unknown-command-sort-fix' 2014-09-26 14:39:49 -07:00
help.h help: add help_unknown_ref() 2013-05-08 15:31:54 -07:00
hex.c
http-backend.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
http-fetch.c
http-push.c Merge branch 'ah/fix-http-push' into maint 2014-07-22 10:29:07 -07:00
http-walker.c http-walker: simplify process_alternates_response() using strbuf 2014-09-02 10:57:14 -07:00
http.c Merge branch 'da/include-compat-util-first-in-c' 2014-10-14 10:49:01 -07:00
http.h http: optionally extract charset parameter from content-type 2014-05-27 09:59:19 -07:00
ident.c Merge branch 'jk/commit-author-parsing' 2014-09-19 11:38:33 -07:00
imap-send.c Merge branch 'as/calloc-takes-nmemb-then-size' 2014-09-19 11:38:37 -07:00
INSTALL Fix profile feedback with -jN and add profile-fast 2014-07-08 10:56:47 -07:00
khash.h use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
kwset.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
line-log.h range-set: publish API for re-use by git-blame -L 2013-08-06 14:27:20 -07:00
line-range.c line-range: reject -L line numbers less than 1 2013-08-06 14:48:55 -07:00
line-range.h line-range: teach -L/RE/ to search relative to anchor point 2013-08-06 14:36:34 -07:00
list-objects.c Merge branch 'jk/pack-bitmap' 2014-04-08 12:00:33 -07:00
list-objects.h list-objects: reduce one argument in mark_edges_uninteresting 2013-08-28 11:54:18 -07:00
ll-merge.c ll-merge.c: refactor read_merge_config() to use git_config_string() 2014-08-13 12:36:21 -07:00
ll-merge.h
lockfile.c lockfile: remove unable_to_lock_error 2014-10-15 10:47:27 -07:00
lockfile.h lockfile: remove unable_to_lock_error 2014-10-15 10:47:27 -07:00
log-tree.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
log-tree.h Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
mailmap.c Merge branch 'jc/strcasecmp-pure-inline' 2013-09-24 23:28:13 -07:00
mailmap.h mailmap: simplify map_user() interface 2013-01-10 12:33:08 -08:00
Makefile Merge branch 'cc/interpret-trailers' 2014-10-20 12:25:32 -07:00
match-trees.c use xstrfmt to replace xmalloc + sprintf 2014-06-19 15:20:54 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'mh/lockfile' 2014-10-14 10:49:45 -07:00
merge-recursive.h
merge.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
mergesort.c
mergesort.h
name-hash.c hashmap: add simplified hashmap_get_from_hash() API 2014-07-07 13:56:35 -07:00
notes-cache.c Merge branch 'jk/commit-buffer-length' 2014-07-02 12:53:02 -07:00
notes-cache.h
notes-merge.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
notes-merge.h Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-utils.c Merge branch 'jk/commit-buffer-length' 2014-07-02 12:53:02 -07:00
notes-utils.h commit_tree: take a pointer/len pair rather than a const strbuf 2014-06-12 10:29:41 -07:00
notes.c notes.c: rearrange xcalloc arguments 2014-05-27 14:02:45 -07:00
notes.h many small typofixes 2013-07-29 12:32:25 -07:00
object.c Merge branch 'rs/realloc-array' 2014-09-26 14:39:45 -07:00
object.h Refactor type_from_string() to allow continuing after detecting an error 2014-09-10 13:52:13 -07:00
pack-bitmap-write.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-bitmap.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-bitmap.h pack-bitmap: implement optional name_hash cache 2013-12-30 12:19:23 -08:00
pack-check.c
pack-objects.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
pack-objects.h pack-objects: implement bitmap writing 2013-12-30 12:19:22 -08:00
pack-revindex.c pack-revindex.c: rearrange xcalloc arguments 2014-05-27 14:02:45 -07:00
pack-revindex.h do not discard revindex when re-preparing packfiles 2014-01-16 14:33:46 -08:00
pack-write.c pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt() 2014-09-02 10:37:24 -07:00
pack.h finish_tmp_packfile():use strbuf for pathname construction 2014-03-03 12:15:10 -08:00
pager.c Merge branch 'rs/child-process-init' 2014-09-11 10:33:27 -07:00
parse-options-cb.c prune: introduce OPT_EXPIRY_DATE() and use it 2013-04-25 11:42:10 -07:00
parse-options.c Merge branch 'jc/parseopt-verify-short-name' 2014-09-19 11:38:38 -07:00
parse-options.h Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' 2014-06-06 11:21:36 -07:00
patch-delta.c
patch-ids.c patch-ids.c: use ALLOC_GROW() in add_commit() 2014-03-03 14:49:12 -08:00
patch-ids.h
path.c Merge branch 'mm/config-edit-global' 2014-09-02 13:23:20 -07:00
pathspec.c Merge branch 'maint' 2014-07-21 12:35:39 -07:00
pathspec.h Support pathspec magic :(exclude) and its short form :! 2013-12-06 13:00:39 -08:00
pkt-line.c trace: improve trace performance 2014-07-13 21:24:23 -07:00
pkt-line.h comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
preload-index.c cache.h: rename cache_def_free to cache_def_clear 2014-07-13 10:12:37 -07:00
pretty.c Merge branch 'jn/parse-config-slot' 2014-10-20 12:23:48 -07:00
prio-queue.c prio-queue: make output stable with respect to insertion 2014-07-15 11:02:54 -07:00
prio-queue.h prio-queue: make output stable with respect to insertion 2014-07-15 11:02:54 -07:00
progress.c progress: simplify performance measurement by using getnanotime() 2014-07-13 21:25:21 -07:00
progress.h
prompt.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
prompt.h
quote.c quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
quote.h quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
reachable.c reachable.c: add HEAD to reachability starting commits 2014-09-03 10:47:44 -07:00
reachable.h
read-cache.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
README doc: add 'everyday' to 'git help' 2014-10-10 16:02:26 -07:00
reflog-walk.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
reflog-walk.h stylefix: asterisks stick to the variable, not the type 2014-09-02 11:33:32 -07:00
refs.c ref_transaction_commit: bail out on failure to remove a ref 2014-10-15 10:47:27 -07:00
refs.h refs.c: allow listing and deleting badly named refs 2014-10-15 10:47:26 -07:00
RelNotes Git 2.1.2 2014-09-29 22:15:00 -07:00
remote-curl.c Merge branch 'jc/push-cert' 2014-10-08 13:05:25 -07:00
remote-testsvn.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
remote.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
remote.h use a hashmap to make remotes faster 2014-07-30 11:29:33 -07:00
replace_object.c Merge branch 'dd/use-alloc-grow' 2014-03-18 13:50:21 -07:00
rerere.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
rerere.h rerere.h: mark string for translation 2014-09-15 11:29:46 -07:00
resolve-undo.c resolve-undo: be specific what part of the index has changed 2014-06-13 11:49:38 -07:00
resolve-undo.h convert unmerge_cache to take struct pathspec 2013-07-15 10:56:08 -07:00
revision.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
revision.h Merge branch 'jk/pack-bitmap' 2014-04-08 12:00:33 -07:00
run-command.c run-command: inline prepare_run_command_v_opt() 2014-08-20 09:56:12 -07:00
run-command.h run-command: introduce child_process_init() 2014-08-20 09:54:58 -07:00
send-pack.c Merge branch 'jc/push-cert' 2014-10-08 13:05:25 -07:00
send-pack.h signed push: add "pushee" header to push certificate 2014-09-15 13:23:28 -07:00
sequencer.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
sequencer.h cherry-pick, revert: add the --gpg-sign option 2014-01-27 15:15:52 -08:00
server-info.c server-info: clean up after writing info/packs 2014-09-15 11:39:54 -07:00
setup.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
sh-i18n--envsubst.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c sha1-lookup: handle duplicates in sha1_pos() 2014-10-01 13:32:19 -07:00
sha1-lookup.h
sha1_file.c Merge branch 'mh/lockfile' 2014-10-14 10:49:45 -07:00
sha1_name.c refs: make rev-parse --quiet actually quiet 2014-09-19 10:46:15 -07:00
shallow.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
shell.c use xstrfmt to replace xmalloc + strcpy/strcat 2014-06-19 15:20:54 -07:00
shortlog.h
show-index.c
sideband.c sideband.c: do not use ANSI control sequence on non-terminal 2014-06-02 11:02:27 -07:00
sideband.h pkt-line: move LARGE_PACKET_MAX definition from sideband 2013-02-20 13:42:22 -08:00
sigchain.c cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
sigchain.h
split-index.c update-index: new options to enable/disable split index mode 2014-06-13 11:49:41 -07:00
split-index.h split-index: the reading part 2014-06-13 11:49:40 -07:00
strbuf.c Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
strbuf.h Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
streaming.c open_istream(): do not dereference NULL in the error case 2014-02-18 16:00:53 -08:00
streaming.h
string-list.c use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18 09:13:42 -07:00
string-list.h string-list: add string_list initializer helper function 2014-07-21 10:23:36 -07:00
submodule.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
submodule.h rm: delete .gitmodules entry of submodules removed from the work tree 2013-08-06 14:11:00 -07:00
symlinks.c symlinks: remove PATH_MAX limitation 2014-07-07 11:22:42 -07:00
tag.c gpg-interface: move parse_signature() to where it should be 2014-09-15 13:23:20 -07:00
tag.h gpg-interface: move parse_signature() to where it should be 2014-09-15 13:23:20 -07:00
tar.h
test-chmtime.c comments: fix misuses of "nor" 2014-03-31 15:29:27 -07:00
test-config.c add tests for git_config_get_string_const() 2014-08-07 11:41:20 -07:00
test-ctype.c
test-date.c date: use strbufs in date-formatting functions 2014-08-27 10:32:56 -07:00
test-delta.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-dump-cache-tree.c Merge branch 'dt/cache-tree-repair' 2014-09-11 10:33:32 -07:00
test-dump-split-index.c t1700: new tests for split-index mode 2014-06-13 11:49:42 -07:00
test-genrandom.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-hashmap.c hashmap: add string interning API 2014-07-07 13:56:38 -07:00
test-index-version.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-line-buffer.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
test-match-trees.c use 'tree-ish' instead of 'treeish' 2013-09-04 15:02:56 -07:00
test-mergesort.c sparse: Fix mingw_main() argument number/type errors 2013-04-28 12:32:08 -07:00
test-mktemp.c
test-parse-options.c parse-options: remove unused OPT_SET_PTR 2014-03-31 13:01:19 -07:00
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c prio-queue: priority queue of pointers to structs 2013-06-11 15:15:21 -07:00
test-read-cache.c read-cache: add simple performance test 2013-06-09 17:03:00 -07:00
test-regex.c cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
test-revision-walking.c
test-run-command.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
test-scrap-cache-tree.c lockfile.h: extract new header file for the functions in lockfile.c 2014-10-01 13:56:14 -07:00
test-sha1-array.c sha1-array: add test-sha1-array and basic tests 2014-10-01 13:32:10 -07:00
test-sha1.c test-sha1: add a binary output mode 2013-08-22 16:39:46 -07:00
test-sha1.sh
test-sigchain.c cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
test-string-list.c replace {pre,suf}fixcmp() with {starts,ends}_with() 2013-12-05 14:13:21 -08:00
test-subprocess.c run-command: introduce CHILD_PROCESS_INIT 2014-08-20 09:53:37 -07:00
test-svn-fe.c msvc: test-svn-fe: Fix linker "unresolved external" error 2013-02-25 12:40:34 -08:00
test-urlmatch-normalization.c builtin/config.c: compilation fix 2013-08-09 09:20:38 -07:00
test-wildmatch.c stop using fnmatch (either native or compat) 2014-02-20 14:16:11 -08:00
thread-utils.c mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE 2013-05-08 12:14:35 -07:00
thread-utils.h
trace.c Merge branch 'bw/trace-no-inline-getnanotime' 2014-10-16 14:16:45 -07:00
trace.h git: add performance tracing for git's main() function to debug scripts 2014-07-13 21:25:21 -07:00
trailer.c trailer: execute command from 'trailer.<name>.command' 2014-10-13 13:59:48 -07:00
trailer.h trailer: put all the processing together and print 2014-10-13 13:55:27 -07:00
transport-helper.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
transport.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
transport.h push: the beginning of "git push --signed" 2014-09-15 13:23:20 -07:00
tree-diff.c tree-diff: rework diff_tree() to generate diffs for multiparent cases as well 2014-04-07 14:40:46 -07:00
tree-walk.c cleanup duplicate name_compare() functions 2014-06-20 10:12:14 -07:00
tree-walk.h tree-walk: finally switch over tree descriptors to contain a pre-parsed entry 2014-02-24 14:43:29 -08:00
tree.c add object_as_type helper for casting objects 2014-07-28 10:14:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unicode_width.h Update of unicode_width.h to Unicode Version 7.0 2014-06-18 10:53:45 -07:00
unimplemented.sh
unix-socket.c Merge branch 'rs/strbuf-getcwd' 2014-09-02 13:28:44 -07:00
unix-socket.h
unpack-trees.c Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint 2014-09-19 14:05:12 -07:00
unpack-trees.h diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const 2013-06-02 15:31:14 -07:00
update_unicode.sh utf8: make it easier to auto-update git_wcwidth() 2014-05-12 10:38:01 -07:00
upload-pack.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
url.c use strbuf_addch for adding single characters 2014-07-10 14:06:46 -07:00
url.h
urlmatch.c refactor skip_prefix to return a boolean 2014-06-20 10:44:43 -07:00
urlmatch.h config: add generic callback wrapper to parse section.<url>.key 2013-07-31 14:58:42 -07:00
usage.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
userdiff.c userdiff: have 'cpp' hunk header pattern catch more C++ anchor points 2014-03-21 15:03:32 -07:00
userdiff.h
utf8.c Merge branch 'rs/export-strbuf-addchars' 2014-09-19 11:38:39 -07:00
utf8.h add missing "format" function attributes 2013-07-09 22:23:04 -07:00
varint.c cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
varint.h cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
version.c
version.h
versioncmp.c tag: support --sort=<spec> 2014-02-27 14:04:05 -08:00
walker.c refs.c: pass the ref log message to _create/delete/update instead of _commit 2014-10-15 10:47:22 -07:00
walker.h
wildmatch.c wildmatch: properly fold case everywhere 2013-06-02 14:13:05 -07:00
wildmatch.h
wrap-for-bin.sh wrap-for-bin: make bin-wrappers chainable 2013-07-08 08:55:34 -07:00
wrapper.c wrapper.c: add a new function unlink_or_msg 2014-10-15 10:47:21 -07:00
write_or_die.c refs: write packed_refs file using stdio 2014-09-10 10:58:32 -07:00
ws.c use strchrnul() in place of strchr() and strlen() 2014-03-10 08:35:30 -07:00
wt-status.c refs.c: change resolve_ref_unsafe reading argument to be a flags field 2014-10-15 10:47:24 -07:00
wt-status.h Merge branch 'mm/status-porcelain-format-i18n-fix' 2014-03-31 16:31:25 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: fix compilation failures with Sun C Compilaer 2013-04-22 09:49:04 -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 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.

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).

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 (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.