A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Phillip Wood 5fb415b57f rebase: honor --rerere-autoupdate
Rebase accepts '--rerere-autoupdate' as an option but only honors it
if '-m' is also given. Fix it for a non-interactive rebase by passing
on the option to 'git am' and 'git cherry-pick'. Rework the tests so
that they can be used for each rebase flavor and extend them.

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-02 15:16:09 -07:00
.github Configure Git contribution guidelines for github.com 2017-06-13 08:41:47 -07:00
Documentation Sync with maint 2017-07-31 13:52:53 -07:00
block-sha1
builtin am: remember --rerere-autoupdate setting 2017-08-02 15:16:09 -07:00
ci Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
compat Merge branch 'tb/push-to-cygwin-unc-path' 2017-07-18 12:48:09 -07:00
contrib Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint 2017-07-10 13:59:06 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2017-01-18 10:27:59 -08:00
gitweb Spelling fixes 2017-06-27 10:35:49 -07:00
mergetools mergetools/meld: improve compatibiilty with Meld on macOS X 2017-06-18 22:11:29 -07:00
perl Merge branch 'pw/unquote-path-in-git-pm' 2017-07-10 13:42:50 -07:00
po l10n: zh_CN: review for git v2.14.0 l10n 2017-08-02 08:02:37 +08:00
ppc
refs Merge branch 'mh/packed-ref-store-prep' 2017-06-26 14:09:29 -07:00
sha1collisiondetection@19d97bf5af sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
sha1dc Merge branch 'ab/sha1dc-maint' 2017-07-06 18:14:44 -07:00
t rebase: honor --rerere-autoupdate 2017-08-02 15:16:09 -07:00
templates pre-rebase hook: capture documentation in a <<here document 2017-07-11 08:56:33 -07:00
vcs-svn timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
xdiff xdiff -W: relax end-of-file function detection 2017-01-15 16:08:11 -08:00
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore rebase--helper: add a builtin helper for interactive rebases 2017-02-09 14:55:26 -08:00
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap Git 2.12.2 2017-03-24 13:31:01 -07:00
.travis.yml Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
COPYING
GIT-VERSION-GEN Git 2.13.4 2017-08-01 11:45:17 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jc/po-pritime-fix' 2017-07-21 14:57:37 -07:00
README.md README: create HTTP/HTTPS links from URLs in Markdown 2017-03-01 14:45:45 -08:00
RelNotes fixes from 'master' for 2.13.4 2017-07-21 15:06:09 -07:00
abspath.c Spelling fixes 2017-06-27 10:35:49 -07:00
aclocal.m4
advice.c Merge branch 'jk/warn-add-gitlink' 2017-06-24 14:28:41 -07:00
advice.h add: warn when adding an embedded repository 2017-06-15 09:10:44 -07:00
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
apply.c Merge branch 'rs/apply-avoid-over-reading' into maint 2017-07-31 13:51:04 -07:00
apply.h
archive-tar.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive-zip.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c
argv-array.h
attr.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
attr.h pathspec: allow querying for attributes 2017-03-13 15:28:54 -07:00
base85.c
bisect.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
bisect.h
blame.c Merge branch 'js/blame-lib' 2017-07-31 13:05:15 -07:00
blame.h blame: move entry prepend to libgit 2017-05-25 13:08:23 +09:00
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
branch.h branch: record creation of renamed branch in HEAD's log 2017-02-20 22:04:47 -08:00
builtin.h blame: move textconv_object with related functions 2017-05-24 15:41:50 +09:00
bulk-checkin.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
bulk-checkin.h
bundle.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h Merge branch 'jt/unify-object-info' 2017-07-05 13:32:57 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
color.h
column.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
column.h
combine-diff.c Merge branch 'bw/ls-files-sans-the-index' 2017-06-24 14:28:40 -07:00
command-list.txt relink: retire the command 2017-01-25 14:42:37 -08:00
commit-slab.h *.[ch] refactoring: make use of the FREE_AND_NULL() macro 2017-06-16 12:44:09 -07:00
commit.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
commit.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
common-main.c attr: use hashmap for attribute dictionary 2017-02-01 13:46:53 -08:00
config.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
config.h config: read config from a repository object 2017-06-23 18:24:34 -07:00
config.mak.in
config.mak.uname config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin 2017-07-21 11:58:06 -07:00
configure.ac Merge branch 'nd/fopen-errors' 2017-06-22 14:15:20 -07:00
connect.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
connect.h
connected.c check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
connected.h check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
convert.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
convert.h convert: convert renormalize_buffer to take an index 2017-06-13 11:40:51 -07:00
copy.c
credential-cache--daemon.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
credential-cache.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
credential.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
date.c Merge branch 'ab/strbuf-addftime-tzname-boolify' 2017-07-06 18:14:47 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
diff-no-index.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
diff.h Merge branch 'bw/object-id' 2017-06-19 12:38:44 -07:00
diffcore-break.c Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
diffcore-delta.c Merge branch 'tk/diffcore-delta-remove-unused' 2016-11-17 13:45:22 -08:00
diffcore-order.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2017-03-28 13:52:24 -07:00
diffcore-rename.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'ab/wildmatch' 2017-07-10 13:42:51 -07:00
dir.h Merge branch 'pc/dir-count-slashes' 2017-06-22 14:15:21 -07:00
editor.c
entry.c entry.c: submodule recursing: respect force flag correctly 2017-04-18 21:18:29 -07:00
environment.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
exec_cmd.c Merge branch 'js/exec-path-coverity-workaround' into maint 2017-01-31 13:32:10 -08:00
exec_cmd.h common-main: stop munging argv[0] path 2016-11-29 11:01:48 -08:00
fast-import.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
fetch-pack.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
fetch-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
fsck.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'pw/unquote-path-in-git-pm' into maint 2017-07-31 13:51:05 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'tb/push-to-cygwin-unc-path' 2017-07-18 12:48:09 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh filter-branch: add [--] to usage 2017-06-12 09:49:52 -07:00
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
git-mergetool.sh mergetool: fix running in subdir when rerere enabled 2017-01-10 13:22:51 -08:00
git-p4.py git-p4: filter for {'code':'info'} in p4CmdList 2017-07-13 10:52:42 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh rebase: honor --rerere-autoupdate 2017-08-02 15:16:09 -07:00
git-rebase--interactive.sh doc: replace more gmane links 2017-05-09 21:13:13 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
git-remote-testgit.sh
git-request-pull.sh request-pull: drop old USAGE stuff 2017-01-15 16:23:23 -08:00
git-send-email.perl Merge branch 'xz/send-email-batch-size' 2017-07-06 18:14:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-stash.sh Merge branch 'lb/status-stash-count' 2017-06-26 14:09:29 -07:00
git-submodule.sh add: warn when adding an embedded repository 2017-06-15 09:10:44 -07:00
git-svn.perl git svn: fix authentication with 'branch' 2017-03-07 21:29:03 +00:00
git-web--browse.sh
git.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
git.rc
gpg-interface.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
gpg-interface.h gpg-interface, tag: add GPG_VERIFY_OMIT_STATUS flag 2017-01-17 16:10:22 -08:00
graph.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
graph.h
grep.c grep: remove redundant REG_NEWLINE when compiling fixed regex 2017-06-30 10:06:24 -07:00
grep.h grep: remove regflags from the public grep_opt API 2017-06-30 10:06:24 -07:00
hash.h sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
hashmap.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
hashmap.h hashmap: migrate documentation from Documentation/technical into header 2017-06-30 13:11:59 -07:00
help.c Merge branch 'mb/reword-autocomplete-message' into maint 2017-07-10 13:59:04 -07:00
help.h
hex.c Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ 2017-03-26 22:08:21 -07:00
http-backend.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
http-fetch.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
http-push.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
http-walker.c Merge branch 'ew/http-alternates-as-redirects-warning' into maint 2017-03-28 13:52:23 -07:00
http.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
ident.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
imap-send.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
line-log.h
line-range.c use SWAP macro 2017-01-30 14:17:00 -08:00
line-range.h
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h
list.h
ll-merge.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
ll-merge.h
lockfile.c lockfile: LOCK_REPORT_ON_ERROR 2016-12-07 11:31:59 -08:00
lockfile.h lockfile: add a new method, is_lock_file_locked() 2017-05-23 14:29:54 +09:00
log-tree.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
log-tree.h pretty: use fmt_output_email_subject() 2017-03-01 15:09:17 -08:00
mailinfo.c Spelling fixes 2017-06-27 10:35:49 -07:00
mailinfo.h
mailmap.c cocci: refactor common patterns to use xstrdup_or_null() 2016-10-12 11:22:10 -07:00
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'sb/merge-recursive-code-cleanup' 2017-07-06 18:14:45 -07:00
merge-recursive.h
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
notes-cache.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
notes-utils.h builtin/notes: convert to struct object_id 2017-06-02 09:36:06 +09:00
notes.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
notes.h notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
object.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
object.h object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
oidset.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
oidset.h add oidset API 2017-02-08 15:39:55 -08:00
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c Merge branch 'jc/pack-bitmap-unaligned' into maint 2017-07-10 13:59:00 -07:00
pack-bitmap.h
pack-check.c Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h pack-objects: enforce --depth limit in reused deltas 2017-01-27 16:24:44 -08:00
pack-revindex.c use SWAP macro 2017-01-30 14:17:00 -08:00
pack-revindex.h
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pager.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
parse-options.h ref-filter: add --no-contains option to tag/branch/for-each-ref 2017-03-24 12:15:26 -07:00
patch-delta.c
patch-ids.c patch-ids.c: use hashmap correctly 2017-06-30 13:11:54 -07:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c path: add repo_worktree_path and strbuf_repo_worktree_path 2017-06-23 18:24:34 -07:00
path.h path: add repo_worktree_path and strbuf_repo_worktree_path 2017-06-23 18:24:34 -07:00
pathspec.c Spelling fixes 2017-06-27 10:35:49 -07:00
pathspec.h pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pkt-line.c convert: move packet_write_line() into pkt-line as packet_writel() 2017-05-08 10:57:26 +09:00
pkt-line.h pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL 2017-05-15 13:01:36 +09:00
preload-index.c preload-index: avoid lstat for skip-worktree items 2017-02-10 14:44:18 -08:00
pretty.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
prio-queue.c *.[ch] refactoring: make use of the FREE_AND_NULL() macro 2017-06-16 12:44:09 -07:00
prio-queue.h
progress.c progress: show overall rate in last update 2017-07-09 09:54:20 -07:00
progress.h
prompt.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
prompt.h
quote.c
quote.h
reachable.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c Merge branch 'cc/shared-index-permfix' 2017-07-05 13:32:57 -07:00
ref-filter.c Merge branch 'kn/ref-filter-branch-list' into maint 2017-07-12 15:23:09 -07:00
ref-filter.h Convert struct ref_array_item to struct object_id 2017-05-08 15:12:57 +09:00
reflog-walk.c Merge branch 'jk/reflog-walk-maint' 2017-07-10 13:42:53 -07:00
reflog-walk.h
refs.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
refs.h Spelling fixes 2017-06-27 10:35:49 -07:00
remote-curl.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
remote-testsvn.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
remote.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
remote.h Merge branch 'bw/push-options-recursively-to-submodules' 2017-04-19 21:37:14 -07:00
replace_object.c
repository.c repository: enable initialization of submodules 2017-06-23 18:24:34 -07:00
repository.h repository: enable initialization of submodules 2017-06-23 18:24:34 -07:00
rerere.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ab/grep-lose-opt-regflags' 2017-07-13 16:14:54 -07:00
revision.h Merge branch 'sg/revision-parser-skip-prefix' into maint 2017-06-24 15:29:34 -07:00
run-command.c run-command: restrict PATH search to executable files 2017-04-25 23:17:36 -07:00
run-command.h run-command: expose is_executable function 2017-04-25 18:45:29 -07:00
send-pack.c Spelling fixes 2017-06-27 10:35:49 -07:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
sequencer.h sequencer (rebase -i): learn about the 'verbose' mode 2017-01-09 14:57:29 -08:00
server-info.c Merge branch 'nd/fopen-errors' 2017-06-13 13:47:09 -07:00
setup.c Merge branch 'js/alias-early-config' into maint 2017-07-10 13:58:58 -07:00
sh-i18n--envsubst.c remove unnecessary check before QSORT 2016-09-29 15:42:18 -07:00
sha1-array.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'ew/fd-cloexec-fix' into maint 2017-07-21 15:03:40 -07:00
sha1_name.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
sha1dc_git.c sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
sha1dc_git.h sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
shallow.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
shell.c Merge branch 'maint-2.8' into maint-2.9 2017-05-05 13:13:48 +09:00
shortlog.h shortlog: group by committer information 2016-12-15 16:19:13 -08:00
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
split-index.h Revert "split-index: add and use unshare_split_index()" 2017-06-24 12:02:39 -07:00
strbuf.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
strbuf.h Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
streaming.c Merge branch 'jk/pack-objects-optim-mru' 2016-10-10 14:03:47 -07:00
streaming.h
string-list.c Merge branch 'bw/forking-and-threading' into maint 2017-06-13 13:27:00 -07:00
string-list.h string-list: add string_list_remove function 2017-04-20 17:55:32 -07:00
sub-process.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
sub-process.h hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
submodule-config.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule-config.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
symlinks.c
tag.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tag.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tar.h
tempfile.c tempfile: set errno to a known value before calling ferror() 2017-02-17 14:40:29 -08:00
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c tmp-objdir: quote paths we add to alternates 2016-12-12 15:10:46 -08:00
tmp-objdir.h tmp-objdir: introduce API for temporary object directories 2016-10-10 13:54:02 -07:00
trace.c
trace.h
trailer.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
trailer.h trailer: have function to describe trailer layout 2016-11-29 14:22:18 -08:00
transport-helper.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
transport.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
transport.h for_each_alternate_ref: pass name/oid instead of ref struct 2017-02-08 15:39:55 -08:00
tree-diff.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree-walk.c Merge branch 'jk/diff-blob' into maint 2017-06-24 15:29:28 -07:00
tree-walk.h fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree.h tree: convert read_tree to take an index parameter 2017-06-13 11:40:51 -07:00
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
unpack-trees.h unpack-trees: check if we can perform the operation for submodules 2017-03-16 14:07:16 -07:00
upload-pack.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
urlmatch.h urlmatch: include host in urlmatch ranking 2017-02-01 13:22:46 -08:00
usage.c die(): stop hiding errors due to overzealous recursion guard 2017-06-21 14:09:13 -07:00
userdiff.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
userdiff.h
utf8.c utf8: accept "latin-1" as ISO-8859-1 2016-09-26 18:16:23 -07:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h
wildmatch.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
wildmatch.h wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
worktree.c path: convert strbuf_git_common_path to take a 'struct repository' 2017-06-23 18:24:34 -07:00
worktree.h worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() 2017-04-24 21:28:55 -07:00
wrap-for-bin.sh
wrapper.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
write_or_die.c run-command: move check_pipe() from write_or_die to run_command 2016-10-17 11:36:49 -07:00
ws.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
wt-status.c Merge branch 'rs/wt-status-cleanup' 2017-07-12 15:18:23 -07:00
wt-status.h Merge branch 'ks/status-initial-commit' 2017-06-30 13:45:22 -07:00
xdiff-interface.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
xdiff-interface.h
zlib.c

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 https://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-.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 https://public-inbox.org/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