kernel/git - git - PowerEL Git System

Johannes Schindelin c85c79279d pull --rebase: be cleverer with rebased upstream branches When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		17 years ago
Documentation	pull --rebase: be cleverer with rebased upstream branches	17 years ago
arm	…
compat	Simplify strchrnul() compat code	17 years ago
contrib	Update git-completion for new 'remote rm' option	17 years ago
git-gui	Merge git://repo.or.cz/git-gui	17 years ago
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	17 years ago
gitweb	gitweb: fix whitespace in config_to_multi (indent with tab)	17 years ago
mozilla-sha1	…
perl	Don't cache DESTDIR in perl/perl.mak.	17 years ago
ppc	…
t	pull --rebase: be cleverer with rebased upstream branches	17 years ago
templates	Officially deprecate repo-config.	17 years ago
xdiff	Remove unreachable statements	17 years ago
.gitignore	Remove old generated files from .gitignore.	17 years ago
.mailmap	GIT 1.5.4-rc1	17 years ago
COPYING	…
GIT-VERSION-GEN	GIT 1.5.4-rc3	17 years ago
INSTALL	Mention 'cpio' dependency in INSTALL	17 years ago
Makefile	Add a missing dependency on http.h	17 years ago
README	…
RelNotes	GIT 1.5.3.8	17 years ago
alloc.c	…
archive-tar.c	Fix the expansion pattern of the pseudo-static path buffer.	18 years ago
archive-zip.c	preserve executable bits in zip archives	18 years ago
archive.c	Move sha1_file_to_archive into libgit	17 years ago
archive.h	…
attr.c	Merge branch 'maint'	17 years ago
attr.h	…
base85.c	…
blob.c	…
blob.h	…
builtin-add.c	Improve use of lockfile API	17 years ago
builtin-annotate.c	…
builtin-apply.c	Improve use of lockfile API	17 years ago
builtin-archive.c	Move sha1_file_to_archive into libgit	17 years ago
builtin-blame.c	Fix grammar nits in documentation and in code comments.	17 years ago
builtin-branch.c	git config --get-colorbool	17 years ago
builtin-bundle.c	bundle create: keep symbolic refs' names instead of resolving them	17 years ago
builtin-cat-file.c	…
builtin-check-attr.c	Full rework of quote_c_style and write_name_quoted.	18 years ago
builtin-check-ref-format.c	…
builtin-checkout-index.c	Improve use of lockfile API	17 years ago
builtin-clean.c	git-clean: fix off-by-one memory access when given no arguments	17 years ago
builtin-commit-tree.c	Re-fix "builtin-commit: fix --signoff"	17 years ago
builtin-commit.c	git-commit: exit non-zero if we fail to commit the index	17 years ago
builtin-config.c	config --get-colorbool: diff.color is a deprecated synonym to color.diff	17 years ago
builtin-count-objects.c	Make builtin-count-objects.c use parse_options.	17 years ago
builtin-describe.c	make 'git describe --all --contains' work	17 years ago
builtin-diff-files.c	add a "basic" diff config callback	17 years ago
builtin-diff-index.c	add a "basic" diff config callback	17 years ago
builtin-diff-tree.c	add a "basic" diff config callback	17 years ago
builtin-diff.c	Improve use of lockfile API	17 years ago
builtin-fast-export.c	Fix git-fast-export for zero-sized blobs	17 years ago
builtin-fetch--tool.c	Error out when user doesn't have access permission to the repository	17 years ago
builtin-fetch-pack.c	Improve use of lockfile API	17 years ago
builtin-fetch.c	Rewrite builtin-fetch option parsing to use parse_options().	17 years ago
builtin-fmt-merge-msg.c	Fix parent rewriting in --early-output	17 years ago
builtin-for-each-ref.c	for-each-ref: Fix quoting style constants.	17 years ago
builtin-fsck.c	Make 'git fsck' complain about non-commit branches	17 years ago
builtin-gc.c	slightly better auto gc message	17 years ago
builtin-grep.c	Don't access line[-1] for a zero-length "line" from fgets.	17 years ago
builtin-http-fetch.c	http-push and http-fetch: handle URLs without trailing /	17 years ago
builtin-init-db.c	Allow a relative builtin template directory.	17 years ago
builtin-log.c	git show <tag>: show the tagger	17 years ago
builtin-ls-files.c	Export three helper functions from ls-files	17 years ago
builtin-ls-remote.c	ls-remote: add -t and -h options.	17 years ago
builtin-ls-tree.c	Full rework of quote_c_style and write_name_quoted.	18 years ago
builtin-mailinfo.c	Make mailsplit and mailinfo strip whitespace from the start of the input	17 years ago
builtin-mailsplit.c	Merge branch 'maint'	17 years ago
builtin-merge-base.c	…
builtin-merge-file.c	…
builtin-merge-ours.c	git-merge-ours: make it a builtin.	17 years ago
builtin-mv.c	Improve use of lockfile API	17 years ago
builtin-name-rev.c	Make builtin-name-rev.c use parse_options.	17 years ago
builtin-pack-objects.c	pack-objects: Fix segfault when object count is less than thread count	17 years ago
builtin-pack-refs.c	Improve use of lockfile API	17 years ago
builtin-prune-packed.c	return the prune-packed progress display to the inner loop	17 years ago
builtin-prune.c	Add "--expire <time>" option to 'git prune'	17 years ago
builtin-push.c	Merge branch 'sp/refspec-match'	17 years ago
builtin-read-tree.c	Improve use of lockfile API	17 years ago
builtin-reflog.c	…
builtin-rerere.c	Improve use of lockfile API	17 years ago
builtin-reset.c	Improve use of lockfile API	17 years ago
builtin-rev-list.c	Don't access line[-1] for a zero-length "line" from fgets.	17 years ago
builtin-rev-parse.c	git-rev-parse --symbolic-full-name	17 years ago
builtin-revert.c	Improve use of lockfile API	17 years ago
builtin-rm.c	Improve use of lockfile API	17 years ago
builtin-send-pack.c	Update callers of check_ref_format()	17 years ago
builtin-shortlog.c	shortlog: mention the "-e" option in the usage	17 years ago
builtin-show-branch.c	format-patch -s: add MIME encoding header if signer's name requires so	17 years ago
builtin-show-ref.c	…
builtin-stripspace.c	Clean up stripspace a bit, use strbuf even more.	18 years ago
builtin-symbolic-ref.c	Make builtin-symbolic-ref.c use parse_options.	17 years ago
builtin-tag.c	Fix $EDITOR regression introduced by rewrite in C.	17 years ago
builtin-tar-tree.c	…
builtin-unpack-objects.c	relax usage of the progress API	17 years ago
builtin-update-index.c	Improve use of lockfile API	17 years ago
builtin-update-ref.c	Make builtin-update-ref.c use parse_options	17 years ago
builtin-upload-archive.c	…
builtin-verify-pack.c	…
builtin-verify-tag.c	…
builtin-write-tree.c	Improve use of lockfile API	17 years ago
builtin.h	Merge branch 'kh/commit'	17 years ago
bundle.c	Improve use of lockfile API	17 years ago
bundle.h	Move bundle specific stuff into bundle.[ch]	18 years ago
cache-tree.c	Small cache_tree_write refactor.	18 years ago
cache-tree.h	Small cache_tree_write refactor.	18 years ago
cache.h	Fix random fast-import errors when compiled with NO_MMAP	17 years ago
check-builtins.sh	…
check-racy.c	ce_match_stat, run_diff_files: use symbolic constants for readability	17 years ago
color.c	Support GIT_PAGER_IN_USE environment variable	17 years ago
color.h	git config --get-colorbool	17 years ago
combine-diff.c	Fix rewrite_diff() name quoting.	17 years ago
command-list.txt	Officially deprecate repo-config.	17 years ago
commit.c	parse_commit_buffer: tighten checks while parsing	17 years ago
commit.h	add -i: Fix running from a subdirectory	17 years ago
config.c	Improve use of lockfile API	17 years ago
config.mak.in	autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.	17 years ago
configure.ac	autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>.	17 years ago
connect.c	Miscellaneous const changes and utilities	17 years ago
convert.c	treat any file with NUL as binary	17 years ago
copy.c	…
csum-file.c	remove dead code from the csum-file interface	17 years ago
csum-file.h	remove dead code from the csum-file interface	17 years ago
ctype.c	…
daemon.c	Style: place opening brace of a function definition at column 1	17 years ago
date.c	parse_date_format(): convert a format name to an enum date_mode	18 years ago
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	fix style of a few comments in diff-delta.c	17 years ago
diff-lib.c	Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c	17 years ago
diff.c	color unchanged lines as "plain" in "diff --color-words"	17 years ago
diff.h	add a "basic" diff config callback	17 years ago
diffcore-break.c	rename: Break filepairs with different types.	17 years ago
diffcore-delta.c	optimize diffcore-delta by sorting hash entries.	17 years ago
diffcore-order.c	Use xmemdupz() in many places.	18 years ago
diffcore-pickaxe.c	…
diffcore-rename.c	Fix a pathological case in git detecting proper renames	17 years ago
diffcore.h	copy vs rename detection: avoid unnecessary O(n*m) loops	17 years ago
dir.c	Fix a memory leak	17 years ago
dir.h	per-directory-exclude: lazily read .gitignore files	17 years ago
dump-cache-tree.c	…
entry.c	Merge branch 'jc/maint-add-sync-stat'	17 years ago
environment.c	Support GIT_PAGER_IN_USE environment variable	17 years ago
exec_cmd.c	Trace and quote with argv: get rid of unneeded count argument.	17 years ago
exec_cmd.h	use only the $PATH for exec'ing git commands	17 years ago
fast-import.c	Document the hairy gfi_unpack_entry part of fast-import	17 years ago
fetch-pack.h	Always obtain fetch-pack arguments from struct fetch_pack_args	18 years ago
fixup-builtins	…
generate-cmdlist.sh	Consolidate command list to one.	17 years ago
git-add--interactive.perl	add--interactive: allow diff colors without interactive colors	17 years ago
git-am.sh	git-am: Run git gc only once and not for every patch.	17 years ago
git-archimport.perl	…
git-bisect.sh	git-bisect visualize: work in non-windowed environments better	17 years ago
git-checkout.sh	Fix a typo in checkout.sh and cleanup one-line help messages	17 years ago
git-clone.sh	clone: fix options '-o' and '--origin' to be recognised again	17 years ago
git-compat-util.h	pre-POSIX.1-2001 systems do not have <sys/select.h>	17 years ago
git-cvsexportcommit.perl	cvsexportcommit: fix massive commits	17 years ago
git-cvsimport.perl	cvsimport: remove last use of repo-config from git standard tools	17 years ago
git-cvsserver.perl	cvsserver: Fix for histories with multiple roots	17 years ago
git-filter-branch.sh	filter-branch: work correctly with ambiguous refnames	17 years ago
git-help--browse.sh	rename git-browse--help to git-help--browse	17 years ago
git-instaweb.sh	Fix git-instaweb breakage on MacOS X due to the limited sed functionality	17 years ago
git-lost-found.sh	Merge branch 'ph/parseopt-sh'	17 years ago
git-merge-octopus.sh	…
git-merge-one-file.sh	Support a merge with conflicting gitlink change	17 years ago
git-merge-resolve.sh	…
git-merge-stupid.sh	…
git-merge.sh	Merge branch 'ph/parseopt-sh'	17 years ago
git-mergetool.sh	Allow git-mergetool to handle paths with a leading space	17 years ago
git-parse-remote.sh	…
git-pull.sh	pull --rebase: be cleverer with rebased upstream branches	17 years ago
git-quiltimport.sh	Replace instances of export VAR=VAL with VAR=VAL; export VAR	17 years ago
git-rebase--interactive.sh	Squelch bogus progress output from git-rebase--interactive	17 years ago
git-rebase.sh	Merge branch 'maint'	17 years ago
git-relink.perl	…
git-remote.perl	Merge branch 'maint'	17 years ago
git-repack.sh	Migrate git-repack.sh to use git-rev-parse --parseopt	17 years ago
git-request-pull.sh	Merge branch 'ph/parseopt-sh'	17 years ago
git-send-email.perl	send-email, fix breakage in combination with --compose	17 years ago
git-sh-setup.sh	shell-scripts usage(): consistently exit with non-zero	17 years ago
git-stash.sh	git-stash clear: refuse to work with extra parameter for now	17 years ago
git-submodule.sh	git-submodule: fix subcommand parser	17 years ago
git-svn.perl	git-svn: default to repacking every 1000 commits	17 years ago
git.c	Merge branch 'kh/commit'	17 years ago
git.spec.in	RPM spec: include gitk message files.	17 years ago
grep.c	…
grep.h	…
hash-object.c	git-hash-object should honor config variables	17 years ago
hash.c	Do linear-time/space rename logic for exact renames	17 years ago
hash.h	Do linear-time/space rename logic for exact renames	17 years ago
help.c	rename git-browse--help to git-help--browse	17 years ago
http-push.c	http-push and http-fetch: handle URLs without trailing /	17 years ago
http-walker.c	Move fetch_ref from http-push.c and http-walker.c to http.c	17 years ago
http.c	Move fetch_ref from http-push.c and http-walker.c to http.c	17 years ago
http.h	Clarify that http-push being temporarily disabled with older cURL	17 years ago
ident.c	Fix grammar nits in documentation and in code comments.	17 years ago
imap-send.c	strbuf change: be sure ->buf is never ever NULL.	18 years ago
index-pack.c	Merge branch 'np/progress'	17 years ago
interpolate.c	Merge branch 'mv/unknown'	17 years ago
interpolate.h	…
list-objects.c	Fix memory leak in traverse_commit_list	17 years ago
list-objects.h	…
lockfile.c	close_lock_file(): new function in the lockfile API	17 years ago
log-tree.c	Make the diff_options bitfields be an unsigned with explicit masks.	17 years ago
log-tree.h	rev-list: implement --bisect-all	17 years ago
mailmap.c	mailmap: fix bogus for() loop that happened to be safe by accident	17 years ago
mailmap.h	…
match-trees.c	Improved const correctness for strings	17 years ago
merge-file.c	xdl_diff: identify call sites.	17 years ago
merge-index.c	…
merge-recursive.c	Improve use of lockfile API	17 years ago
merge-tree.c	xdl_diff: identify call sites.	17 years ago
mktag.c	Now that cache.h needs strbuf.h, remove useless includes.	18 years ago
mktree.c	Rework unquote_c_style to work on a strbuf.	18 years ago
object-refs.c	…
object.c	Don't dereference NULL upon lookup failure.	17 years ago
object.h	…
pack-check.c	…
pack-redundant.c	…
pack-write.c	Merge branch 'np/progress'	17 years ago
pack.h	Merge branch 'np/progress'	17 years ago
pager.c	Support GIT_PAGER_IN_USE environment variable	17 years ago
parse-options.c	parse-options: catch likely typo in presense of aggregated options.	17 years ago
parse-options.h	parse-options: Allow to hide options from the default usage.	17 years ago
patch-delta.c	…
patch-id.c	…
patch-ids.c	Make the diff_options bitfields be an unsigned with explicit masks.	17 years ago
patch-ids.h	…
path-list.c	…
path-list.h	…
path.c	…
pkt-line.c	…
pkt-line.h	…
pretty.c	custom pretty format: tolerate empty e-mail address	17 years ago
progress.c	Flush progress message buffer in display().	17 years ago
progress.h	nicer display of thin pack completion	17 years ago
quote.c	Fix rewrite_diff() name quoting.	17 years ago
quote.h	Fix rewrite_diff() name quoting.	17 years ago
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'jc/maint-add-sync-stat'	17 years ago
receive-pack.c	receive-pack: reject invalid refnames	17 years ago
reflog-walk.c	…
reflog-walk.h	…
refs.c	refs.c: rework ref_locks by abstracting from underlying struct lock_file	17 years ago
refs.h	lock_any_ref_for_update(): reject wildcard return from check_ref_format	17 years ago
remote.c	remote: Fix bogus make_branch() call in configuration reader.	17 years ago
remote.h	Add remote.<name>.proxy	17 years ago
revision.c	Fix "git log --diff-filter" bug	17 years ago
revision.h	shortlog: default to HEAD when the standard input is a tty	17 years ago
run-command.c	run-command: Support sending stderr to /dev/null	17 years ago
run-command.h	run-command: Support sending stderr to /dev/null	17 years ago
send-pack.h	Teach send-pack a mirror mode	17 years ago
server-info.c	Don't access line[-1] for a zero-length "line" from fgets.	17 years ago
setup.c	Fix grammar nits in documentation and in code comments.	17 years ago
sha1_file.c	Fix random fast-import errors when compiled with NO_MMAP	17 years ago
sha1_name.c	Merge branch 'sp/refspec-match'	17 years ago
shallow.c	…
shell.c	shell should call the new setup_path() to setup $PATH	17 years ago
show-index.c	Use PRIuMAX instead of 'unsigned long long' in show-index	17 years ago
sideband.c	recv_sideband: Do not use ANSI escape sequence on dumb terminals.	17 years ago
sideband.h	…
strbuf.c	Uninline prefixcmp()	17 years ago
strbuf.h	builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.	17 years ago
symlinks.c	…
tag.c	parse_tag_buffer: don't parse invalid tags	17 years ago
tag.h	…
tar.h	…
test-absolute-path.c	…
test-chmtime.c	…
test-date.c	…
test-delta.c	…
test-genrandom.c	…
test-match-trees.c	…
test-parse-options.c	parse-options: catch likely typo in presense of aggregated options.	17 years ago
test-sha1.c	…
test-sha1.sh	the use of 'tr' in the test suite isn't really portable	17 years ago
trace.c	Trace and quote with argv: get rid of unneeded count argument.	17 years ago
transport.c	Don't access line[-1] for a zero-length "line" from fgets.	17 years ago
transport.h	Merge branch 'aw/mirror-push' into jk/send-pack	17 years ago
tree-diff.c	Fix small memory leaks induced by diff_tree_setup_paths	17 years ago
tree-walk.c	tree-walk: don't parse incorrect entries	17 years ago
tree-walk.h	rename: Break filepairs with different types.	17 years ago
tree.c	…
tree.h	…
unpack-file.c	…
unpack-trees.c	unpack-trees: FLEX_ARRAY fix	17 years ago
unpack-trees.h	…
update-server-info.c	…
upload-pack.c	upload-pack: Use finish_{command,async}() instead of waitpid().	17 years ago
usage.c	print warning/error/fatal messages in one shot	17 years ago
utf8.c	utf8_width(): allow non NUL-terminated input	17 years ago
utf8.h	utf8_width(): allow non NUL-terminated input	17 years ago
var.c	Re-fix "builtin-commit: fix --signoff"	17 years ago
walker.c	Clarify error response from 'git fetch' for bad responses	17 years ago
walker.h	Modularize commit-walker	18 years ago
write_or_die.c	…
ws.c	whitespace: more accurate initial-indent highlighting	17 years ago
wt-status.c	git-commit: squelch needless message during an empty merge	17 years ago
wt-status.h	git-commit: squelch needless message during an empty merge	17 years ago
xdiff-interface.c	Re(-re)*fix trim_common_tail()	17 years ago
xdiff-interface.h	xdl_diff: identify call sites.	17 years ago

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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
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.