Go to file

Johannes Schindelin 7543f6f444 rebase -i: introduce --rebase-merges=[no-]rebase-cousins When running `git rebase --rebase-merges` non-interactively with an ancestor of HEAD as <upstream> (or leaving the todo list unmodified), we would ideally recreate the exact same commits as before the rebase. However, if there are commits in the commit range <upstream>.. that do not have <upstream> as direct ancestor (i.e. if `git log <upstream>..` would show commits that are omitted by `git log --ancestry-path <upstream>..`), this is currently not the case: we would turn them into commits that have <upstream> as direct ancestor. Let's illustrate that with a diagram: C / \ A - B - E - F \ / D Currently, after running `git rebase -i --rebase-merges B`, the new branch structure would be (pay particular attention to the commit `D`): --- C' -- / \ A - B ------ E' - F' \ / D' This is not really preserving the branch topology from before! The reason is that the commit `D` does not have `B` as ancestor, and therefore it gets rebased onto `B`. This is unintuitive behavior. Even worse, when recreating branch structure, most use cases would appear to want cousins not to be rebased onto the new base commit. For example, Git for Windows (the heaviest user of the Git garden shears, which served as the blueprint for --rebase-merges) frequently merges branches from `next` early, and these branches certainly do not want to be rebased. In the example above, the desired outcome would look like this: --- C' -- / \ A - B ------ E' - F' \ / -- D' -- Let's introduce the term "cousins" for such commits ("D" in the example), and let's not rebase them by default. For hypothetical use cases where cousins do need to be rebased, `git rebase --rebase=merges=rebase-cousins` needs to be used. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-04-26 12:28:43 +09:00
.github	…
Documentation	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
block-sha1	…
builtin	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
ci	Merge branch 'tg/split-index-fixes' into maint	2018-03-22 14:24:10 -07:00
compat	mingw: abort on invalid strftime formats	2018-03-19 10:53:17 -07:00
contrib	pull: accept --rebase=merges to recreate the branch topology	2018-04-26 12:28:43 +09:00
ewah	…
git-gui	Merge branch 'cb/git-gui-ttk-style'	2018-04-25 13:28:49 +09:00
gitk-git	…
gitweb	gitweb: hard-depend on the Digest::MD5 5.8 module	2018-03-05 10:52:27 -08:00
mergetools	mergetools: add support for guiffy	2018-04-06 08:11:39 +09:00
perl	git-svn: allow empty email-address using authors-prog and authors-file	2018-04-05 19:22:06 +00:00
po	l10n: de.po: translate 132 new messages	2018-03-31 13:21:09 +02:00
ppc	…
refs	refs: use chdir_notify to update cached relative paths	2018-03-30 12:50:03 -07:00
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
templates	…
vcs-svn	…
xdiff	Merge branch 'jt/diff-anchored-patience'	2017-12-19 11:33:56 -08:00
.clang-format	clang-format: adjust penalty for return type line break	2018-01-24 13:42:04 -08:00
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	travis-ci: build Git during the 'script' phase	2018-01-08 14:07:41 -08:00
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	The first batch for 2.18 cycle	2018-04-10 08:31:17 +09:00
INSTALL	RelNotes: add details on Perl module changes	2018-03-16 16:07:37 -07:00
LGPL-2.1	…
Makefile	Merge branch 'jm/mem-pool'	2018-04-25 13:29:06 +09:00
README.md	…
RelNotes	The first batch for 2.18 cycle	2018-04-10 08:31:17 +09:00
abspath.c	…
aclocal.m4	…
advice.c	Merge branch 'ls/editor-waiting-message'	2017-12-19 11:33:59 -08:00
advice.h	Merge branch 'ls/editor-waiting-message'	2017-12-19 11:33:59 -08:00
alias.c	…
alloc.c	…
apply.c	Merge branch 'bc/object-id'	2018-04-10 08:25:45 +09:00
apply.h	…
archive-tar.c	sha1_file: convert sha1_object_info* to object_id	2018-03-14 09:23:49 -07:00
archive-zip.c	sha1_file: convert sha1_object_info* to object_id	2018-03-14 09:23:49 -07:00
archive.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
archive.h	archive: convert sha1_file_to_archive to struct object_id	2018-03-14 09:23:48 -07:00
argv-array.c	…
argv-array.h	…
attr.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'ys/bisect-object-id-missing-conversion-fix'	2018-04-10 16:28:24 +09:00
bisect.h	Merge branch 'ma/bisect-leakfix'	2017-11-15 12:14:28 +09:00
blame.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
blame.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'ks/branch-cleanup'	2017-12-27 11:16:25 -08:00
branch.h	Merge branch 'ks/branch-cleanup'	2017-12-27 11:16:25 -08:00
builtin.h	…
bulk-checkin.c	Merge branch 'sb/packfiles-in-repository'	2018-04-11 13:09:55 +09:00
bulk-checkin.h	bulk-checkin: convert index_bulk_checkin to struct object_id	2018-03-14 09:23:47 -07:00
bundle.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
bundle.h	…
cache-tree.c	Merge branch 'tg/split-index-fixes' into maint	2018-03-22 14:24:10 -07:00
cache-tree.h	cache-tree: convert write_*_as_tree to object_id	2018-03-14 09:23:47 -07:00
cache.h	Merge branch 'jk/relative-directory-fix'	2018-04-25 13:28:52 +09:00
chdir-notify.c	add chdir-notify API	2018-03-30 12:49:57 -07:00
chdir-notify.h	add chdir-notify API	2018-03-30 12:49:57 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	checkout: factor out functions to new lib file	2017-11-27 09:48:06 +09:00
checkout.h	checkout: factor out functions to new lib file	2017-11-27 09:48:06 +09:00
color.c	color.h: document and modernize header	2018-02-13 10:17:12 -08:00
color.h	color.h: document and modernize header	2018-02-13 10:17:12 -08:00
column.c	…
column.h	…
combine-diff.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
command-list.txt	…
commit-slab.h	…
commit.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
commit.h	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
common-main.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
config.c	Merge branch 'sb/filenames-with-dashes'	2018-04-25 13:29:05 +09:00
config.h	Merge branch 'hm/config-parse-expiry-date'	2017-12-06 09:23:37 -08:00
config.mak.in	…
config.mak.uname	config.mak.uname: remove SPARSE_FLAGS setting for cygwin	2018-02-12 12:19:18 -08:00
configure.ac	Merge branch 'es/fread-reads-dir-autoconf-fix'	2018-04-25 13:29:01 +09:00
connect.c	connect: correct style of C-style comment	2017-11-21 14:01:03 +09:00
connect.h	…
connected.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
connected.h	…
convert.c	convert: convert to struct object_id	2018-03-14 09:23:50 -07:00
convert.h	convert: convert to struct object_id	2018-03-14 09:23:50 -07:00
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	credential: ignore SIGPIPE when writing to credential helpers	2018-03-29 15:33:55 -07:00
credential.h	…
csum-file.c	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
csum-file.h	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
ctype.c	…
daemon.c	Merge branch 'lw/daemon-log-destination'	2018-04-25 13:28:58 +09:00
date.c	…
decorate.c	decorate: clean up and document API	2017-12-08 09:16:27 -08:00
decorate.h	decorate: clean up and document API	2017-12-08 09:16:27 -08:00
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
diff-no-index.c	…
diff.c	Merge branch 'bc/object-id'	2018-04-10 08:25:45 +09:00
diff.h	Merge branch 'nd/diff-stat-with-summary'	2018-03-14 12:01:02 -07:00
diffcore-break.c	…
diffcore-delta.c	diffcore-delta: rename 'new' variables	2018-02-22 10:08:05 -08:00
diffcore-order.c	…
diffcore-pickaxe.c	diff: properly error out when combining multiple pickaxe options	2018-01-04 15:02:40 -08:00
diffcore-rename.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
dir.h	Merge branch 'nd/fix-untracked-cache-invalidation'	2018-02-27 10:33:50 -08:00
editor.c	launch_editor(): indicate that Git waits for user input	2017-12-07 10:10:19 -08:00
entry.c	convert: convert to struct object_id	2018-03-14 09:23:50 -07:00
environment.c	Merge branch 'jk/relative-directory-fix'	2018-04-25 13:28:52 +09:00
exec-cmd.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
exec-cmd.h	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
fast-import.c	Merge branch 'jm/mem-pool'	2018-04-25 13:29:06 +09:00
fetch-object.c	unpack-trees: batch fetching of missing blobs	2017-12-08 09:58:51 -08:00
fetch-object.h	unpack-trees: batch fetching of missing blobs	2017-12-08 09:58:51 -08:00
fetch-pack.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
fetch-pack.h	fetch-pack, index-pack, transport: partial clone	2017-12-08 09:58:51 -08:00
fmt-merge-msg.h	…
fsck.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
fsck.h	…
fsmonitor.c	Merge branch 'bp/fsmonitor-prime-index'	2018-04-25 13:29:04 +09:00
fsmonitor.h	dir.c: ignore paths containing .git when invalidating untracked cache	2018-02-07 12:27:02 -08:00
generate-cmdlist.sh	generate-cmdlist: avoid non-deterministic output	2017-11-22 14:56:30 +09:00
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'pw/add-p-single'	2018-04-02 10:10:55 -07:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'sb/bisect-run-empty'	2017-11-15 12:14:36 +09:00
git-compat-util.h	wrapper: rename 'template' variables	2018-02-22 10:08:05 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	perl: call timegm and timelocal with 4-digit year	2018-02-23 14:47:06 -08:00
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	Merge branch 'yk/filter-branch-non-committish-refs'	2018-04-10 16:28:23 +09:00
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	git-p4: update multiple shelved change lists	2017-12-22 13:30:52 -08:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	Merge branch 'pw/rebase-signoff'	2018-04-25 13:28:51 +09:00
git-rebase--interactive.sh	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
git-rebase--merge.sh	Merge branch 'pw/rebase-signoff'	2018-04-25 13:28:51 +09:00
git-rebase.sh	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'ab/perl-fixes'	2018-03-15 15:00:46 -07:00
git-sh-i18n.sh	git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME	2018-02-08 10:09:45 -08:00
git-sh-setup.sh	…
git-stash.sh	Merge branch 'tg/stash-untracked-with-pathspec-fix'	2018-04-10 08:25:45 +09:00
git-submodule.sh	submodule: port submodule subcommand 'deinit' from shell to C	2018-01-16 11:29:50 -08:00
git-svn.perl	git-svn: search --authors-prog in PATH too	2018-04-05 06:55:02 +00:00
git-web--browse.sh	…
git.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
grep.h	Merge branch 'ab/pcre-v2' into maint	2017-11-21 14:05:30 +09:00
hash.h	hash: update obsolete reference to SHA1_HEADER	2018-02-09 09:56:10 -08:00
hashmap.c	…
hashmap.h	Merge branch 'rb/hashmap-h-compilation-fix' into maint	2018-03-22 14:24:15 -07:00
help.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
help.h	…
hex.c	…
http-backend.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
http-fetch.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
http-push.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
http-walker.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
http.c	Merge branch 'lv/tls-1.3'	2018-04-11 13:09:57 +09:00
http.h	…
ident.c	…
imap-send.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	tree-walk: convert tree entry functions to object_id	2018-03-14 09:23:50 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects-filter-options.c	fetch: inherit filter-spec from partial clone	2017-12-08 09:58:52 -08:00
list-objects-filter-options.h	fetch: inherit filter-spec from partial clone	2017-12-08 09:58:52 -08:00
list-objects-filter.c	sha1_name.c: rename to use dash in file name	2018-04-11 18:11:00 +09:00
list-objects-filter.h	list-objects: filter objects in traverse_commit_list	2017-11-22 14:11:57 +09:00
list-objects.c	Merge branch 'jh/fsck-promisors'	2018-02-13 13:39:03 -08:00
list-objects.h	list-objects: filter objects in traverse_commit_list	2017-11-22 14:11:57 +09:00
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Convert find_unique_abbrev* to struct object_id	2018-03-14 09:23:48 -07:00
log-tree.h	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
mailinfo.c	Merge branch 'jc/mailinfo-cleanup-fix' into maint	2018-03-22 14:24:16 -07:00
mailinfo.h	…
mailmap.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
mailmap.h	…
match-trees.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
mem-pool.c	mem-pool: move reusable parts of memory pool into its own file	2018-04-12 11:55:20 +09:00
mem-pool.h	mem-pool: move reusable parts of memory pool into its own file	2018-04-12 11:55:20 +09:00
merge-blobs.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
merge-blobs.h	…
merge-recursive.c	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
merge-recursive.h	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
merge.c	merge: always roll back lock in `checkout_fast_forward()`	2018-02-28 11:15:51 -08:00
mergesort.c	…
mergesort.h	…
name-hash.c	Merge branch 'bp/name-hash-dirname-fix'	2018-02-27 10:33:53 -08:00
notes-cache.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
notes-cache.h	…
notes-merge.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
notes-merge.h	…
notes-utils.c	notes: convert write_notes_tree to object_id	2018-01-30 10:42:36 -08:00
notes-utils.h	commit: convert commit_tree* to object_id	2018-01-30 10:42:36 -08:00
notes.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
notes.h	notes: convert write_notes_tree to object_id	2018-01-30 10:42:36 -08:00
object-store.h	sha1_file: allow map_sha1_file to handle arbitrary repositories	2018-03-26 10:05:55 -07:00
object.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
object.h	sha1_name.c: rename to use dash in file name	2018-04-11 18:11:00 +09:00
oidmap.c	oidmap: ensure map is initialized	2017-12-27 12:28:06 -08:00
oidmap.h	oidmap: add oidmap iterator methods	2017-11-22 14:11:56 +09:00
oidset.c	oidset: add iterator methods to oidset	2017-11-22 14:11:56 +09:00
oidset.h	oidset: don't return value from oidset_init	2018-01-08 15:24:35 -08:00
pack-bitmap-write.c	sha1_file: convert sha1_object_info* to object_id	2018-03-14 09:23:49 -07:00
pack-bitmap.c	packfile: keep prepare_packed_git() private	2018-03-26 10:07:43 -07:00
pack-bitmap.h	…
pack-check.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	object-store: move packed_git and packed_git_mru to object store	2018-03-26 10:05:46 -07:00
pack-revindex.h	…
pack-write.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
pack.h	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
packfile.c	Merge branch 'sb/packfiles-in-repository'	2018-04-11 13:09:55 +09:00
packfile.h	Merge branch 'sb/packfiles-in-repository'	2018-04-11 13:09:55 +09:00
pager.c	…
parse-options-cb.c	…
parse-options.c	Merge branch 'ps/contains-id-error-message'	2018-04-10 16:28:20 +09:00
parse-options.h	Merge branch 'ps/contains-id-error-message'	2018-04-10 16:28:20 +09:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	repository: introduce raw object store field	2018-03-23 11:06:01 -07:00
path.h	path: document path functions	2017-12-13 11:14:25 -08:00
pathspec.c	…
pathspec.h	Merge branch 'bw/pathspec-match-submodule-boundary'	2017-12-19 11:33:56 -08:00
pkt-line.c	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
pkt-line.h	…
preload-index.c	trace: measure where the time is spent in the index-heavy operations	2018-02-02 11:20:16 -08:00
pretty.c	strbuf: convert strbuf_add_unique_abbrev to use struct object_id	2018-03-14 09:23:48 -07:00
pretty.h	format: create docs for pretty.h	2017-12-12 10:41:15 -08:00
prio-queue.c	…
prio-queue.h	…
progress.c	Merge branch 'en/rename-progress'	2017-12-19 11:33:55 -08:00
progress.h	progress: fix progress meters when dealing with lots of work	2017-11-15 13:11:25 +09:00
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	Merge branch 'jk/sq-dequote-on-bogus-input'	2018-02-27 10:34:02 -08:00
quote.h	trace: avoid unnecessary quoting	2018-01-16 12:16:54 -08:00
reachable.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
reachable.h	…
read-cache.c	Merge branch 'bc/object-id'	2018-04-10 08:25:45 +09:00
ref-filter.c	Merge branch 'jk/ref-array-push'	2018-04-25 13:28:59 +09:00
ref-filter.h	ref-filter: factor ref_array pushing into its own function	2018-04-09 06:14:46 +09:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	sequencer: make refs generated by the `label` command worktree-local	2018-04-26 12:28:43 +09:00
refs.h	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
remote-curl.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
remote-testsvn.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
remote.c	sha1_file: convert sha1_object_info* to object_id	2018-03-14 09:23:49 -07:00
remote.h	Merge branch 'jh/status-no-ahead-behind'	2018-03-08 12:36:24 -08:00
replace-object.c	replace_object.c: rename to use dash in file name	2018-04-11 18:11:00 +09:00
repository.c	repository: introduce raw object store field	2018-03-23 11:06:01 -07:00
repository.h	repository: introduce raw object store field	2018-03-23 11:06:01 -07:00
rerere.c	Merge branch 'bc/object-id'	2018-04-10 08:25:45 +09:00
rerere.h	completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate	2018-03-07 11:02:48 -08:00
resolve-undo.c	resolve-undo: convert struct resolve_undo_info to object_id	2018-03-14 09:23:47 -07:00
resolve-undo.h	resolve-undo: convert struct resolve_undo_info to object_id	2018-03-14 09:23:47 -07:00
revision.c	Merge branch 'jk/cached-commit-buffer' into maint	2018-03-22 14:24:25 -07:00
revision.h	Merge branch 'jk/cached-commit-buffer'	2018-03-06 14:54:05 -08:00
run-command.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
run-command.h	…
send-pack.c	send-pack: convert remaining functions to struct object_id	2018-03-14 09:23:48 -07:00
send-pack.h	…
sequencer.c	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
sequencer.h	rebase -i: introduce --rebase-merges=[no-]rebase-cousins	2018-04-26 12:28:43 +09:00
server-info.c	packfile: keep prepare_packed_git() private	2018-03-26 10:07:43 -07:00
setup.c	Merge branch 'jk/relative-directory-fix'	2018-04-25 13:28:52 +09:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	sha1_file.c: rename to use dash in file name	2018-04-11 18:11:00 +09:00
sha1-lookup.c	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1-lookup.h	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1-name.c	sha1_name.c: rename to use dash in file name	2018-04-11 18:11:00 +09:00
sha1dc_git.c	…
sha1dc_git.h	sha1dc_git.h: re-arrange an ifdef chain for a subsequent change	2017-12-08 15:01:01 -08:00
shallow.c	…
shell.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
shortlog.h	…
show-index.c	…
sideband.c	refactor "dumb" terminal determination	2017-12-04 09:38:30 -08:00
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
split-index.h	split-index: rename 'new' variables	2018-02-22 10:08:05 -08:00
strbuf.c	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
strbuf.h	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
streaming.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
streaming.h	streaming: convert open_istream to use struct object_id	2018-03-14 09:23:49 -07:00
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	Docs: split out long-running subprocess handshake	2018-01-25 11:24:32 -08:00
submodule-config.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
submodule-config.h	…
submodule.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
submodule.h	submodule: rename 'new' variables	2018-02-22 10:08:05 -08:00
symlinks.c	…
tag.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
tag.h	…
tar.h	…
tempfile.c	tempfile: rename 'template' variables	2018-02-22 10:08:05 -08:00
tempfile.h	tempfile: rename 'template' variables	2018-02-22 10:08:05 -08:00
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	object-store: migrate alternates struct and functions from cache.h	2018-03-23 11:06:01 -07:00
tmp-objdir.h	…
trace.c	trace.c: export trace_setup_key	2018-03-30 12:49:57 -07:00
trace.h	trace.c: export trace_setup_key	2018-03-30 12:49:57 -07:00
trailer.c	trailer: rename 'template' variables	2018-02-22 10:08:05 -08:00
trailer.h	…
transport-helper.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
transport-internal.h	transport: make transport vtable more private	2017-12-14 14:28:04 -08:00
transport.c	Merge branch 'sb/object-store'	2018-04-11 13:09:55 +09:00
transport.h	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
tree-diff.c	…
tree-walk.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
tree-walk.h	tree-walk: convert tree entry functions to object_id	2018-03-14 09:23:50 -07:00
tree.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -07:00
tree.h	tree: convert read_tree_recursive to struct object_id	2018-03-14 09:23:47 -07:00
unicode-width.h	unicode_width.h: rename to use dash in file name	2018-04-11 18:11:00 +09:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
unpack-trees.h	Revert "Merge branch 'en/rename-directory-detection'"	2018-04-11 18:07:11 +09:00
upload-pack.c	exec_cmd: rename to use dash in file name	2018-04-11 18:11:00 +09:00
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	Merge branch 'tl/userdiff-csharp-async'	2018-03-15 15:00:47 -07:00
userdiff.h	…
utf8.c	unicode_width.h: rename to use dash in file name	2018-04-11 18:11:00 +09:00
utf8.h	…
varint.c	…
varint.h	…
version.c	version --build-options: report commit, too, if possible	2017-12-14 22:53:04 -08:00
version.h	version --build-options: report commit, too, if possible	2017-12-14 22:53:04 -08:00
versioncmp.c	…
walker.c	object: rename function 'typename' to 'type_name'	2018-02-14 13:10:05 -08:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	worktree remove: allow it when $GIT_WORK_TREE is already gone	2018-02-12 13:13:35 -08:00
worktree.h	worktree remove: allow it when $GIT_WORK_TREE is already gone	2018-02-12 13:13:35 -08:00
wrap-for-bin.sh	Makefile: replace perl/Makefile.PL with simple make rules	2017-12-11 15:28:10 -08:00
wrapper.c	wrapper: rename 'template' variables	2018-02-22 10:08:05 -08:00
write-or-die.c	write_or_die.c: rename to use dashes in file name	2018-04-11 18:11:00 +09:00
ws.c	…
wt-status.c	Convert find_unique_abbrev* to struct object_id	2018-03-14 09:23:48 -07:00
wt-status.h	wt-status: convert struct wt_status_state to object_id	2018-03-14 09:23:48 -07:00
xdiff-interface.c	sha1_file: convert read_sha1_file to struct object_id	2018-03-14 09:23:50 -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