kernel/git - git - PowerEL Git System

Go to file

Michael Haggerty 50438340bc rebase -i: Remove dead code This branch of the "if" is only executed if $no_ff is empty, which only happens if $1 was not '-n'. (This code has been dead since 1d25c8cf82eead72e11287d574ef72d3ebec0db1.) Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-01-14 00:27:56 -08:00
Documentation	Add a command "fixup" to rebase --interactive	2009-12-07 13:50:57 -08:00
block-sha1	…
compat	Explicitly truncate bswap operand to uint32_t	2009-11-25 00:16:38 -08:00
contrib	Merge branch 'jn/faster-completion-startup'	2009-11-22 16:41:43 -08:00
git-gui	Merge git://repo.or.cz/git-gui	2009-10-27 14:55:37 -07:00
gitk-git	…
gitweb	gitweb: Describe (possible) gitweb.js minification in gitweb/README	2009-12-03 12:38:45 -08:00
perl	…
ppc	…
t	rebase-i: Ignore comments and blank lines in peek_next_command	2010-01-12 12:34:50 -08:00
templates	Merge branch 'bs/maint-pre-commit-hook-sample' into maint	2009-11-16 00:03:15 -08:00
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'jh/notes' (early part)	2009-11-20 23:53:55 -08:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Git 1.6.5.4	2009-12-03 00:08:16 -08:00
INSTALL	…
Makefile	Merge branch 'rj/maint-cygwin-count-objects' into maint	2009-12-03 13:53:54 -08:00
README	…
RelNotes	Prepare for 1.6.5.4	2009-12-02 10:29:00 -08:00
abspath.c	…
advice.c	merge-recursive: point the user to commit when file would be overwritten.	2009-11-22 16:07:27 -08:00
advice.h	merge-recursive: point the user to commit when file would be overwritten.	2009-11-22 16:07:27 -08:00
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	Refactor pretty_print_commit arguments into a struct	2009-10-19 22:28:20 -07:00
archive.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin-add.c	…
builtin-annotate.c	…
builtin-apply.c	builtin-apply.c: pay attention to -p<n> when determining the name	2009-11-26 19:02:24 -08:00
builtin-archive.c	…
builtin-bisect--helper.c	…
builtin-blame.c	Merge branch 'jc/log-stdin'	2009-11-23 22:30:08 -08:00
builtin-branch.c	Refactor pretty_print_commit arguments into a struct	2009-10-19 22:28:20 -07:00
builtin-bundle.c	…
builtin-cat-file.c	…
builtin-check-attr.c	…
builtin-check-ref-format.c	check-ref-format -h: it does not know the --print option yet	2009-11-10 20:45:23 -08:00
builtin-checkout-index.c	…
builtin-checkout.c	fixup tr/stash-format merge	2009-10-30 20:18:31 -07:00
builtin-clean.c	…
builtin-clone.c	clone: detect extra arguments	2009-10-30 15:18:11 -07:00
builtin-commit-tree.c	Show usage string for 'git commit-tree -h'	2009-11-09 17:08:44 -08:00
builtin-commit.c	Merge branch 'em/commit-claim'	2009-11-30 14:43:26 -08:00
builtin-config.c	…
builtin-count-objects.c	…
builtin-describe.c	describe: do not use unannotated tag even if exact match	2009-11-20 21:58:11 -08:00
builtin-diff-files.c	…
builtin-diff-index.c	…
builtin-diff-tree.c	Teach --stdin option to "log" family	2009-11-20 15:10:29 -08:00
builtin-diff.c	…
builtin-fast-export.c	…
builtin-fetch-pack.c	Smart fetch over HTTP: client side	2009-11-04 17:58:15 -08:00
builtin-fetch.c	Merge branch 'bg/fetch-multi'	2009-11-23 00:03:15 -08:00
builtin-fmt-merge-msg.c	…
builtin-for-each-ref.c	…
builtin-fsck.c	Check the format of more printf-type functions	2009-11-15 18:24:58 -08:00
builtin-gc.c	gc --auto --quiet: make the notice a bit less verboase	2009-10-21 15:28:42 -07:00
builtin-grep.c	Merge branch 'bc/grep-i-F' into maint	2009-12-03 13:51:26 -08:00
builtin-help.c	help: Do not unnecessarily look for a repository	2009-12-01 12:10:09 -08:00
builtin-init-db.c	…
builtin-log.c	Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint	2009-12-03 13:54:25 -08:00
builtin-ls-files.c	Merge branch 'jk/maint-1.6.3-ls-files-i' into maint	2009-11-15 23:07:32 -08:00
builtin-ls-remote.c	Require a struct remote in transport_get()	2009-11-03 21:39:28 -08:00
builtin-ls-tree.c	ls-tree: migrate to parse-options	2009-11-17 21:58:12 -08:00
builtin-mailinfo.c	Merge branch 'jc/mailinfo-remove-brackets'	2009-11-30 14:43:24 -08:00
builtin-mailsplit.c	Show usage string for 'git mailsplit -h'	2009-11-10 11:06:57 -08:00
builtin-merge-base.c	…
builtin-merge-file.c	…
builtin-merge-ours.c	Show usage string for 'git merge-ours -h'	2009-11-09 17:08:45 -08:00
builtin-merge-recursive.c	merge-{recursive,subtree}: use usagef() to print usage	2009-11-10 12:00:21 -08:00
builtin-merge.c	Merge branch 'ap/maint-merge-strategy-list-fix' into maint	2009-12-03 13:54:11 -08:00
builtin-mktree.c	…
builtin-mv.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
builtin-name-rev.c	…
builtin-pack-objects.c	Merge branch 'maint'	2009-11-23 21:54:39 -08:00
builtin-pack-refs.c	…
builtin-prune-packed.c	prune-packed: only show progress when stderr is a tty	2009-11-23 21:29:45 -08:00
builtin-prune.c	…
builtin-push.c	Merge branch 'jk/maint-push-config' into maint	2009-11-15 23:07:17 -08:00
builtin-read-tree.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
builtin-receive-pack.c	Merge branch 'sp/smart-http'	2009-11-20 23:51:23 -08:00
builtin-reflog.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
builtin-remote.c	Merge branch 'th/maint-remote-update-help-string' into maint	2009-12-03 13:52:31 -08:00
builtin-replace.c	…
builtin-rerere.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
builtin-reset.c	…
builtin-rev-list.c	Merge branch 'jc/log-stdin'	2009-11-23 22:30:08 -08:00
builtin-rev-parse.c	Merge branch 'jn/help-everywhere'	2009-11-20 23:44:52 -08:00
builtin-revert.c	…
builtin-rm.c	…
builtin-send-pack.c	Merge branch 'maint'	2009-11-23 21:54:39 -08:00
builtin-shortlog.c	Merge branch 'uk/maint-shortlog-encoding'	2009-11-30 14:42:28 -08:00
builtin-show-branch.c	Refactor pretty_print_commit arguments into a struct	2009-10-19 22:28:20 -07:00
builtin-show-ref.c	Show usage string for 'git show-ref -h'	2009-11-09 17:08:53 -08:00
builtin-stripspace.c	Show usage string for 'git stripspace -h'	2009-11-10 11:06:57 -08:00
builtin-symbolic-ref.c	…
builtin-tag.c	…
builtin-tar-tree.c	Show usage string for 'git get-tar-commit-id -h'	2009-11-10 11:06:57 -08:00
builtin-unpack-objects.c	…
builtin-update-index.c	Check the format of more printf-type functions	2009-11-15 18:24:58 -08:00
builtin-update-ref.c	…
builtin-update-server-info.c	…
builtin-upload-archive.c	Merge branch 'np/maint-sideband-favor-status' into maint	2009-12-03 13:50:24 -08:00
builtin-verify-pack.c	…
builtin-verify-tag.c	…
builtin-write-tree.c	…
builtin.h	Retire fetch--tool helper to contrib/examples	2009-11-09 17:08:44 -08:00
bundle.c	Merge branch 'jc/log-stdin'	2009-11-23 22:30:08 -08:00
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'mm/config-pathname-tilde-expand' into maint	2009-12-03 13:51:36 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	Add a notice that only certain functions can print color escape codes	2009-11-27 00:28:40 -08:00
combine-diff.c	Give the hunk comment its own color	2009-11-28 10:05:44 -08:00
command-list.txt	Merge branch 'jh/notes' (early part)	2009-11-20 23:53:55 -08:00
commit.c	Merge branch 'jh/notes' (early part)	2009-11-20 23:53:55 -08:00
commit.h	Merge branch 'sp/smart-http'	2009-11-20 23:51:23 -08:00
config.c	Merge branch 'mm/config-pathname-tilde-expand'	2009-11-22 16:28:38 -08:00
config.mak.in	…
configure.ac	configure: add settings for gitconfig, editor and pager	2009-11-04 11:29:46 -08:00
connect.c	Merge branch 'cc/replace'	2009-11-23 22:24:01 -08:00
convert.c	…
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'tc/format-attribute'	2009-11-22 16:28:14 -08:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	diff --no-index: make the usage string less scary	2009-11-10 12:00:21 -08:00
diff.c	Give the hunk comment its own color	2009-11-28 10:05:44 -08:00
diff.h	Give the hunk comment its own color	2009-11-28 10:05:44 -08:00
diffcore-break.c	diffcore-break: save cnt_data for other phases	2009-11-16 13:21:12 -08:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	diffcore-rename: reduce memory footprint by freeing blob data early	2009-11-20 22:13:47 -08:00
diffcore.h	…
dir.c	…
dir.h	…
editor.c	Provide a build time default-editor setting	2009-11-13 12:20:54 -08:00
entry.c	…
environment.c	Merge branch 'cc/replace'	2009-11-23 22:24:01 -08:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'jh/notes' (early part)	2009-11-20 23:53:55 -08:00
fetch-pack.h	Smart fetch over HTTP: client side	2009-11-04 17:58:15 -08:00
fixup-builtins	…
fsck.c	…
fsck.h	Check the format of more printf-type functions	2009-11-15 18:24:58 -08:00
generate-cmdlist.sh	…
git-add--interactive.perl	Merge branch 'jn/editor-pager'	2009-11-20 23:48:52 -08:00
git-am.sh	Merge branch 'jc/maint-am-keep' into maint	2009-12-03 13:54:03 -08:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-compat-util.h	Introduce usagef() that takes a printf-style format	2009-11-10 12:00:21 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-instaweb.sh	Merge branch 'rs/work-around-grep-opt-insanity' into maint	2009-12-03 13:53:58 -08:00
git-lost-found.sh	…
git-merge-octopus.sh	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-merge-one-file.sh	Show usage string for 'git merge-one-file -h'	2009-11-10 11:06:57 -08:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-mergetool.sh	…
git-notes.sh	…
git-parse-remote.sh	…
git-pull.sh	git-pull.sh: Fix call to git-merge for new command format	2009-12-02 10:42:48 -08:00
git-quiltimport.sh	…
git-rebase--interactive.sh	rebase -i: Remove dead code	2010-01-14 00:27:56 -08:00
git-rebase.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-relink.perl	…
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'fc/send-email-envelope'	2009-11-30 14:42:50 -08:00
git-sh-setup.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-stash.sh	stash list: drop the default limit of 10 stashes	2009-10-19 22:28:26 -07:00
git-submodule.sh	Merge branch 'rs/work-around-grep-opt-insanity'	2009-11-25 11:45:07 -08:00
git-svn.perl	git svn: strip leading path when making empty dirs	2009-11-22 18:15:42 -08:00
git-web--browse.sh	…
git.c	Merge branch 'cc/replace'	2009-11-23 22:24:01 -08:00
git.spec.in	…
graph.c	…
graph.h	Documentation: undocument gc'd function graph_release()	2009-11-19 23:05:17 -08:00
grep.c	grep: Allow case insensitive search of fixed-strings	2009-11-16 16:06:46 -08:00
grep.h	grep: Allow case insensitive search of fixed-strings	2009-11-16 16:06:46 -08:00
hash-object.c	…
hash.c	…
hash.h	…
help.c	…
help.h	…
http-backend.c	http-backend: Let gcc check the format of more printf-type functions.	2009-11-15 22:15:01 -08:00
http-fetch.c	Let 'git http-fetch -h' show usage outside any git repository	2009-11-10 11:11:21 -08:00
http-push.c	Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST	2009-11-22 22:56:54 -08:00
http-walker.c	…
http.c	Smart push over HTTP: client side	2009-11-04 17:58:15 -08:00
http.h	Smart push over HTTP: client side	2009-11-04 17:58:15 -08:00
ident.c	Suppress warnings from "git var -l"	2009-11-13 12:16:30 -08:00
imap-send.c	Merge branch 'tc/format-attribute'	2009-11-22 16:28:14 -08:00
index-pack.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	Introduce new pretty formats %g[sdD] for reflog information	2009-10-19 22:28:26 -07:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	…
merge-recursive.c	Merge branch 'mm/maint-merge-ff-error-message-fix'	2009-11-30 14:45:08 -08:00
merge-recursive.h	merge-recursive: make the error-message generation an extern function	2009-11-29 23:52:31 -08:00
merge-tree.c	…
mktag.c	…
name-hash.c	…
notes.c	Fix crasher on encountering SHA1-like non-note in notes tree	2009-12-03 10:10:35 -08:00
notes.h	…
object.c	…
object.h	…
pack-check.c	…
pack-redundant.c	Let 'git <command> -h' show usage without a git dir	2009-11-10 12:00:21 -08:00
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	Provide a build time default-pager setting	2009-11-13 12:20:56 -08:00
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-id.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'mm/config-pathname-tilde-expand'	2009-11-22 16:28:38 -08:00
pkt-line.c	pkt-line: Make packet_read_line easier to debug	2009-10-30 19:20:53 -07:00
pkt-line.h	pkt-line: Add strbuf based functions	2009-10-30 19:20:53 -07:00
preload-index.c	…
pretty.c	Merge branch 'jc/pretty-lf'	2009-11-30 14:44:22 -08:00
progress.c	…
progress.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
reflog-walk.c	Introduce new pretty formats %g[sdD] for reflog information	2009-10-19 22:28:26 -07:00
reflog-walk.h	Introduce new pretty formats %g[sdD] for reflog information	2009-10-19 22:28:26 -07:00
refs.c	teach warn_dangling_symref to take a FILE argument	2009-11-10 01:01:47 -08:00
refs.h	teach warn_dangling_symref to take a FILE argument	2009-11-10 01:01:47 -08:00
remote-curl.c	remote-curl.c: fix rpc_out()	2009-11-23 21:25:55 -08:00
remote.c	Merge branch 'bg/fetch-multi'	2009-11-23 00:03:15 -08:00
remote.h	remote: refactor some logic into get_stale_heads()	2009-11-10 01:01:22 -08:00
replace_object.c	…
rerere.c	…
rerere.h	…
revision.c	Merge branch 'jc/log-stdin'	2009-11-23 22:30:08 -08:00
revision.h	Merge branch 'jc/log-stdin'	2009-11-23 22:30:08 -08:00
run-command.c	…
run-command.h	…
send-pack.h	Smart push over HTTP: client side	2009-11-04 17:58:15 -08:00
server-info.c	…
setup.c	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Fix incorrect error check while reading deflated pack data	2009-10-21 23:19:47 -07:00
sha1_name.c	…
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	Show usage string for 'git show-index -h'	2009-11-10 11:06:57 -08:00
sideband.c	Smart push over HTTP: client side	2009-11-04 17:58:15 -08:00
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	…
strbuf.h	Check the format of more printf-type functions	2009-11-15 18:24:58 -08:00
string-list.c	…
string-list.h	…
submodule.c	submodule.c: Squelch a "use before assignment" warning	2009-11-20 21:58:11 -08:00
submodule.h	Add the --submodule option to the diff option family	2009-10-19 22:31:00 -07:00
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-match-trees.c	…
test-parse-options.c	…
test-path-utils.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	remote-helpers: return successfully if everything up-to-date	2009-10-30 19:20:54 -07:00
transport.c	Merge branch 'sp/smart-http'	2009-11-20 23:51:23 -08:00
transport.h	fetch: Allow transport -v -v -v to set verbosity to 3	2009-10-30 19:20:54 -07:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-file.c	Show usage string for 'git unpack-file -h'	2009-11-10 11:06:57 -08:00
unpack-trees.c	Merge branch 'jc/fix-tree-walk' (early part)	2009-11-20 23:55:50 -08:00
unpack-trees.h	…
upload-pack.c	Merge branch 'np/maint-sideband-favor-status' into maint	2009-12-03 13:50:24 -08:00
usage.c	Fix truncated usage messages	2009-11-22 16:14:48 -08:00
userdiff.c	…
userdiff.h	…
utf8.c	strbuf_add_wrapped_text(): skip over colour codes	2009-11-23 15:36:07 -08:00
utf8.h	…
var.c	Teach git var about GIT_PAGER	2009-11-13 12:20:47 -08:00
walker.c	…
walker.h	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…

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.