Go to file

Alex Henrie d18c950a69 pull: warn if the user didn't say whether to rebase or to merge Often novice Git users forget to say "pull --rebase" and end up with an unnecessary merge from upstream. What they usually want is either "pull --rebase" in the simpler cases, or "pull --ff-only" to update the copy of main integration branches, and rebase their work separately. The pull.rebase configuration variable exists to help them in the simpler cases, but there is no mechanism to make these users aware of it. Issue a warning message when no --[no-]rebase option from the command line and no pull.rebase configuration variable is given. This will inconvenience those who never want to "pull --rebase", who haven't had to do anything special, but the cost of the inconvenience is paid only once per user, which should be a reasonable cost to help a number of new users. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-03-10 13:06:41 -07:00
.github	…
Documentation	The seventh batch for 2.26	2020-02-25 11:18:32 -08:00
block-sha1	…
builtin	pull: warn if the user didn't say whether to rebase or to merge	2020-03-10 13:06:41 -07:00
ci	Merge branch 'js/ci-squelch-doc-warning'	2020-02-12 12:41:39 -08:00
compat	Merge branch 'js/mingw-open-in-gdb'	2020-02-17 13:22:18 -08:00
contrib	Merge branch 'mt/sparse-checkout-doc-update'	2020-02-05 14:35:00 -08:00
ewah	ewah/bitmap: introduce bitmap_word_alloc()	2020-01-23 10:51:50 -08:00
git-gui	Merge https://github.com/prati0100/git-gui	2020-01-08 11:18:06 -08:00
gitk-git	…
gitweb	Merge branch 'do/gitweb-typofix-in-comments'	2020-01-08 12:44:11 -08:00
mergetools	…
negotiator	…
perl	…
po	l10n: zh_CN: for git v2.25.0 l10n round 1	2020-01-12 19:22:02 +08:00
ppc	…
refs	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
sha1collisiondetection@855827c583	…
sha1dc	Merge branch 'jk/lore-is-the-archive'	2019-12-06 15:09:23 -08:00
sha256	…
t	pull: warn if the user didn't say whether to rebase or to merge	2020-03-10 13:06:41 -07:00
templates	Merge branch 'kw/fsmonitor-watchman-racefix'	2020-02-14 12:54:20 -08:00
trace2	…
vcs-svn	…
xdiff	Merge branch 'rs/xdiff-ignore-ws-w-func-context'	2019-12-16 13:08:32 -08:00
.cirrus.yml	CI: add FreeBSD CI support via Cirrus-CI	2019-12-20 12:09:12 -08:00
.clang-format	…
.editorconfig	editorconfig: indent text files with tabs	2020-01-06 08:46:32 -08:00
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	Merge branch 'ds/sparse-cone' into maint	2020-02-14 12:42:29 -08:00
.travis.yml	…
.tsan-suppressions	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.25.1	2020-02-16 20:37:38 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'bw/remote-rename-update-config'	2020-02-25 11:18:32 -08:00
README.md	…
RelNotes	Git 2.25.1	2020-02-16 20:37:38 -08:00
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'js/add-p-leftover-bits'	2020-02-05 14:34:58 -08:00
add-interactive.h	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
add-patch.c	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
advice.c	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
advice.h	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
apply.h	…
archive-tar.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
archive-zip.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
azure-pipelines.yml	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
cache-tree.h	…
cache.h	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	color.c: alias RGB colors 8-15 to aixterm colors	2020-02-11 11:19:00 -08:00
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
commit-graph.c	commit-graph.h: use odb in 'load_commit_graph_one_fd_st'	2020-02-04 11:36:51 -08:00
commit-graph.h	commit-graph.h: use odb in 'load_commit_graph_one_fd_st'	2020-02-04 11:36:51 -08:00
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'rs/strbuf-insertstr'	2020-02-17 13:22:17 -08:00
commit.h	gpg-interface: add minTrustLevel as a configuration option	2020-01-15 14:06:06 -08:00
common-main.c	…
config.c	Merge branch 'bw/remote-rename-update-config'	2020-02-25 11:18:32 -08:00
config.h	config: provide access to the current line number	2020-02-10 10:52:10 -08:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
configure.ac	…
connect.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
connect.h	…
connected.c	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
connected.h	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
convert.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	doc: move credential helper info into gitcredentials(7)	2020-02-14 14:43:16 -08:00
csum-file.c	…
csum-file.h	csum-file: introduce hashfile_total()	2020-01-23 10:51:50 -08:00
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
diff.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
dir.h	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'ec/fetch-mark-common-refs-trace2'	2019-12-05 12:52:44 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
fsck.h	…
fsmonitor.c	fsmonitor: handle version 2 of the hooks that will use opaque token	2020-01-13 14:58:43 -08:00
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	git add -p: use non-zero exit code when the diff generation failed	2019-12-06 08:57:34 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-stash.sh	Merge branch 'js/patch-mode-in-others-in-c'	2020-02-05 14:34:58 -08:00
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: avoid leak of file handle when cloning	2020-01-30 12:21:13 -08:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	submodule add: show 'add --dry-run' stderr when aborting	2020-01-15 10:22:24 -08:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	Merge branch 'hi/gpg-mintrustlevel'	2020-01-30 14:17:08 -08:00
gpg-interface.h	Merge branch 'hi/gpg-mintrustlevel'	2020-01-30 14:17:08 -08:00
graph.c	graph: fix collapse of multiple edges	2020-01-15 12:14:51 -08:00
graph.h	…
grep.c	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
grep.h	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	strbuf: add and use strbuf_insertstr()	2020-02-10 09:04:45 -08:00
http.h	…
ident.c	…
imap-send.c	…
interdiff.c	…
interdiff.h	…
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	mailinfo: factor out some repeated header handling	2020-02-11 10:21:43 -08:00
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	merge-recursive: use subtraction to flip stage	2020-01-27 11:17:41 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	…
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	strbuf: add and use strbuf_insertstr()	2020-02-10 09:04:45 -08:00
notes-utils.h	…
notes.c	Merge branch 'rs/strbuf-insertstr'	2020-02-17 13:22:17 -08:00
notes.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
object-store.h	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
object.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
object.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pack-bitmap.h	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pack-check.c	sha1-file: allow check_object_signature() to handle any repo	2020-01-31 10:45:39 -08:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'mt/threaded-grep-in-object-store'	2020-02-14 12:54:20 -08:00
packfile.h	Merge branch 'jk/packfile-reuse-cleanup'	2020-02-14 12:54:19 -08:00
pager.c	…
parse-options-cb.c	parse-options: simplify parse_options_dup()	2020-02-10 09:45:49 -08:00
parse-options.c	Merge branch 'jb/parse-options-message-fix'	2020-02-12 12:41:37 -08:00
parse-options.h	parse-options: const parse_options_concat() parameters	2020-02-10 09:44:58 -08:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	normalize_path_copy(): document "dst" size expectations	2020-01-30 13:45:58 -08:00
path.h	…
pathspec.c	prefix_path: show gitdir when arg is outside repo	2020-02-16 15:32:59 -08:00
pathspec.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'rs/strbuf-insertstr'	2020-02-17 13:22:17 -08:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	fetch: default to protocol version 2	2020-01-15 14:03:55 -08:00
protocol.h	…
quote.c	…
quote.h	…
range-diff.c	range-diff: mark pointers as const	2019-12-06 12:34:49 -08:00
range-diff.h	Merge branch 'dl/range-diff-with-notes'	2019-12-16 13:08:46 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-10 14:45:27 -08:00
rebase-interactive.c	rebase-interactive: warn if commit is dropped with `rebase --edit-todo'	2020-01-28 14:14:57 -08:00
rebase-interactive.h	rebase-interactive: warn if commit is dropped with `rebase --edit-todo'	2020-01-28 14:14:57 -08:00
rebase.c	pull --rebase/remote rename: document and honor single-letter abbreviations rebase types	2020-02-10 10:52:10 -08:00
rebase.h	pull --rebase/remote rename: document and honor single-letter abbreviations rebase types	2020-02-10 10:52:10 -08:00
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
remote-testsvn.c	…
remote.c	config: split repo scope to local and worktree	2020-02-10 10:32:20 -08:00
remote.h	…
replace-object.c	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
replace-object.h	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
revision.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
run-command.c	Merge branch 'bc/run-command-nullness-after-free-fix' into maint	2020-02-14 12:42:27 -08:00
run-command.h	…
send-pack.c	Merge branch 'jk/send-pack-check-negative-with-quick'	2019-12-06 15:09:22 -08:00
send-pack.h	…
sequencer.c	Merge branch 'ag/edit-todo-drop-check'	2020-02-14 12:54:21 -08:00
sequencer.h	Merge branch 'ag/edit-todo-drop-check'	2020-02-14 12:54:21 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	Merge branch 'es/outside-repo-errmsg-hints'	2020-02-17 13:22:19 -08:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	Merge branch 'jk/get-oid-error-message-i18n'	2020-02-14 12:54:21 -08:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
strbuf.h	strbuf: add and use strbuf_insertstr()	2020-02-10 09:04:45 -08:00
streaming.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
streaming.h	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
string-list.c	…
string-list.h	Merge branch 'en/string-list-can-be-custom-sorted' into maint	2020-02-14 12:42:27 -08:00
sub-process.c	…
sub-process.h	…
submodule-config.c	Merge branch 'mr/show-config-scope'	2020-02-17 13:22:17 -08:00
submodule-config.h	submodule-config: add skip_if_read option to repo_read_gitmodules()	2020-01-17 13:52:14 -08:00
submodule.c	Merge branch 'es/submodule-fetch-message-fix' into maint	2020-02-14 12:42:32 -08:00
submodule.h	Sync with 2.22.2	2019-12-06 16:31:30 +01:00
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	…
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
transport-internal.h	…
transport.c	Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint	2020-02-14 12:42:28 -08:00
transport.h	…
tree-diff.c	…
tree-walk.c	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
tree-walk.h	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'ds/sparse-checkout-harden'	2020-02-14 12:54:22 -08:00
unpack-trees.h	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
upload-pack.c	config: split repo scope to local and worktree	2020-02-10 10:32:20 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	Merge branch 'ln/userdiff-elixir'	2019-12-25 11:21:59 -08:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	walker_fetch(): avoid raw array length computation	2020-01-30 13:55:02 -08:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	xdiff: avoid computing non-zero offset from NULL pointer	2020-01-28 23:13:25 -08: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-<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 https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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