kernel/git - git - PowerEL Git System

Go to file

Jonathan Nieder cddb42d2c5 rebase -i -p: document shortcomings The rebase --preserve-merges facility presents a list of commits in its instruction sheet and uses a separate table to keep track of their parents. Unfortunately, in practice this means that with -p after most attempts to rearrange patches, some commits have the "wrong" parent and the resulting history is rarely what the caller expected. Yes, it would be nice to fix that. But first, add a warning to the manual to help the uninitiated understand what is going on. Reported-by: Jiří Paleček <jpalecek@web.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-06-11 08:44:13 -07:00
Documentation	rebase -i -p: document shortcomings	2010-06-11 08:44:13 -07:00
block-sha1	…
builtin	Change C99 comments to old-style C comments	2010-06-07 15:50:21 -07:00
compat	Fix checkout of large files to network shares on Windows XP	2010-05-20 16:12:13 -07:00
contrib	completion: --set-upstream option for git-branch	2010-05-28 15:05:53 -07:00
git-gui	…
git_remote_helpers	…
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2010-04-18 18:36:41 -07:00
gitweb	gitweb: simplify gitweb.min.* generation and clean-up rules	2010-04-17 12:40:19 -07:00
perl	…
ppc	…
t	rebase -i -p: document shortcomings	2010-06-11 08:44:13 -07:00
templates	…
xdiff	xdiff/xmerge.c: use memset() instead of explicit for-loop	2010-05-01 11:11:11 -07:00
.gitattributes	…
.gitignore	Gitweb: ignore built file	2010-05-02 08:27:58 -07:00
.mailmap	Merge branch 'mg/mailmap-update' into maint	2010-04-09 22:22:06 -07:00
COPYING	…
GIT-VERSION-GEN	GIT-VERSION-GEN: restrict tags used	2010-05-11 23:04:23 -07:00
INSTALL	…
Makefile	Merge branch 'maint-1.7.0' into maint	2010-05-28 16:59:36 -07:00
README	…
RelNotes	Git 1.7.0.6	2010-04-22 23:04:21 -07:00
abspath.c	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint	2010-04-11 13:39:47 -07:00
branch.h	…
builtin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	fix const-correctness of write_sha1_file	2010-04-01 23:49:03 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
combine-diff.c	remove ecb parameter from xdi_diff_outf()	2010-05-04 15:19:14 -07:00
command-list.txt	…
commit.c	…
commit.h	pretty: Initialize notes if %N is used	2010-04-13 18:15:08 -07:00
config.c	…
config.mak.in	…
configure.ac	Gitweb: add autoconfigure support for minifiers	2010-04-02 21:23:38 -07:00
connect.c	…
convert.c	…
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'bc/maint-daemon-sans-ss-family' into maint	2010-04-09 22:22:00 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	test get_git_work_tree() return value for NULL	2010-05-25 09:28:51 -07:00
diff.c	Merge branch 'maint-1.7.0' into maint	2010-05-04 15:20:47 -07:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	get_cwd_relative(): do not misinterpret suffix as subdirectory	2010-05-28 15:02:50 -07:00
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	…
git-am.sh	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX	2010-06-02 10:03:53 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	difftool: Fix '--gui' when diff.guitool is unconfigured	2010-03-28 09:29:12 -07:00
git-filter-branch.sh	…
git-instaweb.sh	git-instaweb: pass through invoking user's path to gitweb CGI scripts	2010-04-17 12:40:20 -07:00
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-parse-remote.sh	…
git-pull.sh	…
git-quiltimport.sh	…
git-rebase--interactive.sh	rebase-interactive: silence warning when no commits rewritten	2010-04-18 11:41:53 -07:00
git-rebase.sh	Merge branch 'mb/rebase-i-no-ff'	2010-04-03 12:28:44 -07:00
git-relink.perl	…
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'mg/maint-send-email-lazy-editor' into maint	2010-04-09 22:23:04 -07:00
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'maint'	2010-05-01 20:23:10 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.spec.in	RPM spec: include bash completion support	2010-03-29 09:40:06 -07:00
graph.c	…
graph.h	…
grep.c	Merge branch 'rs/threaded-grep-context'	2010-04-03 12:28:39 -07:00
grep.h	…
hash.c	…
hash.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	Merge branch 'rr/imap-send-unconfuse-from-line'	2010-04-03 12:28:42 -07:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	…
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-recursive.c	…
merge-recursive.h	…
name-hash.c	…
notes.c	…
notes.h	notes.h: declare bit field as unsigned to silence compiler complaints	2010-04-06 21:55:50 -07:00
object.c	…
object.h	…
pack-check.c	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	pretty: Initialize notes if %N is used	2010-04-13 18:15:08 -07:00
progress.c	…
progress.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'jc/maint-refs-dangling' into maint	2010-03-31 15:09:32 -07:00
refs.h	…
remote-curl.c	…
remote.c	Change C99 comments to old-style C comments	2010-06-07 15:50:21 -07:00
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	start_command: close cmd->err descriptor when fork/spawn fails	2010-05-20 16:11:29 -07:00
run-command.h	…
send-pack.h	…
server-info.c	…
setup.c	setup: document prefix	2010-06-05 08:41:39 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	hash_object: correction for zero length file	2010-05-18 21:46:36 -07:00
sha1_name.c	…
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	…
strbuf.h	…
string-list.c	string-list: add unsorted_string_list_lookup()	2010-03-24 19:41:19 -07:00
string-list.h	string-list: add unsorted_string_list_lookup()	2010-03-24 19:41:19 -07:00
submodule.c	Teach diff --submodule and status to handle .git files in submodules	2010-04-10 11:51:56 -07:00
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-match-trees.c	…
test-parse-options.c	…
test-path-utils.c	…
test-run-command.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	…
unpack-trees.h	…
upload-pack.c	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
walker.c	…
walker.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	Merge branch 'maint-1.7.0' into maint	2010-05-04 15:20:47 -07:00
xdiff-interface.h	Merge branch 'maint-1.7.0' into maint	2010-05-04 15:20:47 -07:00

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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

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. 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://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.