kernel/git - git - PowerEL Git System

Go to file

Junio C Hamano 261f315beb merge & sequencer: turn "Conflicts:" hint into a comment Just like other hints such as "Changes to be committed" we show in the editor to remind the committer what paths were involved in the resulting commit to help improving their log message, this section is merely a reminder. Traditionally, it was not made into comments primarily because it has to be generated outside the wt-status infrastructure, and also because it was meant as a bit stronger reminder than the others (i.e. explaining how you resolved conflicts is much more important than mentioning what you did to every paths involved in the commit). But that still does not make this hint a part of the log message proper, and not showing it as a comment is inviting mistakes. Note that we still notice "Conflicts:" followed by list of indented pathnames as an old-style cruft and insert a new Signed-off-by: before it. This is so that "commit --amend -s" adds the new S-o-b at the right place when used on an older commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-10-28 14:04:28 -07:00
Documentation	git-tag.txt: Add a missing hyphen to `-s`	2014-10-07 11:08:06 -07:00
block-sha1	…
builtin	merge & sequencer: turn "Conflicts:" hint into a comment	2014-10-28 14:04:28 -07:00
compat	…
contrib	Merge branch 'mi/typofixes' into maint	2013-12-17 11:34:01 -08:00
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
perl	git-svn: workaround for a bug in svn serf backend	2014-01-17 11:24:30 -08:00
po	l10n: de.po: fix translation of 'prefix'	2014-01-03 18:21:38 +01:00
ppc	…
t	merge & sequencer: turn "Conflicts:" hint into a comment	2014-10-28 14:04:28 -07:00
templates	…
vcs-svn	…
xdiff	…
.gitattributes	…
.gitignore	…
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Git 1.8.5.5	2014-02-13 13:41:53 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	…
README	…
RelNotes	Git 1.8.5.5	2014-02-13 13:41:53 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jh/checkout-auto-tracking' into maint	2013-10-23 13:32:50 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jc/upload-pack-send-symref' into maint	2013-11-08 11:38:00 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-slab.h	…
commit.c	Remove the line length limit for graft files	2013-12-27 16:46:25 -08:00
commit.h	Merge branch 'nd/fetch-into-shallow' into maint	2013-10-23 13:32:17 -07:00
config.c	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	git_connect(): use common return point	2013-12-09 14:54:48 -08:00
connect.h	connect.c: refactor url parsing	2013-12-09 14:54:48 -08:00
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	daemon: be strict at parsing parameters --[no-]informative-errors	2013-12-20 14:05:07 -08:00
date.c	Merge branch 'jk/date-c-double-semicolon'	2013-10-30 12:11:01 -07:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'mg/more-textconv'	2013-10-23 13:21:31 -07:00
diff.h	Merge branch 'mg/more-textconv'	2013-10-23 13:21:31 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	Merge branch 'jc/ls-files-killed-optim' into maint	2013-10-23 13:33:08 -07:00
dir.h	…
editor.c	…
entry.c	checkout_entry(): clarify the use of topath[] parameter	2013-10-24 14:59:39 -07:00
environment.c	cache: remove unused function 'have_git_dir'	2013-10-28 08:56:06 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.c	Merge branch 'jk/allow-fetch-onelevel-refname' into maint	2014-02-13 13:38:34 -08:00
fetch-pack.h	git fetch-pack: add --diag-url	2013-12-09 14:54:47 -08:00
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	add-interactive: handle unborn branch in patch mode	2013-10-25 14:54:17 -07:00
git-am.sh	…
git-archimport.perl	…
git-bisect.sh	typofixes: fix misspelt comments	2013-11-12 09:24:27 -08:00
git-compat-util.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'	2013-11-04 14:58:05 -08:00
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-lost-found.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-pull.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	…
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'rk/send-email-ssl-cert' into maint	2014-02-13 13:38:19 -08:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	stash: handle specifying stashes with $IFS	2014-01-07 10:51:04 -08:00
git-submodule.sh	Sync with 1.8.4.5	2013-12-02 15:34:44 -08:00
git-svn.perl	…
git-web--browse.sh	web--browse: Add support for xdg-open	2013-10-30 13:54:15 -07:00
git.c	…
git.rc	…
git.spec.in	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.c	…
hash.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	Merge branch 'jk/http-auth-redirects' into maint	2013-11-08 11:37:26 -08:00
http-walker.c	…
http.c	Merge branch 'jk/http-auth-redirects'	2013-10-30 12:09:53 -07:00
http.h	…
ident.c	Merge branch 'jk/split-broken-ident' into maint	2013-11-07 14:34:51 -08:00
imap-send.c	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	Merge branch 'nd/magic-pathspec'	2013-10-30 12:10:33 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	log: properly handle decorations with chained tags	2013-12-20 14:37:03 -08:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'jk/diff-algo' into maint	2013-10-28 10:16:11 -07:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.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	Merge branch 'mg/more-textconv'	2013-10-23 13:21:31 -07:00
object.h	Merge branch 'mg/more-textconv'	2013-10-23 13:21:31 -07:00
pack-check.c	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'jx/relative-path-regression-fix'	2013-10-28 10:42:30 -07:00
pathspec.c	Merge branch 'mi/typofixes' into maint	2013-12-17 11:34:01 -08:00
pathspec.h	pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses	2013-10-28 09:57:36 -07:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	enums: remove trailing ',' after last item in enum	2014-07-02 12:37:05 -07:00
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	Revert "prompt: clean up strbuf usage"	2014-01-02 10:21:40 -08:00
prompt.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'sb/refs-code-cleanup'	2013-11-01 07:38:58 -07:00
refs.h	Merge branch 'sb/refs-code-cleanup'	2013-11-01 07:38:58 -07:00
remote-curl.c	Merge branch 'jk/http-auth-redirects'	2013-10-30 12:09:53 -07:00
remote-testsvn.c	…
remote.c	Merge branch 'jk/remote-literal-string-leakfix'	2013-10-28 10:43:28 -07:00
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jc/revision-range-unpeel' into maint	2014-02-13 13:38:47 -08:00
revision.h	revision: add missing include	2013-10-31 13:46:03 -07:00
run-command.c	run-command: trivial style fixes	2013-10-31 13:48:26 -07:00
run-command.h	…
send-pack.c	Merge branch 'jl/pack-transfer-avoid-double-close'	2013-10-30 12:10:45 -07:00
send-pack.h	…
sequencer.c	merge & sequencer: turn "Conflicts:" hint into a comment	2014-10-28 14:04:28 -07:00
sequencer.h	merge & sequencer: unify codepaths that write "Conflicts:" hint	2014-10-24 11:34:59 -07:00
server-info.c	…
setup.c	setup: trivial style fixes	2013-10-31 13:48:32 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure	2013-12-18 14:59:43 -08:00
sha1_name.c	interpret_branch_name: find all possible @-marks	2014-01-15 12:51:14 -08:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule.c	…
submodule.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	…
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-index-version.c	…
test-line-buffer.c	…
test-match-trees.c	…
test-mergesort.c	…
test-mktemp.c	…
test-parse-options.c	…
test-path-utils.c	…
test-prio-queue.c	…
test-read-cache.c	…
test-regex.c	…
test-revision-walking.c	…
test-run-command.c	…
test-scrap-cache-tree.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-list.c	…
test-subprocess.c	…
test-svn-fe.c	…
test-urlmatch-normalization.c	…
test-wildmatch.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	transport-helper: trivial style fix	2013-10-31 13:47:22 -07:00
transport.c	connect.c: refactor url parsing	2013-12-09 14:54:48 -08:00
transport.h	…
tree-diff.c	pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses	2013-10-28 09:57:36 -07:00
tree-walk.c	Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint	2014-02-13 13:37:53 -08:00
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'jk/two-way-merge-corner-case-fix' into maint	2013-12-17 11:32:17 -08:00
unpack-trees.h	…
upload-pack.c	Merge branch 'maint'	2013-11-18 12:25:28 -08:00
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	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
wrap-for-bin.sh	…
wrapper.c	typofixes: fix misspelt comments	2013-11-12 09:24:27 -08:00
write_or_die.c	…
ws.c	…
wt-status.c	commit -v: strip diffs and submodule shortlogs from the commit message	2013-12-05 14:39:11 -08:00
wt-status.h	commit -v: strip diffs and submodule shortlogs from the commit message	2013-12-05 14:39:11 -08:00
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	…

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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 http://news.gmane.org/gmane.comp.version-control.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.