1
0
mirror of https://github.com/git/git.git synced 2024-10-20 02:58:26 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Meng-Sung Wu 28cb06020b doc: update the order of the syntax git merge --continue
The syntax "git merge <message> HEAD <commit>" has been removed. The
order of the syntax should also be updated.

Signed-off-by: Meng-Sung Wu <mengsungwu@fortunewhite.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-14 09:15:55 -07:00
block-sha1
builtin Merge branch 'jc/merge-drop-old-syntax' 2017-03-30 14:07:13 -07:00
ci
compat
contrib Merge branch 'rs/strbuf-add-real-path' into maint 2017-03-28 13:52:19 -07:00
Documentation doc: update the order of the syntax git merge --continue 2018-06-14 09:15:55 -07:00
ewah Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint 2017-03-21 15:03:24 -07:00
git-gui
gitk-git
gitweb
mergetools
perl
po
ppc
refs Merge branch 'bc/object-id' 2017-03-17 13:50:25 -07:00
sha1dc sha1dc: avoid CPP macro collisions 2017-03-26 15:34:44 -07:00
t Merge branch 'jh/memihash-opt' 2017-03-28 14:06:00 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap Git 2.12.2 2017-03-24 13:31:01 -07:00
.travis.yml
abspath.c prefix_filename: simplify windows #ifdef 2017-03-21 11:18:41 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c prefix_filename: return newly allocated string 2017-03-21 11:18:41 -07:00
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 'mm/two-more-xstrfmt' into maint 2017-03-16 13:56:43 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c encode_in_pack_object_header: respect output buffer length 2017-03-24 12:34:07 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jh/memihash-opt' 2017-03-28 14:06:00 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c Merge branch 'rs/commit-parsing-optim' into maint 2017-03-21 15:03:29 -07:00
commit.h
common-main.c
config.c Merge branch 'jk/parse-config-key-cleanup' into maint 2017-03-28 13:52:19 -07:00
config.mak.in
config.mak.uname Merge branch 'rj/remove-unused-mktemp' into maint 2017-03-21 15:03:24 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c credential-cache: use XDG_CACHE_HOME for socket 2017-03-17 11:19:40 -07:00
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 prefix_filename: return newly allocated string 2017-03-21 11:18:41 -07:00
diff.c Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint 2017-03-21 15:03:26 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2017-03-28 13:52:24 -07:00
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'sb/checkout-recurse-submodules' 2017-03-28 14:05:58 -07:00
dir.h
editor.c
entry.c entry.c: create submodules when interesting 2017-03-16 14:07:16 -07:00
environment.c Merge branch 'jk/pack-name-cleanups' into maint 2017-03-28 13:52:25 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jk/fast-import-cleanup' 2017-03-28 14:05:59 -07:00
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'jk/add-i-use-pathspecs' 2017-03-17 13:50:26 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jk/pack-name-cleanups' into maint 2017-03-28 13:52:25 -07:00
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
git-rebase--merge.sh
git-rebase.sh
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jh/send-email-one-cc' into maint 2017-03-21 15:03:30 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh stash: keep untracked files intact in stash -k 2017-03-22 14:55:56 -07:00
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Git 2.12.2 2017-03-24 12:59:15 -07:00
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: set default output method 2017-03-17 12:18:41 -07:00
grep.h
hash.h Makefile: add DC_SHA1 knob 2017-03-17 10:40:25 -07:00
hashmap.c hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
hashmap.h hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c http-push: don't check return value of lookup_unknown_object() 2017-03-18 10:14:07 -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 'jt/http-base-url-update-upon-redirect' into maint 2017-03-16 13:56:42 -07:00
http.h
ident.c
imap-send.c
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'vn/line-log-memcpy-size-fix' into maint 2017-03-16 13:56:42 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
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
Makefile Merge branch 'jh/memihash-opt' 2017-03-28 14:06:00 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c name-hash: perf improvement for lazy_init_name_hash 2017-03-24 11:00:03 -07:00
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.h
oidset.c
oidset.h
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 encode_in_pack_object_header: respect output buffer length 2017-03-24 12:34:07 -07:00
pack.h pack.h: define largest possible encoded object size 2017-03-24 12:34:07 -07:00
pager.c Merge branch 'jk/pager-in-use' 2017-03-28 14:05:59 -07:00
parse-options-cb.c
parse-options.c prefix_filename: return newly allocated string 2017-03-21 11:18:41 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'cc/split-index-config' 2017-03-17 13:50:23 -07:00
README.md
ref-filter.c Merge branch 'jk/ref-filter-flags-cleanup' 2017-03-17 13:50:25 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'sg/skip-prefix-in-prettify-refname' 2017-03-28 14:05:59 -07:00
refs.h Merge branch 'bc/object-id' 2017-03-17 13:50:25 -07:00
RelNotes Prepare for 2.12.3 2017-03-28 13:54:14 -07:00
remote-curl.c remote-curl: allow push options 2017-03-22 15:41:21 -07:00
remote-testsvn.c
remote.c Merge branch 'jn/remote-helpers-with-git-dir' into maint 2017-03-24 12:57:53 -07:00
remote.h Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint 2017-03-28 13:52:22 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'bc/object-id' 2017-03-17 13:50:25 -07:00
revision.h Merge branch 'rs/path-name-safety-cleanup' into maint 2017-03-28 13:52:27 -07:00
run-command.c Merge branch 'jk/execv-dashed-external' into maint 2017-03-28 13:52:23 -07:00
run-command.h
send-pack.c Merge branch 'sb/push-options-via-transport' 2017-03-27 10:59:27 -07:00
send-pack.h
sequencer.c sequencer: fix missing newline 2017-03-23 11:19:23 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'rs/strbuf-add-real-path' into maint 2017-03-28 13:52:19 -07:00
sh-i18n--envsubst.c
sha1_file.c Merge branch 'jk/pack-name-cleanups' into maint 2017-03-28 13:52:25 -07:00
sha1_name.c Merge branch 'bc/object-id' 2017-03-17 13:50:25 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.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
strbuf.h Merge branch 'jk/interpret-branch-name' into maint 2017-03-28 13:52:22 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
submodule-config.c Merge branch 'sb/checkout-recurse-submodules' 2017-03-28 14:05:58 -07:00
submodule-config.h update submodules: add submodule config parsing 2017-03-15 18:15:54 -07:00
submodule.c Merge branch 'sb/checkout-recurse-submodules' 2017-03-28 14:05:58 -07:00
submodule.h Merge branch 'sb/checkout-recurse-submodules' 2017-03-28 14:05:58 -07: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
trailer.c
trailer.h
transport-helper.c Merge branch 'jn/remote-helpers-with-git-dir' into maint 2017-03-24 12:57:53 -07:00
transport.c Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint 2017-03-28 13:52:22 -07: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: check if we can perform the operation for submodules 2017-03-16 14:07:16 -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
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 Merge branch 'rs/strbuf-add-real-path' into maint 2017-03-28 13:52:19 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'sb/wt-status-cleanup' into maint 2017-03-28 13:52:26 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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