Go to file

Thomas Gummerer 2c27002a0a worktree: improve message when creating a new worktree Currently 'git worktree add' produces output like the following: Preparing ../foo (identifier foo) HEAD is now at 26da330922 <title> The '../foo' is the path where the worktree is created, which the user has just given on the command line. The identifier is an internal implementation detail, which is not particularly relevant for the user and indeed isn't mentioned explicitly anywhere in the man page. Instead of this message, print a message that gives the user a bit more detail of what exactly 'git worktree' is doing. There are various dwim modes which perform some magic under the hood, which should be helpful to users. Just from the output of the command it is not always visible to users what exactly has happened. Help the users a bit more by modifying the "Preparing ..." message and adding some additional information of what 'git worktree add' did under the hood, while not displaying the identifier anymore. Currently there are several different cases: - 'git worktree add -b ...' or 'git worktree add <path>', both of which create a new branch, either through the user explicitly requesting it, or through 'git worktree add' implicitly creating it. This will end up with the following output: Preparing worktree (new branch '<branch>') HEAD is now at 26da330922 <title> - 'git worktree add -B ...', which may either create a new branch if the branch with the given name does not exist yet, or resets an existing branch to the current HEAD, or the commit-ish given. Depending on which action is taken, we'll end up with the following output: Preparing worktree (resetting branch '<branch>'; was at caa68db14) HEAD is now at 26da330922 <title> or: Preparing worktree (new branch '<branch>') HEAD is now at 26da330922 <title> - 'git worktree add --detach' or 'git worktree add <path> <commit-ish>', both of which create a new worktree with a detached HEAD, for which we will print the following output: Preparing worktree (detached HEAD 26da330922) HEAD is now at 26da330922 <title> - 'git worktree add <path> <local-branch>', which checks out the branch and prints the following output: Preparing worktree (checking out '<local-branch>') HEAD is now at 47007d5 <title> Additionally currently the "Preparing ..." line is printed to stderr, while the "HEAD is now at ..." line is printed to stdout by 'git reset --hard', which is used internally by 'git worktree add'. Fix this inconsistency by printing the "Preparing ..." message to stdout as well. As "Preparing ..." is not an error, stdout also seems like the more appropriate output stream. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-04-30 09:06:34 +09:00
.github	…
Documentation	First batch after 2.16	2018-01-23 13:21:10 -08:00
block-sha1	…
builtin	worktree: improve message when creating a new worktree	2018-04-30 09:06:34 +09:00
ci	travis-ci: check that all build artifacts are .gitignore-d	2018-01-03 13:29:19 -08:00
compat	…
contrib	Merge branch 'ra/prompt-eread-fix'	2017-12-28 14:08:45 -08:00
ewah	…
git-gui	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	2018-01-09 11:07:03 -08:00
gitk-git	…
gitweb	…
mergetools	…
perl	perl/Git: remove now useless email-address parsing code	2018-01-08 10:35:38 -08:00
po	l10n: de.po: translate 72 new messages	2018-01-15 07:47:30 +01:00
ppc	…
refs	…
sha1collisiondetection@19d97bf5af	…
sha1dc	…
t	Merge branch 'nd/add-i-ignore-submodules'	2018-01-23 13:16:41 -08:00
templates	…
vcs-svn	…
xdiff	…
.clang-format	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	travis-ci: don't install default addon packages for the 32 bit Linux build	2017-12-27 12:14:39 -08:00
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Git 2.16.1	2018-01-21 21:14:25 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'ab/dc-sha1-loose-ends'	2018-01-09 14:32:53 -08:00
README.md	…
RelNotes	Git 2.16.1	2018-01-21 21:14:25 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
apply.c	…
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	Merge branch 'ys/bisect-object-id-missing-conversion-fix'	2018-01-23 13:16:40 -08:00
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	Merge branch 'rs/lose-leak-pending'	2018-01-23 13:16:36 -08:00
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	diff: introduce DIFF_PICKAXE_KINDS_MASK	2018-01-04 15:02:40 -08:00
command-list.txt	…
commit-slab.h	…
commit.c	commit: remove unused function clear_commit_marks_for_object_array()	2017-12-28 13:50:05 -08:00
commit.h	Merge branch 'rs/lose-leak-pending'	2018-01-23 13:16:36 -08:00
common-main.c	…
config.c	…
config.h	…
config.mak.in	…
config.mak.uname	…
configure.ac	Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1	2017-12-28 11:55:56 -08:00
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'sb/diff-blobfind-pickaxe'	2018-01-23 13:16:37 -08:00
diff.h	Merge branch 'sb/diff-blobfind-pickaxe'	2018-01-23 13:16:37 -08:00
diffcore-break.c	…
diffcore-delta.c	…
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	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	…
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	add--interactive: ignore submodule changes except HEAD	2018-01-16 12:32:45 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
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-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'	2018-01-10 14:01:24 -08:00
git-rebase--merge.sh	…
git-rebase.sh	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	send-email: add and use a local copy of Mail::Address	2018-01-05 12:21:31 -08:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	Merge branch 'tg/stash-with-pathspec-fix'	2018-01-23 13:16:39 -08:00
git-submodule.sh	…
git-svn.perl	Merge branch 'jm/svn-pushmergeinfo-fix'	2018-01-23 13:16:36 -08:00
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
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	Merge branch 'rs/use-argv-array-in-child-process'	2018-01-05 13:28:10 -08:00
http.h	…
ident.c	…
imap-send.c	…
iterator.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	…
line-log.h	…
line-range.c	…
line-range.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	Merge branch 'sb/describe-blob'	2017-12-28 14:08:50 -08:00
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'jc/merge-symlink-ours-theirs'	2018-01-23 13:16:37 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
mru.c	…
mru.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	object: add clear_commit_marks_all()	2017-12-28 13:50:05 -08:00
object.h	Merge branch 'rs/lose-leak-pending'	2018-01-23 13:16:36 -08:00
oidmap.c	oidmap: ensure map is initialized	2017-12-27 12:28:06 -08:00
oidmap.h	…
oidset.c	…
oidset.h	oidset: don't return value from oidset_init	2018-01-08 15:24:35 -08:00
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
ref-filter.c	Merge branch 'rs/lose-leak-pending'	2018-01-23 13:16:36 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace_object.c	…
repository.c	repository: pre-initialize hash algo pointer	2018-01-19 14:23:32 -08:00
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'sb/diff-blobfind-pickaxe'	2018-01-23 13:16:37 -08:00
revision.h	Merge branch 'rs/lose-leak-pending'	2018-01-23 13:16:36 -08:00
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	sequencer: do not invent whitespace when transforming OIDs	2017-12-27 12:33:38 -08:00
sequencer.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	…
sha1_name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	Merge branch 'jd/fix-strbuf-add-urlencode-bytes'	2018-01-05 13:28:10 -08:00
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	submodule: submodule_move_head omits old argument in forced case	2018-01-05 12:35:35 -08:00
submodule.h	…
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	…
trailer.c	…
trailer.h	…
transport-helper.c	Merge branch 'jt/transport-hide-vtable'	2017-12-28 14:08:47 -08:00
transport-internal.h	…
transport.c	Merge branch 'jt/transport-hide-vtable'	2017-12-28 14:08:47 -08:00
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	unpack-trees: oneway_merge to update submodules	2018-01-05 12:35:35 -08:00
unpack-trees.h	…
upload-pack.c	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
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	Merge branch 'nd/ita-wt-renames-in-status'	2018-01-23 13:16:28 -08:00
wt-status.h	Merge branch 'nd/ita-wt-renames-in-status'	2018-01-23 13:16:28 -08:00
xdiff-interface.c	…
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